openatc-components 0.3.95 → 0.3.97

package/package.json

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

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

@@ -222,6 +222,10 @@ export default {
       type: Boolean,
       devault: true
     },
+    isShowMessage: {
+      type: Boolean,
+      default: true
+    },
     roadDirection: {
       type: String
     },
@@ -718,7 +722,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.$message.error(msg)
+          this.isShowMessage && this.$message.error(msg)
           return
         }
         this.isLoaded = true
@@ -1040,10 +1044,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         let channelList = res.data.data.channelList.filter(ele => ele.type !== undefined)

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -41,6 +41,7 @@
       :clickMode="clickMode"
       :isThirdSignal="isThirdSignal"
       :channelType="channelType"
+      :isShowMessage ="isShowMessage"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
@@ -84,6 +85,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isShowMessage: {
+      type: Boolean,
+      default: true
+    },
     roadDirection: {
       type: String,
       default: 'right'

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

@@ -23,6 +23,7 @@
         :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
+        :isShowMessage ="isShowMessage"
         :isShowInterval="isShowInterval"
         @onSelectStages="onSelectStages"/>
   </div>
@@ -73,6 +74,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isShowMessage: {
+      type: Boolean,
+      default: true
+    },
     isShowState: {
       type: Boolean,
       devault: false
@@ -140,7 +145,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.$message.error(msg)
+          this.isShowMessage && this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -192,7 +197,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
+            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
@@ -208,7 +213,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.$message.error(msg)
+          this.isShowMessage && this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           if (this.isResend) {
             this.reSend()
@@ -222,7 +227,7 @@ export default {
         this.controlData = this.controlFormat.handleGetData(param)
         this.$emit('getTscControl', data)
       }).catch(error => {
-        this.$message.error(error)
+        this.isShowMessage && this.$message.error(error)
         console.log(error)
       })
     },
@@ -235,7 +240,7 @@ export default {
         if (!res.data.success) {
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
-          this.$message.error(msg)
+          this.isShowMessage && this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -295,7 +300,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.$message.error(this.$t(errormsg))
+              this.isShowMessage && this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -330,7 +335,7 @@ export default {
         }
         if (!data.data.success) {
           if (data.data.code === '4003') {
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return
           }
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
@@ -339,10 +344,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.$message.error(parrenterror)
+            this.isShowMessage && this.$message.error(parrenterror)
           }
           return
         }
@@ -359,7 +364,7 @@ export default {
           controlData: controlData
         }
       }).catch(error => {
-        this.$message.error(error)
+        this.isShowMessage && this.$message.error(error)
         console.log(error)
       })
     },
@@ -368,10 +373,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         this.phaseList = res.data.data.phaseList

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

@@ -20,6 +20,8 @@
             :stateName="stateName"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
+            :isShowMessage ="isShowMessage"
+            :isShowInterval="isShowInterval"
             :roadDirection="roadDirection" />
           <channelization
             v-if="curHomePage === 'Channelization'"
@@ -132,6 +134,14 @@ export default {
       type: String,
       default: 'right'
     },
+    isShowInterval: {
+      type: Boolean,
+      default: true
+    },
+    isShowMessage: {
+      type: Boolean,
+      default: true
+    },
     isfromatc: {
       type: Boolean,
       default: true
@@ -140,6 +150,7 @@ export default {
   data () {
     return {
       stateName: this.$t('openatccomponents.overview.offline'),
+      curBodyWidth: 1920,
       controlData: {},
       checked: false,
       overlap: [],
@@ -317,10 +328,10 @@ export default {
           //   let childErrorCode = data.data.data.errorCode
           //   if (childErrorCode) {
           //     let childerror = getMessageByCode(data.data.data.errorCode, _this.$i18n.locale)
-          //     _this.$message.error(parrenterror + ',' + childerror)
+          //     _this.isShowMessage && _this.$message.error(parrenterror + ',' + childerror)
           //   }
           // } else {
-          //   _this.$message.error(parrenterror)
+          //   _this.isShowMessage && _this.$message.error(parrenterror)
           // }
           _this.curHomePage = 'Graphical'
           return
@@ -360,7 +371,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.$message.error(this.$t(errormsg))
+              this.isShowMessage && this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -370,10 +381,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.$message.error(parrenterror)
+            this.isShowMessage && this.$message.error(parrenterror)
           }
           if (this.isResend) {
             this.reSend()
@@ -435,7 +446,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.$message.error(this.$t(errormsg))
+              this.isShowMessage && this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -443,7 +454,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             if (this.isResend) {
               this.reSend()
             }
@@ -455,10 +466,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.$message.error(parrenterror)
+            this.isShowMessage && this.$message.error(parrenterror)
           }
           this.clearPatternInterval() // 清除其他定时器
           this.clearVolumeInterval()
@@ -478,7 +489,7 @@ export default {
         console.log('this.controlData', this.controlData)
         this.checkStage(this.controlData)
       }).catch(error => {
-        // this.$message.error(error)
+        // this.isShowMessage && this.$message.error(error)
         console.log(error)
       })
     },
@@ -701,7 +712,7 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam
@@ -733,7 +744,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.$message.error(this.$t(errormsg))
+              this.isShowMessage && this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -743,10 +754,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.$message.error(parrenterror + ',' + childerror)
+              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.$message.error(parrenterror)
+            this.isShowMessage && this.$message.error(parrenterror)
           }
           return
         }
@@ -758,7 +769,7 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam

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

@@ -1268,16 +1268,17 @@ export default {
           obj.split = split
           obj.cycle = cycle
           const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
+          const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
           if (isZero <= 0) {
             if (ring.sum) {
               obj.sum = ring.sum
-              obj.redWidth = ((((currPhase.redclear + ring.sum) / split) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+              obj.redWidth = ((((currPhase.redclear + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
             } else {
-              obj.redWidth = (((currPhase.redclear / split) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+              obj.redWidth = (((currPhase.redclear / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
             }
-            obj.greenWidth = (((split - (currPhase.redclear / split) - (currPhase.yellow / split) - (currPhase.flashgreen / split)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.yellowWidth = (((currPhase.yellow / split) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.flashgreen = (((currPhase.flashgreen / split) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.greenWidth = (((split - (currPhase.redclear / allAdd) - (currPhase.yellow / allAdd) - (currPhase.flashgreen / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.yellowWidth = (((currPhase.yellow / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.flashgreen = (((currPhase.flashgreen / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
           } else {
             if (ring.sum) {
               obj.sum = ring.sum

package/src/node_modules/.package_versions.json

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

package/src/views/intersection.vue

@@ -1,16 +1,15 @@
 <template>
   <div>
-    <intersection-with-interface :AgentId="agentId" />
     <h2 class="text">实时通道路口图</h2>
-    <!-- <channel-realtime-intersection
+    <channel-realtime-intersection
       :agentId="this.agentId"
       :roadDirection="roadDirection"
       :channelRealtimeStatusData="channelRealtimeStatusData"
-    /> -->
+    />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
-    <!-- <intersection-direction-selection
+    <intersection-direction-selection
       :agentId="this.agentId"
       :choosedDirection="[14,6,13,8]"
       :choosedPedDirection="[1]"
@@ -26,7 +25,7 @@
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
         @handleClickCrossIcon="handleClickCrossIcon" />
-      </div> -->
+      </div>
 
       <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
@@ -162,12 +161,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '32050101041121000001',
+      agentId: 'tjblfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
+      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/intersection2.vue

@@ -102,12 +102,12 @@ export default {
     return {
       roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '32050101041121000001',
+      agentId: 'cllzpl',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNjkzMjkyMzI0NzUyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6NDA5MjEzNDQwMCwiaWF0IjoxNjkwODE5MjAwfQ.97bSPcUdh4xgAqkbw96Q-NfLVhFbgK0Yo1S8KYkSwz8',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -1,15 +1,13 @@
 <template>
   <div id="test1">
-    <!-- <overview
+    <overview
         :AgentId="agentId"
         :reqUrl="reqUrl"
         :modeName="modeName"
         :controlName="controlName"
         :isShowState="isShowState"
         :isShowMode="isShowMode"
-        :Token="Token"></overview> -->
-    <el-button @click="handleChangeOverview">切换overview组件</el-button>
-    <overview-component :AgentId="agentId" />
+        :Token="Token"></overview>
   </div>
 </template>
 
@@ -21,23 +19,12 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: '13013',
-      agentid1: 'gjnlahql',
-      agentid2: '13013',
-      sum: 0,
-      Token: 'eyJraWQiOiIxNzI5ODIxNjcyNTQ3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyOTgyNTI3MiwiaWF0IjoxNzI5ODE4MDcyfQ._C-0Cf3CQYx3tpGPAF-973Km8ekzJhAm4XwpNKFgSfk',
+      agentId: 'jmlxhl',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },
   methods: {
-    handleChangeOverview () {
-      if (this.sum % 2 === 0) {
-        this.agentId = this.agentid1
-      } else {
-        this.agentId = this.agentid2
-      }
-      this.sum++
-    }
   },
   watch: {
   },