openatc-components 0.1.84 → 0.1.86

package/package/kisscomps/components/Channelization/Channelization.vue

@@ -495,27 +495,36 @@ export default {
 </script>
 
 <style lang="css" rel="stylesheet/scss">
-    .show-channelization {
-      position: relative;
-    }
+  .show-channelization {
+    position: relative;
+    overflow: hidden;
+  }
+  .widescreenCrossImg {
+    zoom: 1.3;
+  }
   .superlargeCrossImg {
-   zoom: 1;
+    zoom: 1.3;
   }
   .largeCrossImg {
-   zoom: 0.9;
-
+    zoom: 1.2;
   }
   .middleCrossImg {
-  zoom: 0.8;
+    zoom: 1.1;
+  }
+  .middleCrossImg2 {
+    zoom: 1;
   }
   .smallCrossImg {
-  zoom: 0.65;
+    zoom: 0.9;
+  }
+  .smallCrossImg2 {
+    zoom: 0.8;
   }
   .miniCrossImg {
-   zoom: 0.5;
+    zoom: 0.7;
   }
   .superminiCrossImg {
-    zoom: 0.45;
+    zoom: 0.6;
   }
   .minimumCrossImg {
     zoom: 0.35;

package/package/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue

@@ -300,27 +300,36 @@ export default {
 </script>
 
 <style lang="css" rel="stylesheet/scss">
-    .show-channelization {
-      position: relative;
-    }
+  .show-channelization {
+    position: relative;
+    overflow: hidden;
+  }
+  .widescreenCrossImg {
+    zoom: 1.3;
+  }
   .superlargeCrossImg {
-   zoom: 1;
+    zoom: 1.3;
   }
   .largeCrossImg {
-   zoom: 0.9;
-
+    zoom: 1.2;
   }
   .middleCrossImg {
-  zoom: 0.8;
+    zoom: 1.1;
+  }
+  .middleCrossImg2 {
+    zoom: 1;
   }
   .smallCrossImg {
-  zoom: 0.65;
+    zoom: 0.9;
+  }
+  .smallCrossImg2 {
+    zoom: 0.8;
   }
   .miniCrossImg {
-   zoom: 0.5;
+    zoom: 0.7;
   }
   .superminiCrossImg {
-    zoom: 0.45;
+    zoom: 0.6;
   }
   .minimumCrossImg {
     zoom: 0.35;

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

@@ -826,6 +826,17 @@ export default {
           return k.id
         })
       })
+      let valSplit = val.map(item => {
+        return item.map(val => {
+          return val.value + (val.sum ? val.sum : 0)
+        })
+      })
+      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)// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -923,7 +934,9 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        this.fillGap(ringTeams, val)
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         this.barrierList = barrier.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
@@ -993,14 +1006,14 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
           obj.mode = ring.mode
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (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) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示

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

@@ -182,14 +182,10 @@ export default {
         control: 24,
         delay: this.manualInfo.delay,
         duration: this.manualInfo.duration,
-        data: {
-          type: this.manualInfo.type,
-          phase: this.manualInfo.phase,
-          level: this.manualInfo.level
-        }
-
+        type: this.manualInfo.type,
+        phase: this.manualInfo.phase,
+        level: this.manualInfo.level
       }
-      console.log(submitdata, 'submitdata')
       this.$emit('closePhaseControl', submitdata)
     }
   }