openatc-components 0.2.37 → 0.2.39

package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -484,6 +484,8 @@
 </template>
 <script>
 import { mapState } from 'vuex'
+import { getTheme } from '../../../utils/auth.js'
+
 export default {
   name: 'xdr-dir-selector',
   props: {
@@ -554,196 +556,196 @@ export default {
           id: 1,
           name: '东西路段人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 2,
           name: '南北路段人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 3,
           name: 'X人行横道-\\',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 4,
           name: 'X人行横道-/',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 5,
           name: '北人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 6,
           name: '南人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 7,
           name: '东人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 8,
           name: '西人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 9,
           name: '西人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 10,
           name: '西人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 11,
           name: '东人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 12,
           name: '东人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 13,
           name: '南人行横道-右',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 14,
           name: '南人行横道-左',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 15,
           name: '北人行横道-右',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 16,
           name: '北人行横道-左',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 17,
           name: '东南人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 18,
           name: '西南人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 19,
           name: '东北人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 20,
           name: '西北人行横道',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 21,
           name: '东南人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 22,
           name: '东南人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 23,
           name: '西南人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 24,
           name: '西南人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 25,
           name: '东北人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 26,
           name: '东北人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 27,
           name: '西北人行横道-上',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         },
         {
           id: 28,
           name: '西北人行横道-下',
           isshow: false,
-          color: '#040000',
+          color: getTheme() === 'light' ? '#040000' : '#fff',
           lockColor: '#7ccc66'
         }
       ],

package/src/views/intersection.vue

@@ -144,7 +144,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
+      Token: 'eyJraWQiOiIxNzE1NzM1NTU3NjcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTc3ODc1NywiaWF0IjoxNzE1NzM1NTU3fQ.7ED5tQWYBpdv7HcBjZ_KSZprkcstns9ybCCwcrj5qZQ',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -20,7 +20,7 @@ export default {
       modeName: '交警遥控',
       controlName: '步进',
       agentId: 'jmlxhl',
-      Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
+      Token: 'eyJraWQiOiIxNzE1NzM1NTU3NjcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNTc3ODc1NywiaWF0IjoxNzE1NzM1NTU3fQ.7ED5tQWYBpdv7HcBjZ_KSZprkcstns9ybCCwcrj5qZQ',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }
   },

package/static/styles/commonkanban.scss

@@ -88,6 +88,7 @@
     box-sizing: border-box;
     .index{
       color: $--color-text-primary;
+      font-size: 14PX;
     }
     .el-input {
       width: 100%;

package/static/styles/light/theme/element-light.scss

@@ -13,17 +13,17 @@
 $--color-black: #f7f8fa;
 $--color-primary: #299BCC;
 // $--color-white: #202940;
-// $--color-black: #30384D;
+// $--color-black: #f7f8fa;
 // $--background-color-base: #191F34;
 // $--color-text-primary: #FFFFFF;
 // $--color-text-regular: #FFFFFF;
 // $--color-text-secondary: #B9BABF;
 // $--color-text-placeholder: #8D9498;
 // $--color-info: #8D9498;
-// $--border-color-base: #30384D;
+// $--border-color-base: #DCDFE6;
 // $--border-color-light: #30384D;
-// $--border-color-lighter: #30384D;
-// $--border-color-extra-light:#30384D;
+// $--border-color-lighter: #EBEEF5;
+// $--border-color-extra-light:#F2F6FC;
 // $--box-shadow-base: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
 // $--button-primary-font-color: #FFFFFF;
 // $--button-info-font-color: #FFFFFF;

package/static/styles/schemeconfig.scss

@@ -57,14 +57,14 @@
   .model-label, .stage-label {
     width: 100PX;
     font-size: 14PX;
-    font-weight: 400;
-    color: #606266;
+    font-weight: 700;
+    color: $--color-text-secondary;;
     line-height: 28PX;
     padding-right: 12PX;
   }
   .model-label-title {
     font-size: 14PX;
-    font-weight: 400;
+    font-weight: 700;
     line-height: 28PX;
     color: $--color-text-secondary;
     padding-right: 12PX;
@@ -74,8 +74,8 @@
     text-align: center;
     cursor:pointer;
     width: 70PX;
-    height: 65PX;
-    background-color: #edf6ff;
+    height: 80PX;
+    // background-color: #edf6ff;
     border-radius: 6PX;
     line-height: 1.15;
     .patternWalk{
@@ -88,22 +88,28 @@
     height: 24PX;
   }
   .single-model .model-icon {
-    margin-top: 10PX;
+    margin: 0 auto;
     width: 24PX;
     height: 24PX;
+    color: $--color-text-regular;
   }
   .single-model-select {
+    // background-color: #299BCC !important;
+    // border: solid 1PX #409eff;
+  }
+  .single-model-new {
     margin-right: 10PX;
+    padding-top: 13PX;
     text-align: center;
     cursor:pointer;
     width: 70PX;
-    height: 65PX;
-    background-color: #a2cfff;
+    height: 80PX;
+    background-color: #edf6ff;
     border-radius: 6PX;
-    // border: solid 1PX #409eff;
+    line-height: 1.15;
   }
   .single-model-name {
-    margin-top: 3PX;
+    margin-top: 13PX;
     font-size: 12PX;
     font-weight: normal;
     font-stretch: normal;
@@ -111,6 +117,15 @@
     letter-spacing: 0PX;
     color: #606266;
   }
+  .single-model-name-theme {
+    margin-top: 13PX;
+    font-size: 13PX;
+    font-weight: normal;
+    font-stretch: normal;
+    // line-height: 22PX;
+    letter-spacing: 0PX;
+    color: $--color-text-regular;
+  }
   .current-stage-num {
     margin-top: 3PX;
     font-size: 12PX;
@@ -207,7 +222,7 @@
 }
 // 手动控制弹框
 .manual-control-modal{
-  padding: 21PX 0PX 21PX 28PX;
+  // padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
   .title {
@@ -226,7 +241,7 @@
     // width: 100% !important;
   }
   .model-label {
-    margin-top: 14PX;
+    margin-top: 6PX;
   }
   .stage-label {
     margin-top: 30PX;
@@ -240,7 +255,6 @@
   }
   .el-form-item__label {
     font-size: 14PX;
-    font-weight: 400;
     color: $--color-text-secondary;
   }
   .el-dialog__footer {
@@ -264,25 +278,68 @@
       text-align: left;
     }
   }
-  .footer {
-    button {
-      width: 56PX;
-      height: 32PX;
-      padding: 0;
-      text-align: center;
-      line-height: 30PX;
-      font-size: 12PX;
-      font-weight: normal;
-      font-stretch: normal;
-    }
-  }
   .model-label, .stage-label {
     color: $--color-text-secondary;
   }
 } 
+.manual-control-modal-new {
+  padding: 20PX 20PX 0 20PX;
+  .el-tabs__nav.is-top {
+    width: 100%;
+  }
+  .el-tabs--card>.el-tabs__header .el-tabs__nav {
+    border-color: $--border-color-lighter;
+  }
+  .el-tabs--card>.el-tabs__header .el-tabs__item {
+    background-color: $--color-black;
+    width: 25%;
+    text-align: center;
+    border-left: none;
+    border-bottom-color: $--border-color-lighter;
+  }
+  .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
+    background-color: $--color-white;
+    border-bottom: none;
+  }
+  .el-tabs__content {
+    overflow-x: auto;
+  }
+  .group-control {
+    margin-bottom: 20PX;
+    overflow: hidden;
+  }
+
+  .common-config {
+    .el-form-item__label {
+      color: $--color-text-secondary;
+    }
+    .el-form-item {
+      margin-bottom: 0PX;
+    }
+    .el-input-number {
+      .el-input__inner {
+        text-align: left;
+      }
+    }
+  }
+
+  .footer {
+    float: right;
+    margin: 28PX 0PX 40PX 0;
+  }
+
+  .main-patternstatus {
+    margin-bottom: 0;
+  }
+  .closephasekanban:last-child {
+    margin-bottom: 0;
+  }
+  .stage-part {
+    margin-top: 6PX;
+  }
+}
 .priority-control{
   height: 100%;
-  padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: auto;
   .title {
@@ -299,32 +356,19 @@
   }
   .footer {
     float: right;
-    margin: 38PX 24PX 40PX 0;
-    button {
-      width: 56PX;
-      height: 32PX;
-      padding: 0;
-      text-align: center;
-      line-height: 30PX;
-      font-size: 12PX;
-      font-weight: normal;
-      font-stretch: normal;
-    }
   }
   .el-input--mini{
     width: 90%;
   }
   .el-form-item {
     margin-bottom: 10PX;
+    margin-right: 10PX;
   }
   .el-form-item__label {
     font-size: 14PX;
-    font-weight: 400;
+    font-weight: 700;
     color: $--color-text-secondary;
   }
-  .el-select {
-    width: 90%;
-  }
   .el-input-number {
     width: 100%;
     .el-input__inner {
@@ -334,7 +378,7 @@
 }
 .tentativeplan-control{
   // height: 100%;
-  padding: 21PX 0PX 21PX 28PX;
+  // padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: hidden !important;
   .forbiddenstage{
@@ -362,6 +406,7 @@
     color: $--color-text-primary;
     padding: 1px 1px;
     box-sizing: border-box;
+    font-size: 14PX;
   }
   .title {
     margin-bottom: 24PX;
@@ -378,6 +423,9 @@
   .col-inner{
     // width: 100% !important;
   }
+  .model-label, .stage-label {
+    color: $--color-text-secondary;
+  }
   .model-label {
     margin-top: 14PX;
   }
@@ -389,14 +437,13 @@
   }
   .footer {
     float: right;
-    margin: 38PX 24PX 40PX 0;
   }
   .el-form-item {
     margin-bottom: 0PX;
+    margin-right: 10PX;
   }
   .el-form-item__label {
     font-size: 14PX;
-    font-weight: 400;
     color: $--color-text-secondary;
   }
   .el-dialog__footer {
@@ -405,27 +452,12 @@
   .el-dialog__header {
     padding: 19PX 30PX;
   }
-  .el-select {
-    width: 90%;
-  }
   .el-input-number {
     width: 100%;
     .el-input__inner {
       text-align: left;
     }
   }
-  .footer {
-    button {
-      width: 56PX;
-      height: 32PX;
-      padding: 0;
-      text-align: center;
-      line-height: 30PX;
-      font-size: 12PX;
-      font-weight: normal;
-      font-stretch: normal;
-    }
-  }
   .model-label, .stage-label {
     color: $--color-text-secondary;
   }

package/static/styles/stages.scss

@@ -35,14 +35,7 @@
     }
   }
   .single-model-select {
-    margin-right: 10px;
-    text-align: center;
-    cursor:pointer;
-    width: 70px;
-    height: 65px;
-    background-color: #a2cfff;
-    border-radius: 6px;
-    // border: solid 1PX #409eff;
+    // background-color: #a2cfff;
   }
   .single-model-name {
     margin-top: 3px;

package/src/node_modules/.package_versions.json

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