openatc-components 0.2.36 → 0.2.38

package/package.json

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

package/src/i18n/language/en.js

@@ -213,6 +213,7 @@ const en = {
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
+      'modelList101': 'Direction Lock',
       'modelList24': 'Priority Control',
       'modelList25': 'Azimuth locking',
       'controlType201': 'Scheme Update Frequency',

package/src/i18n/language/zh.js

@@ -266,6 +266,7 @@ const zh = {
       'modelList25': '方位锁定',
       'modelList23': '相位放行控制',
       'modelList100': '临时方案',
+      'modelList101': '方向锁定',
       'modelList24': '优先控制',
       'modelList99': '设备维护',
       'controlType201': '方案更新频次',

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,19 +1,20 @@
 <template>
-  <div class="intersection-direction-selection">
+  <div class="intersection-direction-selection" v-if="isSpecialIntersection !== undefined">
     <intersection-base-map
-            v-if="!isSpecialIntersection"
+            v-if="!isSpecialIntersection && reset"
             ref="intersectionMap2"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
             isVipRoute
-            clickMode
+            :clickMode="clickMode"
             :isThirdSignal="isThirdSignal"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
             @handleClickCrossIcon="handleClickCrossIcon" />
     <direction-list-configuration
-      v-if="isSpecialIntersection"
+      v-if="isSpecialIntersection && clickMode && reset"
+      ref="listConfiguration"
       :agentId="agentId"
       :isThirdSignal="isThirdSignal"
       :choosedDirection="choosedDirection"
@@ -34,8 +35,9 @@ export default {
   data () {
     return {
       crossStatusData: {},
-      isSpecialIntersection: false,
-      isThirdSignal: false
+      isSpecialIntersection: undefined,
+      isThirdSignal: false,
+      reset: true
     }
   },
   props: {
@@ -55,6 +57,23 @@ export default {
     },
     thirdSignal: { // 是否是第三方平台（可以直接传，也可以内部接口判断）
       type: Boolean
+    },
+    clickMode: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    agentId: {
+      handler: function (val, oldVal) {
+        if (val) {
+          this.reset = false
+          this.$nextTick(() => {
+            this.reset = true
+            this.initSelection()
+          })
+        }
+      }
     }
   },
   methods: {
@@ -87,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
         }
@@ -113,15 +137,22 @@ export default {
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {
       this.$emit('handleClickCrossIcon', allChoosedDir, curClickedPhase)
+    },
+    initSelection () {
+      this.getIntersectionInfo()
+      this.getPlatform()
     }
   },
   mounted () {
-    this.getIntersectionInfo()
-    this.getPlatform()
+    this.initSelection()
   },
   destroyed () {
   }
 }
 </script>
 <style lang='scss'>
+  .intersection-direction-selection {
+    width: 100%;
+    height: 100%
+  }
 </style>

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

@@ -433,7 +433,7 @@ export default {
     getStage () {
       if (!this.stagesChange) return
       const globalParamModel = this.$store.getters.globalParamModel
-      let pattern = globalParamModel ? globalParamModel.getParamsByType('patternList') : this.allPatternList
+      let pattern = this.allPatternList ? this.allPatternList : globalParamModel.getParamsByType('patternList')
       let mapAdd = pattern.map(item => item.stagesList).map(item => {
         return item.map(val => {
           return val.stageSplit ? val.stageSplit : val.split

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

@@ -60,7 +60,7 @@
         </div>
         <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
-          <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
+          <Stages :crossStatusData="crossStatusData"
                   :phaseList="phaseList"
                   :preselectStages="preselectStages"
                   :preselectModel="preselectModel"

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

@@ -93,12 +93,9 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-radio
-        v-model="isRing"
-        :label="false"
-        @change="changeRing"
-        >{{ $t('openatccomponents.common.ringStyle') }}</el-radio
-      >
+      <el-radio v-model="isRing" :label="false" @change="changeRing">{{
+        $t('openatccomponents.common.ringStyle')
+      }}</el-radio>
       <el-radio v-model="isRing" :label="true" @change="changeStage">{{
         $t('openatccomponents.common.stageStyle')
       }}</el-radio>
@@ -130,11 +127,11 @@
       </pattern-list>
     </el-row>
     <el-row>
-      <el-tabs v-model="activeList" type="card">
+      <el-tabs v-model="activeTab" type="card">
         <el-tab-pane
           v-if="!isRing"
           :label="$t('openatccomponents.pattern.ringConfig')"
-          name="ring"
+          name="kanban"
         >
           <div style="width: 100%; overflow: hidden; margin-top: 20px">
             <kan-ban
@@ -280,14 +277,14 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <over-lap
-                    :stageList="stagesList"
-                    :overlap="overlap"
-                    :checked="true"
-                    :tentative="true"
-                    :cycleChange="false"
-                    :cycle="overLapCycle"
-                    >
-                    </over-lap>
+                :stageList="stagesList"
+                :overlap="overlap"
+                :checked="true"
+                :tentative="true"
+                :cycleChange="false"
+                :cycle="overLapCycle"
+              >
+              </over-lap>
             </el-col>
           </el-row>
         </el-tab-pane>
@@ -364,7 +361,15 @@ export default {
       type: Array
     }
   },
+  watch: {
+    isRing (newVal) {
+      this.activeTab = newVal ? 'ring' : 'kanban'
+    }
+  },
   computed: {
+    computedActiveTab () {
+      return this.isRing ? 'ring' : 'kanban'
+    },
     rings () {
       return this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
     },
@@ -396,7 +401,8 @@ export default {
       max: '',
       contrloType: '',
       patternCycleEqual: true,
-      activeList: 'ring',
+      // activeList: 'ring',
+      activeTab: 'kanban',
       isRing: false,
       // isChange: false,
       ringCount: 1,
@@ -1166,6 +1172,9 @@ export default {
         } else {
           submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
         }
+        this.patternOne[0].stagesList.forEach((stage) => {
+          delete stage.split
+        })
         submitdata.data.stagesList = this.patternOne[0].stagesList
       }
       submitdata.data.offset = this.offset

package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -1034,6 +1034,7 @@ export default {
         for (let j = 0; j < this.peoplestatus.length; j++) {
           if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {
             this.peoplestatus[j].isshow = true
+            this.peoplestatus[j].color = showlist[0].peddirection[i].color
           }
         }
       }

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

@@ -80,9 +80,33 @@
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
               :phaseList="scope.row.currPhase"
+              :contrloType="getControlType(scope.row)"
             >
             </pattern-list>
-            </div>
+            <!-- <pattern-list
+              v-if="getControlType(scope.row) === 'ring'"
+              :patternStatusList="scope.row.rings"
+              :cycles="scope.row.cycle"
+              :phaseList="scope.row.currPhase"
+              :contrloType="getControlType(scope.row)"
+            >
+            </pattern-list>
+            <pattern-list
+              v-else
+              :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>
          </template>
       </el-table-column>
     </el-table>
@@ -91,7 +115,8 @@
 
 <script>
 import XiaoKanBan from '../../XiaoKanBan'
-import { getPatternList } from '../../../../api/route'
+// import { getPatternList } from '../../../../api/route'
+import { getIntersectionInfo } from '../../../../api/template'
 import { getMessageByCode } from '../../../../utils/responseMessage'
 // import { getDirName } from '../../../components/SelectCrossPhase/utils.js'
 export default {
@@ -114,6 +139,7 @@ export default {
   },
   data () {
     return {
+      controlType: 'stage',
       loading: true,
       tableHeight: 460,
       screenHeight: window.innerHeight, // 屏幕高度
@@ -179,6 +205,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,28 +321,59 @@ 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
       let _this = this
-      // let patterns = this.newPatternList.filter(item => item.agentid === agentid)[0]
-      // if (patterns.allPatterns && patterns.allPatterns.length > 0) {
-      //   patterns.allPatterns = patterns.allPatterns
-      //   return false
-      // }
-      getPatternList(agentid).then(res => {
+      getIntersectionInfo(agentid).then(res => {
         this.loading = false
         if (!res.data.success) {
-          if (res.data.code === '4003') {
-            this.$message.error(this.$t('openatc.common.devicenotonline'))
-            return
+          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
+            }
           }
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           return
         }
+        let allPatternList = res.data.data.param.patternList
         _this.newPatternList.forEach(ele => {
           if (ele.agentid === agentid) {
-            ele.allPatterns = res.data.data.data.patternList.map(ele => {
+            ele.allPatterns = allPatternList.map(ele => {
               return {
                 ...ele,
                 patternid: ele.id,

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
         }

package/src/views/intersection.vue

@@ -9,13 +9,19 @@
 
     <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
-    <intersection-base-map
+    <!-- <intersection-base-map
             ref="intersectionMap"
             :crossStatusData="crossStatusData"
-            agentId="bclgkxl"
+            agentId="tjblsxl-ticp6"
             isVipRoute
             :choosedDirection="[1,2,3]"
             :choosedPedDirection="[3,4]"
+            :roadDirection="roadDirection" /> -->
+      <intersection-direction-selection
+            :agentId="this.agentId"
+            :clickMode="false"
+            :choosedDirection="[14,6,13,8]"
+            :choosedPedDirection="[1]"
             :roadDirection="roadDirection" />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
@@ -131,14 +137,14 @@ export default {
   name: 'demo',
   data () {
     return {
-      roadDirection: 'left',
+      roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'bclgkxl',
+      agentId: 'tjblsxl-ticp6',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
+      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',