diff --git a/frontend/.env.development b/frontend/.env.development index 0e60d61..282bdb3 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -19,6 +19,6 @@ VITE_API_URL=/api # 开发环境跨域代理,支持配置多个 -VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] +VITE_PROXY=[["/api","http://192.168.1.124:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 diff --git a/frontend/src/views/plan/autoTest/index.vue b/frontend/src/views/plan/autoTest/index.vue index 0e17589..f8238f0 100644 --- a/frontend/src/views/plan/autoTest/index.vue +++ b/frontend/src/views/plan/autoTest/index.vue @@ -337,6 +337,9 @@ const handlePreTest = () => { ElMessage.success("启动预检测"); currentIndex = 0; percentage.value = 0; + statusList.value = []; + deviceTestList.value = []; + statusId.value = 0; testModel.value = "preTest" beforeTest.value = false; getTreeData(preTestData) @@ -371,6 +374,9 @@ const handleAutoTest = () => { ElMessage.success("启动正式检测"); currentIndex = 0; percentage.value = 0; + statusList.value = []; + deviceTestList.value = []; + statusId.value = 0; testModel.value = "Test" beforeTest.value = false; getTreeData(data) @@ -410,9 +416,9 @@ const customColors = [ //加载进度条 const refreshProgress = () => { - console.log(currentIndex,totalNum) + console.log(currentIndex,totalNum,percentage.value) if (percentage.value < 100) { - percentage.value = Math.trunc(currentIndex/totalNum) * 100; + percentage.value = Math.trunc(currentIndex/totalNum * 100); } else { @@ -422,7 +428,7 @@ const refreshProgress = () => { let strTemp = "" if(testModel.value === "preTest") strTemp = "预检测过程全部结束" - else if(testModel.value === "test") + else if(testModel.value === "Test") strTemp = "正式检测全部结束" statusId.value++; @@ -431,17 +437,12 @@ const refreshProgress = () => { remark: strTemp, status: 0, }); - statusList.value.map((item: any, index: any) => { - if (index == statusList.value.length - 1) { - item.status = 1; - } else { - item.status = 0; - } - }); + + console.log("检测结束") if(testModel.value === "preTest") ElMessage.success("预检测过程全部结束") - else if(testModel.value === "test") + else if(testModel.value === "Test") ElMessage.success("正式检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作") // percentage.value = 0;