openatc-components 0.1.33 → 0.1.35

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

@@ -14,13 +14,13 @@
       <!-- 环模式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.controltype===99?'direction': ''">
+          <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'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
-                      <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                      <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
@@ -43,8 +43,10 @@
               <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
-        <div v-if="showBarrier" v-for="(item, index) in barrierList" :key="index + '1'">
-          <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
+        <div v-if="showBarrier">
+          <div v-for="(item, index) in barrierList" :key="index + '1'">
+            <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
+          </div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
           <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#409EFF'}">{{ timeNumDevide }}</div>
@@ -63,7 +65,7 @@
                   </div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
-                      <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                      <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="36px" Height="34px" :showlist="list.direction"></xdrdirselector>
                     </div>
                     <div class="box" style="line-height:28px">
@@ -83,7 +85,7 @@
       </div>
 </template>
 <script>
-import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
@@ -91,7 +93,7 @@ import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 export default {
   name: 'pattern-list',
   components: {
-    patternwalksvg,
+    // patternwalksvg,
     xdrdirselector
   },
   data () {
@@ -133,6 +135,9 @@ export default {
     controlData: {
       type: Object
     },
+    condition: {
+      type: Boolean
+    },
     cycle: {
       type: Number
     },
@@ -184,7 +189,11 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        this.handlePatternData()
+        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.condition)) {
+          this.handleTentivePatternData()
+        } else {
+          this.handlePatternData()
+        }
         this.handleBarrierHeight()
       },
       // 深度观察监听
@@ -298,6 +307,7 @@ export default {
     },
     handleStageData (data) {
       if (!data) return
+      let peddirections = this.getPed(data)
       let stagesTemp = []
       let tempList = []
       for (let stg of data) {
@@ -309,11 +319,19 @@ export default {
           directionList.push(...currPhase.direction)
           directionList = Array.from(new Set(directionList))
         }
-        // if (directionList.length === 0) return
-        tempList = directionList.map(dir => ({
-          id: dir,
-          color: '#606266'
-        }))
+        if (directionList.length === 0) {
+          tempList.push({
+            id: '',
+            color: '#606266',
+            peddirection: peddirections
+          })
+        } else {
+          tempList = directionList.map(dir => ({
+            id: dir,
+            color: '#606266',
+            peddirection: peddirections
+          }))
+        }
         stagesTemp.push(...tempList)
       }
       return stagesTemp
@@ -332,7 +350,7 @@ export default {
           this.stageLists = this.localPatternList[i].stagesList.map(item => {
             return {
               ...item,
-              peddirection: this.getPed(item.phases ? item.phases : item.stages),
+              // peddirection: this.getPed(item.phases ? item.phases : item.stages),
               direction: this.handleStageData(item.phases ? item.phases : item.stages),
               greenWidth: (item.green / stageMaxCyle * 100).toFixed(3) + '%',
               yellowWidth: (item.yellow / stageMaxCyle * 100).toFixed(3) + '%',
@@ -353,7 +371,7 @@ export default {
       this.stageLists = this.stagesChange.map(item => {
         return {
           ...item,
-          peddirection: this.getPed(item.phases ? item.phases : item.stages),
+          // peddirection: this.getPed(item.phases ? item.phases : item.stages),
           direction: this.handleStageData(item.phases ? item.phases : item.stages),
           greenWidth: (item.green / stageMaxCyle * 100).toFixed(3) + '%',
           yellowWidth: (item.yellow / stageMaxCyle * 100).toFixed(3) + '%',
@@ -406,15 +424,17 @@ export default {
         }
       })
     },
-    handlePatternData () {
+    handleTentivePatternData () {
       if (!this.controlData) return
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return
+      // let cycle = this.controlData.cycle
       if (!this.controlData.rings) return
       let newValue = []
       for (let rings of this.controlData.rings) {
         let phase = this.controlData.phase
+        // let list = []
         let obj = {}
         for (let key in rings.sequence) {
           obj[key] = rings.sequence[key]
@@ -438,14 +458,9 @@ export default {
           })
         }
       }
-      this.handleOverViewChange(newValue)
+      this.handleTentative(newValue)
     },
-    handleBarrierHeight () { // 屏障高度
-      if (!this.patternInfo) return
-      let patternLength = this.patternInfo.length
-      this.barrierHeight = (patternLength * 35 + 21) + 'px'
-    },
-    handleOverViewChange (val) {
+    handleTentative (val) {
       if (val === null || val.length === 0) return
       this.patternInfo = []
       let currentArr = []
@@ -489,6 +504,20 @@ export default {
             }
             return item.id === ring.id
           })[0]
+          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))
+              }
+            // }
+            }
+          }
           if (ring.desc) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
@@ -497,12 +526,23 @@ export default {
               }
             })
           } else {
-            obj.direction = currPhase.direction.map(item => {
-              return {
-                id: item,
-                color: '#454545'
-              }
-            })
+            if (currPhase.direction.length > 0) {
+              obj.direction = currPhase.direction.map(item => {
+                return {
+                  id: item,
+                  peddirection: peddirections,
+                  color: '#454545'
+                }
+              })
+            } else {
+              obj.direction = [
+                {
+                  id: '',
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              ]
+            }
           }
           obj.split = split
           if (ring.sum) {
@@ -513,7 +553,76 @@ export default {
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
-          // obj.peddirection = currPhase.peddirection
+          // 忽略相位不显示
+          let mode = ring.mode
+          if (mode !== 7) { // 忽略相位不显示
+            list.push(obj)
+          }
+        }
+        this.patternInfo.push(list)
+      }
+    },
+    handlePatternData () {
+      if (!this.controlData) return
+      // this.newList = []
+      if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
+      if (!this.controlData.phase) return
+      if (!this.controlData.rings) return
+      let nowPattern = this.localPatternList.filter(item => {
+        return item.id === this.controlData.patternid
+      })[0].rings
+      this.handleOverViewChange(nowPattern)
+    },
+    handleBarrierHeight () { // 屏障高度
+      if (!this.patternInfo) return
+      let patternLength = this.patternInfo.length
+      this.barrierHeight = (patternLength * 35 + 21) + 'px'
+    },
+    handleOverViewChange (val) {
+      if (val === null || val.length === 0) return
+      this.patternInfo = []
+      let currentArr = []
+      let newPattern = []
+      val.map(i => {
+        newPattern.push(...i)
+      })
+      if (this.phaseList.length === 0) return
+      for (let patternStatus of val[0]) {
+        // if (patternStatus.mode !== 7) {
+        let concurrent = this.phaseList.filter((item) => {
+          return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
+        })[0].concurrent// 当前相位的并发相位
+        if (concurrent) {
+          let obj = {
+            id: patternStatus.id,
+            current: concurrent.sort()
+          }
+          currentArr.push(obj)
+        }
+        // }
+      }
+      if (currentArr.length !== 0) {
+        let newCurrent = this.tranform(currentArr)
+        let ringTeam = this.step1(this.phaseList, newCurrent)
+        this.fillGap(ringTeam, val)
+      }
+      let cycle = this.controlData.cycle
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.value === 0) continue
+          let obj = {}
+          let split = ring.value
+          obj.id = ring.id
+          obj.mode = ring.mode
+          // obj.split = split
+          let currPhase = this.phaseList.filter((item) => {
+            if (item.id === ring.id && item.controltype === 99) {
+              obj.controltype = item.controltype
+            }
+            return item.id === ring.id
+          })[0]
           let peddirections = []
           for (let walk of this.sidewalkPhaseData) {
             for (let ped of currPhase.peddirection) {
@@ -528,12 +637,46 @@ export default {
             // }
             }
           }
-          obj.peddirection = peddirections
-          // 忽略相位不显示
-          let mode = ring.mode
-          if (mode !== 7) { // 忽略相位不显示
-            list.push(obj)
+          if (ring.desc) {
+            obj.direction = ring.desc.map(item => { // 虚相位desc为空
+              return {
+                id: item.id,
+                color: '#454545'
+              }
+            })
+          } else {
+            if (currPhase.direction.length > 0) {
+              obj.direction = currPhase.direction.map(item => {
+                return {
+                  id: item,
+                  peddirection: peddirections,
+                  color: '#454545'
+                }
+              })
+            } else {
+              obj.direction = [
+                {
+                  id: '',
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              ]
+            }
+          }
+          obj.split = split
+          if (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) + '%'
           }
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          // 忽略相位不显示
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
         }
         this.patternInfo.push(list)
       }
@@ -549,18 +692,18 @@ export default {
       })
       if (this.phaseList.length === 0) return
       for (let patternStatus of val[0]) {
-        if (patternStatus.mode !== 7) {
-          let concurrent = this.phaseList.filter((item) => {
-            return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
-          })[0].concurrent// 当前相位的并发相位
-          if (concurrent) {
-            let obj = {
-              id: patternStatus.id,
-              current: concurrent.sort()
-            }
-            currentArr.push(obj)
+        // if (patternStatus.mode !== 7) {
+        let concurrent = this.phaseList.filter((item) => {
+          return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
+        })[0].concurrent// 当前相位的并发相位
+        if (concurrent) {
+          let obj = {
+            id: patternStatus.id,
+            current: concurrent.sort()
           }
+          currentArr.push(obj)
         }
+        // }
       }
       if (currentArr.length !== 0) {
         let newCurrent = this.tranform(currentArr)
@@ -590,20 +733,46 @@ export default {
             }
             return item.id === ring.id
           })[0]
-          if (ring.desc) {
+          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))
+              }
+            // }
+            }
+          }
+          if (ring.desc && ring.desc.length > 0) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
-                color: '#454545'
+                color: '#454545',
+                peddirection: peddirections
               }
             })
           } else {
-            obj.direction = currPhase.direction.map(item => {
-              return {
-                id: item,
-                color: '#454545'
-              }
-            })
+            if (currPhase.direction > 0) {
+              obj.direction = currPhase.direction.map(item => {
+                return {
+                  id: item,
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              })
+            } else {
+              obj.direction = [
+                {
+                  id: '',
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              ]
+            }
           }
           if (ring.sum) {
             obj.split = split + ring.sum
@@ -612,30 +781,31 @@ export default {
             obj.split = split
             obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           }
+          obj.mode = ring.mode
           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
+          // // 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) { // 忽略相位不显示
-            list.push(obj)
-          }
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
         }
         this.patternInfo.push(list)
       }
@@ -721,9 +891,9 @@ export default {
       let ret = []
       const patternObj = {}
       pattern.forEach(l => {
-        if (l.mode !== 7) {
-          patternObj[l.id] = l.value
-        }
+        // if (l.mode !== 7) {
+        patternObj[l.id] = l.value
+        // }
       })
       newArr.forEach((na, index) => {
         let max = 0
@@ -733,7 +903,7 @@ export default {
             max = total
           }
         })
-        while (index > 0 && max < this.newCycle) { // && max < _this.newCycle
+        while (index > 0) { // && max < _this.newCycle
           index--
           max += ret[index]
         }
@@ -746,9 +916,9 @@ export default {
       const patternObj = {}
       pattern.forEach(l => {
         l.map(k => {
-          if (k.mode !== 7) {
-            patternObj[k.id] = k.value
-          }
+          // if (k.mode !== 7) {
+          patternObj[k.id] = k.value
+          // }
         })
       })
       let newMax = []
@@ -768,7 +938,7 @@ export default {
           this.max = newmaxNum + newminNum
           pattern.map(d => {
             d.map(r => {
-              if (r.sum && r.mode !== 7) {
+              if (r.sum) {
                 delete r.sum
               }
             })
@@ -778,7 +948,7 @@ export default {
           na.map(n => {
             pattern.map(h => {
               h.map(d => {
-                if (d.id === n.data[1] && d.sum && d.mode !== 7) {
+                if (d.id === n.data[1] && d.sum) {
                   delete d.sum
                 }
               })
@@ -790,11 +960,11 @@ export default {
               pattern.map(h => {
                 h.map(d => {
                   if (n.data.length > 1) {
-                    if (d.id === n.data[1] && d.mode !== 7) {
+                    if (d.id === n.data[1]) {
                       delete d.sum
                     }
                   } else {
-                    if (d.id === n.data[0] && d.mode !== 7) {
+                    if (d.id === n.data[0]) {
                       delete d.sum
                     }
                   }
@@ -812,11 +982,11 @@ export default {
               pattern.filter((i) => {
                 i.map(j => {
                   if (m.data.length > 1) {
-                    if (j.id === m.data[1] && j.mode !== 7) {
+                    if (j.id === m.data[1]) {
                       j.sum = sum
                     }
                   } else {
-                    if (j.id === m.data[0] && j.mode !== 7) {
+                    if (j.id === m.data[0]) {
                       j.sum = sum
                     }
                   }
@@ -826,7 +996,7 @@ export default {
           }
           let mapAdd = pattern.map(item => {
             return item.map(val => {
-              return val.mode === 7 ? 0 : val.value + (val.sum ? val.sum : 0)
+              return val.value + (val.sum ? val.sum : 0)
             })
           })
           let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
@@ -904,6 +1074,7 @@ export default {
     float: left;
     // margin-left: 5px;
     height: 34px;
+    width: 36px;
     z-index: 999;
     background: rgba(30, 96, 12, 0.2);
     // margin-top:1px;

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

@@ -534,6 +534,24 @@ export default {
       }
       return isequal
     },
+    getMaxCycle (pattern) {
+      let rings = pattern.rings
+      let maxCycle = 0
+      for (let ring of rings) {
+        if (ring.length === 0) continue
+        let cycle = 0
+        for (let r of ring) {
+          if (r.mode === 7) { // 忽略相位不计周期
+            continue
+          }
+          cycle = cycle + r.value
+        }
+        if (cycle > maxCycle) {
+          maxCycle = cycle
+        }
+      }
+      return maxCycle
+    },
     checkPatternRules (rings) {
       if (!this.isRingCycleEqual(rings)) {
         this.patternCycleEqual = false
@@ -561,8 +579,12 @@ export default {
         // duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }
+      if (this.patternOne.length === 0) {
+        submitdata.data.cycle = this.getMaxCycle(this.planPattern)
+      } else {
+        submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
+      }
       submitdata.data.offset = this.offset
-      submitdata.data.cycle = this.cycle
       submitdata.data.rings = this.rings
       this.checkPatternRules(submitdata.data.rings)
       if (this.patternCycleEqual) {

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

@@ -24,11 +24,11 @@
                                 :Width="'55'"
                                 :Height="'55'" />
               </template> -->
-                <patternwalksvg class="patternWalk"
+                <!-- <patternwalksvg class="patternWalk"
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
-                          :Height="'40'" />
-              <xdr-dir-selector Width="40PX" Height="40PX" :showlist="item"></xdr-dir-selector>
+                          :Height="'40'" /> -->
+              <xdr-dir-selector Width="40PX" Height="40PX" :Data="showStyle" :showlist="item"></xdr-dir-selector>
               <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
@@ -53,11 +53,11 @@
 <script>
 /* eslint-disable */
 import RingDataModel from '../../../utils/RingDataModel.js'
-import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 export default {
   name: 'Stages',
   components: {
-    patternwalksvg
+    // patternwalksvg
   },
   props: {
     isShowCurrentStage: {
@@ -99,6 +99,10 @@ export default {
   },
   data () {
     return {
+      showStyle:{
+        top:'5PX',
+        left:'14px'
+      },
       presetStageIndex: -1,
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],