openatc-components 0.0.37 → 0.0.39-hotfix

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

@@ -288,6 +288,13 @@ export default {
           this.init()
         }
       }
+    },
+    agentId: {
+      handler: function (val1, val2) {
+        if (val1 !== val2) {
+          this.init()
+        }
+      }
     }
   },
   data () {
@@ -417,6 +424,15 @@ export default {
         }))
         this.comdireBusPhaseData = JSON.parse(JSON.stringify(comdireBusPhaseData))
       }
+      if (this.mainType === '103') {
+        if (this.LanePhaseData.length) {
+          const LanePhaseData = this.LanePhaseData.map(data => ({
+            ...data,
+            color: this.phaseControlColorMap.get(Control)
+          }))
+          this.LanePhaseData = JSON.parse(JSON.stringify(LanePhaseData))
+        }
+      }
     },
     createPhaseStatusMap () {
       // 生成相位id和相位状态对应数据结构

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -63,7 +63,8 @@ export default {
       type: Boolean
     },
     tentative: {
-      type: Boolean
+      type: Boolean,
+      default: false
     },
     cycle: {
       type: Number

package/src/main.js

@@ -11,6 +11,7 @@ import animate from 'animate.css'
 import i18n from './i18n'
 import 'element-ui/lib/theme-chalk/index.css'
 import './icons' // icon
+import './icons/iconfont.css'
 
 window.dev = process.env.NODE_ENV
 

package/src/views/intersection.vue

@@ -77,9 +77,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '10002-994',
-      reqUrl: 'http://192.168.13.105:11003/openatc',
-      Token: 'eyJraWQiOiIxNjUwNzMxMTY2NTQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNzEzMTE2NiwiaWF0IjoxNjUwNzMxMTY2fQ.qjp7-LyJdSLr29Jm0T8KAQIoPA8ldkpTg83vVvorg_s',
+      // agentId: '10002-994',
+      // reqUrl: 'http://192.168.13.105:11003/openatc',
+      // Token: 'eyJraWQiOiIxNjUwNzMxMTY2NTQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNzEzMTE2NiwiaWF0IjoxNjUwNzMxMTY2fQ.qjp7-LyJdSLr29Jm0T8KAQIoPA8ldkpTg83vVvorg_s',
+      agentId: '30003-352',
+      reqUrl: 'https://kints-dev.devdolphin.com/openatc',
+      Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
       boxVisible: false,
       dialogWidth: '80%',
       modeName: '交警遥控',

package/src/views/schemeconfig.vue

@@ -20,18 +20,18 @@
       :close-on-click-modal="false"
       @close="oncancle"
       append-to-body>
-      <scheme-config
+      <!-- <scheme-config
         agentId="10002-994"
         :statusData="crossStatusData"
         :realtimeStatusModalvisible="false"
-        @patternCommitCallback="patternCommitCallback"/>
-      <!-- <scheme-config
+        @patternCommitCallback="patternCommitCallback"/> -->
+      <scheme-config
         ref="rightpanel"
         :agentId="agentId"
         :lockPhaseBtnName="lockPhaseBtnName"
         :statusData="crossStatusData"
         roadDirection="left"
-         /> -->
+         />
          <!-- funcSort="basicFunc" -->
     </el-dialog>
   </div>
@@ -48,7 +48,7 @@ export default {
     return {
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
       agentId: '10002-994',
-      Token: 'eyJraWQiOiIxNjUzMzgzNjY1MzM2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTc4MzY2NiwiaWF0IjoxNjUzMzgzNjY2fQ.mJwz9IdnRefpwgLeJwIq8HA3Qo5ncSQPZUL1jF81KnA',
+      Token: 'eyJraWQiOiIxNjUzMjgyODkwMDYxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTY4Mjg5MCwiaWF0IjoxNjUzMjgyODkwfQ.emqFxXlot1Zk6TGkLMDx0zIp2B8toSz17xdZI_DrXZI',
       Token103: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
       boxVisible: false,
       dialogWidth: '80%',