openatc-components 0.1.11 → 0.1.13

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

@@ -226,6 +226,10 @@ export default {
     controlName: {
       type: String,
       default: ''
+    },
+    stateName: {
+      type: String,
+      default: ''
     }
   },
   // computed: {
@@ -260,6 +264,12 @@ export default {
           this.isHasPhase = false
           return
         }
+        if (val.control === 16) {
+          // 方向锁定时，相位状态显示与通道无关，显示接口返回的红灯会有歧义，此处特殊处理显示默认白色
+          this.handleSpecialControlStatus('方向锁定')
+          this.isHasPhase = false
+          return
+        }
         this.curPhase = val.current_phase
         this.isHasPhase = true
         this.createPhaseStatusMap()
@@ -310,7 +320,6 @@ export default {
   },
   data () {
     return {
-      stateName: '',
       roadDir: 'right', // 道路行车方向，默认右行
       phaseCountdownList: [], // 相位倒计时列表
       statusData: null, // 信号机状态
@@ -328,7 +337,7 @@ export default {
       crossType: '', // 路口底图类型
       isLoaded: false, // 是否成功加载底图
       isHasPhase: true, // 是否有相位状态数据
-      phaseControlColorMap: new Map([['黄闪', '#f7b500'], ['全红', '#ff2828'], ['关灯', '#828282'], ['默认', '#fff']]),
+      phaseControlColorMap: new Map([['黄闪', '#f7b500'], ['全红', '#ff2828'], ['关灯', '#828282'], ['默认', '#fff'], ['方向锁定', '#fff']]),
       sidewalkPhaseData: [], // 行人相位
       overlapsidewalkPhaseData: [], // 行人跟随相位
       resetflag: true, // 离线后，控制行人相位、车道相位reset标识
@@ -554,7 +563,6 @@ export default {
         if (!res.data.success) {
           this.isLoaded = false
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
-          this.stateName = this.$t('openatccomponents.overview.offline')
           let msg = getMessageByCode(res.data.code, this.$i18n.locale)
           if (res.data.data) {
             // 子类型错误
@@ -568,7 +576,6 @@ export default {
           this.$message.error(msg)
           return
         }
-        this.stateName = this.$t('openatccomponents.overview.online')
         this.isLoaded = true
         this.crossInfo = res.data.data.param
         this.tempType = res.data.data.type

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -31,6 +31,7 @@
       :isShowMode="isShowMode"
       :modeName="modeName"
       :controlName="controlName"
+      :stateName="stateName"
       :devStatus="devStatus"
       :roadDirection="roadDirection" />
   </div>
@@ -95,6 +96,10 @@ export default {
     controlName: {
       type: String,
       default: ''
+    },
+    stateName: {
+      type: String,
+      default: ''
     }
   },
   watch: {

package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -21,6 +21,7 @@
         :roadDirection="roadDirection"
         :modeName="modeName !== '' ? modeName : controlData.mode"
         :controlName="controlName !== '' ? controlName : controlData.control"
+        :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
         :isShowInterval="isShowInterval"
@@ -41,6 +42,7 @@ export default {
   },
   data () {
     return {
+      stateName: this.$t('openatccomponents.overview.offline'),
       controlData: {},
       boxVisible: false,
       dialogWidth: '100%',
@@ -244,6 +246,12 @@ export default {
           _this.agentName = res.data.data.name
         }
         _this.platform = res.data.data.platform
+        let state = res.data.data.state
+        if (state === 'UP') {
+          _this.stateName = _this.$t('openatccomponents.overview.online')
+        } else {
+          _this.stateName = _this.$t('openatccomponents.overview.offline')
+        }
         _this.$refs.intersectionMap.resetCrossDiagram()
         _this.registerMessage() // 注册消息
         _this.$emit('queryDevice', res)

package/package/kisscomps/components/overView/index.vue

@@ -27,6 +27,7 @@
           <intersection-base-map
             ref="intersectionMap"
             :modeName="modeName"
+            :stateName="stateName"
             :controlName="controlName"
             :isShowState="isShowState"
             :isShowMode="isShowMode"
@@ -138,6 +139,7 @@ export default {
   },
   data () {
     return {
+      stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
       FuncSort: 'allFunc',
@@ -643,6 +645,12 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
+        let state = res.data.data.state
+        if (state === 'UP') {
+          this.stateName = this.$t('openatccomponents.overview.online')
+        } else {
+          this.stateName = this.$t('openatccomponents.overview.offline')
+        }
         // let func = 'allFunc'
         // if (this.platform === 'OpenATC') {
         //   func = 'allFunc'