openatc-components 0.1.74 → 0.1.76

package/package.json

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

package/src/i18n/language/en.js

@@ -270,7 +270,9 @@ const en = {
       'putTscControlError20': 'green ratio greater than maximum green ',
       'putTscControlError21': 'Unsupported Phase type ',
       'putTscControlError22': 'Number of unsupported phases ',
-      'putTscControlError23': 'Control message sending exception ',
+      'putTscControlError23': 'Key error',
+      'putTscControlError24': 'The check information does not exist',
+      'putTscControlError25': 'Protocol incompatibility',
       'putTscControlError99': 'Control exception ',
       // 'putTscControlError20': 'In the provisional scheme, the green signal ratio should be greater than the phase minimum green + yellow light + all red, and less than the maximum green 1+ yellow light + all red',
       'nofault': 'None',
@@ -1069,6 +1071,8 @@ const en = {
       '4205': 'Udp Receive InfoType error by Send InfoType',
       '4206': 'Can not find UdpCommunication for Receive Msg',
       '4207': 'Error response from feature download',
+      '4208': 'Error protocol data from respose message',
+      '4209': 'Answer from atc',
       // device not online
       '4301': 'Device not online',
       // 协调路线错误

package/src/i18n/language/zh.js

@@ -270,7 +270,9 @@ const zh = {
       'putTscControlError20': '绿信比大于最大绿',
       'putTscControlError21': '不支持的相位类型',
       'putTscControlError22': '不支持的相位数量',
-      'putTscControlError23': '控制消息发送异常',
+      'putTscControlError23': '密钥错误',
+      'putTscControlError24': '校验信息不存在',
+      'putTscControlError25': '协议不兼容',
       'putTscControlError99': '控制异常',
       // 'putTscControlError20': '临时方案中绿信比应大于相位的最小绿+黄灯+全红，并小于最大绿1+黄灯+全红',
       'nofault': '无',
@@ -1068,6 +1070,8 @@ const zh = {
       '4205': 'Udp接收消息类型错误',
       '4206': '从接收信息中没找到UdpCommunication',
       '4207': '下载异常导致应答错误',
+      '4208': '应答的消息协议不兼容',
+      '4209': '信号机应答错误',
       // device not online
       '4301': '设备不在线',
       // 协调路线错误

package/src/kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface.vue

@@ -103,6 +103,14 @@ export default {
       registerMessage(this.AgentId).then(data => {
         if (!data.data.success) {
           // this.devStatus = 2
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
             // 子类型错误
@@ -159,6 +167,14 @@ export default {
         this.responseTime = diffTime
         this.intervalFlag = true
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           if (data.data.code === '4003') {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
@@ -253,6 +269,14 @@ export default {
         resData = data
         let success = 0
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           that.$message.error(getMessageByCode(data.data.code, that.$i18n.locale))
           return
         }
@@ -283,6 +307,14 @@ export default {
           controlData: null
         }
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           if (data.data.code === '4003') {
             this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return

package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -289,6 +289,14 @@ export default {
         resData = data
         let success = 0
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           that.$message.error(getMessageByCode(data.data.code, that.$i18n.locale))
           return
         }

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

@@ -470,6 +470,18 @@ export default {
     },
     handleTentative (val) {
       if (val === null || val.length === 0) return
+      // 周期以实际的绿信比来计算
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.value + (val.sum ? val.sum : 0)
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       this.patternInfo = []
       let currentArr = []
       let newPattern = []
@@ -496,7 +508,7 @@ export default {
         let ringTeam = this.step1(this.phaseList, newCurrent)
         this.fillGap(ringTeam, val)
       }
-      let cycle = this.controlData.cycle
+      // let cycle = this.controlData.cycle
       for (let rings of val) {
         if (rings.length === 0) continue
         let list = []
@@ -607,6 +619,18 @@ export default {
     },
     handleOverViewChange (val) {
       if (val === null || val.length === 0) return
+      // 周期以实际的绿信比来计算
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.value + (val.sum ? val.sum : 0)
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       // 按环序分组
       let ringlength = []
       let ringsequence = val.map(item => {
@@ -711,7 +735,7 @@ export default {
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         this.fillGap(ringTeams, val)
       }
-      let cycle = this.controlData.cycle
+      // let cycle = this.controlData.cycle
       for (let rings of val) {
         if (rings.length === 0) continue
         let list = []

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

@@ -551,6 +551,14 @@ export default {
         that.unlockScreen()
         let success = 0
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           that.$message.error(getMessageByCode(data.data.code, that.$i18n.locale))
           return
         }
@@ -677,6 +685,14 @@ export default {
         this.unlockScreen()
         let success = 0
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }

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

@@ -72,7 +72,7 @@
                 <kan-ban v-for="n in ringCount"
                 :key="n" class="closephasekanban"
                 :index="n"
-                :options="patternOne.length===0?allPatternList[0].options:patternOne[0].options"
+                :options="patternOne.length===0?planPattern[0].options:patternOne[0].options"
                 :list="patternOne.length===0?planPattern.rings[n-1]:patternOne[0].rings[n-1]"
                 :phaseList="phaseList"
                 :header-text="$t('openatccomponents.pattern.ring')+n"
@@ -83,12 +83,11 @@
         <el-tab-pane :label="$t('openatccomponents.pattern.stageConfig')" name="kanban">
             <el-scrollbar :vertical="true">
                 <div class="stage-panel-contener">
-                    <stage-board v-for="(stage,index) in patternOne.length===0?allPatternList[0].stagesList:patternOne[0].stagesList"
+                    <stage-board v-for="(stage,index) in patternOne.length===0?stagesList:patternOne[0].stagesList"
                         class="closephasekanban"
                         :key="index"
                         :stage="stage"
-                        :options="patternOne.length===0?allPatternList[0].options:patternOne[0].options"
-                        :stageInfo="patternOne.length===0?allPatternList[0].stagesList:patternOne[0].stagesList"
+                        :stageInfo="patternOne.length===0?stagesList:patternOne[0].stagesList"
                         :coordphaseOption="coordphaseOption"
                         :subIndex="index"
                         @onStageSplitChange="onStageSplitChange"
@@ -106,7 +105,7 @@
                     v-for="(j,index) in ringCounts"
                     :key="index"
                     class="closephasekanban"
-                    :options="patternOne.length===0?allPatternList[0].options:patternOne[0].options"
+                    :options="patternOne.length===0?planPattern[0].options:patternOne[0].options"
                     :header-text="$t('openatccomponents.pattern.ring')+j"
                     :list="patternOne.length===0?planPattern.rings[j-1]:patternOne[0].rings[j-1]"
                     >
@@ -468,7 +467,17 @@ export default {
           this.narr.reverse()// 阶段差
           for (let i = 0; i < newPhaselist.length; i++) {
             let stage = JSON.parse(JSON.stringify(newPhaselist[i]))
-            let stageItem = this.getStageItem(stage, rings, i)
+            let newStage = []
+            stage.map(item => {
+              for (let ring of rings) {
+                for (let ringItem of ring) {
+                  if (item === ringItem.id && (ringItem.mode !== 7 && ringItem.mode !== 8)) {
+                    newStage.push(item)
+                  }
+                }
+              }
+            })
+            let stageItem = this.getStageItem(newStage, stage, rings, i)
             stagesList.push(JSON.parse(JSON.stringify(stageItem)))
           }
           this.overLapCycle = stagesList.reduce((prev, curr) => prev + parseInt(curr.split), 0)
@@ -476,11 +485,12 @@ export default {
         }
       }
     },
-    getStageItem (stageArr, ringsList, i) {
+    getStageItem (stageArr, stage, ringsList, i) {
       let res = {
         key: i,
         split: this.narr[i], // 阶段绿性比
         stages: stageArr,
+        stageKanban: stage,
         delaystart: 0,
         advanceend: 0
       }

package/src/kisscomps/components/StageBord/StageBord.vue

@@ -51,7 +51,7 @@
             <el-input
               v-if="this.contrloType === 'ring' || !this.contrloType"
               size="small"
-              :value="stage.stages.join(',')"
+              :value="stage.stageKanban.join(',')"
               ref="type"
               :disabled="true">
             </el-input>

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

@@ -377,6 +377,14 @@ export default {
         this.responseTime = diffTime
         this.intervalFlag = true
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
           if (data.data.code === '4003') {
             // this.devStatus = 2

package/src/node_modules/.package_versions.json

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

package/src/views/schemeconfig.vue

@@ -87,6 +87,14 @@ export default {
       this.getIntersectionInfo(this.agentId, '')
       getTscControl(this.agentId).then((data) => {
         if (!data.data.success) {
+          if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
+            let success = data.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           if (data.data.code === '4003') {
             this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return