openatc-components 0.2.79 → 0.2.80

package/src/kisscomps/components/SchemeConfig/azimuthlocking/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.azimuthlocking')}}</div> -->
       <el-row>
         <el-col :span="12">
@@ -45,10 +45,10 @@
         </el-col>
       </el-row>
       <el-row style="margin-top: 6px;">
-        <el-col :span="24">
+        <el-col :span="5">
             <span class="model-label-title">{{$t('openatccomponents.overview.indirection')}}:</span>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="19">
             <div class="control-model" v-for="(item, index) in imgs" :key="index">
                 <div :style="{'backgroundColor': item.bgcolor}" :class="{'single-model-select':spanIndex.indexOf(index)>-1}" class="single-model"  @click="boxShow(index,item)">
                     <div v-if="item.class" :style="{color: themeColor}" :class="item.class" style="border:0px;font-size: 50px;"></div>
@@ -89,13 +89,13 @@
         </div>
       </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.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>
@@ -117,10 +117,6 @@ export default {
     realtimeStatusModalvisible: {
       type: Boolean,
       default: true
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   watch: {

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

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="manual-control-modal closephase-control  manual-common-content">
+  <div class="manual-control-modal closephase-control">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div> -->
     <el-row>
       <el-col :span="24">
@@ -61,13 +61,13 @@
         </div>
     </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>
@@ -118,10 +118,6 @@ export default {
     },
     roadDirection: {
       type: String
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {

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

@@ -10,11 +10,12 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="lockingphase-control manual-common-content">
+  <div class="lockingphase-control manual-control-modal">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
     <el-row>
       <el-col :span="12">
          <el-form
+          :inline="true"
            ref="manual"
            label-position="left"
            :model="manualInfo"
@@ -40,6 +41,7 @@
       </el-col>
       <el-col :span="12">
         <el-form
+         :inline="true"
           ref="manual"
           label-position="left"
           :model="manualInfo"
@@ -88,8 +90,8 @@
         </div>
     </el-row>
     <div class="footer">
-        <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="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
   </div>
@@ -116,10 +118,6 @@ export default {
     },
     roadDirection: {
       type: String
-    },
-    isShowBack: {
-      type: Boolean,
-      default: true
     }
   },
   data () {

package/src/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/src/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/src/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/src/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/src/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/src/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/src/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,

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/views/intersection.vue

@@ -1,14 +1,31 @@
 <template>
   <div>
-    <h2 class="text">实时通道路口图</h2>
-    <channel-intection-with-interface
-      :agentId="this.agentId"
-      :roadDirection="roadDirection"
-      :channelRealtimeStatusData="channelRealtimeStatusData"
-    />
+    <!-- <h2>静态路口图</h2> -->
+    <!-- <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            :agentId="agentId"
+            :clickMode="true" /> -->
+
+    <!-- 显示按通道获取相位的模版路口图 -->
+    <h2 class="text">显示配置的相位路口图</h2>
+    <!-- <intersection-base-map
+            ref="intersectionMap"
+            :crossStatusData="crossStatusData"
+            agentId="tjblsxl-ticp6"
+            isVipRoute
+            :choosedDirection="[1,2,3]"
+            :choosedPedDirection="[3,4]"
+            :roadDirection="roadDirection" /> -->
+      <intersection-direction-selection
+            :agentId="this.agentId"
+            :clickMode="false"
+            :choosedDirection="[14,6,13,8]"
+            :choosedPedDirection="[1]"
+            :roadDirection="roadDirection" />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
-    <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
+    <h2 class="text">非第三方配置路口图</h2>
     <intersection-direction-selection
       :agentId="this.agentId"
       :choosedDirection="[14,6,13,8]"
@@ -16,7 +33,7 @@
       :roadDirection="roadDirection"
       @handleClickCrossIcon="handleClickCrossIcon" />
 
-      <h2 class="text">第三方配置路口图(按路口相位配置显示相位方向)</h2>
+      <h2 class="text">第三方配置路口图</h2>
       <div>
         <intersection-direction-selection
         :agentId="this.agentId"
@@ -27,23 +44,6 @@
         @handleClickCrossIcon="handleClickCrossIcon" />
       </div>
 
-      <!-- 显示按通道获取相位的模版路口图 -->
-    <h2 class="text">显示配置的相位路口图</h2>
-    <!-- <intersection-base-map
-            ref="intersectionMap"
-            :crossStatusData="crossStatusData"
-            agentId="tjblsxl-ticp6"
-            isVipRoute
-            :choosedDirection="[1,2,3]"
-            :choosedPedDirection="[3,4]"
-            :roadDirection="roadDirection" /> -->
-      <!-- <intersection-direction-selection
-            :agentId="this.agentId"
-            :clickMode="false"
-            :choosedDirection="[14,6,13,8]"
-            :choosedPedDirection="[1]"
-            :roadDirection="roadDirection" /> -->
-
       <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
       <button @click="changeControlPattern" >改变控制方案</button><br/>
@@ -139,12 +139,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjbljml',
+      agentId: 'tjblsxl-ticp6',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE4NjcyODI1MTg4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODcxNjAyNSwiaWF0IjoxNzE4NjcyODI1fQ.vjEP7xqngwal74DlUwqs4FLoy-IsNphHNrbuDqzGce4',
+      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -186,39 +186,7 @@ export default {
           }
         }
       ],
-      crossStatusData: {},
-      channelRealtimeStatusData: {
-        'channellamp': [
-          {
-            'id': 1,
-            'light': 1
-          },
-          {
-            'id': 2,
-            'light': 3
-          },
-          {
-            'id': 3,
-            'light': 1
-          },
-          {
-            'id': 4,
-            'light': 1
-          },
-          {
-            'id': 5,
-            'light': 3
-          },
-          {
-            'id': 6,
-            'light': 1
-          },
-          {
-            'id': 7,
-            'light': 3
-          }
-        ]
-      }
+      crossStatusData: {}
     }
   },
   components: {

package/src/views/overView.vue

@@ -20,7 +20,7 @@ export default {
       modeName: '交警遥控',
       controlName: '步进',
       agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzE4NjcyODI1MTg4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxODcxNjAyNSwiaWF0IjoxNzE4NjcyODI1fQ.vjEP7xqngwal74DlUwqs4FLoy-IsNphHNrbuDqzGce4',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/commonkanban.scss

@@ -57,7 +57,7 @@
   overflow: hidden;
   text-align: center;
   padding: 0 6PX;
-  margin-bottom: -10PX;
+  margin-bottom: -20PX;
   font-size: 12PX;
   color: $--color-info;
   background-color: $--color-black;
@@ -141,10 +141,10 @@
     cursor: pointer;
     width: 100%;
     height: 48PX;
-    // margin: 5PX 0;
+    margin: 5PX 0;
     // background-color: rgba(31,46,46,0.9);
     text-align: left;
-    line-height: 37PX;
+    line-height: 40PX;
     padding: 1PX 1PX;
     box-sizing: border-box;
     // cursor: pointer;

package/static/styles/overview.scss

@@ -109,7 +109,7 @@
     margin-left: 15PX;
     margin-top: 15PX;
     height: 20PX;
-    font-size: 18PX;
+    font-size: 20PX;
     font-weight: normal;
     font-stretch: normal;
     line-height: 22PX;
@@ -130,7 +130,7 @@
     float: right;
     color: $--color-text-regular;
     .el-checkbox__label {
-      font-size: 14PX;
+      font-size: 16PX;
       color: $--color-text-regular;
       font-weight: normal;
       font-stretch: normal;