openatc-components 0.1.82 → 0.1.84

package/package.json

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

package/src/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/src/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/src/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/src/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/src/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/src/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/src/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">

package/src/utils/errorcode.js

@@ -34,8 +34,6 @@ let errorCodeMap = new Map([
   [503, '星期超出限值'],
   [504, '日期值超出限值'],
   [505, '配置未知计划号'],
-  [505, '配置未知计划号'],
-  [506, '包含普通计划的日期未覆盖全年'],
   [601, '通道数超出限值'],
   [602, '通道配置未知控制源'],
   [603, '通道控制源未配置'],
@@ -123,8 +121,6 @@ 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,7 +74,6 @@
           .lock-map {
             cursor: pointer;
             margin: 0 5PX;
-            font-size: 18PX;
           }
           .el-icon-lock {
             color: $--color-text-secondary;

package/static/styles/intersection.scss

@@ -11,6 +11,21 @@
   .changePaddingBottom {
     padding-bottom: 30px;
   }
+  @media only screen and (min-width: 2048px){
+    .crossDirection-display{
+      zoom: 1.5;
+    }
+   }
+  @media only screen and (max-width: 2048px){
+    .crossDirection-display{
+      zoom: 1.3;
+    }
+   }
+  @media only screen and (max-width: 1920px){
+    .crossDirection-display{
+      zoom: 1.2;
+    }
+   }
   /*当屏幕小于等于1680px的屏幕样式*/
   @media only screen and (max-width: 1680px){
     .crossDirection-display{
@@ -76,39 +91,37 @@
       font-size: 12px;
     }
   }
+
+  .widescreenCrossImg {
+    // 宽屏最大缩放到1.3，否则高度溢出
+    zoom: 1.3;
+  }
   .superlargeCrossImg {
   //  transform: scale(0.9);
-   zoom: 1;
-  
+    zoom: 1.3;
   }
   .largeCrossImg {
-  //  transform: scale(0.8);
-   zoom: 0.9;
-  
+    zoom: 1.2;
   }
   .middleCrossImg {
-  //  transform: scale(0.65);
-  // zoom: 0.65;
-  zoom: 0.8;
+    zoom: 1.1;
+  }
+  .middleCrossImg2 {
+    zoom: 1;
   }
   .smallCrossImg {
-  //  transform: scale(0.5);
-  //  zoom: 0.5;
-  zoom: 0.65;
+    zoom: 0.9;
+  }
+  .smallCrossImg2 {
+    zoom: 0.8;
   }
   .miniCrossImg {
-  //  transform: scale(0.45);
-  //  zoom: 0.45;
-   zoom: 0.5;
+    zoom: 0.7;
   }
   .superminiCrossImg {
-  //  transform: scale(0.35);
-  //  zoom: 0.35;
-    zoom: 0.45;
+    zoom: 0.6;
   }
   .minimumCrossImg {
-  //  transform: scale(0.25);
-  //  zoom: 0.25;
     zoom: 0.35;
   }
   .transMiddleCrossImg {

package/static/styles/schemeconfig.scss

@@ -330,21 +330,6 @@
   padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
-  .forbiddenstage{
-    width: 60%;
-    margin: 10px auto;
-    color: $--color-text-primary;
-  }
-  .stage-item {
-    cursor: pointer;
-    width: 100%;
-    height: auto;
-    margin: 5px 0;
-    line-height: 40px;
-    color: $--color-text-primary;
-    padding: 1px 1px;
-    box-sizing: border-box;
-  }
   .title {
     margin-bottom: 24PX;
     font-size: 20PX;

package/src/node_modules/.package_versions.json

@@ -1 +0,0 @@
-{}