openatc-components 0.4.21 → 0.4.23

package/package.json

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

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

@@ -391,7 +391,8 @@ export default {
       },
       isHasCountdown: false,
       contrloType: 'ring',
-      isMphaseStatusDataReturnMap: new Map() // 每个跟随相位的母相位是否返回了相位状态数据
+      isMphaseStatusDataReturnMap: new Map(), // 每个跟随相位的母相位是否返回了相位状态数据
+      overlapStatusCompareSum: 0 // 首次加载跳过比较母相位状态数据是否返回
     }
   },
   methods: {
@@ -660,7 +661,6 @@ export default {
     createOverlapPhaseStatusMap () {
       // 处理跟随相位的母相位设置为忽略相位后的情况（如果跟随相位的母相位包含忽略相位，过滤掉跟随相位的状态数据，参照相位状态数据处理）
       let isMphaseStatusDataReturn = false
-      let sum = 0 // 首次加载跳过比较母相位状态数据是否返回
       let reset = false
       this.overlapStatusList = this.overlapStatusList.filter(ele => {
         let phaseids = this.phaseStatusList.map(item => item.id)
@@ -670,14 +670,14 @@ export default {
         const phaseidsSet = new Set(phaseids)
         isMphaseStatusDataReturn = mphase.every(value => phaseidsSet.has(value))
         console.log(`跟随相位${ele.id}的母相位状态数据是否均返回?`, isMphaseStatusDataReturn)
-        if (isMphaseStatusDataReturn !== this.isMphaseStatusDataReturnMap.get(ele.id) && !reset && sum > 0) {
+        if (isMphaseStatusDataReturn !== this.isMphaseStatusDataReturnMap.get(ele.id) && !reset && this.overlapStatusCompareSum > 0) {
           this.getIntersectionInfo()
           reset = true
         }
         this.isMphaseStatusDataReturnMap = this.isMphaseStatusDataReturnMap.set(ele.id, isMphaseStatusDataReturn)
         return isMphaseStatusDataReturn
       })
-      sum++
+      this.overlapStatusCompareSum = this.overlapStatusCompareSum + 1
       // 得到跟随相位状态Map数据
       this.overlapPhaseStatusMap = new Map()
       this.overlapStatusList.map(phase => {

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

@@ -28,7 +28,7 @@
             </el-tooltip>
             </div>
             <div class="first-1" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}"></div>
-            <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></div>
+            <div class="first-1" :style="{'width':item.redWidth,'height':'17px',marginTop: '9px','background':'#f27979'}"></div>
         </div>
     </div>
 </div>

package/src/node_modules/.package_versions.json

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

package/src/views/intersection.vue

@@ -162,12 +162,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'jmlfql',
+      agentId: '32050101041121000001',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzM5NDI1ODM3MzQ3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTQyOTQzNywiaWF0IjoxNzM5NDIyMjM3fQ.vUDOYbb0xRKLdCSYtZfYoxFKp84ih7w_NmTaTlIMUG0',
+      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',