openatc-components 0.3.115 → 0.3.117

package/src/kisscomps/components/StageOptimize/StageOptimize.vue

@@ -0,0 +1,310 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+<template>
+<div>
+  <div v-if="this.nowNumber === 1" class="optimizetype">
+      <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
+      <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
+        <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="$t('openatccomponents.overview.type' + item.value)"
+            :value="item.value"
+            >
+        </el-option>
+        </el-select>
+        <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
+        <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
+      <el-button type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
+    </div>
+    <div class="common-board-column" style="margin-top: 50px;">
+      <div class="common-board-column-header">
+        {{headerText}}
+      </div>
+      <div class="common-board-table-header">
+        <el-row :gutter="13">
+          <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
+          </el-col>
+          <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
+          </el-col>
+          <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
+          </el-col>
+        </el-row>
+      </div>
+      <draggable
+        class="common-board-column-content"
+        :list="stageData"
+        :options="options">
+        <div class="common-board-item" v-for="element in stageData" :key="element.id">
+          <el-row :gutter="13">
+            <el-col :span="4">
+              <el-tooltip class="item" effect="dark" placement="left">
+                <div slot="content">{{element.name}}</div>
+                <div class="common-phase-description">
+                  <xdrdirselector v-if="element.desc.length > 0" Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                </div>
+              </el-tooltip>
+          </el-col>
+          <el-col :span="10">
+              <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
+          </el-col>
+          <el-col :span="10">
+              <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
+          </el-col>
+          </el-row>
+        </div>
+      </draggable>
+  </div>
+</div>
+</template>
+<script>
+import draggable from 'vuedraggable'
+import { getDuration } from '../../../api/cross'
+import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+
+export default {
+  name: 'StageOptimize',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  data () {
+    return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
+      styles: {
+        left: '1px',
+        top: '0px'
+      },
+      typeOptions: [{
+        value: 'flow-split-opt'
+      }, {
+        value: 'cycle-opt'
+      }],
+      value: '',
+      optimizecycle: 0
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    contrloType: {
+      type: String
+    },
+    stageData: {
+      type: Array
+    },
+    stagesChange: {
+      type: Array
+    },
+    id: {
+      type: Number
+    },
+    rings: {
+      type: Object
+    },
+    nowNumber: {
+      type: Number
+    },
+    phaseList: {
+      type: Array
+    },
+    options: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    // index: {
+    //   type: Number
+    // },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    }
+  },
+  created () {
+    // this.addMinSplit()
+    this.addMin()
+  },
+  watch: {
+    list: {
+      handler: function () {
+        this.addMin()
+        // let list = this.$refs.type
+        // let flow = this.$refs.types
+        // console.log(this.list, 'list')
+        // let cycle = 0
+        // let n = this.index
+        // for (let i = 0; i < list.length; i++) {
+        //   cycle = cycle + Number(list[i].currentValue)
+        // }
+        // const globalParamModel = this.$store.getters.globalParamModel
+        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
+        // let pattern = globalParamModel.getParamsByType('patternList')[n]
+        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
+        // this.addMinSplit()
+        // this.$emit('handleSplit', n)
+      },
+      deep: true
+    },
+    stageData: {
+      handler: function () {
+        this.addMins()
+        // let list = this.$refs.type
+        // let flow = this.$refs.types
+        // console.log(this.list, 'list')
+        // let cycle = 0
+        // let n = this.index
+        // for (let i = 0; i < list.length; i++) {
+        //   cycle = cycle + Number(list[i].currentValue)
+        // }
+        // const globalParamModel = this.$store.getters.globalParamModel
+        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
+        // let pattern = globalParamModel.getParamsByType('patternList')[n]
+        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
+        // this.addMinSplit()
+        // this.$emit('handleSplit', n)
+      },
+      deep: true
+    }
+  },
+  methods: {
+    optimize () {
+      let _that = this
+      let newPha = []
+      for (let i = 0; i < _that.rings.rings.length; i++) {
+        newPha.push(..._that.rings.rings[i])
+      }
+      let phaseData = newPha.map(item => {
+        return {
+          id: item.id,
+          flowperhour: item.flowperhour,
+          saturation: item.saturation
+        }
+      })
+      //   let patternList = _that.$store.state.globalParam.tscParam.patternList
+      //   console.log(patternList, 'patternList')
+      let pattern = _that.rings
+      let reqData = {
+        'type': _that.value,
+        'optcycle': _that.optimizecycle,
+        'phaseList': _that.phaseList,
+        'pattern': pattern,
+        'phases': phaseData
+      }
+      let isValidata = []
+      for (let j = 0; j < newPha.length; j++) {
+        let comNum = (newPha[j].length / 4) * 1700 * 0.8
+        isValidata.push(newPha[j].flowperhour > comNum)
+      }
+      if (isValidata.includes(true)) {
+        this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
+          this.$t('openatccomponents.common.alarm'), {
+            confirmButtonText: this.$t('openatccomponents.common.confirm'),
+            cancelButtonText: this.$t('openatccomponents.common.cancel'),
+            type: 'warning'
+          }).then(() => {
+          getDuration(reqData).then(data => {
+            if (data.data.success) {
+              _that.$message({
+                type: 'success',
+                message: _that.$t('openatccomponents.pattern.success')
+              })
+              for (let i = 0; i < _that.stagesChange.length; i++) {
+                if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
+                  _that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
+                }
+              }
+              this.$emit('optimizestage', this.id)
+            }
+          }).catch(error => {
+            console.log(error)
+          })
+        }).catch(() => {
+        })
+      } else {
+        getDuration(reqData).then(data => {
+          if (data.data.success) {
+            _that.$message({
+              type: 'success',
+              message: _that.$t('openatccomponents.pattern.success')
+            })
+            for (let i = 0; i < _that.stagesChange.length; i++) {
+              if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
+                _that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
+              }
+            }
+            this.$emit('optimizestage', this.id)
+          }
+        }).catch(error => {
+          console.log(error)
+        })
+      }
+    },
+    addMins () {
+      for (let i of this.stageData) {
+          if (!i.flowperhour || !i.saturation) {
+            i.flowperhour = 0
+            i.saturation = 1700
+            i.length = this.list.length
+          }
+      }
+    },
+    addMin () {
+      for (let i of this.list) {
+        if (!i.flowperhour || !i.saturation) {
+          i.flowperhour = 0
+          i.saturation = 1700
+          i.length = this.list.length
+        }
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.col-content {
+  width: 100%;
+}
+.optimizetype{
+  position: absolute;
+  margin:0 0 10PX 0;
+  .el-input {
+    width: 80PX;
+  }
+  .el-select{
+    width: 145PX;
+  }
+  .el-button {
+    margin-left: 10PX;
+  }
+  .optimiNum {
+    padding-left: 10PX;
+  }
+}
+</style>

package/src/kisscomps/components/StageOptimize/index.js

@@ -0,0 +1,2 @@
+import StageOptimize from './StageOptimize.vue'
+export default StageOptimize

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

@@ -153,8 +153,8 @@ 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, '设备维护']]),
-      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']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [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, 'Inductive Adaptive'], [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表示红，黄，绿
       ip: '--',

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

@@ -5,6 +5,7 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
+    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -19,6 +20,7 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
+    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -502,6 +504,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     contrloType: {
       type: String
     },
@@ -581,6 +587,11 @@ 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/kisscomps/index.js

@@ -12,6 +12,7 @@ import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
 import PatternStatus from './components/PatternStatus/index'
+import StageOptimize from './components/StageOptimize/index'
 import BoardCard from './components/BoardCard/index'
 import StageStatus from './components/StageStatus/index'
 import OverLap from './components/OverLap/index'
@@ -69,6 +70,7 @@ const components = {
   priorityControl,
   tentativeplancontrolmodal,
   PhaseDirectionText,
+  StageOptimize,
   patternConfig,
   XiaoKanBan,
   PhaseDirectionSelect,

package/src/utils/ControlFormat.js

@@ -14,8 +14,8 @@ 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.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.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [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, 'Inductive Adaptive'], [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,15 +1,16 @@
 <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]"
@@ -25,7 +26,7 @@
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
         @handleClickCrossIcon="handleClickCrossIcon" />
-      </div>
+      </div> -->
 
       <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
@@ -161,12 +162,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblfql',
+      agentId: '32050101041121000001',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzM0MDc1MTI0MjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDA3ODcyNCwiaWF0IjoxNzM0MDcxNTI0fQ.KixCOm8CIbS10UYc0djLAr-NCg24S5ftHM384yweVVU',
+      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
       // 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: 'cllzpl',
+      // agentId: '32050101041121000001',
       // agentId: '13013',
-      // agentId: '12007_390',
+      agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
+      Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
       // 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: true,
+      isShowMessage: false,
       isShowPatternStatus: false,
       isShowIntersection: true,
       isShowInterval: true,

package/src/views/overView.vue

@@ -1,13 +1,18 @@
 <template>
   <div id="test1">
-    <overview
+    <!-- <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview>
+        :Token="Token"></overview> -->
+    <el-button @click="handleChangeOverview">切换overview组件</el-button>
+    <overview-component
+        :AgentId="agentId2"
+        :isShowInterval="isShowInterval"
+        :isShowMessage ="isShowMessage"/>
   </div>
 </template>
 
@@ -19,12 +24,29 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'stao',
-      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
-      reqUrl: 'http://192.168.13.103:10003/openatc'
+      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
     }
   },
   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: 12PX;
-  height: 12PX;
+  width: 6PX;
+  height: 6PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 4px;
+  border-radius: 3PX;
   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: $--color-text-placeholder;
+$--tag-info-color: #FFFFFF;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/intersection.scss

@@ -38,9 +38,6 @@
       zoom: 0.9;
       
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -49,9 +46,6 @@
       zoom: 0.8;
       
     }
-    .centerText .text {
-      font-size: 18px;
-    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -59,9 +53,6 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
-    .centerText .text {
-      font-size: 20px;
-    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -69,9 +60,6 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -79,9 +67,6 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
-    .centerText .text {
-      font-size: 14px;
-    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -188,4 +173,9 @@
     color: $--color-text-primary;
     font-size:30PX;
  }
+ .centerText {
+  .text {
+    font-size: 18PX;
+  }
+ }
 }

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

@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
 // $--button-success-font-color: #FFFFFF;
 // $--radio-button-checked-font-color: #FFFFFF;
 // $--radio-font-color: $--color-text-secondary;
-// $--tag-info-color: $--color-text-placeholder;
+$--tag-info-color: #303133;
 // $--tooltip-color: $--color-white;
 // $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/schemeconfig.scss

@@ -226,7 +226,7 @@
       overflow-y: auto;
     }
     .manual-common-content::-webkit-scrollbar {
-      width: 8PX;
+      width: 6PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: center;
+    text-align: left;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: center;
+      text-align: left;
     }
   }
   .el-select {
@@ -540,6 +540,9 @@
   }
   .el-input-number {
     width: 100%;
+    .el-input__inner {
+      text-align: left;
+    }
   }
   .el-input-number--mini{
     width: 100%;