openatc-components 0.1.85 → 0.1.86

package/package.json

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

package/src/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/src/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)
     }
   }

package/src/utils/errorcode.js

@@ -34,6 +34,8 @@ let errorCodeMap = new Map([
   [503, '星期超出限值'],
   [504, '日期值超出限值'],
   [505, '配置未知计划号'],
+  [505, '配置未知计划号'],
+  [506, '包含普通计划的日期未覆盖全年'],
   [601, '通道数超出限值'],
   [602, '通道配置未知控制源'],
   [603, '通道控制源未配置'],
@@ -121,6 +123,8 @@ let errorCodeMapEn = new Map([
   [503, 'The week exceeds the limit'],
   [504, 'The date value exceeds the limit'],
   [505, 'Configure unknown plan number'],
+  [506, 'Dates that include common plans do not cover the full year'],
+  [507, 'No month is configured for the scheduling plan'],
   [601, 'The number of channels exceeds the limit'],
   [602, 'Channel configuration unknown control source'],
   [603, 'Channel control source is not configured'],

package/static/styles/channelizatioon.scss

@@ -74,6 +74,7 @@
           .lock-map {
             cursor: pointer;
             margin: 0 5PX;
+            font-size: 18PX;
           }
           .el-icon-lock {
             color: $--color-text-secondary;

package/static/styles/overview.scss

@@ -17,211 +17,6 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
   }
-  .container-left {
-    float: left;
-    margin-top: 20PX;
-    margin-left: 20PX;
-    width: 76.8%;
-    height: 880PX;
-    background-color: $--color-white;
-    border: solid 1PX $--border-color-lighter;
-  }
-  .container-right {
-    float: left;
-    margin-top: 20PX;
-    margin-left: 20PX;
-    width: 20%;
-    height: 880PX;
-    background-color: $--color-white;
-    border: solid 1PX $--border-color-lighter;
-  }
-  .container-left-top {
-    width: 100%;
-    height: 420PX;
-  }
-  .container-left-bottom {
-    width: 100%;
-    height: calc(100% - 420PX);
-    background-color: $--color-white;
-  }
-  .curr-order {
-    float: left;
-    margin-left: 20PX;
-    margin-top: 1PX;
-  }
-  .control-right {
-    margin-top: 40PX;
-    margin-left: 20PX;
-  }
-  .agent-div {
-    float: left;
-    width: 28%;
-    height: 420PX;
-    border-bottom: solid 0.5PX $--border-color-lighter;
-  }
-  .other-div {
-    float: left;
-    width: 24%;
-    height: 210PX;
-    border-left: solid 1PX $--border-color-lighter;
-    border-bottom: solid 1PX $--border-color-lighter;
-    .model-icon {
-      width: 20PX;
-      height: 20PX;
-    }
-  }
-  .agent-icon {
-    position:relative;
-    float: left;
-    width: 50%;
-    height: 210PX;
-  }
-  .agent-num {
-    float: left;
-    width: 50%;
-    height: 210PX;
-  }
-  .lianji-success {
-    position:relative;
-    float: right;
-    right: 30PX;
-    top: 25PX;
-    text-align: center;
-    width: 81PX;
-    height: 34PX;
-    background-color: $--color-primary;
-    border-radius: 4PX;
-    font-size: 14PX;
-    padding:10PX 0;
-    color: $--color-white;
-  }
-  .lianji-fail {
-    position:relative;
-    float: right;
-    right: 30PX;
-    top: 25PX;
-    text-align: center;
-    width: 81PX;
-    height: 34PX;
-    background-color: #909399;
-    border-radius: 4PX;
-    font-size: 14PX;
-    padding:10PX 0;
-    color: $--color-white;
-  }
-  .lianji-wait {
-    position:relative;
-    float: right;
-    right: 30PX;
-    top: 25PX;
-    text-align: center;
-    width: 110PX;
-    height: 34PX;
-    background-color: #e6a23c;
-    border-radius: 4PX;
-    font-size: 14PX;
-    padding:10PX 0;
-    color: $--color-white;
-  }
-  .agent-id {
-    margin-top: 20PX;
-    margin-right: 30PX;
-    text-align: right;
-    font-size: 14PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-text-secondary;
-  }
-  .agent-number {
-    margin-top: 10PX;
-    margin-right: 30PX;
-    text-align: right;
-    font-size: 16PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-text-primary;
-  }
-  .agent-port {
-    margin-top: 20PX;
-    margin-right: 30PX;
-    text-align: right;
-    font-size: 14PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-text-secondary;
-  }
-  .port-number {
-    margin-top: 10PX;
-    margin-right: 30PX;
-    text-align: right;
-    font-size: 16PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-text-primary;
-  }
-  .model-name {
-    float: left;
-    margin-top: 32PX;
-    font-size: 14PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-text-regular;
-    margin-right: 10PX;
-  }
-  .model-tupian {
-    float: left;
-    margin-top: 30PX;
-    margin-left: 20PX;
-    margin-right: 10PX;
-  }
-  .to-detail {
-    float: left;
-    margin-top: 35PX;
-    line-height: 10PX;
-    font-size: 14PX;
-    font-weight: normal;
-    font-stretch: normal;
-    letter-spacing: 0PX;
-    color: $--color-primary;
-    padding-left: 10PX;
-    border-left: 1PX solid $--color-primary;
-    cursor: pointer;
-  }
-
-  .control-center {
-    // float: left;
-    text-align: center;
-    margin-top: 40PX;
-    font-size: 30PX;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 20PX;
-    letter-spacing: 0PX;
-    color: $--color-text-primary;
-  }
-  .curr-grade {
-    margin-top: 30PX;
-    font-size: 24PX;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 14PX;
-    letter-spacing: 0PX;
-    color: $--color-text-regular;
-  }
-  .curr-num {
-    margin-top: 20PX;
-    font-size: 14PX;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 14PX;
-    letter-spacing: 0PX;
-    color: $--color-text-secondary;
-  }
   .icon-ziyuan:before {
     content: "\e670";
     position:absolute;
@@ -230,31 +25,6 @@
     top: 72PX;
     // color: #$--color-primary;
   }
-  .yuanxing {
-    position:absolute;
-    left: 20PX;
-    top: 50PX;
-    z-index:1;
-    width: 90PX;
-    height: 90PX;
-    // background-color: #459ffc;
-    opacity: 0.2;
-    border-radius: 50%;
-  }
-  .dev-status {
-    position:absolute;
-    // text-align: center;
-    // margin-top: 150PX;
-    // left: 30PX;
-    top: 150PX;
-    height: 21PX;
-    font-size: 22PX;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 14PX;
-    letter-spacing: 0PX;
-    // color: $--color-primary;
-  }
   .tuxing-left {
     float: left;
     // margin-top: 20PX;
@@ -326,23 +96,6 @@
     cursor:pointer;
     margin-top: 15PX;
   }
-  .control-time {
-    margin-top: 40PX;
-    font-size: 30PX;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: 20PX;
-    letter-spacing: 0PX;
-    color: $--color-text-primary;
-  }
-  .control-time .time {
-    width: 50%;
-    display: inline-block;
-    text-align: center;
-  }
-  .control-time span:first-of-type {
-    border-right: 1PX solid #e5e5e5;
-  }
   .pattern-explain {
     float: right;
     color: $--color-text-regular;
@@ -361,12 +114,4 @@
     max-height:300PX;
   }
  }
- .wenzijiemian {
-   .container-left {
-     margin-top: 0;
-   }
-   .container-right {
-     margin-top: 0;
-   }
- }
 }