openatc-components 0.1.197 → 0.1.199

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

@@ -810,7 +810,7 @@ export default {
           newPattern.push(...i)
         })
         let barrier = this.step2(ringTeams, newPattern)
-        let barrierLeft = barrier.map(item => item - 0.3)
+        let barrierLeft = barrier.map(item => item)
         this.barrierList = barrierLeft.map(j => {
           return (j / (this.max ? this.max : this.contrloCycle) * 100) + '%'
         })
@@ -1037,7 +1037,7 @@ export default {
           this.max = ''
         }
         let barrier = this.step2(ringTeams, newPattern)
-        let barrierLeft = barrier.map(item => item - 0.3)// 屏障左移显示出人行横道
+        let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
@@ -1410,15 +1410,15 @@ export default {
     border: 5px solid transparent;
     border-left-color: rgba(30, 96, 12, 0.2);
   }
-  .divider {
-    position: absolute;
-    top: -10px;
-    // left: 370px;
-    width: 3px;
-    // height: 99px;
-    z-index: 999;
-    background-color:#B9BABF;
-  }
+  // .divider {
+  //   position: absolute;
+  //   top: -10px;
+  //   // left: 370px;
+  //   width: 2px;
+  //   // height: 99px;
+  //   z-index: 999;
+  //   background-color:#B9BABF;
+  // }
   // .curTimeLine {
   //   position: absolute;
   //   top: -10px;

package/package/kisscomps/components/patternConfig/index.vue

@@ -184,6 +184,7 @@
                 </div>
                 <div style="height: 94%;" class="table-container">
                   <PatternTable ref="patterntable"
+                                :maxTableHeight="maxTableHeight"
                                 :opt="item.devs"
                                 :isAllowedExpand="isAllowedExpand"
                                 @onNewPatternListChange="onNewPatternListChange"/>
@@ -210,6 +211,7 @@
       <PatternTable ref="patterntable"
                     :opt="opt.optPatternList[0].devs"
                     :isAllowedExpand="isAllowedExpand"
+                    :maxTableHeight="maxTableHeight"
                     @onNewPatternListChange="onNewPatternListChange"/>
     </div>
     <PlanContent v-show="false"
@@ -284,6 +286,7 @@ export default {
   },
   data () {
     return {
+      maxTableHeight: 200,
       chartData: {},
       months: monthsModel,
       days: [],
@@ -394,6 +397,9 @@ export default {
   },
   mounted () {
     // this.getAllPlan()
+    const clientHeight = this.$el.parentElement.clientHeight
+    const extHeight = this.isShowSingle ? 0 : 94
+    this.maxTableHeight = clientHeight - extHeight - 1
   },
   methods: {
     async handeAgentidsChange () {

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

@@ -106,6 +106,10 @@ export default {
     isAllowedExpand: {
       type: Boolean,
       default: true
+    },
+    maxTableHeight: {
+      type: Number,
+      default: 200
     }
   },
   data () {
@@ -119,9 +123,9 @@ export default {
   created () {
   },
   watch: {
-    screenHeight: function () {
-      this.tableHeight = screen.height < 1080 ? screen.height * 0.35 : screen.height * 0.5
-    },
+    // screenHeight: function () {
+    //   this.tableHeight = screen.height < 1080 ? screen.height * 0.35 : screen.height * 0.5
+    // },
     optList: {
       handler: function (val) {
         if (val && val.length > 0) {
@@ -142,12 +146,7 @@ export default {
   mounted: function () {
     var _this = this
     _this.$nextTick(function () {
-      _this.$nextTick(function () {
-        _this.tableHeight = screen.height < 1080 ? screen.height * 0.35 : screen.height * 0.5
-        window.onresize = function () {
-          _this.tableHeight = screen.height < 1080 ? screen.height * 0.35 : screen.height * 0.5
-        }
-      })
+      _this.tableHeight = _this.maxTableHeight
     })
   },
   methods: {