m

src/api/task.js

@@ -18,7 +18,7 @@ export const fetchBenchDetail = (benchId) => {
 //    data,
 //  });
 export const fetchTaskList = (data) => {
-  return api("/tts-test/v1.0.0/tts/task/list", {
+  return api(`/tts-test/v1.0.0/tts/task/list`, {
     method: "POST",
     data,
   });

src/components/SearchBar/index.vue

@@ -189,8 +189,8 @@ export default {
 }
 
 .squareBtn{
-  height: 23px;
-  width: 23px;
+  height: 22px;
+  width: 22px;
   background-image: url(../../assets/square.png);
 }
 

src/views/ordinaryPage/index.less

@@ -212,7 +212,7 @@
     position: absolute;
     top: 10px;
     right: 10px;
-    z-index: 9999;
+    z-index: 0;
   }
 
   .ordinary-map-hidden {
@@ -280,6 +280,26 @@
         text-overflow: ellipsis;
       }
     }
+
+    .item-time {
+      display: flex;
+      margin-top: 0.92vh;
+      color: #d1d1d1;
+      font-size: 12px;
+
+      .time {
+        white-space: nowrap;
+        color: #f2f2f2;
+      }
+
+      .time:nth-child(1) {
+        margin-right: 10px;
+      }
+
+      .time:nth-child(2) {
+        margin-left: 10px;
+      }
+    }
   }
 
   .item-tag {

src/views/ordinaryPage/index.vue

@@ -835,7 +835,7 @@ export default {
     window.bmMapItemUnSelect = this.bmMapItemUnSelect.bind(this);
     window.handleClickIssue = this.handleClickIssue.bind(this);
     window.selectBench = this.selectBench.bind(this);
-    that.$store.dispatch("taskList/clearTaskList")
+    that.$store.dispatch("taskList/clearTaskList");
     that.$store.dispatch("taskList/fetchTaskList", {
       page_num: 1,
       page_size: 1000,
@@ -901,7 +901,8 @@ export default {
           let benchId = JSON.parse(JSON.stringify(objRBL[i]));
           setTimeout(() => {
             console.log("connect bench", benchId);
-            wsArray[i]?.connectBench({ bench_id: String(benchId) })
+            wsArray[i]
+              ?.connectBench({ bench_id: String(benchId) })
               .then((res) => {
                 console.log("connect bench success", benchId);
                 self.getBenchImage(benchId, 1, wsArray[i], () => {});
@@ -973,9 +974,10 @@ export default {
     bus.on("switchScreen", (param) => {
       this.currentScreen = param.currentScreen;
     });
-    bus.on("goHome", ()=>{
+    bus.on("goHome", () => {
       this.isConnected = false;
       this.$store.dispatch("common/setSquareStatus", false);
+<<<<<<< HEAD
     })
 
     let autoCurrentTaskData = localStorage.get("autoCurrentTaskData");
@@ -990,6 +992,9 @@ export default {
       autoTaskStatus.value = "running";
       autoTaskStep.value = 3;
     }
+=======
+    });
+>>>>>>> 6503e943e53996a6be919d4c3e4e5efb649cbdc4
   },
   methods: {
     turnToNextManualCase() {},
@@ -1159,7 +1164,7 @@ export default {
       this.$store.commit("planList/setPlanList", manualList);
       that.taskName = task.name;
       this.$nextTick(() => {
-        that.$store.dispatch("planList/clearPlanList")
+        that.$store.dispatch("planList/clearPlanList");
         that.$store.dispatch("planList/fetchPlanList", {
           page_num: 1,
           page_size: 10000,
@@ -1203,6 +1208,11 @@ export default {
                     <div class="item-title">${item.name}</div>
                     <div class="item-description">${item.description}</div>
                   </div>
+                  <div class="item-time">
+                      <div class="time">${item.start_time}</div>
+                      to
+                      <div class="time"> ${item.end_time}</div>
+                  </div>
                   <div class="item-tag">
                       <div class="tag">${item.processor_name}</div>
                       <div class="tag">${item.sw}</div>
@@ -1408,7 +1418,8 @@ export default {
       wsArrayLength++;
       setTimeout(() => {
         console.log("connect bench", benchId);
-        wsArray[i]?.connectBench({ bench_id: String(benchId) })
+        wsArray[i]
+          ?.connectBench({ bench_id: String(benchId) })
           .then((res) => {
             console.log("connect bench success", benchId);
             self.getBenchImage(benchId, 1, wsArray[i], () => {});

vue.config.js

@@ -4,6 +4,11 @@ module.exports = defineConfig({
   lintOnSave: false,
   devServer: {
     proxy: {
+      '/tts-test': {
+        target: 'http://139.196.158.57:8080', //需要代理的域名，目标域名
+        changeOrigin: true, //需要代理跨域
+        rewrite: (path) => path.replace(/^\/tts-test/, ''), //路径重写，把'/api'替换为''
+      },
       '/bench': {
         target: 'http://139.196.158.57:8080', //需要代理的域名，目标域名
         changeOrigin: true, //需要代理跨域
@@ -29,11 +34,6 @@ module.exports = defineConfig({
         changeOrigin: true, //需要代理跨域
         rewrite: (path) => path.replace(/^\/task/, ''), //路径重写，把'/api'替换为''
       },
-      '/tts-test': {
-        target: 'http://139.196.158.57:8080', //需要代理的域名，目标域名
-        changeOrigin: true, //需要代理跨域
-        rewrite: (path) => path.replace(/^\/tts-test/, ''), //路径重写，把'/api'替换为''
-      },
       '/arbitrator': {
         target: 'http://139.196.158.57:8080', //需要代理的域名，目标域名
         changeOrigin: true, //需要代理跨域