openatc-components 0.3.108 → 0.3.109

package/src/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue

@@ -212,8 +212,8 @@ export default {
       Detector: [], // 管理所有检测器
       DetectorChart: [], // 管理所有检测器统计图
       motorwayicon: '',
-      IconLengh: 33,
-      IconWdith: 109,
+      IconLengh: 60,
+      IconWdith: 134,
       textareaW: 200,
       textareaH: 100,
       pedW: 206,
@@ -389,8 +389,8 @@ export default {
         h: this.IconWdith,
         angle: 0
       }
-      this.IconLengh = 33
-      this.IconWdith = 109
+      this.IconLengh = 60
+      this.IconWdith = 134
       let Motorwaysitem = {
         index: this.index,
         id: this.motorid,

package/src/kisscomps/components/DrawChannelization/drawsvg/index.vue

@@ -92,7 +92,7 @@ export default {
           // }
           return
         }
-        if (data.data.data === undefined || JSON.stringify(data.data.data) === '{}') return
+        if (JSON.stringify(data.data.data) === '{}') return
         _this.pageindex = 2
         _this.loadedChannelizatonData = JSON.parse(JSON.stringify(data.data.data))
       })

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import CrossDiagram from './crossDirection/crossDiagram.vue'
+import CrossDiagram from './crossDirection/crossDiagram'
 import { setToken } from '../../../utils/auth.js'
 export default {
   name: 'intersection-base-map',

package/src/kisscomps/components/OverviewComponent/index.vue

@@ -11,9 +11,9 @@
  **/
 <template>
   <div class="container-main">
-    <div class="overview-component-content" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
-        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" ref="tuxingLeft">
+        <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
           <intersection-base-map
             v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
@@ -29,7 +29,7 @@
             :AgentId="agentId"
             :crossStatusData="crossStatusData"
             :detectorStatusData="detectorStatusData" />
-          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
               <span class="pattern-explain"><el-checkbox v-model="checked">{{$t('openatccomponents.overviewcomponent.overLap')}}</el-checkbox></span>
@@ -93,7 +93,7 @@
           </div>
         </div>
 
-        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
+        <div ref="tuxingRight" class="tuxing-right" >
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"
@@ -144,10 +144,6 @@ export default {
     isfromatc: {
       type: Boolean,
       default: true
-    },
-    onlyShowIntersectionMap: {
-      type: Boolean,
-      default: false
     }
   },
   data () {
@@ -171,7 +167,7 @@ export default {
       detectorStatusTimer: null, // 检测器定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿'], [4, '绿闪']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green'], [4, 'Greenclear']]), // phaseType表示红，黄，绿
@@ -339,7 +335,7 @@ export default {
           return
         }
         // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
-        if (_this.isfromatc === true && data.data.success === true && data.data.data !== undefined && JSON.stringify(data.data.data) !== '{}') {
+        if (_this.isfromatc === true && data.data.success === true && JSON.stringify(data.data.data) !== '{}') {
           _this.curHomePage = 'Channelization'
         } else {
           _this.curHomePage = 'Graphical'

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,13 +79,9 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
       styles: {
         left: '1px',
-        top: '0px'
+        top: '0'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -101,9 +97,6 @@ export default {
       type: String,
       default: 'Header'
     },
-    id: {
-      type: Number
-    },
     rings: {
       type: Object
     },
@@ -216,7 +209,6 @@ export default {
                   }
                 }
               }
-              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -240,7 +232,6 @@ export default {
                 }
               }
             }
-            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -14,9 +14,8 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
-            <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -26,18 +25,7 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
-                      <el-input-number
-                        v-if="!isMove"
-                        class="ring-nums"
-                        size="small"
-                        :controls="false"
-                        :min="0"
-                        :step="1"
-                        v-model.number="item.split"
-                        @change="handleEdit(item)"
-                        style="width: 24px"
-                      ></el-input-number>
+                      <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
                 </el-tooltip>
@@ -53,8 +41,7 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
-            </div>
-          </draggable>
+              </div>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -113,7 +100,6 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -121,7 +107,6 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
-    draggable,
     xdrdirselector
   },
   data () {
@@ -129,7 +114,6 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
-      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -158,10 +142,6 @@ export default {
     stagesChange: {
       type: Array
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     controlPhase: {
       type: Object
     },
@@ -363,11 +343,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          // setTimeout(() => {
-          this.handleCurrentChange(this.patternStatusList)
+          setTimeout(() => {
+            this.handleCurrentChange(this.patternStatusList)
+            this.handleBarrierHeight()
+          }, 10)
           this.handleBarrierHeight()
-          // }, 10)
-          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -395,60 +375,6 @@ export default {
     }
   },
   methods: {
-    move (e) {
-      // 这里的e表示即将停靠的元素。
-      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
-      if (!result.includes(e.draggedContext.element.id)) {
-        return false
-      }
-    },
-    endDrag (index) {
-      // 拖动后对原数据排序
-      const idIndexMap = {}
-      this.patternInfo.forEach((subArray, subArrayIndex) => {
-        subArray.forEach((item, index) => {
-          idIndexMap[item.id] = { subArrayIndex, index }
-        })
-      })
-      this.patternStatusList.forEach((subArray, subArrayIndex) => {
-        if (subArray.length > 0) {
-          subArray.sort((aItem, bItem) => {
-            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
-            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
-            return aIndex - bIndex
-          })
-        }
-      })
-    },
-    handleEdit (val) {
-      this.patternStatusList.map(d => {
-        d.map(r => {
-          if (r.id === val.id) {
-            r.value = val.split
-          }
-        })
-      })
-      // this.handleCurrentChange(this.patternStatusList)
-      this.$emit('handleSplitMove', this.patternId)
-    },
-    getMaxCycle (pattern) {
-      // let rings = pattern.rings
-      let maxCycle = 0
-      for (let ring of pattern) {
-        if (ring.length === 0) continue
-        let cycle = 0
-        for (let r of ring) {
-          if (r.mode === 7) { // 忽略相位不计周期
-            continue
-          }
-          cycle = cycle + r.value
-        }
-        if (cycle > maxCycle) {
-          maxCycle = cycle
-        }
-      }
-      return maxCycle
-    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1253,7 +1179,6 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
-        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {

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

@@ -263,7 +263,7 @@ export default {
       faultTimer: null, // 当前故障定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿
@@ -303,7 +303,7 @@ export default {
         id: 9,
         iconClass: 'zishiying',
         permission: 'configer:manual:base',
-        iconName: '自适应控制'
+        iconName: '方案生成'
       }, {
         id: 10,
         iconClass: 'wuxianlan',
@@ -387,14 +387,14 @@ export default {
           iconName: this.$t('openatccomponents.overview.modelList5'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '单点感应',
+          type: '自适应',
           id: 6,
           iconClass: 'ganyingkongzhi',
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList6'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '自适应控制',
+          type: '方案生成',
           id: 9,
           iconClass: 'zishiying',
           permission: 'configer:manual:base',

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

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <el-form-item
-               :label="$t('openatccomponents.overview.duration')"
-               prop="count">
-             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-           </el-form-item>
+                :label="$t('openatccomponents.overview.greenclear')"
+                prop="intersection">
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+            </el-form-item>
 
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash')"
@@ -44,11 +44,13 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-          <el-form-item
-              :label="$t('openatccomponents.overview.greenclear')"
-              prop="intersection">
-            <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
-          </el-form-item>
+
+           <el-form-item
+               :label="$t('openatccomponents.overview.duration')"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
+
            <el-form-item
                :label="$t('openatccomponents.overview.allred')"
                prop="intersection">

package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue

@@ -227,7 +227,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
       </g>
     </svg>
     <svg
-      v-if="type === '单点感应'"
+      v-if="type === '自适应'"
       version="1.1"
       id="图层_1"
       xmlns="http://www.w3.org/2000/svg"
@@ -266,7 +266,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     </svg>
 
     <svg
-      v-if="type === '自适应控制'"
+      v-if="type === '方案生成'"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24.53 21.2"
       :width="iconWidth"

package/src/kisscomps/components/overView/index.vue

@@ -153,7 +153,7 @@ export default {
       volumeControlTimer: null, // 流量定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿

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

@@ -5,7 +5,6 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
-    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -20,7 +19,6 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
-    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -504,10 +502,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -587,11 +581,6 @@ export default {
     // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
     //   this.resetCrossDiagram()
     // }
-  },
-  methods: {
-    handleSplitMove (data) {
-      this.$emit('handleSplitMove', data)
-    }
   }
 }
 </script>

package/src/utils/ControlFormat.js

@@ -14,7 +14,7 @@ export default class ControlFormat {
   constructor (crossStatusData, phaseList) {
     this.ParamsMode = new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']])
     this.ParamsModeEn = new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']])
-    this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
+    this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
     this.ParamsControlEn = new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']])
     this.phaseType = new Map([[1, '红'], [2, '黄'], [3, '绿']]) // phaseType表示红，黄，绿
     this.phaseTypeEn = new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]) // phaseType表示红，黄，绿

package/src/views/intersection.vue

@@ -1,16 +1,15 @@
 <template>
   <div>
-    <intersection-with-interface :AgentId="agentId" />
     <h2 class="text">实时通道路口图</h2>
-    <!-- <channel-realtime-intersection
+    <channel-realtime-intersection
       :agentId="this.agentId"
       :roadDirection="roadDirection"
       :channelRealtimeStatusData="channelRealtimeStatusData"
-    /> -->
+    />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
-    <!-- <intersection-direction-selection
+    <intersection-direction-selection
       :agentId="this.agentId"
       :choosedDirection="[14,6,13,8]"
       :choosedPedDirection="[1]"
@@ -26,7 +25,7 @@
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
         @handleClickCrossIcon="handleClickCrossIcon" />
-      </div> -->
+      </div>
 
       <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
@@ -162,12 +161,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '32050101041121000001',
+      agentId: 'tjblfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
+      Token: 'eyJraWQiOiIxNzM0MDc1MTI0MjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDA3ODcyNCwiaWF0IjoxNzM0MDcxNTI0fQ.KixCOm8CIbS10UYc0djLAr-NCg24S5ftHM384yweVVU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/intersection2.vue

@@ -102,12 +102,12 @@ export default {
     return {
       roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      // agentId: '32050101041121000001',
+      agentId: 'cllzpl',
       // agentId: '13013',
-      agentId: '12007_390',
+      // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -117,7 +117,7 @@ export default {
       controlName: '步进',
       isShowState: true,
       isShowMode: true,
-      isShowMessage: false,
+      isShowMessage: true,
       isShowPatternStatus: false,
       isShowIntersection: true,
       isShowInterval: true,

package/src/views/overView.vue

@@ -1,18 +1,13 @@
 <template>
   <div id="test1">
-    <!-- <overview
+    <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview> -->
-    <el-button @click="handleChangeOverview">切换overview组件</el-button>
-    <overview-component
-        :AgentId="agentId2"
-        :isShowInterval="isShowInterval"
-        :isShowMessage ="isShowMessage"/>
+        :Token="Token"></overview>
   </div>
 </template>
 
@@ -24,29 +19,12 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '13013',
-      agentid1: 'gjnlahql',
-      agentid2: '12007_390',
-      isShowMessage: false,
-      isShowInterval: true,
-      sum: 0,
-      Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
-      reqUrl: 'http://192.168.13.103:10003/openatc',
-      isOnlyMap: true
+      agentId: 'stao',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
+      reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },
   methods: {
-    handleChangeOverview () {
-      if (this.sum % 2 === 0) {
-        this.agentId = this.agentid1
-      } else {
-        this.agentId = this.agentid2
-      }
-      this.sum++
-    },
-    reverseOverviewBtMap () {
-      this.isOnlyMap = !this.isOnlyMap
-    }
   },
   watch: {
   },

package/static/styles/common.scss

@@ -11,12 +11,12 @@
 
  // 全局滚动条样式
  ::-webkit-scrollbar {
-  width: 6PX;
-  height: 6PX;
+  width: 12PX;
+  height: 12PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 3PX;
+  border-radius: 4px;
   background: rgba(144, 147, 153, 0.3);
 }
 ::-webkit-scrollbar-corner{

package/static/styles/dark/theme/element-dark.scss

@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
 $--button-success-font-color: #FFFFFF;
 $--radio-button-checked-font-color: #FFFFFF;
 $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: #FFFFFF;
+$--tag-info-color: $--color-text-placeholder;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;