openatc-components 0.1.40 → 0.1.42

package/package.json

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

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -190,7 +190,7 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition)) {
+        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
           this.handleTentivePatternData()
         } else if (this.controlData) {
           this.handlePatternData()
@@ -471,18 +471,18 @@ export default {
       })
       if (this.phaseList.length === 0) return
       for (let patternStatus of val[0]) {
-        if (patternStatus.mode !== 7) {
-          let concurrent = this.phaseList.filter((item) => {
-            return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
-          })[0].concurrent// 当前相位的并发相位
-          if (concurrent) {
-            let obj = {
-              id: patternStatus.id,
-              current: concurrent.sort()
-            }
-            currentArr.push(obj)
+        // if (patternStatus.mode !== 7) {
+        let concurrent = this.phaseList.filter((item) => {
+          return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
+        })[0].concurrent// 当前相位的并发相位
+        if (concurrent) {
+          let obj = {
+            id: patternStatus.id,
+            current: concurrent.sort()
           }
+          currentArr.push(obj)
         }
+        // }
       }
       if (currentArr.length !== 0) {
         let newCurrent = this.tranform(currentArr)
@@ -555,10 +555,10 @@ export default {
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           // 忽略相位不显示
-          let mode = ring.mode
-          if (mode !== 7) { // 忽略相位不显示
-            list.push(obj)
-          }
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
         }
         this.patternInfo.push(list)
       }

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

@@ -275,6 +275,26 @@ export default {
         }
       }
     },
+    getCycles () {
+      if (!this.patternOne[0].stages) return
+      let stages = this.patternOne[0].stages
+      let modeId = stages.filter(item => item.length === 1)[0]
+      for (let rings of this.patternOne[0].rings) {
+        let num = 0
+        for (let i = 0; i < rings.length; i++) {
+          if (rings[i].length !== 0) {
+            if (rings[i].mode === 7 && (modeId && modeId[0] === rings[i].id)) { // 忽略相位不计周期
+              continue
+            }
+            num = num + Number(rings[i].value)
+          }
+        }
+        if (num !== 0) {
+          this.patternOne[0].cycle = num
+          break
+        }
+      }
+    },
     getPhaseDescription (phaseList) {
       if (!phaseList) return
       let list = []
@@ -343,11 +363,15 @@ export default {
         let currPattern = this.patternOne[0].rings
         setTimeout(() => {
           this.handleStageData(currPattern)
+          this.getCycles()
+          this.patternOne[0].stagesList = this.stagesList
         }, 50)
       } else {
         let currPattern = this.planPattern.rings
         setTimeout(() => {
           this.handleStageData(currPattern)
+          this.getCycle()
+          this.allPatternList[0].stagesList = this.stagesList
         }, 50)
       }
     },
@@ -383,11 +407,11 @@ export default {
           // rings = JSON.parse(JSON.stringify(rings))
           let mapAdd = rings.map(item => {
             return item.map(val => {
-              if (val.mode !== 7) {
-                return val.value + (val.sum ? val.sum : 0)
-              } else {
-                return 0
-              }
+              // if (val.mode !== 7) {
+              return val.value + (val.sum ? val.sum : 0)
+              // } else {
+              //   return 0
+              // }
             })
           })
           let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
@@ -405,14 +429,14 @@ export default {
               let ring = rings[i]// 每个环对象
               let sum = 0
               for (let n = 0; n < ring.length; n++) { // 相位累计长度
-                if (ring[n].mode !== 7) {
-                  sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
-                  if (j < sum) {
-                    let phaseId = ring[n].id
-                    currentIds = currentIds + '-' + phaseId
-                    break
-                  }
+                // if (ring[n].mode !== 7) {
+                sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
+                if (j < sum) {
+                  let phaseId = ring[n].id
+                  currentIds = currentIds + '-' + phaseId
+                  break
                 }
+                // }
               }
             }
             if (lastCurrentIds !== currentIds && lastCurrentIds !== '') { // 当前相位id和上一个相比不同说明相位变化了

package/src/views/intersection.vue

@@ -94,10 +94,10 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '1511_207',
+      agentId: '10002-739',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
+      Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -20,7 +20,7 @@ export default {
       modeName: '交警遥控',
       controlName: '步进',
       agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
+      Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/src/views/schemeconfig.vue

@@ -55,9 +55,9 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '1511_207',
-      Token: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
-      Token103: 'eyJraWQiOiIxNjczMjMwODQ3Njg0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1OTYzMDg0OCwiaWF0IjoxNjczMjMwODQ4fQ.GCpdGk-nf1eiLX-RuowEcKv9PAXsilz8AQuJ2QA037s',
+      agentId: '12004-950',
+      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据