openatc-components 0.0.76 → 0.0.79

package/package.json

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

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -150,7 +150,6 @@ export default {
           })
         }
       })
-      console.log(overlapData, 'overlapData')
       this.overlapDatas = overlapData
     }
   }

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

@@ -65,7 +65,6 @@
                  :phaseList="phaseList"
                  :overlap="overlap"
                  :patternSelect="patternSelect"
-                 :planPattern="planPattern"
                  :allPatternList="allPatternList"
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
@@ -156,15 +155,12 @@ export default {
     ip: {
       type: String
     },
-    planPattern: {
-      type: Object
-    },
-    allPatternList: {
-      type: Array
-    },
-    overlap: {
-      type: Array
-    },
+    // allPatternList: {
+    //   type: Array
+    // },
+    // overlap: {
+    //   type: Array
+    // },
     platform: {
       type: String
     },
@@ -193,6 +189,8 @@ export default {
       crossStatusData: null,
       controlData: {},
       control: '',
+      allPatternList: [],
+      overlap: [],
       sidewalkPhaseData: [],
       list: [{
         iconClass: 'model',
@@ -355,6 +353,8 @@ export default {
       // 获取路口信息
       getIntersectionInfo(agentid).then(res => {
         this.patternAll = res.data.data.param.patternList
+        this.allPatternList = res.data.data.param.patternList
+        this.overlap = res.data.data.param.overlaplList
         this.patternSelect = res.data.data.param.patternList.map(item => {
           return {
             value: item.id,
@@ -499,7 +499,7 @@ export default {
         }
       })
       control.control = that.preselectModel === -1 ? that.currModel : that.preselectModel
-      control.terminal = Number(manualInfo.tempPatternid)
+      control.terminal = isNaN(parseInt(manualInfo.tempPatternid)) ? Number(manualInfo.tempPatternid.replace(/[^0-9]/ig, '')) : manualInfo.tempPatternid
       control.delay = Number(manualInfo.tempDelay)
       control.duration = Number(manualInfo.tempDuration)
       control.value = that.preselectStages === -1 ? 0 : that.preselectStages

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

@@ -171,9 +171,6 @@ export default {
     allPatternList: {
       type: Array
     },
-    planPattern: {
-      type: Object
-    },
     patternSelect: {
       type: Array
     }
@@ -302,149 +299,7 @@ export default {
       ringCounts: 1,
       coordphaseOption: [],
       patternOne: [],
-      // planPattern: {
-      //   cycle: 120,
-      //   offset: 0,
-      //   rings: [
-      //     [
-      //       {
-      //         'name': 'Phase 1',
-      //         'desc': [
-      //           {
-      //             'id': 13,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 1,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 2',
-      //         'desc': [
-      //           {
-      //             'id': 3,
-      //             'color': '#454545'
-      //           },
-      //           {
-      //             'id': 12,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 2,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 3',
-      //         'desc': [
-      //           {
-      //             'id': 1,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 3,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 4',
-      //         'desc': [
-      //           {
-      //             'id': 6,
-      //             'color': '#454545'
-      //           },
-      //           {
-      //             'id': 8,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 4,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       }
-      //     ],
-      //     [
-      //       {
-      //         'name': 'Phase 5',
-      //         'desc': [
-      //           {
-      //             'id': 9,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 5,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 6',
-      //         'desc': [
-      //           {
-      //             'id': 14,
-      //             'color': '#454545'
-      //           },
-      //           {
-      //             'id': 16,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 6,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 7',
-      //         'desc': [],
-      //         'id': 7,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       },
-      //       {
-      //         'name': 'Phase 8',
-      //         'desc': [
-      //           {
-      //             'id': 2,
-      //             'color': '#454545'
-      //           },
-      //           {
-      //             'id': 4,
-      //             'color': '#454545'
-      //           }
-      //         ],
-      //         'id': 8,
-      //         'value': 30,
-      //         'mode': 2,
-      //         'options': [],
-      //         'delaystart': 0,
-      //         'advanceend': 0
-      //       }
-      //     ],
-      //     [],
-      //     []
-      //   ]
-      // },
+      planPattern: {},
       // allPatternList: [
       //   {
       //     'id': 1,
@@ -1176,12 +1031,71 @@ export default {
     }
   },
   created () {
+    this.patternPlan()
+    this.getCycle()
     if (this.patternOne.length === 0) {
       this.handleStageData(this.planPattern.rings)
     }
     this.initData()
   },
   methods: {
+    patternPlan () {
+      let Pattern = {
+        offset: 0,
+        cycle: 0,
+        rings: [[], [], [], []]
+      }
+      var newPattern = JSON.parse(JSON.stringify(Pattern))
+      for (let phase of this.phaseList) {
+        let ring = {}
+        ring.name = 'Phase ' + phase.id
+        ring.desc = this.getPhaseDescription(phase.direction)
+        ring.id = phase.id
+        ring.value = 30
+        ring.mode = 2
+        ring.options = []
+        ring.delaystart = 0
+        ring.advanceend = 0
+        if (phase.ring === 1) {
+          newPattern.rings[0].push(ring)
+        } else if (phase.ring === 2) {
+          newPattern.rings[1].push(ring)
+        } else if (phase.ring === 3) {
+          newPattern.rings[2].push(ring)
+        } else if (phase.ring === 4) {
+          newPattern.rings[3].push(ring)
+        }
+      }
+      this.planPattern = newPattern
+    },
+    getCycle () {
+      for (let rings of this.planPattern.rings) {
+        let num = 0
+        for (let i = 0; i < rings.length; i++) {
+          if (rings[i].length !== 0) {
+            if (rings[i].mode === 7) { // 忽略相位不计周期
+              continue
+            }
+            num = num + Number(rings[i].value)
+          }
+        }
+        if (num !== 0) {
+          this.planPattern.cycle = num
+          break
+        }
+      }
+    },
+    getPhaseDescription (phaseList) {
+      if (!phaseList) return
+      let list = []
+      for (let id of phaseList) {
+        let obj = {}
+        obj.id = id
+        obj.color = '#454545'
+        list.push(obj)
+      }
+      return list
+    },
     handleClose () {
       this.$emit('closePhaseBack')
     },

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

@@ -70,7 +70,6 @@
             ref="rightpanel"
             :statusData="crossStatusData"
             :agentName="agentName"
-            :planPattern="planPattern"
             :responseTime="responseTime"
             :devStatus="devStatus"
             :agentId="agentId"
@@ -145,7 +144,6 @@ export default {
       controlData: {},
       checked: false,
       overlap: [],
-      planPattern: {},
       contrloType: '',
       narr: [],
       patternList: [],
@@ -279,84 +277,6 @@ export default {
         setHost(host)
       }
     },
-    patternPlan () {
-      // this.increaseId()
-      let Pattern = {
-        // id: this.id,
-        // desc: `${this.$t('edge.pattern.pattern')}${this.id}`,
-        offset: 0,
-        cycle: 0,
-        // stagesList: [],
-        rings: [[], [], [], []]
-      }
-      var newPattern = JSON.parse(JSON.stringify(Pattern))
-      // debugger
-      // const phaseList = JSON.parse(JSON.stringify(this.globalParamModel.getParamsByType('phaseList')))
-      for (let phase of this.phaseList) {
-        let ring = {}
-        ring.name = 'Phase ' + phase.id
-        ring.desc = this.getPhaseDescription(phase.direction)
-        ring.id = phase.id
-        ring.value = 30
-        ring.mode = 2
-        ring.options = []
-        ring.delaystart = 0
-        ring.advanceend = 0
-        if (phase.ring === 1) {
-          newPattern.rings[0].push(ring)
-        } else if (phase.ring === 2) {
-          newPattern.rings[1].push(ring)
-        } else if (phase.ring === 3) {
-          newPattern.rings[2].push(ring)
-        } else if (phase.ring === 4) {
-          newPattern.rings[3].push(ring)
-        }
-        // pahseIndex++
-      }
-      this.planPattern = newPattern
-      return newPattern
-    },
-    getPhaseDescription (phaseList) {
-      if (!phaseList) return
-      let list = []
-      for (let id of phaseList) {
-        let obj = {}
-        obj.id = id
-        obj.color = '#454545'
-        list.push(obj)
-      }
-      return list
-    },
-    getCycle () {
-      for (let rings of this.planPattern.rings) {
-        let num = 0
-        for (let i = 0; i < rings.length; i++) {
-          if (rings[i].length !== 0) {
-            if (rings[i].mode === 7) { // 忽略相位不计周期
-              continue
-            }
-            num = num + Number(rings[i].value)
-            let id = rings[i].id
-            rings[i].name = this.getDescription(id)
-          }
-        }
-        if (num !== 0) {
-          this.planPattern.cycle = num
-          break
-        }
-      }
-    },
-    getDescription (id) {
-      for (let phase of this.phaseList) {
-        if (phase.id === id) {
-          if (phase.desc !== '' && phase.desc !== undefined) {
-            return phase.desc
-          } else {
-            return 'phase' + id
-          }
-        }
-      }
-    },
     getIntersectionInfo (agentid, id) {
       // 获取路口信息
       getIntersectionInfo(agentid).then(res => {
@@ -365,8 +285,6 @@ export default {
         this.overlap = res.data.data.param.overlaplList
         this.contrloType = this.allPatternList[0].contrloType
         this.phaseList = res.data.data.param.phaseList
-        this.patternPlan()
-        this.getCycle()
         // this.patternList = res.data.data.param.patternList.filter(item => {
         //   return item.id === id
         // })[0].rings

package/static/styles/schemeconfig.scss

@@ -249,7 +249,7 @@
     // width: 50%;
   }
   .el-input-number--mini {
-    width: 44%;
+    // width: 44%;
   }
   .el-input-number {
     // width: 100%;
@@ -372,6 +372,9 @@
     margin: 0 auto;
     margin-bottom: 13px;
   }
+  .el-input--mini {
+    width: 44%;
+  }
   .el-form-item__content {
     min-width: 120px;
   }
@@ -390,6 +393,9 @@
     width: 45%;
     min-width: 180px;
   }
+  .el-input-number--mini{
+    width: 100%;
+  }
   .el-input {
     width: 100%;
   }