openatc-components 0.1.142 → 0.1.144

package/package.json

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

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

@@ -948,7 +948,8 @@ export default {
           this.fillGap(ringTeams, val)
         }
         let barrier = this.step2(ringTeams, newPattern)
-        this.barrierList = barrier.map(j => {
+        let barrierLeft = barrier.map(item => item - 0.3)// 屏障左移显示出人行横道
+        this.barrierList = barrierLeft.map(j => {
           return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)

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

@@ -12,16 +12,6 @@
 <template>
   <div class="patternConfig">
     <el-container>
-      <!-- <el-aside width="180px">
-        <PlanMenu :planData="planData"
-        :zIndexObj="zIndexObj"
-        :loading="loading"
-        @maskChange="maskChange"
-        @chooseRoute="chooseRoute"
-        @resetContentComponent="resetContentComponent"
-        @editStart="editStart"
-        @refresh="refresh"/>
-      </el-aside> -->
       <!-- <el-main> -->
         <div class="main-container" style="height: 100%;width: 100%;">
           <el-tabs v-model="editableTabsValue" type="card"  @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
@@ -29,23 +19,23 @@
               :closable="true"
               :key="item.tabName"
               v-for="(item) in editableTabs"
-              :label="$t('openatccomponents.greenwaveoptimize.scene') + ' ' +  item.tabName"
+              :label="item.title"
               :name="item.tabName"
             >
               <div class="panel-content" style="height: 100%;">
-                <!-- <div style="height: 12%;">
+                <div style="height: 6%;">
                   <div class="route-filter-container" style="display:flex;">
                     <div class="filter">
-                      <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.patternName')}}：</span>
+                      <span class="header-span">{{$t('openatccomponents.greenwaveoptimize.name')}}：</span>
                       <el-input
                           clearable
                           size="small"
-                          v-model="item.name"
+                          v-model="item.title"
                           style="width:70%;"
                           @change="onConditionChange"
                       />
                     </div>
-                    <div class="filter">
+                    <!-- <div class="filter">
                       <span class="header-span">{{$t('edge.date.month')}}：</span>
                       <el-select multiple
                                   v-model="item.month"
@@ -189,10 +179,10 @@
                                         @change="onDownspeedChange"
                                       v-model="item.downspeed"
                                       ></el-input-number>
-                    </div>
+                    </div> -->
                   </div>
-                </div> -->
-                <div style="height: 100%;" class="table-container">
+                </div>
+                <div style="height: 94%;" class="table-container">
                   <PatternTable ref="patterntable"
                                 :opt="item.devs"
                                 :isAllowedExpand="isAllowedExpand"
@@ -356,7 +346,7 @@ export default {
       },
       currentIndex: 0,
       editableTabs: [{
-        title: '方案 1',
+        title: '仿真实例 1',
         tabName: '1',
         content: 'Tab 1 content',
         patternid: 1,
@@ -783,7 +773,7 @@ export default {
         let tabObj = {
           id: this.currentIndex + 1,
           name: '',
-          title: this.$t('openatccomponents.greenwaveoptimize.pattern') + ' ' + newTabName,
+          title: this.$t('openatccomponents.greenwaveoptimize.scene') + ' ' + newTabName,
           tabName: newTabName,
           content: 'New Tab content',
           patternid: 1,
@@ -875,7 +865,7 @@ export default {
     resetTab () {
       this.editableTabs = [
         {
-          title: this.$t('openatccomponents.greenwaveoptimize.pattern') + ' 1',
+          title: this.$t('openatccomponents.greenwaveoptimize.scene') + ' 1',
           id: 1,
           name: '',
           tabName: '1',

package/src/kisscomps/components/patternConfig/planContent.vue

@@ -372,10 +372,11 @@ export default {
           delete pattern.optstrategy
           delete pattern.plan
           delete pattern.upspeed
-          delete pattern.name
+          pattern.name = pattern.title
+          // delete pattern.name
+          // delete pattern.name
           delete pattern.title
           delete pattern.patternid
-          delete pattern.name
           pattern.devs.map(inter => {
             delete inter.allPatterns
             delete inter.currPhase

package/src/node_modules/.package_versions.json

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

package/src/views/patternConfig.vue

@@ -5,6 +5,7 @@
         <PatternConfig
           :agentids="agentids2"
           :isAllowedExpand="isAllowedExpand"
+          :isOnlyOneTab="isOnlyOneTab"
           :opt="opt2"
           ref="patternConfig"
         >
@@ -20,6 +21,7 @@ export default {
   name: 'PatternConfigTest',
   data () {
     return {
+      isOnlyOneTab: false,
       isAllowedExpand: false,
       // agentids: ['gjnlgjxl'],
       agentids2: ['gjnlahql', 'gjnlgjxl', 'gjnljml', 'jabh', 'jaja', 'jmlfqbl'],
@@ -42,7 +44,7 @@ export default {
         'optPatternList': [
           {
             'id': 1,
-            'name': '',
+            'name': 'dsfasdfdsf',
             'tabName': '1',
             'devs': [
               {
@@ -1439,7 +1441,7 @@ export default {
   /* height: 600px; */
   width: 1020px;
   // height: 620px;
-  height: 600px;
+  height: 670px;
   border: 1PX solid yellow;
   position: relative;
 }

package/static/styles/patternConfig.scss

@@ -1,57 +1,55 @@
-
-  // 路线优化
-  .patternConfig {
-    // margin-top: 15px;
+// 路线优化
+.patternConfig {
+  // margin-top: 15px;
+  height: 100%;
+  background-color: $--background-color-base;
+  .el-dialog__body {
+    padding: 0;
+  }
+  .main-container {
+    border: 0px solid red;
+    width: 100%;
     height: 100%;
-    background-color: $--background-color-base;
-    .el-dialog__body {
-      padding: 0;
-    }
-    .el-main {
-      height: 100%;
-      background-color: $--color-white;
-      .main-container {
-        border: 0px solid red;
-        width: 100%;
-        height: 100%;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    .panel-content {
+      border: 0px solid green;
+      width: 100%;
+      height: 680px;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      .route-filter-container {
+        display: flex;
+        justify-content: flex-start;
         margin-top: 10px;
-        margin-bottom: 10px;
-        .panel-content {
-          border: 0px solid green;
-          width: 100%;
-          height: 680px;
+        margin-left: 20px;
+        flex-wrap: wrap;
+        .filter {
+          width: 30%;
+          border: 0px solid red;
           display: flex;
-          flex-direction: column;
-          .route-filter-container {
+          padding: 0 0 8px 0;
+          justify-content: flex-start;
+          align-items: center;
+          .header-span {
+            width: 45px;
+            border: 0px solid red;
             display: flex;
-            justify-content: end;
-            flex-wrap: wrap;
-            .filter {
-              width: 20%;
-              border: 0px solid red;
-              display: flex;
-              padding: 0 0 8px 0;
-              justify-content: center;
-              align-items: center;
-              .header-span {
-                width: 21%;
-                border: 0px solid red;
-                display: flex;
-                justify-content: flex-end;
-                color: $--color-text-secondary;
-                font-size: 14PX;
-                font-weight: normal;
-                font-stretch: normal;
-                line-height: 14PX;
-              } 
-            }
-          }
-          .table-container {
-            .app-container {
-              background-color: $--color-white;
-            }
+            justify-content: flex-end;
+            color: $--color-text-secondary;
+            font-size: 14px;
+            font-weight: normal;
+            font-stretch: normal;
+            line-height: 14px;
           }
         }
       }
+      .table-container {
+        .app-container {
+          background-color: $--color-white;
+        }
+      }
     }
-  }
+  }
+}