openatc-components 0.1.85 → 0.1.89

package/package/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/package/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 {
@@ -826,6 +823,17 @@ export default {
           return k.id
         })
       })
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.value + (val.sum ? val.sum : 0)
+        })
+      })
+      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+        return item.length > 0 ? item.reduce((a, b) => {
+          return a + b
+        }) : 0
+      }) : 0
+      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -923,7 +931,9 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        this.fillGap(ringTeams, val)
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         this.barrierList = barrier.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
@@ -973,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,
@@ -993,14 +1003,14 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
           obj.mode = ring.mode
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1257,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/package/kisscomps/components/SchemeConfig/priorityControl/index.vue

@@ -182,14 +182,10 @@ export default {
         control: 24,
         delay: this.manualInfo.delay,
         duration: this.manualInfo.duration,
-        data: {
-          type: this.manualInfo.type,
-          phase: this.manualInfo.phase,
-          level: this.manualInfo.level
-        }
-
+        type: this.manualInfo.type,
+        phase: this.manualInfo.phase,
+        level: this.manualInfo.level
       }
-      console.log(submitdata, 'submitdata')
       this.$emit('closePhaseControl', submitdata)
     }
   }

package/package/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/package/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">