openatc-components 0.0.112 → 0.1.1

package/package.json

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

package/src/i18n/language/en.js

@@ -1035,6 +1035,13 @@ const en = {
       '4107': 'Unknown infotype!',
       '4108': 'protocol is null!',
       '4109': 'Receive Time Out or Receive Incorrect Data!',
+      '4110': 'Last sendData is not finished!',
+      '4111': 'Port is null!',
+      '4112': 'Cache is null!',
+      '4113': 'Keyints can not be null',
+      '4114': 'Keyints can not be the first two when strategy is up!',
+      '4115': 'Keyints can not be the last two when strategy is down!',
+      '4116': 'No less than three intersections!',
       // error-response
       '4200': 'response is null!',
       '4201': 'response format error!',

package/src/i18n/language/zh.js

@@ -1034,6 +1034,13 @@ const zh = {
       '4107': '未知的消息类型!',
       '4108': '协议为空!',
       '4109': '接收数据超时或收到错误数据!',
+      '4110': '上一次发送的数据还未完成!',
+      '4111': '端口为空!',
+      '4112': '缓存为空!',
+      '4113': '车队尾红波协调时关键路口不能为空',
+      '4114': '车队尾红波协调时关键路口不能为前两个（上行）',
+      '4115': '车队尾红波协调时关键路口不能为后两个（下行）',
+      '4116': '车队尾红波协调时参与协调的路口至少为3个',
       // error-response
       '4200': '应答为空!',
       '4201': '应答消息转换错误!',

package/src/kisscomps/components/DrawChannelization/drawsvg/basicCoordInfo.vue

@@ -86,7 +86,7 @@ export default {
       // 解决change事件只在失去焦点时响应，此处，可以监听到实时变化
       const key = this.$refs[`refNumber-${field}`].displayValue
       if (this.checkOnlyNum(key)) {
-        this.basicCoodInfo[field] = field === 'angle' ? this.checkMinMaxNum(key) : Number(key)
+        this.basicCoodInfo[field] = field === 'angle' ? this.checkAngleMinMaxNum(key) : Number(key)
         this.$emit('handleChangeBasicCoord', this.basicCoodInfo)
       }
     },
@@ -107,7 +107,7 @@ export default {
     handleChangeAngle (angle) {
       // 解决用上下箭头控制数字改变
       if (this.checkOnlyNum(angle)) {
-        this.basicCoodInfo['angle'] = this.checkMinMaxNum(angle)
+        this.basicCoodInfo['angle'] = this.checkAngleMinMaxNum(angle)
         this.$emit('handleChangeBasicCoord', this.basicCoodInfo)
       }
     },

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

@@ -553,18 +553,19 @@ export default {
       getIntersectionInfo(agentid).then(res => {
         if (!res.data.success) {
           this.isLoaded = false
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
           this.stateName = this.$t('openatccomponents.overview.offline')
-          let parrenterror = getMessageByCode(res.data.code, this.$i18n.locale)
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
           if (res.data.data) {
             // 子类型错误
             let childErrorCode = res.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              msg = msg + ' - ' + childerror
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           return
         }
         this.stateName = this.$t('openatccomponents.overview.online')

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

@@ -313,17 +313,16 @@ export default {
       registerMessage(this.AgentId).then(data => {
         if (!data.data.success) {
           this.devStatus = 2
-          let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
+          let msg = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
-            // 子类型错误
-            let childErrorCode = data.data.data.errorCode
-            if (childErrorCode) {
-              let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+            let errorCode = data.data.data.errorCode
+            if (errorCode) {
+              msg = msg + ' - ' + getMessageByCode(errorCode, this.$i18n.locale)
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -378,27 +377,28 @@ export default {
         this.responseTime = diffTime
         this.intervalFlag = true
         if (!data.data.success) {
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + this.AgentId
           if (data.data.code === '4003') {
             this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
             return
           }
-          let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+          let msg = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {
             // 子类型错误
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              msg = msg + ' - ' + childerror
             }
-          } else {
-            this.$message.error(parrenterror)
           }
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           this.clearVolumeInterval()
           if (this.isResend) {
@@ -587,7 +587,9 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
+          this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -628,7 +630,8 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
           return
         }
         let devParams = res.data.data.jsonparam

package/src/views/customchannelization.vue

@@ -16,7 +16,7 @@ export default {
   name: 'custom-channelization-demo',
   data () {
     return {
-      agentId: '13001-460',
+      agentId: '10002-739',
       tscParams: {}
     }
   },

package/src/views/schemeconfig.vue

@@ -30,6 +30,8 @@
         :agentId="agentId"
         :lockPhaseBtnName="lockPhaseBtnName"
         :statusData="crossStatusData"
+        :phaseList="phaseList"
+        :realtimeStatusModalvisible="false"
         roadDirection="left"
          />
          <!-- funcSort="basicFunc" -->
@@ -39,6 +41,7 @@
 <script>
 import { getTscControl } from '../api/control.js'
 import { getMessageByCode } from '../utils/responseMessage.js'
+import { getIntersectionInfo } from '../api/template'
 import {
   setToken
 } from '../utils/auth'
@@ -48,6 +51,7 @@ export default {
   },
   data () {
     return {
+      phaseList: [],
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
@@ -80,6 +84,7 @@ export default {
     },
     initData () {
       // let iframdevid = getIframdevid()
+      this.getIntersectionInfo(this.agentId, '')
       getTscControl(this.agentId).then((data) => {
         if (!data.data.success) {
           if (data.data.code === '4003') {
@@ -104,6 +109,12 @@ export default {
         console.log(error)
       })
     },
+    getIntersectionInfo (agentid, id) {
+      // 获取路口信息
+      getIntersectionInfo(agentid).then(res => {
+        this.phaseList = res.data.data.param.phaseList
+      })
+    },
     setPropsToken (token) {
       // 获取组件外传入的token，便于独立组件调用接口
       if (token && token !== '') {