openatc-components 0.4.78 → 0.4.80

package/package.json

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

package/src/kisscomps/components/BoardCard/BoardCard.vue

@@ -15,7 +15,6 @@
         :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
-        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -104,9 +103,6 @@ export default {
     patternId: {
       type: Number
     },
-    patternType: {
-      type: String
-    },
     agentId: {
       type: String
     },

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -31,7 +31,7 @@
     <!-- 右行道路 B-->
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
-        <div class="merge-direction-icon">
+        <div v-if="isVipRoute" class="merge-direction-icon">
           <xdr-dir-selector
           :Data="xdrMData"
           Width="80px"

package/src/kisscomps/components/IntersectionMapDirSelect/customCrossDiagram.vue

@@ -688,11 +688,6 @@ export default {
   color: #299BCC;
   margin-top: 20PX;
 }
-.merge-direction-icon {
-  width: 80PX;
-  height: 80PX;
-  margin: 0 auto;
-}
 
 .baseImg {
     width: 100%;

package/src/kisscomps/components/OverLap/OverLap.vue

@@ -10,6 +10,12 @@
                     <span v-for="(ids,index3) in list.includedphases" :key="index3">
                         {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                     </span>
+                     <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                      *{{$t('openatccomponents.phase.phase')}}{{ ids
+                      }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                        >,</span
+                      >
+                    </span>)</span>
                 </div>
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
@@ -22,6 +28,12 @@
                             <span v-for="(ids,index3) in list.includedphases" :key="index3">
                                 {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                             </span>
+                            <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                              *{{$t('openatccomponents.phase.phase')}}{{ ids
+                                }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                                >,</span
+                              >
+                            </span>)</span>
                         </div>
                     </div>
                 </div>
@@ -153,7 +165,16 @@ export default {
           const findItems = stageList.filter(j => (j.phases ? j.phases : j.stages).includes(i))
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
+        // 收集所有包含 modifyphase 中相位的阶段 key
+        let modifyIndexs = []
+        if (item.modifyphase !== undefined) {
+          item.modifyphase.forEach(i => {
+            const findItems = stageList.filter(j => j.phases.includes(i))
+            if (findItems.length) modifyIndexs.push(...findItems.map(m => m.key))
+          })
+        }
         findIndexs = Array.from(new Set(findIndexs))
+        modifyIndexs = Array.from(new Set(modifyIndexs))
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -168,7 +189,7 @@ export default {
           peddirection: this.getPedPhasePos(item.peddirection),
           sidewalkPhaseData: this.getPedPhasePos(item.peddirection),
           stageLists: stageList.map(sta => {
-            const find = findIndexs.includes(sta.key)
+            const find = findIndexs.includes(sta.key) && !modifyIndexs.includes(sta.key)
             return {
               ...sta,
               direction: this.getRoad(item),

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

@@ -11,33 +11,8 @@
  **/
 <template>
     <div class="main-patternstatus">
-      <!-- rcp模式 -->
-      <div v-if="patternType === 'rcp'">
-        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
-          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
-              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
-              v-for="(item, index2) in list" :key="index2">
-            <div class="first-1" :style="{ width:
-                  (Number(item.greenWidth.replace('%', '')) /
-                    Number((((item.split + (item.sum ? item.sum : 0)) /
-                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
-            </div>
-            <el-tooltip placement="top-start" effect="light">
-                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
-                <div v-if="item.id" style="cursor: pointer">
-                  <div
-                    class="box"
-                    style="position: absolute; width:40px; left: 0; top: 5px"
-                  >
-                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
-                  </div>
-                </div>
-              </el-tooltip>
-          </div>
-      </div>
-      </div>
       <!-- 环模式true -->
-      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
+      <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
             <div style="position: relative;" :style="{'height': '35px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode === 7 ? 'direction' : isBorder ? 'hovercell' : ''">
@@ -159,7 +134,6 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
-      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -196,9 +170,6 @@ export default {
     controlPhase: {
       type: Object
     },
-    patternType: {
-      type: String
-    },
     contrloType: {
       type: String
     },
@@ -371,9 +342,6 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
       },
       // 深度观察监听
       deep: true
@@ -398,9 +366,6 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           // setTimeout(() => {
@@ -433,9 +398,6 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
-    if (this.patternType === 'rcp') {
-      this.handleRcp(this.patternStatusList)
-    }
   },
   methods: {
     move (e) {
@@ -523,48 +485,6 @@ export default {
       }
       return ped
     },
-    handleRcp (val) {
-      this.patternRcp = []
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.splitchain
-        })
-      })
-      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)// 每个环的周期最大值
-      for (let rings of val) {
-        if (rings.length === 0) continue
-        let list = []
-        for (let ring of rings) {
-          if (ring.splitchain === 0) continue
-          let obj = {}
-          let split = ring.splitchain
-          obj.split = split
-          obj.cycle = cycle
-          obj.id = ring.phases
-          // if (ring.sum) {
-          //   obj.sum = ring.sum
-          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // } else {
-          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // }
-          // obj.mode = ring.mode
-          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
-          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // 忽略相位不显示
-          // let mode = ring.mode
-          // if (mode !== 7) { // 忽略相位不显示
-          list.push(obj)
-          // }
-        }
-        this.patternRcp.push(list)
-      }
-    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)
@@ -837,6 +757,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1123,6 +1057,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1372,6 +1320,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length >= 1) {
@@ -1430,9 +1392,6 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -1442,6 +1401,9 @@ export default {
         } else {
           this.max = ''
         }
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {

package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue

@@ -441,7 +441,11 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     :width="iconWidth"
     :height="iconHeight"
     >
-    <path d="M947.685353 711.851301h-34.260223v-121.814126c0-15.226766-11.420074-30.453532-30.453531-30.453532h-342.602231v-167.494424h137.040892c38.066914 0 64.713755-30.453532 64.713755-64.713754V114.200743c0-38.066914-30.453532-64.713755-64.713755-64.713754H346.228104c-38.066914-3.806691-68.520446 26.64684-68.520446 64.713754v216.981413c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892v167.494424h-342.602231c-15.226766 0-30.453532 11.420074-30.453531 30.453531v121.814127h-26.64684c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754H167.313606v-91.360595h315.95539v91.360595h-41.873606c-38.066914 0-64.713755 30.453532-64.713754 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713754 64.713755h137.040893c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754h-41.873606v-91.360595H852.518067v91.360595h-45.680297c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c3.806691-38.066914-22.840149-68.520446-60.907063-68.520446z m7.613383 205.561338c0 3.806691-3.806691 7.613383-7.613383 7.613383h-137.040892c-3.806691 0-7.613383-3.806691-7.613383-7.613383v-137.040892c0-3.806691 3.806691-7.613383 7.613383-7.613383h137.040892c3.806691 0 7.613383 3.806691 7.613383 7.613383v137.040892z" p-id="21091"></path></svg>
+      <path
+      :class="themeColor"
+      d="M947.685353 711.851301h-34.260223v-121.814126c0-15.226766-11.420074-30.453532-30.453531-30.453532h-342.602231v-167.494424h137.040892c38.066914 0 64.713755-30.453532 64.713755-64.713754V114.200743c0-38.066914-30.453532-64.713755-64.713755-64.713754H346.228104c-38.066914-3.806691-68.520446 26.64684-68.520446 64.713754v216.981413c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892v167.494424h-342.602231c-15.226766 0-30.453532 11.420074-30.453531 30.453531v121.814127h-26.64684c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754H167.313606v-91.360595h315.95539v91.360595h-41.873606c-38.066914 0-64.713755 30.453532-64.713754 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713754 64.713755h137.040893c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c0-38.066914-30.453532-64.713755-64.713754-64.713754h-41.873606v-91.360595H852.518067v91.360595h-45.680297c-38.066914 0-64.713755 30.453532-64.713755 64.713754v137.040892c0 38.066914 30.453532 64.713755 64.713755 64.713755h137.040892c38.066914 0 64.713755-30.453532 64.713754-64.713755v-137.040892c3.806691-38.066914-22.840149-68.520446-60.907063-68.520446z m7.613383 205.561338c0 3.806691-3.806691 7.613383-7.613383 7.613383h-137.040892c-3.806691 0-7.613383-3.806691-7.613383-7.613383v-137.040892c0-3.806691 3.806691-7.613383 7.613383-7.613383h137.040892c3.806691 0 7.613383 3.806691 7.613383 7.613383v137.040892z" p-id="21091">
+      </path>
+    </svg>
   </span>
 </template>
 

package/src/kisscomps/components/patternList/patternList.vue

@@ -3,7 +3,6 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
-    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :isBorder="isBorder"
@@ -553,9 +552,6 @@ export default {
     patternStatusList: {
       type: Array
     },
-    patternType: {
-      type: String
-    },
     patternId: {
       type: Number
     },