openatc-components 0.0.52 → 0.0.55

package/package/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,6 +292,8 @@ export default {
       confirmedFault: [],
       ignoredFault: [],
       untreatedFault: [],
+      patternAll: [],
+      patternSelect: [], // 所有方案id
       specialPage: '' // 哪一个特殊控制页面
     }
   },
@@ -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/package/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')
     },

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

@@ -48,7 +48,7 @@
     </el-row>
     <el-row>
         <div class="title" style="margin-top:18px; margin-bottom:10px">{{$t('openatccomponents.overview.patternstate')}}:
-            <span>({{$t('openatccomponents.overview.cycle')}}: {{patternOne.length===0?planPattern.cycle:patternOne[0].cycle}}  {{$t('openatccomponents.overview.patternoffset')}}: {{planPattern.offset}})</span>
+            <span>({{$t('openatccomponents.overview.cycle')}}: {{cycle}}  {{$t('openatccomponents.overview.patternoffset')}}: {{offset}})</span>
         </div>
         <stage-status
         :patternStatusList="patternOne.length===0?planPattern.rings:patternOne[0].rings"
@@ -162,9 +162,6 @@ export default {
     controlData: {
       type: Object
     },
-    // patternStatus: {
-    //   type: Object
-    // },
     phaseList: {
       type: Array
     },
@@ -174,9 +171,6 @@ export default {
     allPatternList: {
       type: Array
     },
-    // phaseRings: {
-    //   type: Array
-    // }
     planPattern: {
       type: Object
     },
@@ -189,7 +183,7 @@ export default {
       return this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
     },
     cycle () {
-      return this.patternOne.length === 0 ? this.planPattern.cycle : this.patternOne[0].cycle
+      return this.patternOne.length === 0 ? this.max : (this.patternOne.length > 0 && (this.patternOne[0].cycle < this.max)) ? this.max : this.patternOne[0].cycle
     },
     offset () {
       return this.patternOne.length === 0 ? 0 : this.patternOne[0].offset
@@ -208,13 +202,6 @@ export default {
     return {
       stagesList: [],
       phaseRings: [],
-      // patternSelect: [{
-      //   value: 1
-      // }, {
-      //   value: 2
-      // }, {
-      //   value: 3
-      // }],
       options: {
         group: 'pattern'
       },
@@ -308,6 +295,7 @@ export default {
       //     ]
       //   }
       // ],
+      max: '',
       activeList: 'ring',
       ringCount: 1,
       ringCounts: 1,
@@ -1245,13 +1233,18 @@ export default {
         }
       }
     },
-    handleSplit (index, newList) {
-    //   this.allPatternList[index - 1].rings[index - 1] = newList
-    //   this.planPattern[index - 1] = newList
-    //   let currPattern = this.patternList[index]
-    //   setTimeout(() => {
-    //     this.handleStageData(currPattern.rings, this.patternList[index].id, currPattern.stagesList)
-    //   }, 50)
+    handleSplit (index) {
+      if (this.patternOne.length > 0) {
+        let currPattern = this.patternOne[0].rings
+        setTimeout(() => {
+          this.handleStageData(currPattern)
+        }, 50)
+      } else {
+        let currPattern = this.planPattern.rings
+        setTimeout(() => {
+          this.handleStageData(currPattern)
+        }, 50)
+      }
     },
     selectPattern () {
       this.patternOne = this.allPatternList.filter(item => {
@@ -1410,7 +1403,8 @@ export default {
       let submitdata = {
         control: 100,
         delay: this.manualInfo.tempDelay !== undefined ? Number(this.manualInfo.tempDelay) : 0,
-        duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
+        duration: this.manualInfo.duration,
+        // duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }
       submitdata.data.offset = this.offset

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

@@ -35,7 +35,7 @@
                 <div style="width:70%;">
                   <i class="iconfont icon-feijidongche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 6"></i>
                   <i class="iconfont icon-lukouzhilu" style="font-size:16PX;color:#454545;" v-if="item[item.length-1].controltype === 1"></i>
-                  <i class="iconfont icon-BRT" style="position: absolute;top: 8PX;font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 4"></i>
+                  <i class="iconfont icon-BRT" style="font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 4"></i>
                   <div style="transform:scale(0.65);margin-left:-6px;">
                     <i class="iconfont icon-xuxiangwei" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                   </div>
@@ -97,7 +97,7 @@ export default {
     },
     stagesList () {
       let list = []
-      if (this.crossStatusData && this.crossStatusData.current_stage && this.phaseList && this.phaseList.length > 0) {
+      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.isShowCurrentStage) {