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:
guanj
2025-08-26 18:29:14 +08:00
parent d7f1224df4
commit 8b4c22e959
4 changed files with 97 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
View File

@@ -238,27 +238,27 @@ const initScriptData = async (row: any) => {
} }
//获取基本信息 //获取基本信息
const getBasicInformation = async () => { const getBasicInformation = async () => {
getContrastFormContent({ getContrastFormContent({
planId: checkStore.plan.id, planId: checkStore.plan.id,
scriptType: rowList.value.scriptType, scriptType: rowList.value.scriptType,
deviceId: formContent.deviceId, deviceId: formContent.deviceId,
chnNum: formContent.chnNum, chnNum: formContent.chnNum,
num: formContent.num == '' ? null : parseInt(formContent.num) num: formContent.num == '' ? null : parseInt(formContent.num)
}).then((res: any) => { }).then((res: any) => {
formContent.dataRule = res.data.dataRule formContent.dataRule = res.data.dataRule
formContent.deviceName = res.data.deviceName formContent.deviceName = res.data.deviceName
formContent.errorSysId = res.data.errorSysId formContent.errorSysId = res.data.errorSysId
chnMapList.value = res.data.chnMap chnMapList.value = res.data.chnMap
formContent.num = res.data.checkNum formContent.num = res.data.checkNum
let chnMap: string[] = [] let chnMap: string[] = []
for (let key in res.data.chnMap) { for (let key in res.data.chnMap) {
chnMap.push(key) chnMap.push(key)
} }
chnList.value = chnMap chnList.value = chnMap
formContent.chnNum = formContent.chnNum == null ? chnList.value[0] : formContent.chnNum formContent.chnNum = formContent.chnNum == null ? chnList.value[0] : formContent.chnNum
// 查询表格数据 // 查询表格数据
getResults() getResults()
}) })
} }
// 左边树变化 // 左边树变化
@@ -269,25 +269,25 @@ const handleNodeClick = (data: any) => {
} }
// 获取结果 // 获取结果
const getResults = async () => { const getResults = async () => {
checkResultData.value = [] checkResultData.value = []
rawTableData.value = [] rawTableData.value = []
getContrastResult({ getContrastResult({
planId: checkStore.plan.id, planId: checkStore.plan.id,
scriptType: rowList.value.scriptType, scriptType: rowList.value.scriptType,
deviceId: formContent.deviceId, deviceId: formContent.deviceId,
chnNum: formContent.chnNum, chnNum: formContent.chnNum,
num: formContent.num == '' ? null : formContent.num num: formContent.num == '' ? null : formContent.num
}).then((res: any) => { }).then((res: any) => {
let list: string[] = [] let list: string[] = []
for (let key in res.data.resultMap) { for (let key in res.data.resultMap) {
list.push(key) list.push(key)
} }
currentCheckItem.value = list[0] currentCheckItem.value = list[0]
tesList.value = list tesList.value = list
checkResultData.value = res.data.resultMap checkResultData.value = res.data.resultMap
rawTableData.value = res.data.rawDataMap rawTableData.value = res.data.rawDataMap
}) })
} }
const close = () => { const close = () => {
@@ -332,7 +332,7 @@ defineExpose({
border: 1px solid #ccc; border: 1px solid #ccc;
overflow-y: auto; overflow-y: auto;
overflow-x: auto; overflow-x: auto;
margin-right: 10px;
.content-tree { .content-tree {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -348,7 +348,7 @@ defineExpose({
.content-right { .content-right {
width: 82%; width: 82%;
margin-left: 10px;
flex: 1; flex: 1;
.content-right-title { .content-right-title {

189
frontend/src/views/home/components/compareTest.vue
View File

@@ -213,16 +213,14 @@ const chnSum = computed(() => {
// 用来展示的检测结果 // 用来展示的检测结果
const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(() => { const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(() => {
console.log('🚀 ~ tem.devices:', checkResult)
let result: CheckData.ScriptChnViewItem[] = checkResult.map(item => { let result: CheckData.ScriptChnViewItem[] = checkResult.map(item => {
let temp: CheckData.ScriptChnViewItem = { let temp: CheckData.ScriptChnViewItem = {
scriptType: item.scriptType, scriptType: item.scriptType,
scriptName: item.scriptName, scriptName: item.scriptName,
devices: [] devices: []
} }
item.devices.forEach(device => { item.devices.forEach(device => {
console.log('🚀 ~ item:', item, CheckData.ChnCheckResultEnum)
let tempChnBtnResult: CheckData.ButtonResult[] = [] let tempChnBtnResult: CheckData.ButtonResult[] = []
if (chnSum.value <= MAX_CHN_SUM) { if (chnSum.value <= MAX_CHN_SUM) {
@@ -286,6 +284,9 @@ watch(testStatus, function (newValue, oldValue) {
// 开始计时 // 开始计时
startTimeCount() startTimeCount()
showTestLog() showTestLog()
setTimeout(() => {
initCheckResult(CheckData.ChnCheckResultEnum.LOADING)
}, 500)
//startTimer() // todo 可移除 //startTimer() // todo 可移除
startData.value = new Date() startData.value = new Date()
timeDifference.value = 0 timeDifference.value = 0
@@ -301,7 +302,6 @@ watch(
webMsgSend, webMsgSend,
function (newValue, oldValue) { function (newValue, oldValue) {
console.log('🚀 ~ newValue:', newValue) console.log('🚀 ~ newValue:', newValue)
if (checkStore.selectTestItems.preTest == false && newValue.requestId != 'formal_real') { if (checkStore.selectTestItems.preTest == false && newValue.requestId != 'formal_real') {
if (testLogList[0].log == '正在检测,请稍等...' || testLogList[0].log == '暂无数据，等待检测开始') { if (testLogList[0].log == '正在检测,请稍等...' || testLogList[0].log == '暂无数据，等待检测开始') {
testLogList.shift() testLogList.shift()
@@ -534,10 +534,10 @@ const initDeviceList = () => {
} }
// 初始化检测结果 （详细到通道） // 初始化检测结果 （详细到通道）
const initCheckResult = () => { // 修改函数定义
const initCheckResult = (defaultValue: CheckData.ChnCheckResultEnum) => {
let result: CheckData.ScriptChnItem[] = [] let result: CheckData.ScriptChnItem[] = []
scriptData.forEach(item => { scriptData.forEach(item => {
// 处理当前节点的数据
let temp: CheckData.ScriptChnItem = { let temp: CheckData.ScriptChnItem = {
scriptType: item.id, scriptType: item.id,
scriptName: item.scriptName, scriptName: item.scriptName,
@@ -547,7 +547,7 @@ const initCheckResult = () => {
for (let i = 0; i < deviceList?.length; i++) { for (let i = 0; i < deviceList?.length; i++) {
let tempChnResult: CheckData.ChnCheckResultEnum[] = [] let tempChnResult: CheckData.ChnCheckResultEnum[] = []
for (let j = 0; j < checkStore.chnNumList.length; j++) { for (let j = 0; j < checkStore.chnNumList.length; j++) {
tempChnResult.push(CheckData.ChnCheckResultEnum.UNKNOWN) tempChnResult.push(defaultValue)
} }
temp.devices.push({ temp.devices.push({
deviceId: deviceList[i].deviceId, deviceId: deviceList[i].deviceId,
@@ -561,22 +561,6 @@ const initCheckResult = () => {
Object.assign(checkResult, result) Object.assign(checkResult, result)
} }
// 更新检测结果（详细到通道）
const updateCheckResult = (data: CheckData.ScriptChnItem) => {
const { scriptType } = { ...data }
checkResult.forEach(item => {
if (item.scriptType == scriptType) {
for (let i = 0; i < item.devices.length; i++) {
let targetDevice = data.devices.find(dev => dev.deviceId === item.devices[i].deviceId)
if (targetDevice !== undefined) {
item.devices[i].chnResult = [...targetDevice.chnResult]
}
}
}
})
}
const scrollToBottom = () => { const scrollToBottom = () => {
if (scrollContainerRef.value) { if (scrollContainerRef.value) {
scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight + 70 scrollContainerRef.value.scrollTop = scrollContainerRef.value.scrollHeight + 70
@@ -591,131 +575,42 @@ watch(
{ deep: true } { deep: true }
) )
const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckResult[]) => {
let type = 1
let tempChnResult: CheckData.ChnCheckResultEnum[] = []
for (let i = 0; i < devices.length; i++) {
tempChnResult.push(...devices[i].chnResult)
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
type = CheckData.ChnCheckResultEnum.ERRORDATA
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
type = CheckData.ChnCheckResultEnum.FAIL
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
type = CheckData.ChnCheckResultEnum.TIMEOUT
for (let i = 0; i < devices.length; i++) {
if (devices[i].chnResult.some(item => item === CheckData.ChnCheckResultEnum.TIMEOUT)) {
testLogList.push({
type: 'warning',
log: `${new Date().toLocaleString()} ：${devices[i].deviceName}连接超时`
})
ElMessageBox.alert('连接超时！', '连接超时', {
confirmButtonText: '确定',
type: 'error'
})
emit('update:testStatus', 'connect_timeout')
}
}
}
errorCheckItem.push({ scriptType, type: type })
}
const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
let temp = null
if (isStart) {
temp = getLoadingResult(scriptType)
} else {
setErrorCheckItem(scriptType, devices)
temp = {
scriptType,
devices
}
}
updateCheckResult(temp)
}
// 获取loading状态的结果
const getLoadingResult = (scriptType: string) => {
let devices = []
devices = deviceList.map(item => {
let tempChnResult: CheckData.ChnCheckResultEnum[] = []
for (let i = 0; i < item.chnNum; i++) {
tempChnResult.push(CheckData.ChnCheckResultEnum.LOADING)
}
return {
deviceId: item.deviceId,
deviceName: item.deviceName,
chnResult: tempChnResult
}
})
let tempScriptChnItem: CheckData.ScriptChnItem = {
scriptType,
devices
}
return tempScriptChnItem
}
const getResult = (devices: CheckData.DeviceCheckResult[] = []) => {
let type = 1
let tempChnResult: CheckData.ChnCheckResultEnum[] = []
for (let i = 0; i < devices.length; i++) {
tempChnResult.push(...devices[i].chnResult)
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
type = CheckData.ChnCheckResultEnum.ERRORDATA
}
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
type = CheckData.ChnCheckResultEnum.FAIL
}
return type
}
// 点击查看（设备）通道检测详情。参数1：设备信息，参数2：通道号，-1：代表查看全部通道 // 点击查看（设备）通道检测详情。参数1：设备信息，参数2：通道号，-1：代表查看全部通道
const handleClick = (item: any, chnNum: number, scriptType: string) => { const handleClick = (item: any, chnNum: number, scriptType: string) => {
let checkResultItem = checkResult.find(obj => obj.scriptType === scriptType) let checkResultItem = checkResult.find(obj => obj.scriptType === scriptType)
let flag = -1 let flag = -1
if (checkResultItem) { if (checkResultItem) {
let device = checkResultItem.devices.find(obj => obj.deviceId === item.deviceId) let device = checkResultItem.devices.find(obj => obj.deviceId === item.deviceId)
if (device) { if (device) {
let chnResult = device.chnResult let chnResult = device.chnResult
if (chnNum === -1) { if (chnNum === -1) {
if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.TIMEOUT) !== -1) { if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.TIMEOUT) !== -1) {
flag = 0 flag = 0
} }
if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.ERRORDATA) !== -1) { if (chnResult.findIndex(obj => obj === CheckData.ChnCheckResultEnum.ERRORDATA) !== -1) {
flag = 1 flag = 1
} }
} else { } else {
if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.TIMEOUT) { if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.TIMEOUT) {
flag = 0 flag = 0
} }
if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.ERRORDATA) { if (chnResult[chnNum - 1] === CheckData.ChnCheckResultEnum.ERRORDATA) {
flag = 1 flag = 1
} }
}
} }
}
} }
if (flag === 0) { if (flag === 0) {
ElMessageBox.alert('连接超时，请检查设备通讯是否正常', '连接超时', { ElMessageBox.alert('连接超时，请检查设备通讯是否正常', '连接超时', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'warning', type: 'warning'
}) })
} }
if (flag === -1 || flag === 1) { if (flag === -1 || flag === 1) {
checkStore.setShowDetailType(2) checkStore.setShowDetailType(2)
dataCheckSingleChannelSingleTestPopupRef.value?.open(item, chnNum+'', item.devices[0].deviceId,1) dataCheckSingleChannelSingleTestPopupRef.value?.open(item, chnNum + '', item.devices[0].deviceId, 1)
} }
} }
@@ -729,7 +624,7 @@ const handlePause = () => {
const initializeParameters = async () => { const initializeParameters = async () => {
await initScriptData() await initScriptData()
initDeviceList() initDeviceList()
initCheckResult() initCheckResult(CheckData.ChnCheckResultEnum.UNKNOWN)
percentage.value = 0 percentage.value = 0
timeCount.value = 0 timeCount.value = 0
timeView.value = '00:00:00' timeView.value = '00:00:00'
@@ -739,26 +634,6 @@ const initializeParameters = async () => {
}) })
} }
const pauseSuccessCallback = () => {
endData.value = new Date()
let diffTime = endData.value.getTime() - startData.value.getTime()
timeDifference.value += diffTime
testLogList.push({
type: 'info',
log: `${new Date().toLocaleString()}：暂停检测`
})
console.log('暂停中')
}
const handleResumeTest = () => {
//activeIndex++
startData.value = new Date()
testLogList.push({ type: 'info', log: `${new Date().toLocaleString()}：开始重新检测！` })
//startTimer()
console.log('开始继续检测')
}
// //
onMounted(() => { onMounted(() => {
if (!checkStore.selectTestItems.preTest) { if (!checkStore.selectTestItems.preTest) {

33
frontend/src/views/home/components/compareTestPopup.vue
View File

@@ -17,6 +17,7 @@
process-status="finish" process-status="finish"
finish-status="success" finish-status="success"
> >
<!-- <el-step title="通道配对" /> -->
<el-step <el-step
v-if="preTestSelected" v-if="preTestSelected"
title="预检测" title="预检测"
@@ -258,17 +259,22 @@ const open = async (
//预检测-重新检测 //预检测-重新检测
const handleSubmitAgain = async () => { const handleSubmitAgain = async () => {
console.log("🚀 ~ handleSubmitAgain ~ stepsActive.value:", stepsActiveIndex.value,stepsActiveView.value , stepsActive.value) console.log(
if(checkStore.selectTestItems.preTest){ '🚀 ~ handleSubmitAgain ~ stepsActive.value:',
stepsActiveIndex.value = 1 stepsActiveIndex.value,
stepsActiveView.value = 1 stepsActiveView.value,
stepsActive.value = 1 stepsActive.value
}else{ )
stepsActiveIndex.value = 1 if (checkStore.selectTestItems.preTest) {
stepsActiveView.value = 2 stepsActiveIndex.value = 1
stepsActive.value = 2 stepsActiveView.value = 1
} stepsActive.value = 1
} else {
stepsActiveIndex.value = 1
stepsActiveView.value = 2
stepsActive.value = 2
}
let count = 0 let count = 0
for (let key in checkStore.selectTestItems) { for (let key in checkStore.selectTestItems) {
if (checkStore.selectTestItems[key]) { if (checkStore.selectTestItems[key]) {
@@ -326,8 +332,8 @@ const handleSubmitFast = async () => {
}) })
preTestStatus.value = 'start' preTestStatus.value = 'start'
if (checkStore.selectTestItems.test) { if (checkStore.selectTestItems.test) {
console.log(111111); console.log(111111)
testRef.value.initializeParameters() testRef.value.initializeParameters()
testRef.value.showTestLog() testRef.value.showTestLog()
} }
@@ -378,7 +384,6 @@ watch(TestStatus, function (newValue, oldValue) {
watch(stepsActiveIndex, function (newValue, oldValue) { watch(stepsActiveIndex, function (newValue, oldValue) {
if (checkStore.selectTestItems.test && checkStore.selectTestItems.preTest && newValue == 2) { if (checkStore.selectTestItems.test && checkStore.selectTestItems.preTest && newValue == 2) {
setTimeout(() => { setTimeout(() => {
testRef.value.initializeParameters() testRef.value.initializeParameters()
testRef.value.showTestLog() testRef.value.showTestLog()
testRef.value.startTimeCount() testRef.value.startTimeCount()

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

@@ -1011,7 +1011,11 @@ const openDrawer = async (title: string, row: any) => {
} }
if (title === '误差体系更换') { if (title === '误差体系更换') {
checkStore.setShowDetailType(1) checkStore.setShowDetailType(1)
dataCheckPopupRef.value?.open(row.id, '-1', null) if (modeStore.currentMode == '模拟式') {
dataCheckPopupRef.value?.open(row.id, '-1', null)
} else if (modeStore.currentMode == '比对式') {
dataCheckSingleChannelSingleTestPopupRef.value?.open(row, null, row.id, 2)
}
} }
if (title === '归档') { if (title === '归档') {