openatc-components 0.3.29 → 0.3.30

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

@@ -10,9 +10,9 @@
         <PatternStatus
         :showBarrier="showBarrier"
         :controlPhase="controlPhase"
-        :isShowTip="isShowTip"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
+        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -72,10 +72,6 @@ export default {
     stagesChange: {
       type: Array
     },
-    isShowTip: {
-      type: Boolean,
-      default: true
-    },
     showBarrier: {
       type: Boolean,
       default: false
@@ -92,6 +88,9 @@ export default {
     patternId: {
       type: Number
     },
+    patternType: {
+      type: String
+    },
     agentId: {
       type: String
     },

package/package/kisscomps/components/DrawChannelization/drawsvg/basicCoordInfo.vue

@@ -21,7 +21,7 @@
           @change="handleChangePosY" @input.native="eventChange('y')" />
       </el-form-item>
       <el-form-item v-if="showAngle" :label="$t('openatccomponents.channelizationmap.angle') + ':'">
-        <el-input-number :min="0" :max="360" :precision="0" :step="1" :controls="false" ref="refNumber-angle" v-model="basicCoodInfo.angle"
+        <el-input-number :min="0" :max="360" :controls="false" ref="refNumber-angle" v-model="basicCoodInfo.angle"
           @change="handleChangeAngle" @input.native="eventChange('angle')" />
       </el-form-item>
       <el-form-item v-if="showKeyId" label="ID:">

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

@@ -11,8 +11,33 @@
  **/
 <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">
+      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <div style="position: relative;" :style="{'height': '34px','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': ''">
             <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
@@ -23,7 +48,7 @@
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
+                    <div class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
                       <div class="ring-nums">{{item.split}}</div>
                     </div>
@@ -117,6 +142,7 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -131,10 +157,6 @@ export default {
     }
   },
   props: {
-    isShowTip: {
-      type: Boolean,
-      default: true
-    },
     cycleChange: {
       type: Boolean,
       default: true
@@ -145,6 +167,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -317,6 +342,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -341,6 +369,9 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           setTimeout(() => {
@@ -373,6 +404,9 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   methods: {
     getPed (data) {
@@ -401,6 +435,48 @@ 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)

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/othersIcon.vue

@@ -13,36 +13,84 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     <svg
       v-if="type === '相位关断'"
       xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 54 29.1"
+      viewBox="0 0 45.08 24.79"
       :width="iconWidth"
       :height="iconHeight"
     >
-    <g :class="themeColor">
-      <rect y="15.8" class="st0" width="32.4" height="9"/>
-      <rect x="32.3" y="15.8" class="st3" width="21.7" height="9"/>
-      <rect x="32.3" y="11.3" class="st3" width="1.7" height="17.7"/>
-      <g>
-        <path class="st4" d="M29.2,0.4l8,8L29.2,0.4z"/>
-        <path class="st4" d="M37.2,0.4l-8,8L37.2,0.4z"/>
+      <g id="图层_2" data-name="图层 2">
+        <g id="图层_3" data-name="图层 3" :class="themeColor">
+          <rect class="cls-1" y="13.52" width="27.08" height="7.46" />
+          <rect class="cls-2" x="27" y="13.52" width="18.08" height="7.46" />
+          <rect class="cls-2" x="27" y="9.71" width="1.38" height="15.08" />
+          <path class="cls-3" d="M24.35.35,31,7.05Z" />
+          <path class="cls-3" d="M31,.35l-6.69,6.7Z" />
+        </g>
       </g>
-    </g>
     </svg>
     <svg
       v-if="type === '临时方案'"
       xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 54 29.1"
+      viewBox="0 0 54 9"
       :width="iconWidth"
       :height="iconHeight"
     >
-    <g :class="themeColor">
-      <rect id="矩形_683_拷贝_3" x="0" y="15.8" class="st0" width="39" height="9"/>
-      <rect id="矩形_683_拷贝_3-2" x="39" y="15.8" class="st1" width="8" height="9"/>
-      <rect id="矩形_686_拷贝_4" x="37" y="15.8" class="st2" width="1" height="9"/>
-      <rect id="矩形_686_拷贝_4-2" x="35" y="15.8" class="st2" width="1" height="9"/>
-      <rect id="矩形_686_拷贝_4-3" x="33" y="15.8" class="st2" width="1" height="9"/>
-      <rect id="矩形_686_拷贝_4-4" x="31" y="15.8" class="st2" width="1" height="9"/>
-      <rect id="矩形_683_拷贝_3-3" x="46" y="15.8" class="st3" width="8" height="9"/>
-    </g>
+      <g id="图层_2" data-name="图层 2" :class="themeColor">
+        <rect
+          id="矩形_683_拷贝_3"
+          data-name="矩形 683 拷贝 3"
+          class="cls-1"
+          width="39"
+          height="9"
+        />
+        <rect
+          id="矩形_683_拷贝_3-2"
+          data-name="矩形 683 拷贝 3"
+          class="cls-5"
+          x="39"
+          width="8"
+          height="9"
+        />
+        <rect
+          id="矩形_686_拷贝_4"
+          data-name="矩形 686 拷贝 4"
+          class="cls-6"
+          x="37"
+          width="1"
+          height="9"
+        />
+        <rect
+          id="矩形_686_拷贝_4-2"
+          data-name="矩形 686 拷贝 4"
+          class="cls-6"
+          x="35"
+          width="1"
+          height="9"
+        />
+        <rect
+          id="矩形_686_拷贝_4-3"
+          data-name="矩形 686 拷贝 4"
+          class="cls-6"
+          x="33"
+          width="1"
+          height="9"
+        />
+        <rect
+          id="矩形_686_拷贝_4-4"
+          data-name="矩形 686 拷贝 4"
+          class="cls-6"
+          x="31"
+          width="1"
+          height="9"
+        />
+        <rect
+          id="矩形_683_拷贝_3-3"
+          data-name="矩形 683 拷贝 3"
+          class="cls-2"
+          x="46"
+          width="8"
+          height="9"
+        />
+      </g>
     </svg>
     <svg
       v-if="type === '优先控制'"
@@ -143,9 +191,4 @@ export default {
       .cls-6 {
         fill: #fff;
       }
-.st0{fill:#7CCC66;}
-.st1{fill:#F9DC6A;}
-.st2{fill:#FFFFFF;}
-.st3{fill:#F27979;}
-.st4{fill:none;stroke:#F27979;stroke-width:1.1979;stroke-miterlimit:10;}
 </style>

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

@@ -3,8 +3,8 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
-    :isShowTip="isShowTip"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -498,10 +498,6 @@ export default {
     }
   },
   props: {
-    isShowTip: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -541,6 +537,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },