openatc-components 0.0.53 → 0.0.56

package/package.json

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

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

@@ -21,6 +21,7 @@
                :controlData="controlData"
                :modelList="modelList"
                :patternSelect="patternSelect"
+               :patternAll="patternAll"
                :crossStatusData="crossStatusData"
                :phaseList="phaseList"
                :specialcontrolList="specialcontrolList"
@@ -117,6 +118,7 @@ import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import { setToken } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
+import { getIntersectionInfo } from '../../../api/template'
 export default {
   name: 'scheme-config',
   components: {
@@ -150,9 +152,6 @@ export default {
     ip: {
       type: String
     },
-    patternSelect: {
-      type: Array
-    },
     planPattern: {
       type: Object
     },
@@ -293,17 +292,19 @@ export default {
       confirmedFault: [],
       ignoredFault: [],
       untreatedFault: [],
+      patternAll: [],
+      patternSelect: [], // 所有方案id
       specialPage: '' // 哪一个特殊控制页面
     }
   },
   watch: {
-    statusData: {
-      handler: function (val) {
-        this.initData()
-      },
-      // 深度观察监听
-      deep: true
-    },
+    // statusData: {
+    //   handler: function (val) {
+    //     this.initData()
+    //   },
+    //   // 深度观察监听
+    //   deep: true
+    // },
     phaseList: {
       handler: function (val, oldVal) {
         this.getPedPhasePos()
@@ -330,6 +331,7 @@ export default {
     if (this.realtimeStatusModalvisible === false) {
       this.changeStatus()
     }
+    this.getIntersectionInfo(this.agentId)
   },
   async mounted () {
     this.setPropsToken(this.Token)
@@ -338,6 +340,17 @@ export default {
     this.initData()
   },
   methods: {
+    getIntersectionInfo (agentid) {
+      // 获取路口信息
+      getIntersectionInfo(agentid).then(res => {
+        this.patternAll = res.data.data.param.patternList
+        this.patternSelect = res.data.data.param.patternList.map(item => {
+          return {
+            value: item.id
+          }
+        })
+      })
+    },
     getFault () {
       this.getFaultById()
       this.faultTimer = setInterval(() => {

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

@@ -23,7 +23,7 @@
                 :label="$t('openatccomponents.overview.controlnumber') + ':'"
                 prop="shape">
                 <!-- <el-input-number v-model="manualInfo.tempPatternid" :controls="false" size="mini" :max="65535" :min="0" :precision="0" :step="1" :placeholder="$t('openatccomponents.common.input')"></el-input-number> -->
-                <el-select v-model="manualInfo.tempPatternid" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
+                <el-select v-model="manualInfo.tempPatternid" @change="changeStage" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
                   <el-option
                     v-for="item in patternSelect"
                     :key="item.value"
@@ -94,6 +94,9 @@ export default {
     Stages
   },
   props: {
+    patternAll: {
+      type: Array
+    },
     crossStatusData: {
       type: Object,
       default: () => {}
@@ -150,15 +153,6 @@ export default {
     return {
       basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
-      // patternSelect: [{
-      //   value: 0
-      // }, {
-      //   value: 1
-      // }, {
-      //   value: 2
-      // }, {
-      //   value: 3
-      // }],
       manualInfo: {
         tempPatternid: '', // 控制方式手动操作的情况下的控制编号的临时值。
         tempDelay: 0, // 控制方式手动操作的情况下的延迟时间的临时值。
@@ -167,6 +161,13 @@ export default {
     }
   },
   methods: {
+    changeStage (value) {
+      let stages = []
+      stages = this.patternAll.filter(item => {
+        return item.id === value
+      })[0].stages
+      this.crossStatusData.stages = stages
+    },
     handleClose () {
       this.$emit('closeManualModal')
     },