openatc-components 0.2.42 → 0.2.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.42",
+  "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,23 +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: {
+    noClick: { // 图是否可以点击
       type: Boolean,
       default: false
+    },
+    showDataType: { // 图展示的数据类型：默认按阶段展示，如果传phase则按相位维度展示
+      type: String
     }
   },
   data () {
@@ -162,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
         }

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 = []