@@ -763,19 +763,34 @@ const emit = defineEmits<{
}>();
-const handleCancel = () => {
- //dataSocket.socketServe.closeWs()
- // 清空 name, channel, total
- name.value = [];
- channel.value = [];
- total.value = 0;
- activeIndex.value = 0
- qualified.value = 0
- active.value = 0
- dialogVisible.value = false
- editableTabsValue.value = '0'
- emit('quitClicked'); // 触发事件
+const beforeClose = (done: () => void) => {
+ ElMessageBox.confirm('是否退出系数校准?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }
+ ).then(() => {
+ handleCancel()
+ })
+}
+
+const handleCancel = () => {
+ //dataSocket.socketServe.closeWs()
+ // 清空 name, channel, total
+ name.value = [];
+ channel.value = [];
+ total.value = 0;
+ activeIndex.value = 0
+ qualified.value = 0
+ active.value = 0
+ dialogVisible.value = false
+ editableTabsValue.value = '0'
+ emit('quitClicked'); // 触发事件
+
+
+
+
}
const getTableDataForChannel = (index: number): any[] => {
@@ -832,65 +847,65 @@ const handleSubmit = async () => {
return;
// 初始化 currentTableData
- let isTimer2Completed = false;
+ // let isTimer2Completed = false;
- //"80b4b4f52a4c4064a18319525f8ac13c",
- for (let i = 0; i < channel.value.length; i++) {
- // 重置状态变量
- active.value = 0;
- //activeIndex.value = 0;
- editableTabsValue.value = i.toString();
- // 初始化并填充 currentTableData
- const currentTableData = initializeTableData(dataTemplates2, i);
- tableDataMap.set(i, currentTableData);
- //activeIndex.value++;
+ // //"80b4b4f52a4c4064a18319525f8ac13c",
+ // for (let i = 0; i < channel.value.length; i++) {
+ // // 重置状态变量
+ // active.value = 0;
+ // //activeIndex.value = 0;
+ // editableTabsValue.value = i.toString();
+ // // 初始化并填充 currentTableData
+ // const currentTableData = initializeTableData(dataTemplates2, i);
+ // tableDataMap.set(i, currentTableData);
+ // //activeIndex.value++;
- // 清除之前的 timer1
- clearInterval(timer1);
- // 启动 timer1
- timer1 = setInterval(() => {
- active.value++;
- if (active.value > 5) {
- clearInterval(timer1);
- }
- }, 3000);
+ // // 清除之前的 timer1
+ // clearInterval(timer1);
+ // // 启动 timer1
+ // timer1 = setInterval(() => {
+ // active.value++;
+ // if (active.value > 5) {
+ // clearInterval(timer1);
+ // }
+ // }, 3000);
- // 清除之前的 timer2
- clearInterval(timer2);
- // 启动 timer2
- timer2 = setInterval(() => {
- // 初始化并填充 currentTableData
- const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
- tableDataMap.set(i, currentTableData);
- activeIndex.value++;
+ // // 清除之前的 timer2
+ // clearInterval(timer2);
+ // // 启动 timer2
+ // timer2 = setInterval(() => {
+ // // 初始化并填充 currentTableData
+ // const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
+ // tableDataMap.set(i, currentTableData);
+ // activeIndex.value++;
- clearInterval(timer2);
- const currentDataRef = tableDataMap.get(i);
- if (currentDataRef) {
- const currentData = currentDataRef.value;
- // 检查当前数据中有无不合格字段
- const hasError = checkForErrors(currentData);
- if (hasError) {
- } else {
- qualified.value++;
- }
- updateErrorState(i, hasError);
- }
+ // clearInterval(timer2);
+ // const currentDataRef = tableDataMap.get(i);
+ // if (currentDataRef) {
+ // const currentData = currentDataRef.value;
+ // // 检查当前数据中有无不合格字段
+ // const hasError = checkForErrors(currentData);
+ // if (hasError) {
+ // } else {
+ // qualified.value++;
+ // }
+ // updateErrorState(i, hasError);
+ // }
- // 设置标志变量为 true,表示 timer2 已经完成
- isTimer2Completed = true;
- }, 3000);
+ // // 设置标志变量为 true,表示 timer2 已经完成
+ // isTimer2Completed = true;
+ // }, 3000);
- // 等待 timer2 完成
- while (!isTimer2Completed) {
- // 这里可以添加一个短暂的等待,避免死循环
- await new Promise(resolve => setTimeout(resolve, 100));
- }
+ // // 等待 timer2 完成
+ // while (!isTimer2Completed) {
+ // // 这里可以添加一个短暂的等待,避免死循环
+ // await new Promise(resolve => setTimeout(resolve, 100));
+ // }
- // 重置标志变量
- isTimer2Completed = false;
- }
+ // // 重置标志变量
+ // isTimer2Completed = false;
+ // }
};
// 提取初始化并填充 currentTableData 的函数
diff --git a/frontend/src/views/home/components/writeTHPopup.vue b/frontend/src/views/home/components/writeTHPopup.vue
index 8b00b1d..408cc1a 100644
--- a/frontend/src/views/home/components/writeTHPopup.vue
+++ b/frontend/src/views/home/components/writeTHPopup.vue
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
-
-
+
+
diff --git a/frontend/src/views/machine/devType/components/devTypePopup.vue b/frontend/src/views/machine/devType/components/devTypePopup.vue
index ba17887..3ee892f 100644
--- a/frontend/src/views/machine/devType/components/devTypePopup.vue
+++ b/frontend/src/views/machine/devType/components/devTypePopup.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 18b0db2..284b076 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -6,10 +6,10 @@
设备信息
-
+
-
+
diff --git a/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue b/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue
index 405cce9..7c224c0 100644
--- a/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue
@@ -5,7 +5,7 @@
-
+
-
+
-
+
diff --git a/frontend/src/views/machine/testScript/components/testScriptPopup.vue b/frontend/src/views/machine/testScript/components/testScriptPopup.vue
index 6827808..3255824 100644
--- a/frontend/src/views/machine/testScript/components/testScriptPopup.vue
+++ b/frontend/src/views/machine/testScript/components/testScriptPopup.vue
@@ -10,7 +10,7 @@
class="form-five"
>
-
+
diff --git a/frontend/src/views/machine/testSource/components/parameterPopup.vue b/frontend/src/views/machine/testSource/components/parameterPopup.vue
index 44bc5bb..9dbe7a2 100644
--- a/frontend/src/views/machine/testSource/components/parameterPopup.vue
+++ b/frontend/src/views/machine/testSource/components/parameterPopup.vue
@@ -16,10 +16,10 @@
/>
-
+
-
+
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index 6a2d006..e286e09 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index 1706aa9..37f72e6 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -71,6 +71,7 @@ import {useDownload} from "@/hooks/useDownload";
import {getTestConfig } from '@/api/system/base/index'
import {type Base } from '@/api/system/base/interface'
import { getBoundPqDevList ,staticsAnalyse} from '@/api/plan/plan.ts'
+import { kMaxLength } from 'buffer'
// defineOptions({
// name: 'planList'
diff --git a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
index eea20e0..9f46a2c 100644
--- a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
+++ b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
@@ -7,10 +7,10 @@
-
+
-
+
diff --git a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
index e6f5cf3..bdd35cc 100644
--- a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
+++ b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue b/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
index d244880..ee5a2ef 100644
--- a/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
+++ b/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
@@ -2,13 +2,13 @@
-
+
-
+
-
+
-
+
diff --git a/frontend/src/views/system/template/components/reportPopup.vue b/frontend/src/views/system/template/components/reportPopup.vue
index 5e9d408..30484f1 100644
--- a/frontend/src/views/system/template/components/reportPopup.vue
+++ b/frontend/src/views/system/template/components/reportPopup.vue
@@ -3,10 +3,10 @@
-
+
-
+