openatc-components 0.2.57 → 0.2.58

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -38,6 +38,7 @@
               :overlap="overlap"
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
+              :isShowBack="isShowBack"
               @closeManualModal="closeManualModal"
               @selectModel="selectModel"
               @selectStages="selectStages"
@@ -45,76 +46,8 @@
               @closePhaseBack="closePhaseBack"
               @closePhaseControl="closePhaseControl"
               @selectSpecialModel="selectSpecialModelNew" />
-             <!-- <ManualControlModal
-               :controlData="controlData"
-               :modelList="modelList"
-               :patternSelect="patternSelect"
-               :patternAll="patternAll"
-               :crossStatusData="crossStatusData"
-               :phaseList="phaseList"
-               :specialcontrolList="specialcontrolList"
-               :currModel="currModel"
-               :preselectModel="preselectModel"
-               :preselectStages="preselectStages"
-               :realtimeStatusModalvisible="realtimeStatusModalvisible"
-               :funcSort="funcSort"
-               :roadDirection="roadDirection"
-               @closeManualModal="closeManualModal"
-               @selectModel="selectModel"
-               @selectStages="selectStages"
-               @patternCommit="patternCommit"
-               @selectSpecialModel="selectSpecialModel" /> -->
             </div>
           </transition>
-          <!-- <transition name="fade-left" mode="out-in"
-          enter-active-class="animated fadeInRight"
-          leave-active-class="animated fadeOutRight">
-            <div style="position: absolute;width: 100%;height:100%" v-show="(isOperation && isClosePhase)">
-              <ClosePhaseControlModal
-                v-if="specialPage === 'closephase'"
-                :controlData="controlData"
-                :closePhaseRings="phaseRings"
-                :sidewalkPhaseData="sidewalkPhaseData"
-                :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                :roadDirection="roadDirection"
-                @closePhaseBack="closePhaseBack"
-                @closePhaseControl="closePhaseControl" /> -->
-              <!-- <LockingPhaseControlModal
-                v-if="specialPage === 'lockingphase'"
-                :roadDirection="roadDirection"
-                :phaseList="phaseList"
-                :patternStatus="statusData"
-                :lockPhaseBtnName="lockPhaseBtnName"
-                @closePhaseBack="closePhaseBack"
-                @closePhaseControl="closePhaseControl" /> -->
-                <!-- <TentativePlanControlModal
-                 v-if="specialPage === 'tentativeplan'"
-                 :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                 :controlData="controlData"
-                 :phaseList="phaseList"
-                 :overlap="overlap"
-                 :patternSelect="patternSelect"
-                 :allPatternList="allPatternList"
-                 @closePhaseBack="closePhaseBack"
-                 @closePhaseControl="closePhaseControl"
-                />
-                <priorityControl
-                v-if="specialPage === 'prioritycontrol'"
-                :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                :phaseList="phaseList"
-                 @closePhaseBack="closePhaseBack"
-                 @closePhaseControl="closePhaseControl"
-                /> -->
-                <!-- <AzimuthLocking
-                v-if="specialPage === 'azimuthlocking'"
-                :realtimeStatusModalvisible="realtimeStatusModalvisible"
-                :phaseList="phaseList"
-                :patternStatus="statusData"
-                 @closePhaseBack="closePhaseBack"
-                 @closePhaseControl="closePhaseControl"
-                /> -->
-            <!-- </div>
-          </transition> -->
 
           <transition name="fade-left" mode="out-in"
           enter-active-class="animated fadeInLeft"
@@ -240,6 +173,10 @@ export default {
     isFromAtc: {
       type: Boolean,
       default: true
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -473,32 +410,6 @@ export default {
       faultvisible: false,
       isClosePhase: false, // 是否在相位关断
       toPage: 1, // 与哪一个页面交互，1 代表路口信息页面，3代表 相位关断页面
-      specialcontrolList: [{ // 特殊控制
-        id: 23,
-        isShow: true,
-        permission: 'configer:manual:optimize',
-        iconClass: 'closephase'
-      }, {
-        id: 22,
-        isShow: true,
-        permission: 'configer:manual:optimize',
-        iconClass: 'lockingphase'
-      }, {
-        id: 100,
-        isShow: true,
-        permission: 'configer:manual:optimize',
-        iconClass: 'tentativeplan'
-      }, {
-        id: 24,
-        isShow: true,
-        permission: 'configer:manual:preempt',
-        iconClass: 'prioritycontrol'
-      }, {
-        id: 25,
-        permission: 'configer:manual:optimize',
-        isShow: this.realtimeStatusModalvisible,
-        iconClass: 'azimuthlocking'
-      }],
       phaseRings: [],
       curFaultList: [],
       confirmedFault: [],
@@ -862,10 +773,6 @@ export default {
       }
     },
     closePhaseBack () {
-      // if (!this.realtimeStatusModalvisible) {
-      //   this.$emit('closePhaseBack')
-      //   return
-      // }
       this.toPage = 3
       this.isClosePhase = false
     },

package/package/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -89,12 +89,12 @@
         </div>
       </div> -->
       <div class="footer" v-if="realtimeStatusModalvisible">
-          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
           <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
       </div>
       <div class="footer" v-if="!realtimeStatusModalvisible">
-          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
           <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
       </div>
@@ -117,6 +117,10 @@ export default {
     realtimeStatusModalvisible: {
       type: Boolean,
       default: true
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

package/package/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue

@@ -61,12 +61,12 @@
         </div>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
         <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
         <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
@@ -118,6 +118,10 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue

@@ -88,7 +88,7 @@
         </div>
     </el-row>
     <div class="footer">
-        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
         <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
@@ -116,6 +116,10 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue

@@ -54,6 +54,7 @@
           :phaseList="phaseList"
           :patternStatus="statusData"
           :lockPhaseBtnName="lockPhaseBtnName"
+          :isShowBack="isShowBack"
           @closePhaseBack="handleClose"
           @closePhaseControl="closePhaseControl"
           @toAutoControl="toAutoControl" />
@@ -63,12 +64,13 @@
           :realtimeStatusModalvisible="realtimeStatusModalvisible"
           :phaseList="phaseList"
           :patternStatus="statusData"
+          :isShowBack="isShowBack"
            @closePhaseBack="handleClose"
            @toAutoControl="toAutoControl"
           />
 
           <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+            <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
             <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
           </div>
@@ -102,7 +104,7 @@
         </div>
 
         <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-          <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
           <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
         </div>
@@ -171,7 +173,7 @@
           </div>
 
           <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+            <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
             <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
             <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
           </div>
@@ -198,6 +200,7 @@
         :sidewalkPhaseData="sidewalkPhaseData"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :roadDirection="roadDirection"
+        :isShowBack="isShowBack"
         @closePhaseBack="handleClose"
         @closePhaseControl="closePhaseControl"
         @toAutoControl="toAutoControl" />
@@ -209,6 +212,7 @@
          :overlap="overlap"
          :patternSelect="patternSelect"
          :allPatternList="allPatternList"
+         :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -217,6 +221,7 @@
         v-if="preselecttype === '优先控制'"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :phaseList="phaseList"
+        :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -296,7 +301,7 @@ export default {
     specialcontrolList: {
       type: Array
     },
-    realtimeStatusModalvisible: {
+    realtimeStatusModalvisible: { // 区分是保存方案还是提交方案，保存方案没有路口实时信息
       type: Boolean,
       default: true
     },
@@ -333,6 +338,10 @@ export default {
     },
     patternChooseControlList: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

package/package/kisscomps/components/SchemeConfig/priorityControl/index.vue

@@ -86,12 +86,12 @@
       </el-col>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
         <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
         <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
@@ -114,6 +114,10 @@ export default {
     },
     phaseList: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   data () {

package/package/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -315,7 +315,7 @@
       </el-tabs>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-      <el-button @click="handleClose()">{{
+      <el-button v-if="isShowBack" @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
       <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
@@ -324,7 +324,7 @@
       }}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-      <el-button @click="handleClose()">{{
+      <el-button v-if="isShowBack" @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
       <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
@@ -359,6 +359,10 @@ export default {
     },
     patternSelect: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {