openatc-components 0.4.59 → 0.4.61

package/package.json

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

package/src/api/cross.js

@@ -46,6 +46,12 @@ export const getValidDirections = (agentid) => {
   return api.Send({}, {}, [paramList])
 }
 
+export const getMergeDirections = (agentid) => {
+  let api = new Authapi('getMergeDirections')
+  let paramList = [agentid]
+  return api.Send({}, {}, [paramList])
+}
+
 export default {
   saveChannelizatonChart,
   getChannelizatonChart,

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -31,6 +31,15 @@
     <!-- 右行道路 B-->
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
+        <div class="merge-direction-icon">
+          <xdr-dir-selector
+          :Data="xdrMData"
+          Width="80px"
+          Height="80px"
+          Widths="80px"
+          Heights="80px"
+          :showlist="mergeShowList"></xdr-dir-selector>
+        </div>
       <!-- 相位倒计时 -->
       <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase && isHasCountdown && contrloType === 'ring'" :class="{'countdownBg': isLoaded}">
         <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
@@ -204,7 +213,7 @@ import { getMessageByCode } from '../../../../utils/responseMessage.js'
 
 import CrossDirectionConflictList from '../../../../utils/conflictList.js'
 import RingDataModel from '../../../../utils/RingDataModel.js'
-import { getValidDirections } from '../../../../api/cross.js'
+import { getValidDirections, getMergeDirections } from '../../../../api/cross.js'
 
 export default {
   name: 'crossDiagram',
@@ -401,7 +410,12 @@ export default {
       contrloType: 'ring',
       isMphaseStatusDataReturnMap: new Map(), // 每个跟随相位的母相位是否返回了相位状态数据
       overlapStatusCompareSum: 0, // 首次加载跳过比较母相位状态数据是否返回
-      effectDirData: [] // 路口有效方向
+      effectDirData: [], // 路口有效方向
+      mergeShowList: [2, 4, 10],
+      xdrMData: {
+        left: '18px',
+        top: '18px'
+      }
     }
   },
   methods: {
@@ -867,6 +881,7 @@ export default {
         this.mainDirection = this.tempType.split('-')[1]
         if (this.isVipRoute) {
           this.getValidDirections()
+          this.getMergeDirections()
         }
         if (this.isVipRoute && !this.isThirdSignal) {
           // 特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
@@ -1492,6 +1507,30 @@ export default {
         this.effectiveDirection = data.data.data.validDirections || []
         this.getEffectDirectionPos()
       })
+    },
+    getMergeDirections () {
+      getMergeDirections(this.agentId).then((data) => {
+        if (!data.data.success) {
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          return
+        }
+        this.mergeDirection = data.data.data.mergeDirections || []
+        if (this.mergeDirection && this.mergeDirection.length > 0) {
+              this.mergeShowList = this.mergeDirection.map(dir => {
+                return {
+                  id: dir,
+                  color: '#6e737c'
+                }
+              })
+              } else {
+                this.mergeShowList = [
+                  {
+                  id: '',
+                  color: '#fff'
+                  }
+                ]
+              }
+      })
     }
   },
   mounted () {
@@ -1545,6 +1584,11 @@ export default {
   color: #299BCC;
   margin-top: 20PX;
 }
+.merge-direction-icon {
+  width: 80PX;
+  height: 80PX;
+  margin: 0 auto;
+}
 
 .baseImg {
     width: 100%;

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

@@ -488,7 +488,7 @@ export default {
     platform: {
       handler: function (val1, val2) {
         if (val1 !== val2 && val2 !== undefined) {
-          this.changeStatus()
+          this.handeleChangeStatus()
         }
       },
       // 深度观察监听
@@ -636,8 +636,11 @@ export default {
       }
     },
     changeStatus () {
-      this.toPage = 1
       this.isOperation = true
+      this.handeleChangeStatus()
+    },
+    handeleChangeStatus () {
+      this.toPage = 1
       if (this.platform !== undefined && this.platform !== 'OpenATC') {
         this.queryThirdParty()
       } else {

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

@@ -203,18 +203,6 @@ export default {
     }
   },
   watch: {
-    // phaseList: {
-    //   handler: function (val, oldVal) {
-    //     console.log(val, 'phaseList')
-    //     // debugger
-    //   }
-    // },
-    // crossStatusData: {
-    //   handler: function (val, oldVal) {
-    //     console.log(val, 'crossStatusData')
-    //     // debugger
-    //   }
-    // },
     preselectStages: { 
       handler: function (val, oldVal) {
         if(this.preselectStages === -1 && this.preselectModel !== -1) {

package/src/views/schemeconfig.vue

@@ -123,7 +123,6 @@ export default {
       this.getIntersectionInfo(this.agentId, '')
       this.getPhase()
       getTscControl(this.agentId).then((data) => {
-        // debugger
         if (!data.data.success) {
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
           if (data.data.data) {

package/static/apiconfig.json

@@ -462,5 +462,10 @@
   "key": "getValidDirections",
   "url": "/devs/validdirections",
   "method": "get"
+},
+{
+  "key": "getMergeDirections",
+  "url": "/devs/mergedirections",
+  "method": "get"
 }
 ]