diff --git a/frontend/src/layouts/components/Main/index.vue b/frontend/src/layouts/components/Main/index.vue index cf3ef5f..417cd44 100644 --- a/frontend/src/layouts/components/Main/index.vue +++ b/frontend/src/layouts/components/Main/index.vue @@ -1,84 +1,83 @@ - - - - - + + + + + diff --git a/frontend/src/layouts/components/Tabs/index.vue b/frontend/src/layouts/components/Tabs/index.vue index a26b6ab..05a0920 100644 --- a/frontend/src/layouts/components/Tabs/index.vue +++ b/frontend/src/layouts/components/Tabs/index.vue @@ -1,122 +1,121 @@ - - - - - + + + + + diff --git a/frontend/src/stores/modules/check.ts b/frontend/src/stores/modules/check.ts index ca7b745..4f30b1e 100644 --- a/frontend/src/stores/modules/check.ts +++ b/frontend/src/stores/modules/check.ts @@ -39,7 +39,6 @@ export const useCheckStore = defineStore(CHECK_STORE_KEY, { this.selectTestItems.test = true }, setSelectTestItems(selectTestItems: CheckData.SelectTestItem) { - console.log("🚀 ~ setSelectTestItems ~ selectTestItems:", selectTestItems) this.selectTestItems = selectTestItems }, setCheckType(checkType: number) { diff --git a/frontend/src/views/home/components/channelPairing.vue b/frontend/src/views/home/components/channelPairing.vue index 4c9cff1..a82e2b0 100644 --- a/frontend/src/views/home/components/channelPairing.vue +++ b/frontend/src/views/home/components/channelPairing.vue @@ -244,7 +244,7 @@ const handleNext = async () => { }, {} as Record ) - 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('设备名称:', '') diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue index 0ef9f12..dfb100a 100644 --- a/frontend/src/views/home/components/compareTest.vue +++ b/frontend/src/views/home/components/compareTest.vue @@ -220,7 +220,6 @@ const checkResultView: ComputedRef = 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() diff --git a/frontend/src/views/home/components/compareTestPopup.vue b/frontend/src/views/home/components/compareTestPopup.vue index b38035f..2f15e81 100644 --- a/frontend/src/views/home/components/compareTestPopup.vue +++ b/frontend/src/views/home/components/compareTestPopup.vue @@ -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 diff --git a/frontend/src/views/home/components/deviceConnectionPopup.vue b/frontend/src/views/home/components/deviceConnectionPopup.vue index e098798..2efb3db 100644 --- a/frontend/src/views/home/components/deviceConnectionPopup.vue +++ b/frontend/src/views/home/components/deviceConnectionPopup.vue @@ -269,6 +269,7 @@ const openTestDialog = async () => { generateChannelMapping() setTimeout(() => { + testPopup.value?.open( dialogTitle.value, channelMapping.value, diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index af88c0f..867f22f 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -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) } diff --git a/frontend/src/views/machine/controlSource/components/tree.vue b/frontend/src/views/machine/controlSource/components/tree.vue index e66252b..f8511bd 100644 --- a/frontend/src/views/machine/controlSource/components/tree.vue +++ b/frontend/src/views/machine/controlSource/components/tree.vue @@ -1,166 +1,165 @@ - - - + + + diff --git a/frontend/src/views/machine/testScript/components/communication.vue b/frontend/src/views/machine/testScript/components/communication.vue index a003fb6..32a4d3f 100644 --- a/frontend/src/views/machine/testScript/components/communication.vue +++ b/frontend/src/views/machine/testScript/components/communication.vue @@ -1,185 +1,184 @@ - - - + + + diff --git a/frontend/src/views/machine/testScript/components/setValueTable.vue b/frontend/src/views/machine/testScript/components/setValueTable.vue index 20b02e2..c9cb846 100644 --- a/frontend/src/views/machine/testScript/components/setValueTable.vue +++ b/frontend/src/views/machine/testScript/components/setValueTable.vue @@ -1,351 +1,350 @@ - - - - - + + + + + diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue index 518c762..1df972c 100644 --- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue +++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue @@ -1,725 +1,723 @@ - - - - - + + + + + diff --git a/frontend/src/views/machine/testScript/components/testScriptHarmTab.vue b/frontend/src/views/machine/testScript/components/testScriptHarmTab.vue index c7250d0..f990d40 100644 --- a/frontend/src/views/machine/testScript/components/testScriptHarmTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptHarmTab.vue @@ -1,378 +1,377 @@ - - - - - + + + + + diff --git a/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue b/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue index 6c2bcf5..ec0b1ff 100644 --- a/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue +++ b/frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue @@ -206,7 +206,6 @@ const empty = (index: number) => { props.childForm[index].inharmList = [] } const onSubmit = () => { - console.log('🚀 ~ onSubmit ~ props.childForm[0]:', props.childForm[0].inharmList) if (formInline.value.inharm.length == 0 || formInline.value.famp == '' || formInline.value.fphase == '') { ElMessage.warning('请填写值!') return diff --git a/frontend/src/views/machine/testScript/components/testScriptPopup.vue b/frontend/src/views/machine/testScript/components/testScriptPopup.vue index 3255824..b994669 100644 --- a/frontend/src/views/machine/testScript/components/testScriptPopup.vue +++ b/frontend/src/views/machine/testScript/components/testScriptPopup.vue @@ -224,7 +224,6 @@ const open = async (title: string, row: any) => { } else { let list = JSON.parse(row) formContent.value = list - console.log('🚀 ~ open ~ list:', formContent.value) show.value = true } // 重置表单 @@ -243,7 +242,6 @@ const treeInfo = async (currentMode: string) => { const result = await getDictTreeByCode(data) const result1 = (await getDictTreeByCode({ ...data, code: 'Script_Error' })).data[0].children const allOptions = await convertToOptions(result.data as Dict.ResDictTree[]) - //console.log('🚀 ~ treeInfo ~ result1:', allOptions[0]?.children) const setallTree = await setTree(allOptions[0]?.children, result1) secondLevelOptions.push(...(setallTree || [])) modeId.value = dictStore.getDictData('Pattern').find(item => item.name === currentMode)?.id diff --git a/frontend/src/views/machine/testScript/components/tree.vue b/frontend/src/views/machine/testScript/components/tree.vue index 7f17691..e18f655 100644 --- a/frontend/src/views/machine/testScript/components/tree.vue +++ b/frontend/src/views/machine/testScript/components/tree.vue @@ -1,106 +1,106 @@ - - - + + + diff --git a/frontend/src/views/machine/testScript/components/viewRow.vue b/frontend/src/views/machine/testScript/components/viewRow.vue index 3e9c01e..a09738a 100644 --- a/frontend/src/views/machine/testScript/components/viewRow.vue +++ b/frontend/src/views/machine/testScript/components/viewRow.vue @@ -1,405 +1,398 @@ - - - + + +