openatc-components 0.1.82 → 0.1.84

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

@@ -12,10 +12,13 @@
   <!--静态渠化路口，需要传入路口状态数据和检测器状态数据-->
 <template>
   <div class="show-channelization channelization-base-map" :class="{
+    'widescreenCrossImg': bodyDomWidth > 1680,
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
     'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
-    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
-    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 720,
+    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 1100,
+    'middleCrossImg2': bodyDomWidth <= 1100 && bodyDomWidth > 960,
+    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 890,
+    'smallCrossImg2': bodyDomWidth <= 890 && bodyDomWidth > 720,
     'miniCrossImg': bodyDomWidth <= 720 && bodyDomWidth > 650,
     'superminiCrossImg': bodyDomWidth <= 650 && bodyDomWidth > 450,
     'transMiddleCrossImg': bodyDomWidth <= 450 && bodyDomWidth > 350,

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

@@ -12,10 +12,13 @@
   <!--流量统计渠化路口图-->
 <template>
   <div class="show-channelization channelization-base-map" :class="{
+    'widescreenCrossImg': bodyDomWidth > 1680,
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
     'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
-    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
-    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 720,
+    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 1100,
+    'middleCrossImg2': bodyDomWidth <= 1100 && bodyDomWidth > 960,
+    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 890,
+    'smallCrossImg2': bodyDomWidth <= 890 && bodyDomWidth > 720,
     'miniCrossImg': bodyDomWidth <= 720 && bodyDomWidth > 650,
     'superminiCrossImg': bodyDomWidth <= 650 && bodyDomWidth > 450,
     'transMiddleCrossImg': bodyDomWidth <= 450 && bodyDomWidth > 350,

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -12,10 +12,13 @@
 <template>
 <div class="intersection-map">
   <div class="crossDirection-display openatc-intersection-base-map" :class="{
+    'widescreenCrossImg': bodyDomWidth > 1680,
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
     'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
-    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
-    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 720,
+    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 1100,
+    'middleCrossImg2': bodyDomWidth <= 1100 && bodyDomWidth > 960,
+    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 890,
+    'smallCrossImg2': bodyDomWidth <= 890 && bodyDomWidth > 720,
     'miniCrossImg': bodyDomWidth <= 720 && bodyDomWidth > 650,
     'superminiCrossImg': bodyDomWidth <= 650 && bodyDomWidth > 450,
     'transMiddleCrossImg': bodyDomWidth <= 450 && bodyDomWidth > 350,
@@ -136,11 +139,13 @@ export default {
         if (this.$el.parentElement === null || this.$el.parentElement === undefined) return
         this.bodyDomSize.width = this.$el.parentElement.clientWidth
         this.bodyDomWidth = this.bodyDomSize.width
+        console.log(this.bodyDomWidth)
         window.addEventListener('resize', () => {
         // 定义窗口大小变更通知事件
           if (_this.$el.parentElement === null || _this.$el.parentElement === undefined) return
           _this.bodyDomSize.width = _this.$el.parentElement.clientWidth
           this.bodyDomWidth = this.bodyDomSize.width
+          console.log(this.bodyDomWidth)
           console.log('resize this.bodyDomSize.width', _this.bodyDomSize.width)
         }, false)
       })

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

@@ -826,17 +826,6 @@ 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分组
@@ -934,9 +923,7 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
+        this.fillGap(ringTeams, val)
         let barrier = this.step2(ringTeams, newPattern)
         this.barrierList = barrier.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
@@ -1006,14 +993,14 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           }
           obj.mode = ring.mode
-          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) + '%'
+          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) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示

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

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

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

@@ -111,15 +111,15 @@
                     :list="patternOne.length===0?planPattern.rings[j-1]:patternOne[0].rings[j-1]"
                     >
                     </expend-config>
-                    <div class="forbiddenstage">
+                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
                         {{$t('openatccomponents.pattern.forbiddenstage')}}
                         <el-input class="stage-value" size="small" v-model="forbiddenstage"></el-input>
                     </div>
-                    <div class="forbiddenstage">
+                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
                         {{$t('openatccomponents.pattern.screenstage')}}
                         <el-input class="stage-value" size="small" v-model="screenstage"></el-input>
                     </div>
-                    <div class="forbiddenstage">
+                    <div style="width: 60%;margin: 10px auto;color:#ffffff">
                         {{$t('openatccomponents.pattern.coordinatestage')}}
                         <el-input class="stage-value" size="small" v-model="coordinatestage"></el-input>
                     </div>

package/package/kisscomps/components/StageBord/StageBord.vue

@@ -228,14 +228,14 @@ export default {
     height: auto;
     margin: 5px 0;
     line-height: 40px;
-    // color: #FFFFFF;
+    color: #FFFFFF;
     padding: 1px 1px;
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #409EFF;
     border-color: #409EFF;
-    // color: #FFFFFF;
+    color: #FFFFFF;
   }
 </style>
 <style lang="scss">