diff --git a/frontend/src/api/socket/socket.ts b/frontend/src/api/socket/socket.ts
index 23d8554..5aa445e 100644
--- a/frontend/src/api/socket/socket.ts
+++ b/frontend/src/api/socket/socket.ts
@@ -40,3 +40,8 @@ export const resumeTest = (params) => {
export const contrastTest = (params: any) => {
return http.post(`/prepare/startContrastTest`,params)
}
+
+
+export const getContrastTestNumInfo = (id: string) => {
+ return http.get(`/prepare/getContrastTestNumInfo?planId=${id}`)
+}
diff --git a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue b/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
index 31573ae..d318835 100644
--- a/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/compareDataCheckRawDataTable.vue
@@ -4,18 +4,18 @@
:cell-style="{ textAlign: 'center' }" max-height="282px"
style="width: 100%;">
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
index 1360221..4e3084c 100644
--- a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
@@ -69,6 +69,8 @@ import CompareDataCheckRawDataTable from './compareDataCheckRawDataTable.vue'
import {CheckData} from "@/api/check/interface";
import {useCheckStore} from "@/stores/modules/check";
import {Histogram, Postcard} from "@element-plus/icons-vue";
+import {getPqErrSysList} from '@/api/plan/plan'
+import { getFormData} from "@/api/check/test";
const {appendToBody} = withDefaults(defineProps<{
appendToBody: boolean
@@ -83,6 +85,8 @@ const searchValue = ref('')
const pqErrorList = reactive<{ id: string; name: string; }[]>([])
const activeTab = ref('resultTab')
const currentCheckItem = ref()
+let deviceId: string = ''
+let scriptType: string | null = null
watch(searchValue, (val) => {
treeRef.value!.filter(val)
@@ -112,7 +116,8 @@ const rawTableData = reactive([])
const open = async (_deviceId: string, chnNum: string, _scriptType: string | null) => {
visible.value = true;
-
+ deviceId = _deviceId
+ scriptType = null
// 设置默认选中第一个选项
if (options.length > 0) {
const firstOption = options[0];
@@ -124,6 +129,19 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul
}
}
+
+
+
+ formContent.errorSysId = checkStore.plan.errorSysId
+
+ pqErrorList.length = 0
+ let {data: resPqErrorList} = await getPqErrSysList()
+ Object.assign(pqErrorList, resPqErrorList)
+}
+
+const close = () => {
+ visible.value = false;
+ // 可以在这里添加其他清理逻辑
}
const options = [
diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue
index 23b0626..2560823 100644
--- a/frontend/src/views/home/components/compareTest.vue
+++ b/frontend/src/views/home/components/compareTest.vue
@@ -626,8 +626,6 @@ const updatePercentage = async () => {
}
}
-
-
onBeforeMount(async () => {
await initScriptData()
initDeviceList()
diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue
index 887e400..1d3b954 100644
--- a/frontend/src/views/home/components/compareTestPopup.vue
+++ b/frontend/src/views/home/components/compareTestPopup.vue
@@ -72,7 +72,7 @@ import ComparePreTest from './comparePreTest.vue'
import CompareTest from './compareTest.vue'
import socketClient from '@/utils/webSocketClient';
import {useCheckStore} from "@/stores/modules/check";
-import {pauseTest, resumeTest, startPreTest,contrastTest} from '@/api/socket/socket'
+import {pauseTest, resumeTest, startPreTest,contrastTest,getContrastTestNumInfo} from '@/api/socket/socket'
import {useUserStore} from "@/stores/modules/user";
import {JwtUtil} from "@/utils/jwtUtil";
@@ -145,6 +145,7 @@ const devIds = ref<[]>()
const standardDevIds = ref<[]>()
const pairs = ref()
const testAgain = ref(false)//重新检测按钮是否显示
+const checkNumber = ref(0)//检测次数
const open = async (title: string,mapping:any,plan: string,login: string,devIdsArray: [],standardDevIdsArray: [],pair:any) => {
if(checkStore.selectTestItems.preTest && !checkStore.selectTestItems.test){
testAgain.value = true
@@ -203,6 +204,7 @@ const handleSubmitAgain = async () => {
ActiveStatue.value = 'waiting'
preTestStatus.value = 'waiting'
+ const checkNum = await mapValue()
await contrastTest({
planId: planId.value,
@@ -210,7 +212,8 @@ const handleSubmitAgain = async () => {
devIds: devIds.value,
standardDevIds: standardDevIds.value,
pairs:pairs.value,
- testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test]
+ testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test],
+ num: checkNum
})
preTestStatus.value = 'start'
@@ -222,7 +225,10 @@ const handleSubmitFast = async () => {
ElMessage.error('webSocket连接中断！')
return
}
- console.log("handleSubmit", TestStatus.value)
+
+ const checkNum = await mapValue()
+
+
switch (stepsActive.value) {
case 1:
if (preTestStatus.value == 'waiting') {
@@ -233,7 +239,8 @@ const handleSubmitFast = async () => {
devIds: devIds.value,
standardDevIds: standardDevIds.value,
pairs:pairs.value,
- testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test]
+ testItemList:[checkStore.selectTestItems.preTest,false,checkStore.selectTestItems.test],
+ num: checkNum
})
preTestStatus.value = 'start'
@@ -254,6 +261,18 @@ const handleSubmitFast = async () => {
}
}
+const mapValue = (async () => {
+ const data = await getContrastTestNumInfo(checkStore.plan.id)
+ // 解析返回的数据，现在是 map 类型 {99: 1}
+ const dataMap = data.data as Record
+ // 获取键值对
+ const entries = Object.entries(dataMap)
+ // 获取第一对键值
+ const [key, value] = entries[0]
+
+ return value
+})
+
const emit = defineEmits<{
(e: 'quitClicked'): void;
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 95bba6d..59a5919 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -87,7 +87,7 @@