openatc-components 0.2.71 → 0.2.73

package/package.json

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

package/src/i18n/language/en.js

@@ -114,6 +114,8 @@ const en = {
       'maxFlow': 'The average lane flow is too large. Is it further optimized?',
       'typecycle-opt': 'Cycle Opt',
       'signalIP': 'Signal IP',
+      'stagecountdown': 'Stage Countdown',
+      'stageduration': 'Stage Duration',
       'currentphase': 'Current phase',
       'directionnull': 'Please select the import direction',
       'faultinfo': 'Fault Information',

package/src/i18n/language/zh.js

@@ -114,6 +114,8 @@ const zh = {
       'protocoltype': '协议类型',
       'signalID': '路口ID',
       'signalIP': '信号机IP',
+      'stagecountdown': '阶段倒计时',
+      'stageduration': '阶段时长',
       'faultinfo': '故障信息',
       'platform': '平台类型',
       'online': '在线',

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

@@ -32,7 +32,7 @@
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
       <!-- 相位倒计时 -->
-      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase" :class="{'countdownBg': isLoaded}">
+      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase && isHasCountdown" :class="{'countdownBg': isLoaded}">
         <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
           <div v-if="curPhase.phaseCountdown !== undefined && curPhase.phaseCountdown !== -1" style="overflow: hidden;margin-bottom: 4px;">
             <span style="float: left;width: 33px;height: 33px;position: relative;border: 1px solid rgba(255, 255, 255, 0.1);margin-right: 7px;">
@@ -639,6 +639,7 @@ export default {
     getCurPhaseCountdown () {
       // 获取当前相位倒计时颜色
       this.phaseCountdownList = []
+      this.isHasCountdown = false
       this.curPhase.forEach(curP => {
         this.phaseStatusList.forEach(phaseInfo => {
           if (phaseInfo.id === curP) {
@@ -660,6 +661,9 @@ export default {
             }
 
             this.phaseCountdownList.push(countdownObj)
+            if (phaseInfo.countdown !== undefined && phaseInfo.countdown !== -1) {
+              this.isHasCountdown = true
+            }
           }
         })
       })

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

@@ -49,6 +49,14 @@
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.platform')}}:</div>
       <div style="margin-left: 85px;" class="cross-value">{{platform}}</div>
     </div>
+    <div class="cross-content" v-if="controlData.current_stagecd !== undefined">
+      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.stagecountdown')}}:</div>
+      <div style="margin-left: 85px;" class="cross-value">{{controlData.current_stagecd}}</div>
+    </div>
+    <div class="cross-content" v-if="controlData.stages_len">
+      <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.stageduration')}}:</div>
+      <div style="margin-left: 85px;" class="cross-value">{{controlData.stages_len + ''}}</div>
+    </div>
     <div class="cross-content">
       <div style="float: left;" class="cross-name">{{$t('openatccomponents.overview.faultinfo')}}:</div>
       <div style="margin-left: 85px;" v-if="curFaultList.length">