openatc-components 0.1.38 → 0.1.39

package/package/kisscomps/components/KanBan/kanban.vue

@@ -71,6 +71,8 @@ export default {
         value: 6
       }, {
         value: 7
+      }, {
+        value: 8
       }],
       coordphaseOption: [{
         value: 1

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

@@ -15,7 +15,7 @@
       <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" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
+            <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -32,15 +32,15 @@
                 <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" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && 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>
               </div>
-              <div class="first-1" :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" :style="{'width':item.yellowWidth,'height':'34px','background':'#f9dc6a'}"></div>
-              <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></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>
           </div>
         <div v-if="showBarrier">
@@ -190,9 +190,9 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || this.controlData) {
+        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition)) {
           this.handleTentivePatternData()
-        } else {
+        } else if (this.controlData) {
           this.handlePatternData()
         }
         this.handleBarrierHeight()
@@ -385,15 +385,15 @@ export default {
       this.busPhaseData = []
       this.phaseList.forEach((ele, i) => {
         // if (ele.controltype >= 3 && ele.controltype <= 5) {
-        ele.direction.forEach((dir, index) => {
-          // 车道相位
-          this.busPhaseData.push({
-            phaseid: ele.id, // 相位id，用于对应相位状态
-            id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-            name: this.PhaseDataModel.getBusPhasePos(dir).name,
-            controltype: ele.controltype
-          })
+        // ele.direction.forEach((dir, index) => {
+        // 车道相位
+        this.busPhaseData.push({
+          phaseid: ele.id, // 相位id，用于对应相位状态
+          // id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
+          // name: this.PhaseDataModel.getBusPhasePos(dir).name,
+          controltype: ele.controltype
         })
+        // })
         // }
       })
       let result = []
@@ -581,6 +581,27 @@ export default {
     },
     handleOverViewChange (val) {
       if (val === null || val.length === 0) return
+      // 按环序分组
+      let ringlength = []
+      let ringsequence = val.map(item => {
+        if (item.length === 0) return
+        ringlength.push(item.length)
+        return item.map(k => {
+          return k.id
+        })
+      })
+      let minLength = Math.min(...ringlength)
+      let resultArrs = [] // 环1分组
+      let resultArr = [] // 环2分组
+      for (let j = 0; j < ringsequence[0].length; j += minLength) {
+        resultArrs.push(ringsequence[0].slice(j, j + minLength))
+        if (ringsequence[0].length === minLength) {
+          resultArrs.push([])
+        }
+      }
+      for (let i = 0; i < ringsequence[1].length; i += minLength) {
+        resultArr.push(ringsequence[1].slice(i, i + minLength))
+      }
       this.patternInfo = []
       let currentArr = []
       let newPattern = []
@@ -604,8 +625,60 @@ export default {
       }
       if (currentArr.length !== 0) {
         let newCurrent = this.tranform(currentArr)
-        let ringTeam = this.step1(this.phaseList, newCurrent)
-        this.fillGap(ringTeam, val)
+        // 取没个环与环关系的并集
+        let barrierRing1 = []
+        let barrierRing2 = []
+        let ring1 = [] // 环1与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let adds = [...new Set(resultArrs[0])].filter(item => newCurrent[h].includes(item))
+          ring1.push(adds)
+        }
+        let ring1s = [] // 环1与关系2的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
+          ring1s.push(addRing1)
+        }
+        barrierRing1.push(...ring1, ...ring1s)
+        let ring2s = [] // 环2与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
+          ring2s.push(addRing2)
+        }
+        let ring2 = [] // 环2与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
+          ring2.push(add)
+        }
+        barrierRing2.push(...ring2, ...ring2s)
+        let resultList = []
+        for (let k = 0; k < barrierRing1.length; k++) {
+          resultList.push(barrierRing1[k].concat(barrierRing2[k]))
+        }
+        let resultLists = resultList.filter(item => item.length !== 0)
+        let ringArr = []
+        for (let l = 0; l < resultLists.length; l++) {
+          for (let d = 0; d < newCurrent.length; d++) {
+            if (newCurrent[d].filter(item => resultLists[l].includes(item)).length > 0) {
+              ringArr.push({
+                data: resultLists[l],
+                id: d + 1,
+                index: l
+              })
+            }
+          }
+        }
+        for (var i = 0; i < ringArr.length; i++) {
+          for (var j = i + 1; j < ringArr.length; j++) {
+            if (ringArr[i].id === ringArr[j].id && ringArr[i].index + 1 === ringArr[j].index) {
+              ringArr[i].data = ringArr[i].data.concat(ringArr[j].data)
+              ringArr.splice(ringArr.indexOf(ringArr[j].id), 1)
+            }
+          }
+        }
+        let resArr = ringArr.map(item => item.data)
+        let ringTeam = this.step1(this.phaseList, resArr)
+        let ringTeams = ringTeam.filter(item => item.length !== 0)
+        this.fillGap(ringTeams, val)
       }
       let cycle = this.controlData.cycle
       for (let rings of val) {
@@ -684,6 +757,27 @@ export default {
     },
     handleCurrentChange (val) { // 两个ring的数据
       if (val === null || val.length === 0) return
+      // 按环序分组
+      let ringlength = []
+      let ringsequence = val.map(item => {
+        if (item.length === 0) return
+        ringlength.push(item.length)
+        return item.map(k => {
+          return k.id
+        })
+      })
+      let minLength = Math.min(...ringlength)
+      let resultArrs = [] // 环1分组
+      let resultArr = [] // 环2分组
+      for (let j = 0; j < ringsequence[0].length; j += minLength) {
+        resultArrs.push(ringsequence[0].slice(j, j + minLength))
+        if (ringsequence[0].length === minLength) {
+          resultArrs.push([])
+        }
+      }
+      for (let i = 0; i < ringsequence[1].length; i += minLength) {
+        resultArr.push(ringsequence[1].slice(i, i + minLength))
+      }
       this.patternInfo = []
       this.barrierList = []
       let currentArr = []
@@ -708,12 +802,64 @@ export default {
       }
       if (currentArr.length !== 0) {
         let newCurrent = this.tranform(currentArr)
-        let ringTeam = this.step1(this.phaseList, newCurrent)
+        // 取没个环与环关系的并集
+        let barrierRing1 = []
+        let barrierRing2 = []
+        let ring1 = [] // 环1与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let adds = [...new Set(resultArrs[0])].filter(item => newCurrent[h].includes(item))
+          ring1.push(adds)
+        }
+        let ring1s = [] // 环1与关系2的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
+          ring1s.push(addRing1)
+        }
+        barrierRing1.push(...ring1, ...ring1s)
+        let ring2s = [] // 环2与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
+          ring2s.push(addRing2)
+        }
+        let ring2 = [] // 环2与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
+          ring2.push(add)
+        }
+        barrierRing2.push(...ring2, ...ring2s)
+        let resultList = []
+        for (let k = 0; k < barrierRing1.length; k++) {
+          resultList.push(barrierRing1[k].concat(barrierRing2[k]))
+        }
+        let resultLists = resultList.filter(item => item.length !== 0)
+        let ringArr = []
+        for (let l = 0; l < resultLists.length; l++) {
+          for (let d = 0; d < newCurrent.length; d++) {
+            if (newCurrent[d].filter(item => resultLists[l].includes(item)).length > 0) {
+              ringArr.push({
+                data: resultLists[l],
+                id: d + 1,
+                index: l
+              })
+            }
+          }
+        }
+        for (var i = 0; i < ringArr.length; i++) {
+          for (var j = i + 1; j < ringArr.length; j++) {
+            if (ringArr[i].id === ringArr[j].id && ringArr[i].index + 1 === ringArr[j].index) {
+              ringArr[i].data = ringArr[i].data.concat(ringArr[j].data)
+              ringArr.splice(ringArr.indexOf(ringArr[j].id), 1)
+            }
+          }
+        }
+        let resArr = ringArr.map(item => item.data)
+        let ringTeam = this.step1(this.phaseList, resArr)
+        let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {
-          this.setBarrier(ringTeam, val)
+          this.setBarrier(ringTeams, val)
         }
-        this.fillGap(ringTeam, val)
-        let barrier = this.step2(ringTeam, newPattern)
+        this.fillGap(ringTeams, val)
+        let barrier = this.step2(ringTeams, newPattern)
         this.barrierList = barrier.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
@@ -775,33 +921,16 @@ export default {
               ]
             }
           }
+          obj.split = split
           if (ring.sum) {
-            obj.split = split + ring.sum
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           } else {
-            obj.split = split
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 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.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          // // obj.peddirection = currPhase.peddirection
-          // let peddirections = []
-          // for (let walk of this.sidewalkPhaseData) {
-          //   for (let ped of currPhase.peddirection) {
-          //   // if (stg === walk.phaseid) {
-          //     let objs = {}
-          //     objs.name = walk.name
-          //     objs.id = walk.id
-          //     if (ped === walk.id) {
-          //       peddirections.push(objs)
-          //       peddirections = Array.from(new Set(peddirections))
-          //     }
-          //   // }
-          //   }
-          // }
-          // obj.peddirection = peddirections
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -821,6 +950,7 @@ export default {
             })
           })
           let ret = ringTeam.map((y, index) => {
+            if (!y || y.length === 0) return
             y.map(n => {
               n.length = n.data.length > 1 ? n.data.reduce((pre, cur) => pre + patternObjs[cur], 0) : patternObjs[n.data[0]]
             })
@@ -897,6 +1027,7 @@ export default {
         // }
       })
       newArr.forEach((na, index) => {
+        if (!na || na.length === 0) return
         let max = 0
         na.forEach(n => {
           const total = n.data.reduce((pre, cur) => pre + patternObj[cur], 0)
@@ -904,7 +1035,7 @@ export default {
             max = total
           }
         })
-        while (index > 0) { // && max < _this.newCycle
+        while (index > 0 && max < this.max) { // && max < _this.newCycle
           index--
           max += ret[index]
         }
@@ -925,6 +1056,7 @@ export default {
       let newMax = []
       let newMin = []
       newArr.forEach((na, index) => {
+        if (!na || na.length === 0) return
         na.map(n => {
           n.length = n.data.length > 1 ? n.data.reduce((pre, cur) => pre + patternObj[cur], 0) : patternObj[n.data[0]]
         })
@@ -1127,6 +1259,9 @@ export default {
 .direction {
   opacity: 0.6;
 }
+.mask {
+  background: rgb(242, 121, 121) !important;
+}
 .first-1 {
   float: left;
   // text-align: center;

package/package/kisscomps/components/Stages/index.vue

@@ -36,7 +36,7 @@
                   <i class="iconfont icon-lukouzhilu" style="font-size:16PX;color:#454545;" v-if="item[item.length-1].controltype === 1"></i>
                   <i class="iconfont icon-BRT" style="font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 4"></i>
                   <div style="transform:scale(0.65);margin-left:-6px;">
-                    <i class="iconfont icon-xuxiangwei" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                    <i class="iconfont icon-xuxiangwei-xin" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                   </div>
                   <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 3"></i>
                   <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 5"></i>