修改预检测实时数据详情展示
This commit is contained in:
@@ -244,7 +244,7 @@ const handleNext = async () => {
|
||||
},
|
||||
{} as Record<string, string>
|
||||
)
|
||||
generateChannelMapping()
|
||||
await generateChannelMapping()
|
||||
await checkStore.setChnNum(chnNumList)
|
||||
return {
|
||||
title: dialogTitle.value,
|
||||
@@ -308,12 +308,13 @@ const generateChannelMapping = () => {
|
||||
|
||||
// 查找对应的节点以获取显示名称
|
||||
const sourceDeviceNode = nodes.value.find(node => node.id === sourceDeviceId)
|
||||
|
||||
const targetDeviceNode = nodes.value.find(node => node.id === targetDeviceId)
|
||||
|
||||
if (sourceDeviceNode && targetDeviceNode) {
|
||||
// 提取设备显示文本
|
||||
const sourceDeviceText = sourceDeviceNode.data.label.children[1].children
|
||||
const targetDeviceText = targetDeviceNode.data.label.children[1].children
|
||||
const sourceDeviceText = sourceDeviceNode.data.label.children[1].children[0].children
|
||||
const targetDeviceText = targetDeviceNode.data.label.children[1].children[0].children
|
||||
|
||||
// 构造键名 - 现在以标准设备为键
|
||||
const targetKey = `${targetDeviceText}`.replace('设备名称:', '')
|
||||
|
||||
@@ -220,7 +220,6 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
|
||||
devices: []
|
||||
}
|
||||
item.devices.forEach(device => {
|
||||
console.log('🚀 ~ item:', item, CheckData.ChnCheckResultEnum)
|
||||
let tempChnBtnResult: CheckData.ButtonResult[] = []
|
||||
|
||||
if (chnSum.value <= MAX_CHN_SUM) {
|
||||
@@ -299,7 +298,6 @@ let count = 0
|
||||
watch(
|
||||
webMsgSend,
|
||||
function (newValue, oldValue) {
|
||||
console.log('🚀 ~ newValue:', newValue)
|
||||
if (checkStore.selectTestItems.preTest == false && newValue.requestId != 'formal_real') {
|
||||
if (testLogList[0].log == '正在检测,请稍等...' || testLogList[0].log == '暂无数据,等待检测开始') {
|
||||
testLogList.shift()
|
||||
|
||||
@@ -450,7 +450,6 @@ watch(ActiveStatue, function (newValue, oldValue) {
|
||||
if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {
|
||||
stepsActiveIndex.value += 2
|
||||
nextStepText.value = '检测完成'
|
||||
console.log('🚀 ~ nextStepText.value:', nextStepText.value)
|
||||
}
|
||||
if (newValue === 'test_init_fail') {
|
||||
stepsActiveIndex.value += 2
|
||||
@@ -581,7 +580,6 @@ const nextStep = () => {
|
||||
}
|
||||
|
||||
const handleStepClick = (step: number) => {
|
||||
console.log('🚀 ~ handleStepClick ~ step > stepsActive.value:', step, stepsActive.value)
|
||||
|
||||
if (step > stepsActive.value) {
|
||||
return
|
||||
|
||||
@@ -269,6 +269,7 @@ const openTestDialog = async () => {
|
||||
generateChannelMapping()
|
||||
|
||||
setTimeout(() => {
|
||||
|
||||
testPopup.value?.open(
|
||||
dialogTitle.value,
|
||||
channelMapping.value,
|
||||
|
||||
@@ -778,10 +778,7 @@ const handleTest2 = async () => {
|
||||
const deviceNames = inconsistentPointDevices.map(d => d.name).join(', ')
|
||||
ElMessage.warning(`以下设备存在通道未绑定监测点: ${deviceNames}`)
|
||||
}
|
||||
console.log("🚀 ~ handleTest2 ~ filteredChannelsSelection, pqStandardDevList.value, props.id:", filteredChannelsSelection, )
|
||||
console.log("🚀 ~ handleTest2 ~ filteredChannelsSelection, pqStandardDevList.value, props.id:", pqStandardDevList.value, )
|
||||
console.log("🚀 ~ handleTest2 ~ filteredChannelsSelection, pqStandardDevList.value, props.id:", props.id)
|
||||
|
||||
|
||||
// 只传递有监测点的设备
|
||||
deviceConnectionPopupRef.value?.open(filteredChannelsSelection, pqStandardDevList.value, props.id)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user