deepsea пре 1 година
родитељ
комит
3cf81b5ee6

+ 1 - 0
src/store/modules/case/mutations.js

@@ -113,6 +113,7 @@ export default {
     }
     state.autoTaskItemsMap[data.info.planId] = data.res.data.list;
     let rate = (finishedCaseNum / planCaseNum) * 100;
+    debugger
     state.autoTaskPercentMap[data.info.planId] = rate;
     state.autoTaskStatusMap[data.info.planId] = data.res.data.detail.status;
     if (state.currentPlanId) {

+ 35 - 3
src/views/ordinaryPage/index.less

@@ -1,18 +1,22 @@
 .el-table__column-filter-trigger {
   display: none !important;
 }
+
 .el-select__caret.el-input__icon.el-icon-arrow-up {
   line-height: 30px;
 }
+
 .el-select .el-input .el-select__caret.is-reverse {
   transform: unset !important;
 }
+
 .taskBtn.ready {
   background-image: none;
   background-color: #7BAF66;
 }
 
-.taskBtn.running, .taskBtn.waiting {
+.taskBtn.running,
+.taskBtn.waiting {
   background-image: none;
   background-color: #eebe77;
 }
@@ -27,6 +31,31 @@
   background-color: #92949B;
 }
 
+.process-percent {
+  border-radius: 30px;
+  background-color: #000;
+  .ready {
+    background-image: none;
+    background-color: #7BAF66;
+  }
+
+  .running,
+  .waiting {
+    background-image: none;
+    background-color: #eebe77;
+  }
+
+  .finished {
+    background-image: none;
+    background-color: #eebe77;
+  }
+
+  .offline {
+    background-image: none;
+    background-color: #92949B;
+  }
+}
+
 .ordinary-container {
   display: flex;
 
@@ -36,12 +65,14 @@
     flex-direction: column;
     align-items: center;
     position: relative;
+
     .search-container {
       width: 44.9vw;
       height: 7.4vh;
       margin-top: 11.29vh;
       margin-bottom: 2.13vh;
     }
+
     .filter-bench-list,
     .ordinary-map-container {
       overflow: hidden;
@@ -64,6 +95,7 @@
         border-radius: 40px;
         position: absolute;
         z-index: 999;
+
         // margin-left: -35vw;
         // margin-top: -31vh;
         img {
@@ -540,10 +572,10 @@
   padding: unset;
 }
 
-.tabListBody > .__panel > .__view {
+.tabListBody>.__panel>.__view {
   padding: unset;
 }
 
 .table-box.benchList {
   height: 100%;
-}
+}

+ 8 - 1
src/views/ordinaryPage/index.vue

@@ -839,6 +839,9 @@ export default {
       },
       autoTaskStatusMap: (state) => {
         return state.caseList.autoTaskStatusMap
+      },
+      autoTaskPercentMap: (state) => {
+        return state.caseList.autoTaskPercentMap
       }
     }),
   },
@@ -1019,6 +1022,7 @@ export default {
       this.autoPlanResultInterval = setInterval(() => {
         let autoCurrentTaskData = window.localStorage.getItem("autoCurrentTaskData");
         autoCurrentTaskData = JSON.parse(autoCurrentTaskData);
+        debugger
         if (autoCurrentTaskData) {
           for (let planId in autoCurrentTaskData) {
             let planExecId = autoCurrentTaskData[planId];
@@ -1026,7 +1030,7 @@ export default {
             this.$store.dispatch('caseList/getAutoPlanResult',{planId, planExecId});
           }
         }
-      }, 15000);
+      }, 5000);
     }
   },
   methods: {
@@ -1333,6 +1337,9 @@ export default {
               <div class="left">
                   <div style="display:flex;align-items: center;">
                     <div class="item-title">${item.name}</div>
+                    <div class="process-percent" style="margin-left: 10px; width: 80px">
+                      <div style="width: ${this.autoTaskPercentMap[item.id]}%; height: 10px; border-radius: 10px;" class="${this.autoTaskStatusMap[item.id] || 'ready'}"></div>
+                    </div>
                     <div class="task-auto" style="display:${
                       item.auto ? "block" : "none"
                     }">Auto</div>