openatc-components 0.2.79 → 0.2.80

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

@@ -54,7 +54,6 @@
           :phaseList="phaseList"
           :patternStatus="statusData"
           :lockPhaseBtnName="lockPhaseBtnName"
-          :isShowBack="isShowBack"
           @closePhaseBack="handleClose"
           @closePhaseControl="closePhaseControl"
           @toAutoControl="toAutoControl" />
@@ -64,20 +63,9 @@
           :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 v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-            <el-button @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 && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
-            <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
-          </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
         <ControlModelGroup
@@ -102,17 +90,6 @@
             </el-form-item>
            </el-form>
         </div>
-
-        <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-          <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button @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 && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-          <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
-          <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
-        </div>
-
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
         <ControlModelGroup
@@ -171,16 +148,6 @@
                 </pattern-list>
              </div>
           </div>
-
-          <div class="footer" v-if="realtimeStatusModalvisible && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-            <el-button @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 && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
-            <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
-            <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
-          </div>
       </el-tab-pane>
       <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
@@ -200,7 +167,6 @@
         :sidewalkPhaseData="sidewalkPhaseData"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :roadDirection="roadDirection"
-        :isShowBack="isShowBack"
         @closePhaseBack="handleClose"
         @closePhaseControl="closePhaseControl"
         @toAutoControl="toAutoControl" />
@@ -212,7 +178,6 @@
          :overlap="overlap"
          :patternSelect="patternSelect"
          :allPatternList="allPatternList"
-         :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
@@ -221,13 +186,21 @@
         v-if="preselecttype === '优先控制'"
         :realtimeStatusModalvisible="realtimeStatusModalvisible"
         :phaseList="phaseList"
-        :isShowBack="isShowBack"
          @closePhaseBack="handleClose"
          @closePhaseControl="closePhaseControl"
          @toAutoControl="toAutoControl"
         />
       </el-tab-pane>
     </el-tabs>
+  <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 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 && ((activeName === 'residentcontrol' && preselecttype !== '相位锁定' && preselecttype !== '方向锁定') || activeName === 'specialcontrol' || activeName === 'schemeselection')">
+    <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+    <el-button class="3" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
+  </div>
   </div>
 </template>
 
@@ -301,7 +274,7 @@ export default {
     specialcontrolList: {
       type: Array
     },
-    realtimeStatusModalvisible: { // 区分是保存方案还是提交方案，保存方案没有路口实时信息
+    realtimeStatusModalvisible: {
       type: Boolean,
       default: true
     },
@@ -338,10 +311,6 @@ export default {
     },
     patternChooseControlList: {
       type: Array
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   watch: {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="priority-control manual-common-content">
+  <div class="priority-control">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div> -->
     <el-row>
       <el-col :span="12">
@@ -86,13 +86,13 @@
       </el-col>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-        <el-button v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @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 v-if="isShowBack" @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+        <el-button @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>
   </div>
@@ -114,10 +114,6 @@ export default {
     },
     phaseList: {
       type: Array
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div style="overflow: hidden;">
+<div>
   <div class="cross-mess">{{$t('openatccomponents.overview.crossinfo')}}</div>
   <div class="cross-module">
     <div class="cross-content">

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="tentativeplan-control manual-common-content">
+  <div class="tentativeplan-control">
     <!-- <div class="title" style="margin-bottom: 18px">
       {{ $t('openatccomponents.overview.tentativeplan') }}
     </div> -->
@@ -92,7 +92,7 @@
         </el-form>
       </el-col>
     </el-row>
-    <el-row style="margin-top: 20px;">
+    <el-row>
       <el-radio v-model="isRing" :label="false" @change="changeRing">{{
         $t('openatccomponents.common.ringStyle')
       }}</el-radio>
@@ -126,14 +126,14 @@
       >
       </pattern-list>
     </el-row>
-    <el-row style="margin-top: 20px;">
+    <el-row>
       <el-tabs v-model="activeTab" type="card">
         <el-tab-pane
           v-if="!isRing"
           :label="$t('openatccomponents.pattern.ringConfig')"
           name="kanban"
         >
-          <div style="width: 100%; overflow: hidden;">
+          <div style="width: 100%; overflow: hidden; margin-top: 20px">
             <kan-ban
               v-for="n in ringCount"
               :key="n"
@@ -315,19 +315,19 @@
       </el-tabs>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-      <el-button v-if="isShowBack" @click="handleClose()">{{
+      <el-button @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</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 v-if="isShowBack" @click="handleClose()">{{
+      <el-button @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</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>
@@ -359,10 +359,6 @@ export default {
     },
     patternSelect: {
       type: Array
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   watch: {

package/package/kisscomps/components/Stages/index.vue

@@ -298,7 +298,6 @@ export default {
     dirListSetTheme (list) {
       let dirArr = []
       let color = getTheme() === 'light' ? '#606266' : '#F1F3F4'
-      let pedColor = getTheme() === 'light' ? '#606266' : 'rgba(255, 255, 255, 0.6)'
       for (let rec of list) {
         let recd = {
           ...rec,
@@ -306,7 +305,7 @@ export default {
         }
         dirArr.push(recd)
         for(let i=0;i<rec.peddirection.length;i++) {
-          rec.peddirection[i].color = pedColor
+          rec.peddirection[i].color = color
         }
       }
       return dirArr

package/package/kisscomps/components/patternList/patternList.vue

@@ -3,6 +3,7 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
@@ -536,6 +537,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },

package/package/kisscomps/index.js

@@ -7,7 +7,6 @@ import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselCo
 import Channelization from './components/Channelization/index'
 import ChannelizationFlowStatistic from './components/ChannelizationFlowStatistic/index'
 import DrawChannelization from './components/DrawChannelization/index'
-import ChannelRealtimeIntersection from './components/ChannelRealtimeIntersection/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
@@ -48,7 +47,6 @@ const components = {
   Channelization,
   ChannelizationFlowStatistic,
   DrawChannelization,
-  ChannelRealtimeIntersection,
   FaultDetailModal,
   PatternStatus,
   BoardCard,