openatc-components 0.2.41 → 0.2.43

package/package.json

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

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

@@ -98,7 +98,7 @@ export default {
       type: Number,
       default: 1
     },
-    StageWidth: {
+    StageWidth: { // 图的大小样式
       type: String,
       default: '70px'
     },
@@ -122,19 +122,26 @@ export default {
       type: String,
       default: '65PX'
     },
-    showStyle: {
+    showStyle: { // 图内部方向的位置
       type: Object,
       default: () => ({
         top:'7PX',
         left:'13px'
       })
     },
-    showStyles: {
+    showStyles: { // 图内部人行道的位置
       type: Object,
       default: () => ({
         top:'5PX',
         left:'12px'
       })
+    },
+    noClick: { // 图是否可以点击
+      type: Boolean,
+      default: false
+    },
+    showDataType: { // 图展示的数据类型：默认按阶段展示，如果传phase则按相位维度展示
+      type: String
     }
   },
   data () {
@@ -158,7 +165,11 @@ export default {
       let list = []
       if (this.crossStatusData && this.crossStatusData.stages && this.phaseList && this.phaseList.length > 0) {
         let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
-        list = ringDataModel.getStageData()
+        if (this.showDataType === 'phase') {
+          list = ringDataModel.getStageData('phase')
+        } else {
+          list = ringDataModel.getStageData()
+        }
         if (this.isShowCurrentStage) {
           this.currentStage = this.crossStatusData.current_stage
         }
@@ -254,6 +265,7 @@ export default {
       return res
     },
     selectStages (value) {
+      if (this.noClick) return
       if (this.isShowCurrentStage) {
         return false
       }

package/src/utils/RingDataModel.js

@@ -181,12 +181,19 @@ export default class RingDataModel {
     }
     return stagesTemp
   }
-  getStageData () {
+  getStageData (datatype) {
     let data = this.crossStatusData
     let stagesTemp = []
     let busPhaseData = this.getBusPos()
     let sidewalkPhaseData = this.getPedPhasePos()
-    let stages = data.stages
+    let stages
+    if (datatype === 'phase') {
+      // 如果需要按相位展示，datatype传'phase'
+      stages = data.phase.map(ele => [ele.id])
+    } else {
+      // 默认按阶段数据处理
+      stages = data.stages
+    }
     for (let stage of stages) {
       let tempList = []
       let directionList = []

package/src/views/intersection.vue

@@ -144,7 +144,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE1ODM5MzY0NDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTg4MjU2NCwiaWF0IjoxNzE1ODM5MzY0fQ.WHWB7t9rw-GX8QkWq8TygTLSFpxSoG2QxUJTdblZVu8',
+      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -19,8 +19,8 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'cllzpl',
-      Token: 'eyJraWQiOiIxNzE1ODM5MzY0NDQ2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTg4MjU2NCwiaWF0IjoxNzE1ODM5MzY0fQ.WHWB7t9rw-GX8QkWq8TygTLSFpxSoG2QxUJTdblZVu8',
+      agentId: 'jmlxhl',
+      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },