openatc-components 0.1.91 → 0.1.93

package/package.json

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

package/src/i18n/language/en.js

@@ -140,7 +140,7 @@ const en = {
       'patternnum': 'Pattern Number',
       'details': 'Details',
       'autocontrol': 'Multi Period',
-      'yellowflash': 'Yellow Flash Control',
+      'yellowflash': 'Yellow light',
       'allred': 'Red Control',
       'step': 'Step Control',
       'fixedperiod': 'Fixed_Cycle Control',
@@ -201,13 +201,12 @@ const en = {
       'modelList17': 'Webster Single Point Coordination',
       'modelList18': 'Reserving18',
       'modelList19': 'Inductive Pedestrian Crossing Control',
-      'modelList20': 'Program Intervention',
-      // 'modelList100': 'Program Intervention',
       'modelList21': 'Reserving21',
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
       'modelList100': 'Tentative Plan',
       'modelList24': 'Priority Control',
+      'controlType201': 'Scheme Update Frequency',
       'priorityType': 'Priority Type',
       'priorityPhase': 'Priority Phase',
       'typeOption0': 'Regular Priority',

package/src/i18n/language/zh.js

@@ -167,7 +167,7 @@ const zh = {
       'patternnum': '方案编号',
       'details': '详情',
       'autocontrol': '多时段',
-      'yellowflash': '黄闪',
+      'yellowflash': '黄灯',
       'allred': '全红',
       'step': '步进',
       'fixedperiod': '定周期',
@@ -212,30 +212,29 @@ const zh = {
       'modelList1': '黄闪',
       'modelList2': '全红',
       'modelList3': '关灯',
-      'modelList4': '步进',
+      'modelList4': '阶段锁定',
       'modelList5': '定周期',
-      'modelList6': '感应控制',
+      'modelList6': '单点感应',
       'modelList7': '协调感应控制',
       'modelList8': '方案选择控制',
       'modelList9': '自适应控制',
       'modelList10': '无电缆协调',
-      'modelList11': '上位机协调控制',
+      'modelList11': '平台协调',
       'modelList12': '行人过街',
       'modelList13': '方案恢复过渡',
-      'modelList14': '相位驻留',
+      'modelList14': '相位驻留（Dwell）',
       'modelList15': '通道检测',
-      'modelList16': '方向锁定',
+      'modelList16': '通道锁定',
       'modelList17': '韦伯斯特单点控制',
       'modelList18': '预留18',
       'modelList19': '感应式行人过街',
-      'modelList20': '方案干预',
-      // 'modelList100': '方案干预',
       'modelList21': '预留21',
       'modelList22': '相位锁定',
-      'modelList23': '相位关断',
+      'modelList23': '相位放行控制',
       'modelList100': '临时方案',
       'modelList24': '优先控制',
       'modelList99': '设备维护',
+      'controlType201': '方案更新频次',
       'tips': '提示',
       'exitmanul': '退出前需要先恢复自主控制, 是否退出?',
       'canceled': '已取消',

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

@@ -29,13 +29,13 @@
                     </div>
                   </div>
                 </el-tooltip>
-                <div style="position:relative; width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">
-                  <i class="iconfont icon-lukouzhilu" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-BRT" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 4 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-xuxiangwei-xin" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-feijidongche" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 6 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-gongjiaoche" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 3 && bus.phaseid===item.id"></i>
-                  <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
+                <div style="width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">
+                  <i class="iconfont icon-lukouzhilu" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-BRT" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 4 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-xuxiangwei-xin" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-feijidongche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 6 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-gongjiaoche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 3 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
                 </div>
               </div>
               <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
@@ -566,6 +566,7 @@ export default {
           obj.split = split
           obj.cycle = cycle
           if (ring.sum) {
+            obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
@@ -591,13 +592,23 @@ export default {
       let nowPattern = this.localPatternList.filter(item => {
         return item.id === this.controlData.patternid
       })[0].rings
+      // 信号机忽略相位，更新最新的相位信息
+      let filterPattern = []
+      for (let i of nowPattern) {
+        for (let j of this.controlData.rings) {
+          let filterSequence = i.filter(item => j.sequence.includes(item.id))
+          if (filterSequence.length > 0) {
+            filterPattern.push(filterSequence)
+          }
+        }
+      }
       for (let rings of this.controlData.rings) {
         for (let sequ of rings.sequence) {
           let split = this.controlData.phase.filter((item) => {
             return item.id === sequ
           })[0].split
-          nowPattern.map(d => {
-            d.map(r => {
+          filterPattern.map(d => {
+            return d.map(r => {
               if (r.id === sequ) {
                 r.value = split
               }
@@ -605,7 +616,7 @@ export default {
           })
         }
       }
-      this.handleOverViewChange(nowPattern)
+      this.handleOverViewChange(filterPattern)
     },
     handleBarrierHeight () { // 屏障高度
       if (!this.patternInfo) return
@@ -796,6 +807,7 @@ export default {
           obj.split = split
           obj.cycle = cycle
           if (ring.sum) {
+            obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
@@ -1002,7 +1014,9 @@ export default {
             }
           }
           obj.split = split
+          obj.cycle = cycle
           if (ring.sum) {
+            obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
             obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/static/styles/schemeconfig.scss

@@ -329,7 +329,7 @@
   height: 100%;
   padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
-  overflow: auto;
+  overflow: hidden;
   .forbiddenstage{
     width: 60%;
     margin: 10px auto;