openatc-components 0.2.19 → 0.2.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -124,4 +124,4 @@
     "test": "test"
   },
   "license": "ISC"
-}
+}

package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue

@@ -47,7 +47,7 @@
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 import { uploadSingleTscParam } from '../../../api/param.js'
 import { getMessageByCode } from '../../../utils/responseMessage.js'
-import { getIntersectionInfo } from '../../../api/template.js'
+// import { getIntersectionInfo } from '../../../api/template.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 // import { getTheme } from '../../../utils/auth'
@@ -100,57 +100,57 @@ export default {
     }
   },
   methods: {
-    init () {
+    init (IntersectionInfo) {
       this.CrossDiagramMgr = new CrossDiagramMgr()
       this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
-      this.getIntersectionInfo() // 获取路口信息
+      this.getIntersectionInfo(IntersectionInfo) // 获取路口信息
     },
-    getIntersectionInfo () {
+    getIntersectionInfo (res) {
       // 获取路口信息
-      const agentid = this.agentId || '0'
-      getIntersectionInfo(agentid).then(res => {
-        if (!res.data.success) {
-          this.isLoaded = false
-          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
-          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
-          if (res.data.data) {
-            // 子类型错误
-            let childErrorCode = res.data.data.errorCode
-            if (childErrorCode) {
-              let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
-              msg = msg + ' - ' + childerror
-            }
-          }
-          msg = msg + ' - ' + commomMsg
-          this.$message.error(msg)
-          return
-        }
-        this.tempType = res.data.data.type
-        // 获取车道相位、行人相位信息（坐标、名称）
-        this.mainType = this.tempType.split('-')[0]
-        this.mainDirection = this.tempType.split('-')[1]
-        if (!this.isThirdSignal) {
-          // 可点击模式下，非第三方设备，按通道显示相位方向
-          this.getChannelInfo()
-          return
-        }
-        this.crossInfo = res.data.data.param
-        // 城市道路加载车道相位坐标和人行道坐标
-        this.getPhasePos()
-        this.getOverlapPhasePos()
-        this.getPedPhasePos()
-        this.getOverlapPedPhasePos()
-        if (this.isThirdSignal) {
-          // 第三方设备，按相位方向显示相位方向
-          this.compLanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
-          this.compSidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
-          let allDir = this.compLanePhaseData.map(ele => ele.id)
-          let allPedDir = this.compSidewalkPhaseData.map(ele => ele.id)
-          this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
-          this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
-          this.drawPhaseIcon()
-        }
-      })
+      // const agentid = this.agentId || '0'
+      // getIntersectionInfo(agentid).then(res => {
+      //   if (!res.data.success) {
+      //     this.isLoaded = false
+      //     let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
+      //     let msg = getMessageByCode(res.data.code, this.$i18n.locale)
+      //     if (res.data.data) {
+      //       // 子类型错误
+      //       let childErrorCode = res.data.data.errorCode
+      //       if (childErrorCode) {
+      //         let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
+      //         msg = msg + ' - ' + childerror
+      //       }
+      //     }
+      //     msg = msg + ' - ' + commomMsg
+      //     this.$message.error(msg)
+      //     return
+      //   }
+      this.tempType = res.data.data.type
+      // 获取车道相位、行人相位信息（坐标、名称）
+      this.mainType = this.tempType.split('-')[0]
+      this.mainDirection = this.tempType.split('-')[1]
+      if (!this.isThirdSignal) {
+        // 可点击模式下，非第三方设备，按通道显示相位方向
+        this.getChannelInfo()
+        return
+      }
+      this.crossInfo = res.data.data.param
+      // 城市道路加载车道相位坐标和人行道坐标
+      this.getPhasePos()
+      this.getOverlapPhasePos()
+      this.getPedPhasePos()
+      this.getOverlapPedPhasePos()
+      if (this.isThirdSignal) {
+        // 第三方设备，按相位方向显示相位方向
+        this.compLanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
+        this.compSidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
+        let allDir = this.compLanePhaseData.map(ele => ele.id)
+        let allPedDir = this.compSidewalkPhaseData.map(ele => ele.id)
+        this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
+        this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
+        this.drawPhaseIcon()
+      }
+      // })
     },
     getPhasePos () {
       // 车道相位信息
@@ -448,7 +448,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   }
 }
 </script>

package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="intersection-direction-selection">
+  <div class="intersection-direction-selection" v-if="isSpecialIntersection !== undefined">
     <intersection-base-map
             v-if="!isSpecialIntersection && reset"
             ref="intersectionMap2"
@@ -14,6 +14,7 @@
             @handleClickCrossIcon="handleClickCrossIcon" />
     <direction-list-configuration
       v-if="isSpecialIntersection && clickMode && reset"
+      ref="listConfiguration"
       :agentId="agentId"
       :isThirdSignal="isThirdSignal"
       :choosedDirection="choosedDirection"
@@ -34,7 +35,7 @@ export default {
   data () {
     return {
       crossStatusData: {},
-      isSpecialIntersection: false,
+      isSpecialIntersection: undefined,
       isThirdSignal: false,
       reset: true
     }
@@ -105,6 +106,11 @@ export default {
         this.mainType = this.tempType.split('-')[0]
         if (this.mainType === '999') {
           this.isSpecialIntersection = true
+          if (this.clickMode) {
+            this.$nextTick(() => {
+              this.$refs.listConfiguration.init(res)
+            })
+          }
         } else {
           this.isSpecialIntersection = false
         }

package/src/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -76,13 +76,28 @@
       <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')">
         <template slot-scope="scope">
           <div class="pattern-figure">
-            <pattern-list
+            <!-- <pattern-list
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
               :phaseList="scope.row.currPhase"
+              :contrloType="controlType"
             >
+            </pattern-list> -->
+            <pattern-list
+              :patternId="scope.row.patternid"
+              :contrloType="getControlType(scope.row)"
+              :index="scope.$index"
+              :cycleChange="true"
+              :stagesChange="getSelectedPattern(scope.row).stagesList"
+              :patternStatusList="getSelectedPattern(scope.row).rings"
+              :patternList="scope.row.allPatterns"
+              :allPatternList="scope.row.allPatterns"
+              :cycles="scope.row.cycle"
+              :phaseList="scope.row.currPhase"
+              :agentId="scope.row.agentid"
+              :showBarrier="false">
             </pattern-list>
-            </div>
+          </div>
          </template>
       </el-table-column>
     </el-table>
@@ -114,6 +129,7 @@ export default {
   },
   data () {
     return {
+      controlType: 'stage',
       loading: true,
       tableHeight: 460,
       screenHeight: window.innerHeight, // 屏幕高度
@@ -179,6 +195,9 @@ export default {
           let currPattern
           if (Array.isArray(currPatternList)) {
             currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
+            if (!currPattern) {
+              currPattern = currPatternList[0]
+            }
           } else {
             currPattern = currPatternList
           }
@@ -292,6 +311,34 @@ export default {
       }
       return res
     },
+    getControlType (row) {
+      let contrloType = 'ring'
+      let allPatternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
+      if (
+        !allPatternList[0].contrloType &&
+        allPatternList[0].rings.length > 0
+      ) {
+        contrloType = 'ring'
+      } else if (
+        !allPatternList[0].contrloType &&
+        allPatternList[0].rings.length === 0
+      ) {
+        contrloType = 'stage'
+      } else {
+        contrloType = allPatternList[0].contrloType
+      }
+      let res = contrloType
+      return res
+    },
+    getSelectedPattern (row) {
+      let res = []
+      let patternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
+      let pattern = patternList.find(item => item.id === row.patternid)
+      if (pattern) {
+        res = pattern
+      }
+      return res
+    },
     getCurPattern (agentid) {
       // 获取当前设备所有可选方案
       this.loading = true

package/src/kisscomps/components/patternConfig/planContent.vue

@@ -170,6 +170,9 @@ export default {
         let currPattern
         if (Array.isArray(currPatternList)) {
           currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
+          if (!currPattern) {
+            currPattern = currPatternList[0]
+          }
         } else {
           currPattern = currPatternList
         }