openatc-components 0.3.111 → 0.3.112

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

@@ -399,38 +399,6 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
         p-id="6532"
       ></path>
     </svg>
-
-    <svg
-      v-if="type === '感应式自适应'"
-      t="1734600340213"
-      class="icon"
-      viewBox="0 0 1252 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      p-id="12292"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      :width="iconWidth"
-      :height="iconHeight"
-    >
-      <path
-        :class="themeColor"
-        d="M48.597631 254.131387c22.423358 0 44.846715-18.686131 44.846715-44.846715V85.956204h130.80292c18.686131 0 41.109489-18.686131 41.109489-41.109489C265.356755 18.686131 242.933398 0 220.51004 0H48.597631C22.437047 0 3.750916 18.686131 3.750916 44.846715v168.175183c0 22.423358 18.686131 41.109489 44.846715 41.109489zM1203.400551 0h-168.175183c-22.423358 0-44.846715 18.686131-44.846715 44.846715 0 22.423358 18.686131 44.846715 44.846715 44.846716h123.328467v130.802919c0 22.423358 18.686131 44.846715 44.846716 44.846716 22.423358 0 44.846715-18.686131 44.846715-44.846716V44.846715C1244.51004 18.686131 1225.823908 0 1203.400551 0zM1203.400551 766.131387c-22.423358 0-44.846715 18.686131-44.846716 44.846715V934.306569h-130.802919c-22.423358 3.737226-41.109489 22.423358-41.109489 48.583942 3.737226 22.423358 18.686131 37.372263 41.109489 41.109489H1199.663325c22.423358 0 44.846715-18.686131 44.846715-44.846715v-168.175183c0-26.160584-18.686131-44.846715-41.109489-44.846715zM213.035587 930.569343H89.70712v-130.80292c0-22.423358-18.686131-44.846715-44.846715-44.846715-22.423358 0-44.846715 18.686131-44.846716 44.846715V971.678832c0 22.423358 18.686131 44.846715 44.846716 44.846715h168.175182c22.423358-3.737226 41.109489-22.423358 41.109489-48.583941-3.737226-18.686131-18.686131-33.635036-41.109489-37.372263zM556.860405 186.861314H328.889602C284.042887 186.861314 250.40785 224.233577 250.40785 269.080292v485.839416c0 44.846715 33.635036 78.481752 78.481752 78.481752h227.970803c44.846715 0 78.481752-33.635036 78.481752-78.481752v-485.839416C635.342157 224.233577 601.70712 186.861314 556.860405 186.861314z m18.686131 568.058394c0 11.211679-7.474453 18.686131-18.686131 18.686131H328.889602c-11.211679 0-18.686131-7.474453-18.686132-18.686131v-485.839416c0-11.211679 7.474453-18.686131 18.686132-18.686131h227.970803c7.474453 0 14.948905 7.474453 18.686131 18.686131v485.839416zM881.999091 235.445255l-7.474453-7.474452c-11.211679-11.211679-29.89781-11.211679-41.109489 0-11.211679 11.211679-11.211679 29.89781 0 41.109489 130.80292 130.80292 134.540146 343.824818 3.737227 474.627737l-3.737227 3.737226c-11.211679 11.211679-11.211679 29.89781 0 41.10949 7.474453 3.737226 14.948905 7.474453 22.423358 7.474452 7.474453 0 14.948905-3.737226 22.423358-7.474452 153.226277-145.751825 156.963504-396.145985 3.737226-553.10949z"
-        fill="#606266"
-        p-id="12293"
-      ></path>
-      <path
-        :class="themeColor"
-        d="M784.831208 336.350365c-7.474453-14.948905-26.160584-18.686131-41.109489-7.474453-14.948905 11.211679-14.948905 29.89781-7.474453 41.109489 0 3.737226 3.737226 3.737226 7.474453 7.474453 37.372263 33.635036 56.058394 82.218978 56.058394 130.80292s-18.686131 97.167883-56.058394 130.802919c-11.211679 11.211679-11.211679 29.89781 0 41.109489 7.474453 3.737226 14.948905 7.474453 22.423357 7.474453s14.948905-3.737226 22.423358-7.474453c44.846715-44.846715 71.007299-108.379562 71.007299-171.912408s-26.160584-123.328467-74.744525-171.912409z"
-        fill="#606266"
-        p-id="12294"
-      ></path>
-      <path
-        :class="themeColor"
-        d="M702.61223 467.153285c-18.686131 0-29.89781 11.211679-29.897811 26.160584v29.89781c0 14.948905 11.211679 26.160584 26.160584 26.160584h3.737227c14.948905 0 26.160584-11.211679 26.160584-26.160584v-33.635037c3.737226-11.211679-11.211679-22.423358-26.160584-22.423357z"
-        fill="#606266"
-        p-id="12295"
-      ></path>
-    </svg>
   </span>
 </template>
 

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

@@ -12,15 +12,13 @@
 <template>
   <div class="manual-control-modal-new">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('residentcontrol') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol">
         <ControlModelGroup
           v-if="activeName === 'residentcontrol'"
           ref="ControlModelGroup"
           className="residentcontrol"
           :controlList="residentControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -82,15 +80,13 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('specialcontrol') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
         <ControlModelGroup
           v-if="activeName === 'specialcontrol'"
           ref="ControlModelGroup"
           className="specialcontrol"
           :controlList="specialControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -116,15 +112,13 @@
       </div>
 
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('schemeselection') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
         <ControlModelGroup
           v-if="activeName === 'schemeselection'"
           ref="ControlModelGroup"
           className="otherscontrol"
           :controlList="patternChooseControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel" />
 
@@ -183,16 +177,14 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others"
-        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('others') !== -1))">
+      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
         <ControlModelGroup
-          v-if="activeName === 'others'"
+          v-if="activeName === 'others' && funcSort === 'allFunc'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl
           :controlList="othersControlList"
           :funcSort="funcSort"
-          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel"
         />
@@ -356,15 +348,15 @@ export default {
     isShowImplement: {
       type: Boolean,
       default: true
-    },
-    thirdPartyControlMenu: {
-      type: Array
-    },
-    thirdPartyControl: {
-      type: Array
     }
   },
   watch: {
+    activeName: {
+      handler: function (val) {
+      },
+      // 深度观察监听
+      deep: true
+    },
     patternSelect: {
       handler: function (val) {
         this.manualInfo.tempPatternid = this.crossStatusData.patternid
@@ -383,6 +375,7 @@ export default {
   },
   data () {
     return {
+      basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
       manuals: false,
       realtimeStage: {},

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

@@ -74,6 +74,7 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
+            :funcSort="FuncSort"
             :roadDirection="roadDirection" />
         </div>
       </div>
@@ -139,6 +140,7 @@ export default {
       stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
+      FuncSort: 'allFunc',
       controlData: {},
       checked: false,
       overlap: [],
@@ -153,8 +155,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, '感应式自适应'], [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']]),
+      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表示红，黄，绿
       ip: '--',
@@ -182,6 +184,7 @@ export default {
     ...mapState({
       // curBodyWidth: state => state.globalParam.curBodyWidth,
       curBodyHeight: state => state.globalParam.curBodyHeight,
+      // FuncSort: state => state.globalParam.FuncSort,
       hideMenu: state => state.globalParam.hideMenu
       // graphicMode: state => state.globalParam.graphicMode
       // isShowGui: state => state.globalParam.isShowGui,
@@ -610,6 +613,12 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
         this.$refs.intersectionMap.resetCrossDiagram()
         this.registerMessage() // 注册消息
         this.initData()
@@ -654,6 +663,20 @@ export default {
         } else {
           this.stateName = this.$t('openatccomponents.overview.offline')
         }
+        // let func = 'allFunc'
+        // if (this.platform === 'OpenATC') {
+        //   func = 'allFunc'
+        // }
+        // if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+        //   func = 'basicFunc'
+        // }
+        // this.$store.dispatch('SaveFunctionLevel', func)
+        if (this.platform === 'OpenATC') {
+          this.FuncSort = 'allFunc'
+        }
+        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
+          this.FuncSort = 'basicFunc'
+        }
       })
     },
     isJsonString (str) {

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

@@ -3,9 +3,9 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
-    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -20,7 +20,6 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
-    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -504,10 +503,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -547,6 +542,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },
@@ -587,11 +585,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/node_modules/.package_versions.json

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

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, '感应式自适应'], [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.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: '13000000000000000003',
+      agentId: 'tjblfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzM0NTk4MjYyNTIyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDYwMTg2MiwiaWF0IjoxNzM0NTk0NjYyfQ.aAtypuUpZL4_bmPOcoosu6YB-tmhm5zRSlr2k9s-gjA',
+      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
       // 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: '13000000000000000003',
-      agentid1: 'gjnlahql',
-      agentid2: '13000000000000000003',
-      isShowMessage: false,
-      isShowInterval: true,
-      sum: 0,
-      Token: 'eyJraWQiOiIxNzMzODg3MDYyMjgwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMzg5MDY2MiwiaWF0IjoxNzMzODgzNDYyfQ.qUJZ4lKv0WU3s3lWfYwl5ZM77n2rriYeFQ8qOwRFuzk',
-      reqUrl: 'http://192.168.13.103:10003/openatc',
-      isOnlyMap: true
+      agentId: 'jmlxhl',
+      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/apiconfig.json

@@ -447,15 +447,5 @@
   "key": "getDetectorStatus",
   "url": "/devs/detectorstatus",
   "method": "get"
-},
-{
-  "key": "getRoleByName",
-  "url": "/auth/role/rolename",
-  "method": "get"
-},
-{
-  "key": "getPermission",
-  "url": "/auth/role/",
-  "method": "get"
 }
 ]

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;
 

package/static/styles/intersection.scss

@@ -38,6 +38,9 @@
       zoom: 0.9;
       
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -46,6 +49,9 @@
       zoom: 0.8;
       
     }
+    .centerText .text {
+      font-size: 18px;
+    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -53,6 +59,9 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
+    .centerText .text {
+      font-size: 20px;
+    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -60,6 +69,9 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -67,6 +79,9 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -173,9 +188,4 @@
     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: #303133;
+// $--tag-info-color: $--color-text-placeholder;
 // $--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: 6PX;
+      width: 8PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: left;
+    text-align: center;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: left;
+      text-align: center;
     }
   }
   .el-select {
@@ -540,9 +540,6 @@
   }
   .el-input-number {
     width: 100%;
-    .el-input__inner {
-      text-align: left;
-    }
   }
   .el-input-number--mini{
     width: 100%;

package/package/kisscomps/components/SchemeConfig/utils/thirdPartypermission.js

@@ -1,95 +0,0 @@
-// const permissionMenuMap = new Map([[
-//   'configer:manual:dwell', ['驻留控制']
-// ], [
-//   'configer:manual:senior', ['特殊控制']
-// ], [
-//   'configer:manual:base', ['方案选择']
-// ], [
-//   'configer:manual:optimize', ['其他']
-// ]])
-const permissionControlMap = new Map([[
-  'configer:manual:dwell', [4, 22, 25]
-], [
-  'configer:manual:senior', [1, 2, 3]
-], [
-  'configer:manual:base', [5, 6, 9, 10, 12, 19]
-], [
-  'configer:manual:optimize', [23, 100, 24]
-], [
-  'configer:manual:dwell:step', [4]
-], [
-  'configer:manual:dwell:stage', [4]
-], [
-  'configer:manual:dwell:phaselock', [22]
-], [
-  'configer:manual:dwell:directionlock', [25]
-], [
-  'configer:manual:senior:yellowfalsh', [1]
-], [
-  'configer:manual:senior:allred', [2]
-], [
-  'configer:manual:senior:close', [3]
-], [
-  'configer:manual:base:fix', [5]
-], [
-  'configer:manual:base:free', [6]
-], [
-  'configer:manual:base:adapter', [9]
-], [
-  'configer:manual:base:coordinate', [10]
-], [
-  'configer:manual:base:ped', [12]
-], [
-  'configer:manual:base:pedfree', [19]
-], [
-  'configer:manual:optimize:procedure', [23]
-], [
-  'configer:manual:optimize:temp', [100]
-], [
-  'configer:manual:optimize:preempt', [24]
-]])
-
-export function getPermissionMenu (thirdPartyControl) {
-  // 按第三方平台角色的权限处理可显示的手动控制菜单
-  // let thirdPartyControlMenu = []
-  // for (let i = 0; i < permissionList.length; i++) {
-  //   let per = permissionList[i].permission_code
-  //   if (permissionMenuMap.get(per)) {
-  //     thirdPartyControlMenu = thirdPartyControlMenu.concat(permissionMenuMap.get(per))
-  //   }
-  // }
-  // console.log(thirdPartyControlMenu)
-  // return thirdPartyControlMenu
-  let thirdPartyControlMenu = []
-  for (let i = 0; i < thirdPartyControl.length; i++) {
-    let control = thirdPartyControl[i]
-    if ([4, 22, 25].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['residentcontrol'])
-    }
-    if ([1, 2, 3].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['specialcontrol'])
-    }
-    if ([5, 6, 9, 10, 12, 19].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['schemeselection'])
-    }
-    if ([23, 24, 100].indexOf(control) !== -1) {
-      thirdPartyControlMenu = thirdPartyControlMenu.concat(['others'])
-    }
-  }
-  thirdPartyControlMenu = [...new Set(thirdPartyControlMenu)]
-  // console.log(thirdPartyControlMenu)
-  return thirdPartyControlMenu
-}
-
-export function getPermissionControl (permissionList) {
-  // 按第三方平台角色的权限处理可显示的手动控制按钮
-  let thirdPartyControl = []
-  for (let i = 0; i < permissionList.length; i++) {
-    let per = permissionList[i].permission_code
-    if (permissionControlMap.get(per)) {
-      thirdPartyControl = thirdPartyControl.concat(permissionControlMap.get(per))
-    }
-  }
-  // console.log(thirdPartyControl)
-  return thirdPartyControl
-}