Browse Source

路由缓存。测试执行页面修改。

jxq 3 weeks ago
parent
commit
37f7c3bd52

+ 3 - 1
src/App.vue

@@ -9,7 +9,9 @@
     >
     >
       <router-view v-slot="{ Component }">
       <router-view v-slot="{ Component }">
         <transition name="fade" mode="out-in" appear>
         <transition name="fade" mode="out-in" appear>
-          <component :is="Component" />
+          <keep-alive :include="['MainPage']">
+            <component :is="Component" />
+          </keep-alive>
         </transition>
         </transition>
       </router-view>
       </router-view>
     </el-watermark>
     </el-watermark>

+ 7 - 2
src/views/main/components/layout.vue

@@ -2,9 +2,14 @@
 
 
 <template>
 <template>
   <div class="layout">
   <div class="layout">
-    <router-view v-slot="{ Component }">
+    <router-view v-slot="{ Component, route }">
       <transition name="fade" appear>
       <transition name="fade" appear>
-        <component :is="Component" />
+        <keep-alive :include="['RunTesting']">
+          <component
+            :is="Component"
+            :key="route.path + (route?.query?._refresh || '')"
+          />
+        </keep-alive>
       </transition>
       </transition>
     </router-view>
     </router-view>
   </div>
   </div>

+ 1 - 1
src/views/main/components/menu.vue

@@ -69,7 +69,7 @@ const handleMenuClick = (menu: MenuItem) => {
         return;
         return;
       }
       }
       router.push({
       router.push({
-        name: "RunTestPage",
+        name: "RunTesting",
         params: { engineerId: currentExecutionId.value },
         params: { engineerId: currentExecutionId.value },
       });
       });
     } else {
     } else {

+ 7 - 1
src/views/modules/home/home.vue

@@ -307,7 +307,13 @@ const gotoExecuteTest = (project) => {
 
 
   currentMenuIndex.value = 1;
   currentMenuIndex.value = 1;
 
 
-  router.push({ name: "RunTestPage", params: { engineerId: project.id } });
+  router.push({
+    name: "RunTesting",
+    query: {
+      _refresh: Date.now(), // 每次跳转生成不同的时间戳
+    },
+    params: { engineerId: project.id },
+  });
 };
 };
 </script>
 </script>
 
 

+ 55 - 8
src/views/modules/runTest/run-test.vue

@@ -219,6 +219,53 @@ const setTestingData = () => {
     data[project.projectName] = [];
     data[project.projectName] = [];
   });
   });
   testingWSData.value = data;
   testingWSData.value = data;
+
+  // testingWSData.value = {
+  //   电源测试: [
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //   ],
+  //   wanger: [
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //     {
+  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
+  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //     },
+  //   ],
+  // };
 };
 };
 watch(topProSelectedList, () => {
 watch(topProSelectedList, () => {
   setTestingData();
   setTestingData();
@@ -557,15 +604,15 @@ const cancelMsgType5 = () => {
         <el-scrollbar class="content-B-height-4" v-if="testingWSData">
         <el-scrollbar class="content-B-height-4" v-if="testingWSData">
           <div v-for="(proName, index) in Object.keys(testingWSData)">
           <div v-for="(proName, index) in Object.keys(testingWSData)">
             <div class="cssj-tit">项目名称: {{ proName }}</div>
             <div class="cssj-tit">项目名称: {{ proName }}</div>
-            <div
-              v-for="(data, index) in testingWSData[proName]"
-              :key="index"
-              class="cssj-row-flex"
+            <el-table
+              :data="testingWSData[proName]"
+              show-overflow-tooltip
+              :show-header="false"
             >
             >
-              <span>{{ index }}</span>
-              <span>{{ data?.dataItem }}</span>
-              <span>{{ data?.dataContent }}</span>
-            </div>
+              <el-table-column type="index" width="55" />
+              <el-table-column property="dataItem" width="160" />
+              <el-table-column property="dataContent" />
+            </el-table>
           </div>
           </div>
         </el-scrollbar>
         </el-scrollbar>
       </div>
       </div>