openatc-components 0.2.38 → 0.2.40

package/package.json

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

package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -550,12 +550,12 @@ export default {
     this.setHost(this.reqUrl)
     this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
     this.CrossDiagramMgr = new CrossDiagramMgr()
-    if (this.realtimeStatusModalvisible === false) {
-      this.changeStatus()
-    }
     this.getIntersectionInfo(this.agentId)
   },
   async mounted () {
+    if (this.realtimeStatusModalvisible === false) {
+      this.changeStatus()
+    }
     this.setPropsToken(this.Token)
     // await this.getPhase()
     this.getFault()

package/src/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -7,7 +7,7 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="100px">
+             label-width="74px">
              <el-form-item
                   :label="$t('openatccomponents.overview.duration') + ':'"
                   prop="count">
@@ -30,7 +30,7 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="100px">
+             label-width="74px">
              <el-form-item
                   :label="$t('openatccomponents.overview.greenclear') + ':'"
                   prop="count">
@@ -44,7 +44,7 @@
              </el-form>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row style="margin-top: 6px;">
         <el-col :span="5">
             <span class="model-label-title">{{$t('openatccomponents.overview.indirection')}}:</span>
         </el-col>

package/src/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue

@@ -18,7 +18,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.delay') + ':'"
                 prop="intersection">

package/src/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue

@@ -13,33 +13,25 @@
   <div class="lockingphase-control manual-control-modal">
     <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
     <el-row>
-      <el-col :span="24">
+      <el-col :span="12">
          <el-form
           :inline="true"
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
            <el-form-item
                 :label="$t('openatccomponents.phase.greenclear') + ':'"
                 prop="intersection">
               <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
             </el-form-item>
-            <el-form-item
-                :label="$t('openatccomponents.overview.duration') + ':'"
-                prop="count">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
-            </el-form-item>
+
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash') + ':'"
                 prop="intersection">
               <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempYellow" size="small"></el-input-number>
             </el-form-item>
-            <el-form-item
-                :label="$t('openatccomponents.overview.allred') + ':'"
-                prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempRedclear" size="small"></el-input-number>
-            </el-form-item>
+
             <el-form-item
                 :label="$t('openatccomponents.phase.mingreen') + ':'"
                 prop="count">
@@ -47,6 +39,27 @@
             </el-form-item>
            </el-form>
       </el-col>
+      <el-col :span="12">
+        <el-form
+         :inline="true"
+          ref="manual"
+          label-position="left"
+          :model="manualInfo"
+          label-width="74px">
+
+           <el-form-item
+               :label="$t('openatccomponents.overview.duration') + ':'"
+               prop="count">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+           </el-form-item>
+
+           <el-form-item
+               :label="$t('openatccomponents.overview.allred') + ':'"
+               prop="intersection">
+             <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempRedclear" size="small"></el-input-number>
+           </el-form-item>
+          </el-form>
+     </el-col>
     </el-row>
     <el-row>
         <div class="model-label">{{$t('openatccomponents.overview.mode')}}:</div>

package/src/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue

@@ -27,7 +27,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
@@ -82,7 +82,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
@@ -106,7 +106,7 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="100px">
+             label-width="74px">
               <el-form-item
                   :label="$t('openatccomponents.overview.duration') + ':'"
                   prop="count">

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

@@ -7,7 +7,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.delay') + ':'"
                 prop="intersection">
@@ -34,7 +34,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="intersection">
@@ -67,8 +67,9 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
+                style="margin-bottom: 0;"
                 :label="$t('openatccomponents.overview.level') + ':'"
                 prop="count">
                 <el-select v-model="manualInfo.level" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">

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

@@ -9,7 +9,7 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="100px"
+          label-width="74px"
         >
           <el-form-item
             :label="$t('openatccomponents.overview.patternid') + ':'"
@@ -55,7 +55,7 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="100px"
+          label-width="74px"
         >
           <el-form-item
             :label="$t('openatccomponents.overview.patternoffset') + ':'"

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

@@ -269,6 +269,7 @@ export default {
     line-height: 40px;
     padding: 1px 1px;
     box-sizing: border-box;
+    font-size: 14PX;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #299BCC;

package/src/kisscomps/components/Stages/index.vue

@@ -28,8 +28,8 @@
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
                           :Height="'40'" /> -->
-              <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
-              <div style="height:80px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
+              <xdr-dir-selector :Width="dirWidth" :Height="dirHeight" :Widths="dirWidths" :Heights="dirHeights" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
+              <div style="display:flex;flex-direction:row;justify-content:center;align-items:end;" :style="{height: StageHeight}">
                 <div class="current-stage-num" style="width:20%;" :style="{color: themeColor}">{{index + 1}}</div>
                 <div style="width:70%;">
                   <i class="iconfont icon-feijidongche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
@@ -105,7 +105,23 @@ export default {
     StageHeight: {
       type: String,
       default: '80px'
-    }
+    },
+    dirWidth: {
+      type: String,
+      default: '75PX'
+    },
+    dirHeight: {
+      type: String,
+      default: '75PX'
+    },
+    dirWidths: {
+      type: String,
+      default: '65PX'
+    },
+    dirHeights: {
+      type: String,
+      default: '65PX'
+    },
   },
   data () {
     return {
@@ -153,6 +169,18 @@ export default {
     }
   },
   watch: {
+    // phaseList: {
+    //   handler: function (val, oldVal) {
+    //     console.log(val, 'phaseList')
+    //     // debugger
+    //   }
+    // },
+    // crossStatusData: {
+    //   handler: function (val, oldVal) {
+    //     console.log(val, 'crossStatusData')
+    //     // debugger
+    //   }
+    // },
     preselectStages: { 
       handler: function (val, oldVal) {
         if(this.preselectStages === -1 && this.preselectModel !== -1) {

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

@@ -1034,7 +1034,9 @@ export default {
         for (let j = 0; j < this.peoplestatus.length; j++) {
           if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {
             this.peoplestatus[j].isshow = true
-            this.peoplestatus[j].color = showlist[0].peddirection[i].color
+            if (showlist[0].peddirection[i].color) {
+              this.peoplestatus[j].color = showlist[0].peddirection[i].color
+            }
           }
         }
       }

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

@@ -119,7 +119,7 @@
   }
   .single-model-name-theme {
     margin-top: 13PX;
-    font-size: 12PX;
+    font-size: 13PX;
     font-weight: normal;
     font-stretch: normal;
     // line-height: 22PX;
@@ -241,7 +241,7 @@
     // width: 100% !important;
   }
   .model-label {
-    margin-top: 14PX;
+    margin-top: 6PX;
   }
   .stage-label {
     margin-top: 30PX;
@@ -283,21 +283,27 @@
   }
 } 
 .manual-control-modal-new {
-  padding: 20PX;
+  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: $--background-color-base;
+    background-color: $--color-black;
     width: 25%;
     text-align: center;
     border-left: none;
-    border-bottom-color: $--border-color-light;
+    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;
@@ -321,6 +327,16 @@
     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%;
@@ -390,6 +406,7 @@
     color: $--color-text-primary;
     padding: 1px 1px;
     box-sizing: border-box;
+    font-size: 14PX;
   }
   .title {
     margin-bottom: 24PX;
@@ -406,6 +423,9 @@
   .col-inner{
     // width: 100% !important;
   }
+  .model-label, .stage-label {
+    color: $--color-text-secondary;
+  }
   .model-label {
     margin-top: 14PX;
   }

package/src/node_modules/.package_versions.json

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