openatc-components 0.3.13 → 0.3.14

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

@@ -95,7 +95,7 @@
 
     <!-- 左行道路 B-->
     <div class="left-dir-road" v-if="roadDir === 'left'">
-      <div class="centerText" v-if="mainType === '100' || mainType === '101'" :class="{'countdownBg': isLoaded}">
+      <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
         <!-- 相位倒计时 -->
         <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase && isHasCountdown" :class="{'countdownBg': isLoaded}">
           <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
@@ -954,9 +954,9 @@ export default {
       if (this.mainType === '104') {
         // 路段行人过街
         switch (this.mainDirection) {
-          case '006': this.crossType = 'ped-section-east-west'
+          case '005': this.crossType = 'ped-section-east-west'
             break
-          case '005': this.crossType = 'ped-section-south-north'
+          case '006': this.crossType = 'ped-section-south-north'
             break
         }
       }

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/busPos.json

@@ -21,7 +21,7 @@
       "id": 4,
       "name": "东掉头",
       "x": "645px",
-      "y": "297px"
+      "y": "327px"
     },
     {
       "id": 5,
@@ -45,7 +45,7 @@
       "id": 8,
       "name": "西掉头",
       "x": "196px",
-      "y": "329px"
+      "y": "299px"
     },
     {
       "id": 9,
@@ -68,7 +68,7 @@
     {
       "id": 12,
       "name": "北掉头",
-      "x": "408px",
+      "x": "438px",
       "y": "85px"
     },
     {
@@ -92,7 +92,7 @@
     {
       "id": 16,
       "name": "南掉头",
-      "x": "440px",
+      "x": "410px",
       "y": "533px"
     }
   ],
@@ -118,7 +118,7 @@
     "id": 4,
     "name": "东掉头",
     "x": "638px",
-    "y": "294px"
+    "y": "324px"
   },
   {
     "id": 5,
@@ -142,7 +142,7 @@
     "id": 8,
     "name": "西掉头",
     "x": "145px",
-    "y": "329px"
+    "y": "299px"
   },
   {
     "id": 9,
@@ -165,7 +165,7 @@
   {
     "id": 12,
     "name": "北掉头",
-    "x": "405px",
+    "x": "435px",
     "y": "34px"
   },
   {
@@ -189,7 +189,7 @@
   {
     "id": 16,
     "name": "南掉头",
-    "x": "440px",
+    "x": "411px",
     "y": "526px"
   }
 ]

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/busPos.left.json

@@ -21,7 +21,7 @@
       "id": 4,
       "name": "东掉头",
       "x": "645px",
-      "y": "330px"
+      "y": "300px"
     },
     {
       "id": 5,
@@ -45,7 +45,7 @@
       "id": 8,
       "name": "西掉头",
       "x": "196px",
-      "y": "297px"
+      "y": "327px"
     },
     {
       "id": 9,
@@ -68,7 +68,7 @@
     {
       "id": 12,
       "name": "北掉头",
-      "x": "442px",
+      "x": "412px",
       "y": "85px"
     },
     {
@@ -92,7 +92,7 @@
     {
       "id": 16,
       "name": "南掉头",
-      "x": "408px",
+      "x": "438px",
       "y": "534px"
     }
   ],
@@ -118,7 +118,7 @@
     "id": 4,
     "name": "东掉头",
     "x": "638px",
-    "y": "329px"
+    "y": "300px"
   },
   {
     "id": 5,
@@ -142,7 +142,7 @@
     "id": 8,
     "name": "西掉头",
     "x": "145px",
-    "y": "295px"
+    "y": "325px"
   },
   {
     "id": 9,
@@ -165,7 +165,7 @@
   {
     "id": 12,
     "name": "北掉头",
-    "x": "440px",
+    "x": "410px",
     "y": "34px"
   },
   {
@@ -189,7 +189,7 @@
   {
     "id": 16,
     "name": "南掉头",
-    "x": "406px",
+    "x": "436px",
     "y": "526px"
   }
 ]

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -364,7 +364,7 @@
     <rect x="23.1" y="7.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 0.3558 20.0641)" class="st0" width="2.6" height="4.4"/>
     <rect x="26.8" y="3.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 4.0545 21.5962)" class="st0" width="2.6" height="4.4"/>
   </g>
-  <g id="路段行人过街-南北" :fill="isLock !== 0 ? peoplestatus[1].lockColor:peoplestatus[1].color" :class="peoplestatus[1].isshow? '' : 'invisible'">
+  <g id="路段行人过街-南北" :fill="isLock !== 0 ? peoplestatus[0].lockColor:peoplestatus[0].color" :class="peoplestatus[0].isshow? '' : 'invisible'">
     <rect x="14.8" y="31.4" class="st0" width="4.4" height="2.6"/>
     <rect x="14.8" y="26.2" class="st0" width="4.4" height="2.6"/>
     <rect x="14.8" y="20.9" class="st0" width="4.4" height="2.6"/>
@@ -373,7 +373,7 @@
     <rect x="14.8" y="5.2" class="st0" width="4.4" height="2.6"/>
     <rect x="14.8" y="0" class="st0" width="4.4" height="2.6"/>
   </g>
-  <g id="路段行人过街-东西" :fill="isLock !== 0 ? peoplestatus[0].lockColor:peoplestatus[0].color" :class="peoplestatus[0].isshow? '' : 'invisible'">
+  <g id="路段行人过街-东西" :fill="isLock !== 0 ? peoplestatus[1].lockColor:peoplestatus[1].color" :class="peoplestatus[1].isshow? '' : 'invisible'">
     <rect x="0" y="14.8" class="st0" width="2.6" height="4.4"/>
     <rect x="5.2" y="14.8" class="st0" width="2.6" height="4.4"/>
     <rect x="10.5" y="14.8" class="st0" width="2.6" height="4.4"/>

package/package/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -76,14 +76,14 @@
       <el-table-column align="center" :label="$t('openatccomponents.pattern.plan')">
         <template slot-scope="scope">
           <div class="pattern-figure">
-            <pattern-list
+            <!-- <pattern-list
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
               :phaseList="scope.row.currPhase"
               :contrloType="getControlType(scope.row)"
             >
-            </pattern-list>
-            <!-- <pattern-list
+            </pattern-list> -->
+            <pattern-list
               v-if="getControlType(scope.row) === 'ring'"
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
@@ -96,7 +96,7 @@
               :patternId="scope.row.patternid"
               :contrloType="getControlType(scope.row)"
               :index="scope.$index"
-              :cycleChange="true"
+              :cycleChange="false"
               :stagesChange="getSelectedPattern(scope.row).stagesList"
               :patternStatusList="getSelectedPattern(scope.row).rings"
               :patternList="scope.row.allPatterns"
@@ -105,7 +105,7 @@
               :phaseList="scope.row.currPhase"
               :agentId="scope.row.agentid"
               :showBarrier="false">
-            </pattern-list> -->
+            </pattern-list>
           </div>
          </template>
       </el-table-column>