openatc-components 0.2.80 → 0.2.81

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="priority-control">
+  <div class="priority-control manual-common-content">
     <!-- <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 @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 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">
-        <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 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.comfirm')}}</el-button>
     </div>
   </div>
@@ -114,6 +114,10 @@ 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>
+<div style="overflow: hidden;">
   <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">
+  <div class="tentativeplan-control manual-common-content">
     <!-- <div class="title" style="margin-bottom: 18px">
       {{ $t('openatccomponents.overview.tentativeplan') }}
     </div> -->
@@ -92,7 +92,7 @@
         </el-form>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row style="margin-top: 20px;">
       <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>
+    <el-row style="margin-top: 20px;">
       <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; margin-top: 20px">
+          <div style="width: 100%; overflow: hidden;">
             <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 @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>
+      <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">
-      <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>
+      <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.comfirm')
       }}</el-button>
@@ -359,6 +359,10 @@ export default {
     },
     patternSelect: {
       type: Array
+    },
+    isShowBack: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

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

@@ -298,6 +298,7 @@ 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,
@@ -305,7 +306,7 @@ export default {
         }
         dirArr.push(recd)
         for(let i=0;i<rec.peddirection.length;i++) {
-          rec.peddirection[i].color = color
+          rec.peddirection[i].color = pedColor
         }
       }
       return dirArr

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

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

package/package/kisscomps/index.js

@@ -7,6 +7,7 @@ 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'
@@ -47,6 +48,7 @@ const components = {
   Channelization,
   ChannelizationFlowStatistic,
   DrawChannelization,
+  ChannelRealtimeIntersection,
   FaultDetailModal,
   PatternStatus,
   BoardCard,