openatc-components 0.1.86 → 0.1.89

package/package.json

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

package/src/i18n/language/zh.js

@@ -335,22 +335,22 @@ const zh = {
       'sl': '南左转',
       'sr': '南右转',
       'sb': '南掉头',
-      'eped': '东人行横道',
-      'wped': '西人行横道',
-      'sped': '南人行横道',
-      'nped': '北人行横道',
-      'etped': '东人行横道-上',
-      'ebped': '东人行横道-下',
-      'wtped': '西人行横道-上',
-      'wbped': '西人行横道-下',
-      'slped': '南人行横道-左',
-      'srped': '南人行横道-右',
-      'nlped': '北人行横道-左',
-      'nrped': '北人行横道-右',
-      'xrped': 'X人行横道-/',
-      'xlped': 'X人行横道-\\',
-      'ewped': '东西路段人行横道',
-      'snped': '南北路段人行横道',
+      'eped': '东行人',
+      'wped': '西行人',
+      'sped': '南行人',
+      'nped': '北行人',
+      'etped': '东行人-上',
+      'ebped': '东行人-下',
+      'wtped': '西行人-上',
+      'wbped': '西行人-下',
+      'slped': '南行人-左',
+      'srped': '南行人-右',
+      'nlped': '北行人-左',
+      'nrped': '北行人-右',
+      'xrped': 'X行人-/',
+      'xlped': 'X行人-\\',
+      'ewped': '东西路段行人',
+      'snped': '南北路段行人',
       'redyellow': '红黄',
       'vehiclethresh': '车辆排队阈值',
       'pedestrianthresh': '行人等待阈值',

package/src/kisscomps/components/FaultDetailModal/FaultDetailModal.vue

@@ -121,19 +121,19 @@ export default {
       this.getFaultById()
     },
     formatterBoardType (row) {
-      return formatBoardType(row)
+      return formatBoardType(row, this.$i18n)
     },
     m_byFaultDescValue (row) {
-      return formatFaultDescValue(row)
+      return formatFaultDescValue(row, this.$i18n)
     },
     m_wSubFaultType (row) {
-      return formatSubFaultType(row)
+      return formatSubFaultType(row, this.$i18n)
     },
     m_byFaultLevel (row) {
-      return formatFaultLevel(row)
+      return formatFaultLevel(row, this.$i18n)
     },
     m_wFaultTypes (row) {
-      return formatFaultTypes(row)
+      return formatFaultTypes(row, this.$i18n)
     },
     handleEnumerateCheck (row, enumerate) {
       enumerateCheck(row.agentid, row.m_wFaultID, enumerate).then(res => {
@@ -154,7 +154,7 @@ export default {
       })
     },
     formatterEnumerate (row) {
-      return formatEnumerate(row)
+      return formatEnumerate(row, this.$i18n)
     }
   }
 }

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

@@ -14,8 +14,8 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <div v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-            <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
+          <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+            <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -23,7 +23,7 @@
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="38px" Height="36px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div class="box">
+                    <div class="box" style="position: absolute; left:40px;top: 2px;">
                       <div class="ring-nums">P{{item.id}}</div>
                       <div class="ring-nums">{{item.split}}</div>
                     </div>
@@ -38,9 +38,9 @@
                   <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>
               </div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':item.flashgreen,'height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':item.yellowWidth,'height':'34px','background':'#f9dc6a'}"></div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></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>
+              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
+              <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
         <div v-if="showBarrier">
@@ -104,6 +104,7 @@ export default {
       patternIds: this.patternId,
       newPatterns: [],
       newList: [],
+      contrloCycle: 0,
       sidewalkPhaseData: [],
       // controlDatas: this.controlData,
       max: '',
@@ -161,23 +162,15 @@ export default {
   computed: {
     paddingLeft () {
       let res = '0%'
-      // if (this.newCycle && this.newCycle > 0) {
-      //   let curPercent = (this.newCycle - this.syncTime) / this.newCycle
-      //   res = curPercent * 100 + '%'
-      // }
-      if (this.cycle && this.cycle > 0) {
-        let curPercent = (this.cycle - this.syncTime) / (this.max ? this.max : this.cycle)
+      if (this.contrloCycle > 0) {
+        let curPercent = (this.contrloCycle - this.syncTime) / (this.max ? this.max : this.contrloCycle)
         res = curPercent * 100 + '%'
       }
       return res
     },
     timeNumDevide () {
-      // if (this.newCycle && this.newCycle > 0) {
-      //   let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
-      //   return res
-      // }
-      if (this.cycle && this.cycle > 0) {
-        let res = (this.cycle - this.syncTime) + '/' + this.cycle
+      if (this.contrloCycle > 0) {
+        let res = (this.contrloCycle - this.syncTime) + '/' + this.contrloCycle
         return res
       }
     }
@@ -482,6 +475,7 @@ export default {
         }) : 0
       }) : 0
       let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      this.contrloCycle = cycle
       this.patternInfo = []
       let currentArr = []
       let newPattern = []
@@ -543,7 +537,7 @@ export default {
               peddirections = []
             }
           }
-          if (ring.desc) {
+          if (ring.desc && ring.desc.length > 0) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
@@ -551,7 +545,7 @@ export default {
               }
             })
           } else {
-            if (currPhase.direction.length > 0) {
+            if (currPhase.direction && currPhase.direction.length > 0) {
               obj.direction = currPhase.direction.map(item => {
                 return {
                   id: item,
@@ -570,6 +564,7 @@ export default {
             }
           }
           obj.split = split
+          obj.cycle = cycle
           if (ring.sum) {
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
@@ -631,6 +626,7 @@ export default {
         }) : 0
       }) : 0
       let cycle = Math.max(...splitCycle)// 每个环的周期最大值
+      this.contrloCycle = cycle
       // 按环序分组
       let ringlength = []
       let ringsequence = val.map(item => {
@@ -771,7 +767,7 @@ export default {
               peddirections = []
             }
           }
-          if (ring.desc) {
+          if (ring.desc && ring.desc.length > 0) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
@@ -779,7 +775,7 @@ export default {
               }
             })
           } else {
-            if (currPhase.direction.length > 0) {
+            if (currPhase.direction && currPhase.direction.length > 0) {
               obj.direction = currPhase.direction.map(item => {
                 return {
                   id: item,
@@ -798,6 +794,7 @@ export default {
             }
           }
           obj.split = split
+          obj.cycle = cycle
           if (ring.sum) {
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
@@ -986,7 +983,7 @@ export default {
               }
             })
           } else {
-            if (currPhase.direction.length > 0) {
+            if (currPhase.direction && currPhase.direction.length > 0) {
               obj.direction = currPhase.direction.map(item => {
                 return {
                   id: item,
@@ -1270,9 +1267,10 @@ export default {
   //   color: #ffffff;
   // }
   .box {
-    float: left;
-    margin-left: 6px;
-    margin-right: 10px;
+    text-align: center;
+    // float: left;
+    // margin-left: 6px;
+    // margin-right: 10px;
   }
   .ring-nums {
     // float: left;

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

@@ -111,15 +111,15 @@
                     :list="patternOne.length===0?planPattern.rings[j-1]:patternOne[0].rings[j-1]"
                     >
                     </expend-config>
-                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
+                    <div class="forbiddenstage">
                         {{$t('openatccomponents.pattern.forbiddenstage')}}
                         <el-input class="stage-value" size="small" v-model="forbiddenstage"></el-input>
                     </div>
-                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
+                    <div class="forbiddenstage">
                         {{$t('openatccomponents.pattern.screenstage')}}
                         <el-input class="stage-value" size="small" v-model="screenstage"></el-input>
                     </div>
-                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
+                    <div class="forbiddenstage">
                         {{$t('openatccomponents.pattern.coordinatestage')}}
                         <el-input class="stage-value" size="small" v-model="coordinatestage"></el-input>
                     </div>

package/src/kisscomps/components/StageBord/StageBord.vue

@@ -228,14 +228,14 @@ export default {
     height: auto;
     margin: 5px 0;
     line-height: 40px;
-    color: #FFFFFF;
+    // color: #FFFFFF;
     padding: 1px 1px;
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #409EFF;
     border-color: #409EFF;
-    color: #FFFFFF;
+    // color: #FFFFFF;
   }
 </style>
 <style lang="scss">

package/src/node_modules/.package_versions.json

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

package/src/utils/fault.js

@@ -9,8 +9,8 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-import i18n from '../i18n/index'
-import {faultCodeMap,
+// import i18n from '../i18n/index.js'
+import { faultCodeMap,
   faultCodeMapEn,
   TZParamSubtypeMap,
   TZParamSubtypeMapEn,
@@ -22,7 +22,7 @@ import {faultCodeMap,
   LampGroupSubtypeMapEn
 } from './faultcode.js'
 
-export function getFaultType (type) {
+export function getFaultType (type, i18n) {
   if (type >= 101 && type <= 199) {
     return i18n.t('openatccomponents.faultrecord.maincontrolboardfault')
   } else if (type >= 201 && type <= 299) {
@@ -44,7 +44,7 @@ export function getMainFaultTypeEn (type) {
   return faultCodeMapEn.get(type)
 }
 
-export function getAllMainFaultTypeArr (keyfield, valuefield) {
+export function getAllMainFaultTypeArr (keyfield, valuefield, i18n) {
   let typeArr = []
   let label = 'label'
   let val = 'value'
@@ -71,7 +71,8 @@ export function getAllMainFaultTypeArr (keyfield, valuefield) {
   }
   return typeArr
 }
-export function getBoardType () {
+
+export function getBoardType (i18n) {
   let BoardType = [{
     label: i18n.t('openatccomponents.fault.tab1'),
     value: 1
@@ -93,7 +94,7 @@ export function getBoardType () {
   }]
   return BoardType
 }
-export function formatBoardType (dev) {
+export function formatBoardType (dev, i18n) {
   let boardType = dev.m_byFaultBoardType
   let res = ''
   if (boardType === 1) {
@@ -111,7 +112,7 @@ export function formatBoardType (dev) {
   }
   return res
 }
-export function formatFaultDescValue (dev) {
+export function formatFaultDescValue (dev, i18n) {
   let res = ''
   let faultDesc = dev.m_byFaultDescValue
   let boardType = dev.m_byFaultBoardType
@@ -127,7 +128,7 @@ export function formatFaultDescValue (dev) {
   }
   return res
 }
-export function formatEnumerate (dev) {
+export function formatEnumerate (dev, i18n) {
   let enumerate = dev.enumerate
   let res = ''
   if (enumerate === '0') {
@@ -139,7 +140,7 @@ export function formatEnumerate (dev) {
   }
   return res
 }
-export function formatSubFaultType (dev) {
+export function formatSubFaultType (dev, i18n) {
   let wFaultType = dev.m_wFaultType
   let wSubFaultType = dev.m_wSubFaultType
   let res = ''
@@ -170,7 +171,7 @@ export function formatSubFaultType (dev) {
   }
   return res
 }
-export function formatFaultLevel (dev) {
+export function formatFaultLevel (dev, i18n) {
   let byFaultLevel = dev.m_byFaultLevel
   let res = ''
   if (byFaultLevel === 1) {
@@ -182,7 +183,7 @@ export function formatFaultLevel (dev) {
   }
   return res
 }
-export function formatFaultTypes (dev, column) {
+export function formatFaultTypes (dev, i18n) {
   // 故障主类型需要显示具体类型，不要按范围判断
   let faultType = dev.m_wFaultType
   let res = ''

package/static/styles/schemeconfig.scss

@@ -330,6 +330,21 @@
   padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
+  .forbiddenstage{
+    width: 60%;
+    margin: 10px auto;
+    color: $--color-text-primary;
+  }
+  .stage-item {
+    cursor: pointer;
+    width: 100%;
+    height: auto;
+    margin: 5px 0;
+    line-height: 40px;
+    color: $--color-text-primary;
+    padding: 1px 1px;
+    box-sizing: border-box;
+  }
   .title {
     margin-bottom: 24PX;
     font-size: 20PX;