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-02-26 19:31:34 +08:00
parent d225391248
commit 8be96ca64e
2 changed files with 287 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,12 +51,12 @@
<!-- :icon="Failed"--> <!-- :icon="Failed"-->
<!-- disabled>连接超时--> <!-- disabled>连接超时-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- :icon="RefreshLeft"--> <!-- :icon="RefreshLeft"-->
<!-- v-if="testStatus === 'recheck'"--> <!-- v-if="testStatus === 'recheck'"-->
<!-- @click="emit('sendReCheck')">重新检测--> <!-- @click="emit('sendReCheck')">重新检测-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button> <el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button>
@@ -183,6 +183,9 @@ const props = defineProps({
type: String, type: String,
default: 'waiting' default: 'waiting'
}, },
stepsActive: {
type: Number,
},
webMsgSend: { webMsgSend: {
type: Object, type: Object,
default: () => ({}) default: () => ({})
@@ -347,295 +350,297 @@ watch(testStatus, function (newValue, oldValue) {
let count = 0 let count = 0
watch(webMsgSend, function (newValue, oldValue) { watch(webMsgSend, function (newValue, oldValue) {
if (newValue.code == 10520) { if (props.stepsActive === 4) {
ElMessageBox.alert('报文解析异常！', '初始化失败', { if (newValue.code == 10520) {
confirmButtonText: '确定', ElMessageBox.alert('报文解析异常！', '初始化失败', {
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：报文解析异常！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10521) {
ElMessageBox.alert('程控源參数有误！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：程控源參数有误！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10522) {
ElMessageBox.alert('测试项解析有误！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：测试项解析有误！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10523) {
if (count === 0) {
ElMessageBox.alert('源连接失败！', '初始化失败', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'error', type: 'error',
}) })
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源连接失败！`}) testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：报文解析异常！`})
emit('update:testStatus', 'test_init_fail') emit('update:testStatus', 'test_init_fail')
count++ } else if (newValue.code == 10521) {
} ElMessageBox.alert('程控源參数有误！', '初始化失败', {
} else if (newValue.code == 10524) { confirmButtonText: '确定',
ElMessageBox.alert('获取源控制权失败！', '初始化失败', { type: 'error',
confirmButtonText: '确定', })
type: 'error', testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：程控源參数有误！`})
}) emit('update:testStatus', 'test_init_fail')
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：获取源控制权失败！`}) } else if (newValue.code == 10522) {
emit('update:testStatus', 'test_init_fail') ElMessageBox.alert('测试项解析有误！', '初始化失败', {
} else if (newValue.code == 10525) { confirmButtonText: '确定',
ElMessageBox.alert('重置源失败！', '初始化失败', { type: 'error',
confirmButtonText: '确定', })
type: 'error', testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：测试项解析有误！`})
}) emit('update:testStatus', 'test_init_fail')
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：重置源失败！`}) } else if (newValue.code == 10523) {
emit('update:testStatus', 'test_init_fail') if (count === 0) {
} else if (newValue.code == 10527) { ElMessageBox.alert('源连接失败！', '初始化失败', {
ElMessageBox.alert('源未进行初始化！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未进行初始化！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10528) {
ElMessageBox.alert('目标源有误(该用户已控制其他源，在关闭前无法操作新的源)！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：目标源有误(该用户已控制其他源，在关闭前无法操作新的源)！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10529) {
ElMessageBox.alert('源状态有误，无法响应报文(例如源处于输出状态，无法响应初始化报文)！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源状态有误，无法响应报文(例如源处于输出状态，无法响应初始化报文)！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10550) {
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${newValue.data}设备连接异常！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10551) {
ElMessageBox.alert(`${newValue.data}设备触发报告异常！`, '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${newValue.data}设备触发报告异常！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10552) { //todo 10552之后还会发送消息吗？
ElMessageBox.alert('存在已经初始化步骤,执行自动关闭,请重新发起检测', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({
type: 'error',
log: `${new Date().toLocaleString()}：存在已经初始化步骤,执行自动关闭,请重新发起检测！`
})
// emit('update:testStatus', 'recheck')
emit('update:testStatus', 'test_init_fail')
} else {
switch (newValue.requestId) {
case 'server_error':
if (newValue.operateCode === 'server_error' && count === 0) {
ElMessageBox.alert('源连接失败!', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源连接失败！`})
emit('update:testStatus', 'test_init_fail')
count++
}
break;
case 'formal_real': // 正式测试
switch (newValue.operateCode) {
case "stop_timeout":
ElMessageBox.alert(`暂停时间已过10分钟，本次检测已失效，请重新发起检测！`, '暂停时间过长', {
confirmButtonText: '确定',
type: 'error',
})
emit('update:testStatus', 'pause_timeout')
break;
}
break;
case 'error_flow_end':
ElMessageBox.alert(`设备连接异常，请检查设备连接情况！`, '初始化失败', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'error', type: 'error',
}) })
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源连接失败！`})
emit('update:testStatus', 'test_init_fail') emit('update:testStatus', 'test_init_fail')
break count++
case 'socket_timeout': }
switch (newValue.operateCode) { } else if (newValue.code == 10524) {
case "VOLTAGE": ElMessageBox.alert('获取源控制权失败！', '初始化失败', {
// todo 超时处理 页面按钮更新 confirmButtonText: '确定',
ElMessageBox.alert('连接超时！', '连接超时', { type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：获取源控制权失败！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10525) {
ElMessageBox.alert('重置源失败！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：重置源失败！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10527) {
ElMessageBox.alert('源未进行初始化！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未进行初始化！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10528) {
ElMessageBox.alert('目标源有误(该用户已控制其他源，在关闭前无法操作新的源)！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：目标源有误(该用户已控制其他源，在关闭前无法操作新的源)！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10529) {
ElMessageBox.alert('源状态有误，无法响应报文(例如源处于输出状态，无法响应初始化报文)！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源状态有误，无法响应报文(例如源处于输出状态，无法响应初始化报文)！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10550) {
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${newValue.data}设备连接异常！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10551) {
ElMessageBox.alert(`${newValue.data}设备触发报告异常！`, '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${newValue.data}设备触发报告异常！`})
emit('update:testStatus', 'test_init_fail')
} else if (newValue.code == 10552) { //todo 10552之后还会发送消息吗？
ElMessageBox.alert('存在已经初始化步骤,执行自动关闭,请重新发起检测', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({
type: 'error',
log: `${new Date().toLocaleString()}：存在已经初始化步骤,执行自动关闭,请重新发起检测！`
})
// emit('update:testStatus', 'recheck')
emit('update:testStatus', 'test_init_fail')
} else {
switch (newValue.requestId) {
case 'server_error':
if (newValue.operateCode === 'server_error' && count === 0) {
ElMessageBox.alert('源连接失败!', '初始化失败', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'error', type: 'error',
}) })
emit('update:testStatus', 'connect_timeout') testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源连接失败！`})
break; emit('update:testStatus', 'test_init_fail')
} count++
break; }
// case 'connect': break;
// switch (newValue.operateCode) { case 'formal_real': // 正式测试
// case "Source": switch (newValue.operateCode) {
// ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', { case "stop_timeout":
// confirmButtonText: '确定', ElMessageBox.alert(`暂停时间已过10分钟，本次检测已失效，请重新发起检测！`, '暂停时间过长', {
// 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':
if (newValue.code == 10200) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：源初始化成功！`})
percentage.value = 1
}
if (newValue.code == -1) {
ElMessageBox.alert('源未知异常！', '初始化失败', {
confirmButtonText: '确定', confirmButtonText: '确定',
type: 'error', type: 'error',
}) })
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`}) emit('update:testStatus', 'pause_timeout')
emit('update:testStatus', 'test_init_fail') break;
} }
break; break;
} case 'error_flow_end':
break; ElMessageBox.alert(`设备连接异常，请检查设备连接情况！`, '初始化失败', {
case 'yjc_sbtxjy': confirmButtonText: '确定',
switch (newValue.operateCode) { type: 'error',
case 'INIT_GATHER$01': })
if (newValue.code == 25001) { emit('update:testStatus', 'test_init_fail')
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：设备通讯校验成功！`}) break
percentage.value = 2 case 'socket_timeout':
} switch (newValue.operateCode) {
break case "VOLTAGE":
} // todo 超时处理 页面按钮更新
break; ElMessageBox.alert('连接超时！', '连接超时', {
case 'yjc_xyjy': confirmButtonText: '确定',
switch (newValue.operateCode) { type: 'error',
case 'INIT_GATHER$03': })
if (newValue.code == 25001) { emit('update:testStatus', 'connect_timeout')
ElMessage.success('初始化成功!') break;
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：协议校验成功！`}) }
timeDifference.value = +new Date().getTime() - startData.value.getTime(); break;
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化成功！`}) // case 'connect':
percentage.value = 3 // 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':
if (newValue.code == 10200) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：源初始化成功！`})
percentage.value = 1
}
if (newValue.code == -1) {
ElMessageBox.alert('源未知异常！', '初始化失败', {
confirmButtonText: '确定',
type: 'error',
})
testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
emit('update:testStatus', 'test_init_fail')
}
break;
}
break;
case 'yjc_sbtxjy':
switch (newValue.operateCode) {
case 'INIT_GATHER$01':
if (newValue.code == 25001) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：设备通讯校验成功！`})
percentage.value = 2
}
break
}
break;
case 'yjc_xyjy':
switch (newValue.operateCode) {
case 'INIT_GATHER$03':
if (newValue.code == 25001) {
ElMessage.success('初始化成功!')
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：协议校验成功！`})
timeDifference.value = +new Date().getTime() - startData.value.getTime();
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化成功！`})
percentage.value = 3
activeIndex = getNextActiveIndex() + 2 activeIndex = getNextActiveIndex() + 2
//startTimer() //startTimer()
emit('update:testStatus', 'process') emit('update:testStatus', 'process')
} }
break; break;
} }
break; break;
case 'preStopTest': case 'preStopTest':
if (newValue.operateCode == 'stop') { if (newValue.operateCode == 'stop') {
ElMessage.success('暂停成功') ElMessage.success('暂停成功')
emit('update:testStatus', 'paused') emit('update:testStatus', 'paused')
pauseSuccessCallback() pauseSuccessCallback()
} }
break; break;
// case 'Pause_Fail': // case 'Pause_Fail':
// ElMessage.error('暂停失败') // ElMessage.error('暂停失败')
// break; // break;
case 'Resume_Success': case 'Resume_Success':
ElMessage.success('开始继续检测') ElMessage.success('开始继续检测')
emit('update:testStatus', 'process') emit('update:testStatus', 'process')
handleResumeTest() handleResumeTest()
break; break;
// case 'Resume_Fail': // case 'Resume_Fail':
// ElMessage.error('无法继续检测') // ElMessage.error('无法继续检测')
// break; // break;
case 'FREQ_Start': case 'FREQ_Start':
handleStartItem('FREQ', newValue.desc) handleStartItem('FREQ', newValue.desc)
break; break;
case 'FREQ_End': case 'FREQ_End':
handleEndItem('FREQ', newValue.desc, newValue.data) handleEndItem('FREQ', newValue.desc, newValue.data)
break; break;
case 'V_Start': case 'V_Start':
handleStartItem('V', newValue.desc) handleStartItem('V', newValue.desc)
break; break;
case 'V_End': case 'V_End':
handleEndItem('V', newValue.desc, newValue.data) handleEndItem('V', newValue.desc, newValue.data)
break; break;
case 'HV_Start': case 'HV_Start':
handleStartItem('HV', newValue.desc) handleStartItem('HV', newValue.desc)
break; break;
case 'HV_End': case 'HV_End':
handleEndItem('HV', newValue.desc, newValue.data) handleEndItem('HV', newValue.desc, newValue.data)
break; break;
case 'HI_Start': case 'HI_Start':
handleStartItem('HI', newValue.desc) handleStartItem('HI', newValue.desc)
break; break;
case 'HI_End': case 'HI_End':
handleEndItem('HI', newValue.desc, newValue.data) handleEndItem('HI', newValue.desc, newValue.data)
break; break;
case 'HP_Start': case 'HP_Start':
handleStartItem('HP', newValue.desc) handleStartItem('HP', newValue.desc)
break; break;
case 'HP_End': case 'HP_End':
handleEndItem('HP', newValue.desc, newValue.data) handleEndItem('HP', newValue.desc, newValue.data)
break; break;
case 'HSV_Start': case 'HSV_Start':
handleStartItem('HSV', newValue.desc) handleStartItem('HSV', newValue.desc)
break; break;
case 'HSV_End': case 'HSV_End':
handleEndItem('HSV', newValue.desc, newValue.data) handleEndItem('HSV', newValue.desc, newValue.data)
break; break;
case 'HSI_Start': case 'HSI_Start':
handleStartItem('HSI', newValue.desc) handleStartItem('HSI', newValue.desc)
break; break;
case 'HSI_End': case 'HSI_End':
handleEndItem('HSI', newValue.desc, newValue.data) handleEndItem('HSI', newValue.desc, newValue.data)
break; break;
case 'VOLTAGE_Start': case 'VOLTAGE_Start':
handleStartItem('VOLTAGE', newValue.desc) handleStartItem('VOLTAGE', newValue.desc)
break; break;
case 'VOLTAGE_End': case 'VOLTAGE_End':
handleEndItem('VOLTAGE', newValue.desc, newValue.data) handleEndItem('VOLTAGE', newValue.desc, newValue.data)
break; break;
case 'I_Start': case 'I_Start':
handleStartItem('I', newValue.desc) handleStartItem('I', newValue.desc)
break; break;
case 'I_End': case 'I_End':
handleEndItem('I', newValue.desc, newValue.data) handleEndItem('I', newValue.desc, newValue.data)
break; break;
case 'IMBV_Start': case 'IMBV_Start':
handleStartItem('IMBV', newValue.desc) handleStartItem('IMBV', newValue.desc)
break; break;
case 'IMBV_End': case 'IMBV_End':
handleEndItem('IMBV', newValue.desc, newValue.data) handleEndItem('IMBV', newValue.desc, newValue.data)
break; break;
case 'IMBA_Start': case 'IMBA_Start':
handleStartItem('IMBA', newValue.desc) handleStartItem('IMBA', newValue.desc)
break; break;
case 'IMBA_End': case 'IMBA_End':
handleEndItem('IMBA', newValue.desc, newValue.data) handleEndItem('IMBA', newValue.desc, newValue.data)
break; break;
case 'F_Start': case 'F_Start':
handleStartItem('F', newValue.desc) handleStartItem('F', newValue.desc)
break; break;
case 'F_End': case 'F_End':
handleEndItem('F', newValue.desc, newValue.data) handleEndItem('F', newValue.desc, newValue.data)
break; break;
case 'Quit': case 'Quit':
console.log('检测结束') console.log('检测结束')
break; break;
}
} }
} }
@@ -666,7 +671,7 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
} else { } else {
let result = getResult(devices) let result = getResult(devices)
if (desc.length > 150) { if (desc.length > 150) {
desc = desc.substring(0,150) + '...' desc = desc.substring(0, 150) + '...'
} }
if (result === 1) { if (result === 1) {
testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`}) testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
@@ -1385,7 +1390,7 @@ const getNextActiveIndex = (code: string = ''): number => {
return -1 return -1
} }
const startTimeCount = () => { const startTimeCount = () => {
if(!timer){ if (!timer) {
timer = setInterval(() => { timer = setInterval(() => {
timeCount.value = timeCount.value + 1 timeCount.value = timeCount.value + 1
timeView.value = secondToTime(timeCount.value) timeView.value = secondToTime(timeCount.value)

3
frontend/src/views/home/components/testPopup.vue
View File

@@ -17,7 +17,7 @@
<!-- <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>--> <!-- <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>-->
<factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus"/> <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus"/>
<test v-if="showComponent&&testSelected" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend" <test v-if="showComponent&&testSelected" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend"
@update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck"/> @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" :stepsActive="stepsActive"/>
<template #footer> <template #footer>
<div> <div>
@@ -183,6 +183,7 @@ const handleSubmit = () => {
ElMessage.error('webSocket连接中断！') ElMessage.error('webSocket连接中断！')
return return
} }
console.log("handleSubmit",stepsActive.value,TestStatus.value)
switch (stepsActive.value) { switch (stepsActive.value) {
case 1: case 1:
startPreTest({ startPreTest({