ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善归档接口

Browse Source
This commit is contained in:
caozehui
2025-01-13 22:50:55 +08:00
parent f29d6e8d88
commit 9ff5423368
2 changed files with 194 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/views/home/components/table.vue
View File

@@ -154,8 +154,7 @@
v-if="form.activeTabs === 4"
>数据查看</el-button
> -->
<el-button
:type="scope.row.check_State === '检测完成' ? 'primary' : 'info'"
<el-button type='primary'
link
:icon="Notebook"
@click="openDrawer('归档', scope.row)"
@@ -264,6 +263,7 @@ import { useDownload } from '@/hooks/useDownload'
import {downloadDevData} from '@/api/plan/plan.ts'
import {documentedPqDev} from "@/api/device/device";
import { getPqDev } from '@/api/device/device/index.ts'
import {ResultEnum} from "@/enums/httpEnum";
const dictStore = useDictStore()
const checkStore = useCheckStore()
const webMsgSend = ref();//webSocket推送的数据
@@ -1005,7 +1005,11 @@ const handleTest = async (val:string) => {
// loading.close()
// ElMessage.success("归档成功");
// }, 2000)
documentedPqDev(checkStore.devices.map(item => {item.deviceId}))
documentedPqDev(checkStore.devices.map(item => {item.deviceId})).then((res) => {
if(res.code === ResultEnum.SUCCESS){
ElMessage.success("归档成功!");
}
})
}
@@ -1043,7 +1047,11 @@ const openDrawer = async (title: string, row: any) => {
if (title === '归档')
{
await documentedPqDev([row.id])
await documentedPqDev([row.id]).then((res) => {
if(res.code === ResultEnum.SUCCESS){
ElMessage.success("归档成功!");
}
})
emit('batchGenerateClicked'); // 触发事件
// const loading = ElLoading.service({
// lock: true,

292
frontend/src/views/home/components/test.vue
View File

@@ -306,7 +306,7 @@ watch(testStatus, function (newValue, oldValue) {
percentage.value = 0
}
emit('update:testStatus', 'test_init')
//startTimer() // todo 可移除
startTimer() // todo 可移除
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
}
})
@@ -357,25 +357,25 @@ watch(webMsgSend, function (newValue, oldValue) {
break;
}
break;
case 'connect':
switch (newValue.operateCode) {
case "Source":
ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
break;
case "Dev":
ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
break;
}
emit('update:testStatus', 'test_init_fail')
break;
// case 'connect':
// switch (newValue.operateCode) {
// case "Source":
// ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
// break;
// case "Dev":
// ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
// confirmButtonText: '确定',
// type: 'error',
// })
// testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
// break;
// }
// emit('update:testStatus', 'test_init_fail')
// break;
case 'yjc_ytxjy':
switch (newValue.operateCode) {
case 'INIT_GATHER':
@@ -414,7 +414,7 @@ watch(webMsgSend, function (newValue, oldValue) {
percentage.value = 3
activeIndex = getNextActiveIndex() + 2
//startTimer()
startTimer()
emit('update:testStatus', 'process')
}
@@ -448,7 +448,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('FREQ')
//startTimer()
startTimer()
}
break;
case 'V_Start':
@@ -462,7 +462,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('V')
//startTimer()
startTimer()
}
break;
case 'HV_Start':
@@ -476,7 +476,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HV')
//startTimer()
startTimer()
}
break;
case 'HI_Start':
@@ -490,7 +490,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HI')
//startTimer()
startTimer()
}
break;
case 'HP_Start':
@@ -504,7 +504,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HP')
//startTimer()
startTimer()
}
break;
case 'HSV_Start':
@@ -518,7 +518,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HSV')
//startTimer()
startTimer()
}
break;
case 'HSI_Start':
@@ -532,7 +532,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('HSI')
//startTimer()
startTimer()
}
break;
case 'VOLTAGE_Start':
@@ -546,7 +546,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('VOLTAGE')
//startTimer()
startTimer()
}
break;
case 'I_Start':
@@ -560,7 +560,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('I')
//startTimer()
startTimer()
}
break;
case 'IMBV_Start':
@@ -574,7 +574,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('IMBV')
//startTimer()
startTimer()
}
break;
case 'IMBA_Start':
@@ -588,7 +588,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('IMBA')
//startTimer()
startTimer()
}
break;
case 'F_Start':
@@ -602,7 +602,7 @@ watch(webMsgSend, function (newValue, oldValue) {
updateLog(false)
if (testStatus.value != 'paused') {
activeIndex = getNextActiveIndex('F')
//startTimer()
startTimer()
}
break;
case 'Quit':
@@ -865,7 +865,7 @@ function getErrorCheckItem(scriptType: string) {
const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
// devices = [
devices = [
// {
// chnResult: [3, 4],
// deviceId: "80b4b4f52a4c4064a18319525f8ac13c",
@@ -880,7 +880,13 @@ const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: Ch
// chnResult: [1, 1, 1, 1],
// deviceId: "ae5a7628260349c0a5e7c86c81fbd417",
// deviceName: "240004"
// }]
// }
{
chnResult: [1, 1, 1, 1],
deviceId: "2957b271f39d4240a1c5e275c453676c",
deviceName: "测试003"
},
]
let temp = null
if (isStart) {
temp = getLoadingResult(scriptType)
@@ -1074,6 +1080,62 @@ const startTimer = () => {
}, 6000)
break;
case 1:
emit('update:webMsgSend', {
requestId: 'V_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'V_End'
})
}, 2000);
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'FREQ_Start'
// })
// }, 1000)
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'FREQ_End'
// })
// }, 2000);
break;
case 2:
emit('update:webMsgSend', {
requestId: 'I_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'I_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'V_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'V_End'
// })
// }, 2000);
break;
case 3:
emit('update:webMsgSend', {
requestId: 'IMBV_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'IMBV_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'HV_Start',
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'HV_End'
// })
// }, 2000)
break;
case 4:
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'FREQ_Start'
@@ -1084,18 +1146,16 @@ const startTimer = () => {
requestId: 'FREQ_End'
})
}, 2000);
// emit('update:webMsgSend', {
// requestId: 'HI_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'HI_End'
// })
// }, 2000)
break;
case 2:
emit('update:webMsgSend', {
requestId: 'V_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'V_End'
})
}, 2000);
break;
case 3:
case 5:
emit('update:webMsgSend', {
requestId: 'HV_Start',
})
@@ -1104,8 +1164,16 @@ const startTimer = () => {
requestId: 'HV_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'HP_Start',
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'HP_End'
// })
// }, 2000)
break;
case 4:
case 6:
emit('update:webMsgSend', {
requestId: 'HI_Start'
})
@@ -1114,18 +1182,16 @@ const startTimer = () => {
requestId: 'HI_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'HSV_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'HSV_End'
// })
// }, 2000)
break;
case 5:
emit('update:webMsgSend', {
requestId: 'HP_Start',
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'HP_End'
})
}, 2000)
break;
case 6:
case 7:
emit('update:webMsgSend', {
requestId: 'HSV_Start'
})
@@ -1134,8 +1200,16 @@ const startTimer = () => {
requestId: 'HSV_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'HSI_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'HSI_End'
// })
// }, 2000)
break;
case 7:
case 8:
emit('update:webMsgSend', {
requestId: 'HSI_Start'
})
@@ -1144,57 +1218,55 @@ const startTimer = () => {
requestId: 'HSI_End'
})
}, 2000)
// emit('update:webMsgSend', {
// requestId: 'VOLTAGE_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'VOLTAGE_End'
// })
// }, 2000)
break;
case 8:
emit('update:webMsgSend', {
requestId: 'VOLTAGE_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'VOLTAGE_End'
})
}, 2000)
break;
case 9:
emit('update:webMsgSend', {
requestId: 'I_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'I_End'
})
}, 2000)
break;
case 10:
emit('update:webMsgSend', {
requestId: 'IMBV_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'IMBV_End'
})
}, 2000)
break;
case 11:
emit('update:webMsgSend', {
requestId: 'IMBA_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'IMBA_End'
})
}, 2000)
break;
case 12:
emit('update:webMsgSend', {
requestId: 'F_Start'
})
setTimeout(() => {
emit('update:webMsgSend', {
requestId: 'F_End'
})
}, 2000)
break;
// case 9:
// emit('update:webMsgSend', {
// requestId: 'I_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'I_End'
// })
// }, 2000)
// break;
// case 10:
// emit('update:webMsgSend', {
// requestId: 'IMBV_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'IMBV_End'
// })
// }, 2000)
// break;
// case 11:
// emit('update:webMsgSend', {
// requestId: 'IMBA_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'IMBA_End'
// })
// }, 2000)
// break;
// case 12:
// emit('update:webMsgSend', {
// requestId: 'F_Start'
// })
// setTimeout(() => {
// emit('update:webMsgSend', {
// requestId: 'F_End'
// })
// }, 2000)
// break;
case 13:
emit('update:webMsgSend', {
requestId: 'Quit'
@@ -1222,7 +1294,7 @@ const handleResumeTest = () => {
type: 'info',
log: `${new Date().toLocaleString()}：继续检测`,
})
//startTimer()
startTimer()
console.log('开始继续检测')
};