openatc-components 0.0.39-hotfix → 0.0.40-hotfix

package/config/index.js

@@ -17,6 +17,7 @@ module.exports = {
         // target:  'https://dolphin-test.kedacom.com/openatc',
         target:  'http://192.168.13.105:11003/openatc',
         // target:  'http://192.168.13.103:10003/openatc',
+        // target:  'http://192.168.13.103:10003/openatc',
         // target:  'http://192.168.13.103:9999',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'http://192.168.13.103:9999/kissapi',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         changeOrigin: true,     //跨域

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -350,17 +350,17 @@ export default {
       // 公交相位信息
       this.busPhaseData = []
       this.phaseList.forEach((ele, i) => {
-        if (ele.controltype >= 3 && ele.controltype <= 5) {
-          ele.direction.forEach((dir, index) => {
+        // if (ele.controltype >= 3 && ele.controltype <= 5) {
+        ele.direction.forEach((dir, index) => {
           // 车道相位
-            this.busPhaseData.push({
-              phaseid: ele.id, // 相位id，用于对应相位状态
-              id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-              name: this.PhaseDataModel.getBusPhasePos(dir).name,
-              controltype: ele.controltype
-            })
+          this.busPhaseData.push({
+            phaseid: ele.id, // 相位id，用于对应相位状态
+            id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
+            name: this.PhaseDataModel.getBusPhasePos(dir).name,
+            controltype: ele.controltype
           })
-        }
+        })
+        // }
       })
       let result = []
       let obj = {}

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

@@ -21,11 +21,11 @@
                :controlData="controlData"
                :modelList="modelList"
                :patternSelect="patternSelect"
-               :stagesList="stagesList"
+               :crossStatusData="crossStatusData"
+               :phaseList="phaseList"
                :specialcontrolList="specialcontrolList"
                :currModel="currModel"
                :preselectModel="preselectModel"
-               :currentStage="currentStage"
                :preselectStages="preselectStages"
                :realtimeStatusModalvisible="realtimeStatusModalvisible"
                :funcSort="funcSort"
@@ -86,12 +86,12 @@
                 :confirmedFault="confirmedFault"
                 :ignoredFault="ignoredFault"
                 :untreatedFault="untreatedFault"
-                :currentStage="currentStage"
                 :closePhase="closePhase"
                 :agentName="agentName"
                 :devStatus="devStatus"
                 :agentId="agentId"
-                :stagesList="stagesList"
+                :crossStatusData="crossStatusData"
+                :phaseList="phaseList"
                 :sidewalkPhaseData="sidewalkPhaseData"
                 :roadDirection="roadDirection"
                 @changeStatus="changeStatus"
@@ -191,8 +191,6 @@ export default {
       controlData: {},
       control: '',
       sidewalkPhaseData: [],
-      stagesList: [],
-      currentStage: 0,
       list: [{
         iconClass: 'model',
         name: '控制模式',
@@ -349,23 +347,7 @@ export default {
     getPedPhasePos () {
       let ringDataModel = new RingDataModel(this.statusData, this.phaseList)
       this.sidewalkPhaseData = ringDataModel.getPedPhasePos()
-      // // 行人相位信息
-      // this.sidewalkPhaseData = []
-      // this.phaseList.forEach((ele, i) => {
-      //   if (ele.peddirection) {
-      //     ele.peddirection.forEach((dir, index) => {
-      //     // 行人相位
-      //       if (this.PhaseDataModel.getSidePos(dir)) {
-      //         this.sidewalkPhaseData.push({
-      //           key: this.CrossDiagramMgr.getUniqueKey('pedphase'),
-      //           phaseid: ele.id, // 相位id，用于对应相位状态
-      //           id: dir,
-      //           name: this.PhaseDataModel.getSidePos(dir).name
-      //         })
-      //       }
-      //     })
-      //   }
-      // })
+      this.ringDataModel = ringDataModel
     },
     clearFaultInterval () {
       if (this.faultTimer !== null) {
@@ -377,81 +359,9 @@ export default {
       this.crossStatusData = JSON.parse(JSON.stringify(this.statusData))
       let TscData = JSON.parse(JSON.stringify(this.crossStatusData))
       this.currModel = TscData.control
-      this.handleStageData(TscData) // 处理阶段（驻留）stage数据
       this.controlData = this.handleGetData(TscData)
       this.handleGetPhaseClose()
     },
-    getBusPos () {
-      // 公交相位信息
-      this.busPhaseData = []
-      this.phaseList.forEach((ele, i) => {
-        if (ele.controltype >= 3 && ele.controltype <= 5) {
-          ele.direction.forEach((dir, index) => {
-          // 车道相位
-            this.busPhaseData.push({
-              // key: this.CrossDiagramMgr.getUniqueKey('busphase'),
-              phaseid: ele.id, // 相位id，用于对应相位状态
-              id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-              name: this.PhaseDataModel.getBusPhasePos(dir).name,
-              controltype: ele.controltype
-            })
-          })
-        }
-      })
-      let result = []
-      let obj = {}
-      for (var i = 0; i < this.busPhaseData.length; i++) {
-        if (!obj[this.busPhaseData[i].phaseid]) {
-          result.push(this.busPhaseData[i])
-          obj[this.busPhaseData[i].phaseid] = true
-        }
-      }
-      this.busPhaseData = result
-    },
-    handleStageData (data) {
-      this.getBusPos()
-      this.stagesList = []
-      let busPhaseData = this.busPhaseData
-      this.currentStage = data.current_stage
-      let stages = data.stages
-      if (!stages) return
-      let stagesTemp = []
-      for (let stage of stages) {
-        let tempList = []
-        let directionList = []
-        let stageControType = 0
-        let peddirections = []
-        for (let stg of stage) {
-          let currPhase = this.phaseList.filter((item) => {
-            return item.id === stg
-          })[0]
-          if (currPhase !== undefined) {
-            directionList = [...currPhase.direction, ...directionList]
-          }
-          for (let walk of this.sidewalkPhaseData) {
-            if (stg === walk.phaseid) {
-              peddirections.push(...currPhase.peddirection)
-              peddirections = Array.from(new Set(peddirections))
-            }
-          }
-          for (let busPhase of busPhaseData) {
-            if (stg === busPhase.phaseid) {
-              stageControType = busPhase.controltype
-            }
-          }
-        }
-        directionList = [...new Set(directionList)]
-        if (directionList.length === 0) return
-        tempList = directionList.map(dir => ({
-          id: dir,
-          color: '#606266',
-          controltype: stageControType,
-          peddirection: peddirections
-        }))
-        stagesTemp.push(tempList)
-      }
-      this.stagesList = JSON.parse(JSON.stringify(stagesTemp))
-    },
     lockScreen () {
       this.loading = this.$loading({
         lock: true,

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

@@ -59,20 +59,10 @@
         </div>
         <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;">
-          <div class="control-model" v-for="(item, index) in stagesList" :key="index">
-            <div class="single-model" @click="selectStages(index + 1)" :class="preselectStages == index + 1 ? 'single-model-select' : ''">
-              <xdrdirselector Width="40px" Height="40px" :showlist="item" :roadDirection="roadDirection"></xdrdirselector>
-              <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
-                <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
-                <div style="width:70%;">
-                  <i class="iconfont icon-BRT" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 4"></i>
-                  <i class="iconfont icon-feijidongche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 6"></i>
-                  <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 3"></i>
-                  <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 5"></i>
-                </div>
-              </div>
-            </div>
-          </div>
+          <Stages :crossStatusData="crossStatusData"
+                  :phaseList="phaseList"
+                  :isShowCurrentStage="false"
+                  @onSelectStages="selectStages"></Stages>
         </div>
         <div class="stage-label" v-if="funcSort === 'allFunc'">{{$t('openatccomponents.overview.specialcontrol')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;" v-if="funcSort === 'allFunc'">
@@ -96,12 +86,24 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
+import Stages from '../../Stages/index'
 export default {
   name: 'manualControl',
   components: {
-    xdrdirselector
+    xdrdirselector,
+    Stages
   },
   props: {
+    crossStatusData: {
+      type: Object,
+      default: () => {}
+    },
+    phaseList: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
     Visible: {
       type: Boolean
     },
@@ -111,9 +113,9 @@ export default {
     modelList: {
       type: Array
     },
-    stagesList: {
-      type: Array
-    },
+    // stagesList: {
+    //   type: Array
+    // },
     patternSelect: {
       type: Array
     },

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

@@ -142,12 +142,11 @@
     </div>
     <!-- 信号机控制状态模块 End-->
 
-    <div class="cross-content" v-show="stagesList && stagesList.length > 0">
+    <div class="cross-content">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.currentstage')}}:</div>
       <div style="margin-left: 85PX;">
-      <Stages :stagesList="stagesList"
-              :currentStage="currentStage"
-              :sidewalkPhaseData="sidewalkPhaseData"
+      <Stages :crossStatusData="crossStatusData"
+              :phaseList="phaseList"
               @onSelectStages="onSelectStages"></Stages>
       </div>
     </div>
@@ -170,14 +169,22 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
-import PatternWalkSvg from '../../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 export default {
   name: 'realtimestatus',
   components: {
-    xdrdirselector,
-    PatternWalkSvg
+    xdrdirselector
   },
   props: {
+    crossStatusData: {
+      type: Object,
+      default: () => {}
+    },
+    phaseList: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
     Visible: {
       type: Boolean
     },

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

@@ -16,9 +16,19 @@
         <div style="width: 100%; height: auto;">
           <div class="control-model" v-for="(item, index) in stagesList" :key="index">
             <div style="position:relative;" :style="singleStyle" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
-              <template v-for="(side, index) in item[0].sidewalkPhaseData" >
-                <PatternWalkSvg class="patternWalk" v-if="item[0].peddirection.includes(side.id)" :key="side.key + '-' + index" :Data="side" :Width="'55'" :Height="'55'" />
-              </template>
+              <!-- <template v-for="(side, index) in item[0].sidewalkPhaseData" >
+                <PatternWalkSvg class="patternWalk"
+                                v-if="item[0].peddirection.includes(side.id)"
+                                :key="side.key + '-' + index"
+                                :Data="side"
+                                :Width="'55'"
+                                :Height="'55'" />
+              </template> -->
+                <PatternWalkSvg class="patternWalk"
+                          :showWalk="item[0].peddirection"
+                          :sidewalkPhaseData="item[0].sidewalkPhaseData"
+                          :Width="'55'"
+                          :Height="'55'" />
               <xdr-dir-selector Width="40PX" Height="40PX" :showlist="item"></xdr-dir-selector>
               <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
@@ -31,6 +41,10 @@
               </div>
             </div>
           </div>
+          <!-- <PatternWalkSvg class="patternWalk"
+                                :Data="side"
+                                :Width="'55'"
+                                :Height="'55'" /> -->
         </div>
       </div>
   </div>
@@ -38,20 +52,21 @@
 
 <script>
 /* eslint-disable */
-import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
+import RingDataModel from '../../../utils/RingDataModel.js'
 export default {
   name: 'Stages',
-  components: {
-    PatternWalkSvg
-  },
   props: {
-    stagesList: {
-      type: Array,
-      default: []
+    isShowCurrentStage: {
+      type: Boolean,
+      default: true
     },
-    currentStage: {
-      type: Number,
-      default: -1
+    crossStatusData: {
+      type: Object,
+      default: () => {}
+    },
+    phaseList: {
+      type: Array,
+      default: () => []
     },
     StageWidth: {
       type: String,
@@ -64,6 +79,9 @@ export default {
   },
   data () {
     return {
+      side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
+      // stagesList: [],
+      currentStage: -1,
     };
   },
   computed: {
@@ -72,10 +90,24 @@ export default {
         width: this.StageWidth,
         height: this.StageHeight
       }
+    },
+    stagesList () {
+      let list = []
+      if (this.crossStatusData && this.phaseList) {
+        let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
+        list = ringDataModel.getStageData()
+        if (this.isShowCurrentStage) {
+          this.currentStage = this.crossStatusData.current_stage
+        }
+      }
+      return list
     }
   },
   methods: {
     selectStages (value) {
+      if (this.isShowCurrentStage) {
+        return false
+      }
       this.currentStage = value
       this.$emit('onSelectStages', value)
     }