树控件样式微调

frontend/src/views/home/components/table.vue

@@ -55,13 +55,13 @@
               type="primary"
               @click="handleTest"
               v-if="form.activeTabs === 0"
-              >自动检测</el-button
+              >手动检测</el-button
             >
             <el-button
               type="primary"
               @click="handleTest"
               v-if="form.activeTabs === 0"
-              >手动检测</el-button
+              >自动检测</el-button
             >
             <el-button type="primary" v-if="form.activeTabs === 2"
               >不合格项复检</el-button
@@ -114,6 +114,14 @@
           >生成</el-button
         >
         <el-button
+        type="primary"
+          link
+          :icon="View"
+          @click="openDrawer('数据查看', scope.row)"
+          v-if="form.activeTabs === 4"
+          >数据查看</el-button
+        >
+        <el-button
         type="primary"
           link
           :icon="EditPen"
@@ -685,7 +693,7 @@ function disablecheckResultList(val: string){
 const handleTest = () => {
   //自动检测
   if (form.value.activeTabs === 0) {
-    ElMessage.success("自动检测");
+    ElMessage.success("手动检测");
     router.push({
       path: "/plan/autoTest",
     });

frontend/src/views/home/tabs/dashboard.vue

@@ -124,7 +124,7 @@ const form: any = ref({
 const router = useRouter();
 const activeNames = ref(['2'])
 const tabShow= ref(false);
-const tabLabel1 = ref('自动检测')
+const tabLabel1 = ref('设备检测')
 const editableTabsValue = ref('0')
 const handleChange = (val: string[]) => {
  // console.log(val)

frontend/src/views/plan/autoTest/components/tree.vue

@@ -64,17 +64,21 @@ const getTreeData = (val: any) => {
 
   treeRef.value.setCurrentKey(defaultChecked.value);
 };
+
+const getCurrentIndex = (val: number) => {
+  currentIndex.value = val;
+};
 const filterText = ref("");
 const treeRef = ref();
 const currentIndex = ref(0);
 
-const timer = setInterval(() => {
+// const timer = setInterval(() => {
-  currentIndex.value++;
+//   currentIndex.value++;
-      if (currentIndex.value > 14) 
+//       if (currentIndex.value > 14) 
-      currentIndex.value = 0;
+//       currentIndex.value = 0;
-   // console.log(currentIndex.value);
+//    // console.log(currentIndex.value);
     
-    }, 2000);
+//     }, 2000);
 
 
 watch(
@@ -103,7 +107,7 @@ const detail = (e: any) => {
 onMounted(() => {
   console.log();
 });
-defineExpose({ getTreeData });
+defineExpose({ getTreeData,getCurrentIndex });
 </script>
 <style lang="scss" scoped>
 .plan_tree {

frontend/src/views/plan/autoTest/index.vue

@@ -443,8 +443,17 @@ const refreshProgress = () => {
     if(testModel.value === "preTest")
       ElMessage.success("预检测过程全部结束")
     else if(testModel.value === "Test")
-      ElMessage.success("正式检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作")
+      //ElMessage.success("正式检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作")
-
+ElMessageBox.confirm(
+    '检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作',
+    '检测完成',
+    {
+      confirmButtonText: 'OK',
+      cancelButtonText: 'Cancel',
+      type: 'success',
+    }
+  )
+    .then()
     // percentage.value = 0;
     // statusList.value = [];
     // deviceTestList.value = [];
@@ -510,6 +519,7 @@ const interValTest = () => {
     });
     // console.log(deviceTestList.value,11111);
     currentIndex++;
+    treeRef.value && treeRef.value.getCurrentIndex(currentIndex)
     refreshProgress();
   }, 2000);