openatc-components 0.4.89 → 0.4.90

package/config/index.js

@@ -15,7 +15,7 @@
 const fs = require('fs');
 const path = require('path')
 let VUE_APP_PROXY_API_TARGET = "http://127.0.0.1:8080"
-let VUE_APP_PROXY_MAIN_TARGET = "http://192.168.14.122:10003/openatc"
+let VUE_APP_PROXY_MAIN_TARGET = "http://192.168.13.103:10003/openatc"
 let VUE_APP_PROXY_SOCKET_TARGET = "http://127.0.0.1:8080"
 const localFile = path.resolve(__dirname, 'dev.local.js');
 if (fs.existsSync(localFile)) {

package/package/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"
@@ -888,11 +888,13 @@ export default {
           this.getMergeDirections()
         }
         if (this.isVipRoute && !this.isThirdSignal && !this.isRcp) {
+          alert('1')
           // 特勤、分组管控下，非第三方设备且不是rcp协议，按通道显示相位方向；第三方设备和rcp协议还是按路口相位配置显示相位方向
           this.getChannelInfo()
           return
         }
         if (this.channelType && !this.isThirdSignal) {
+          alert('2')
           this.getChannelInfo()
           return
         }
@@ -936,6 +938,7 @@ export default {
         this.drawDefaultPhaseIcon()
       }
       if ((this.isVipRoute && this.isThirdSignal) || (this.isVipRoute && this.isRcp)) {
+        alert('3')
         this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
         // console.log(this.LanePhaseData)
         this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
@@ -1367,6 +1370,7 @@ export default {
       const targetIds = [4, 8, 12, 16] // 掉头相位后画
       this.LanePhaseData = this.LanePhaseData.filter(item => !targetIds.includes(item.id)).concat(this.LanePhaseData.filter(item => targetIds.includes(item.id)))
       if (!this.isThirdSignal && this.isVipRoute && !this.isRcp) {
+        alert('4')
         await this.getConflictList()
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))

package/package/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/package/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/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -837,6 +837,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 +1137,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 +1400,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 +1472,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 +1481,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/package/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>