openatc-components 0.2.52 → 0.2.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -966,19 +966,33 @@ export default {
     },
     handleRepeatRealdir (channelList) {
       // 按realdir去掉重复方向的数据
+      let dirChannelList = channelList.filter(ele => ele.type === 0 || ele.type === 1 || ele.type === 3)
+      let pedDirChannelList = channelList.filter(ele => ele.type === 2)
       let map = new Map()
-      channelList.forEach(ele => {
+      let map2 = new Map()
+      dirChannelList.forEach(ele => {
         ele.realdir.forEach(dir => {
           if (map.get(dir) === undefined) {
             map.set(dir, ele)
           }
         })
       })
+      pedDirChannelList.forEach(ele => {
+        ele.realdir.forEach(dir => {
+          if (map2.get(dir) === undefined) {
+            map2.set(dir, ele)
+          }
+        })
+      })
       let arr = Array.from(map)
+      let pedarr = Array.from(map2)
       let newarr = []
       arr.forEach(ele => {
         newarr.push(ele[1])
       })
+      pedarr.forEach(ele => {
+        newarr.push(ele[1])
+      })
       // console.log(newarr)
       return newarr
     },

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

@@ -557,7 +557,7 @@ export default {
       this.changeStatus()
     }
     this.setPropsToken(this.Token)
-    await this.getPhase()
+    // await this.getPhase()
     this.getFault()
     this.initData()
   },

package/src/main.js

@@ -18,7 +18,7 @@ window.dev = process.env.NODE_ENV
 
 // 深浅主题按需加载
 import('../static/styles/dark/index.scss')
-import('../static/styles/light/index.scss')
+// import('../static/styles/light/index.scss')
 
 Vue.use(kissui)
 Vue.use(ElementUI)

package/src/views/intersection.vue

@@ -12,7 +12,7 @@
     <!-- <intersection-base-map
             ref="intersectionMap"
             :crossStatusData="crossStatusData"
-            agentId="tjblsxl-ticp6"
+            :agentId="this.agentId"
             isVipRoute
             :choosedDirection="[1,2,3]"
             :choosedPedDirection="[3,4]"
@@ -139,12 +139,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblsxl-ticp6',
+      agentId: '18009',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
+      Token: 'eyJraWQiOiIxNzE2NTE5MTM5MjE4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNjU2MjMzOSwiaWF0IjoxNzE2NTE5MTM5fQ.tWVuMWAkdnISXH6YejL_VP4HPWmjVrL7XHkHSFTxF24',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -19,8 +19,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '18001',
-      Token: 'eyJraWQiOiIxNzE2NDI5NDU1MzQ1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNjQ3MjY1NywiaWF0IjoxNzE2NDI5NDU3fQ.rt8Lbg99Qtm6DO3YXxJ9gGBEIwQwpNU6xxbO9LBZdrM',
+      agentId: 'jmlxhl',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },