diff --git a/frontend/src/views/machine/testScript/components/testProjectPopup.vue b/frontend/src/views/machine/testScript/components/testProjectPopup.vue index bd98766..57d0292 100644 --- a/frontend/src/views/machine/testScript/components/testProjectPopup.vue +++ b/frontend/src/views/machine/testScript/components/testProjectPopup.vue @@ -184,6 +184,7 @@ import TestScriptDipTab from '@/views/machine/testScript/components/testScriptDi import { useDictStore } from '@/stores/modules/dict' import { addScriptDtls } from '@/api/device/testScript' import scriptForm from './scriptForm' +import { on } from 'events' const emit = defineEmits(['addTab', 'close', 'getCommunication']) const dictStore = useDictStore() @@ -578,7 +579,7 @@ const open = (sign: string, row: any) => { handleRowClick({ name: 'L1', sort: 0 }, { label: '相别' }) dictStore.getDictData('Script_Value_Type') - console.log('🚀 ~ open ~ tabChildren.value:', tabChildren.value) + //console.log('🚀 ~ open ~ tabChildren.value:', tabChildren.value) } // 判断后台没有谐波,简谐波值 用于回显 @@ -609,6 +610,7 @@ const copyRow = (num: number, index: number) => { }) } + // 打开 drawer(新增、编辑) const openDialog = () => {} diff --git a/frontend/src/views/machine/testScript/components/testScriptDetail.vue b/frontend/src/views/machine/testScript/components/testScriptDetail.vue index e6f3d26..2265221 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDetail.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDetail.vue @@ -187,9 +187,11 @@ v-if="showDialog" /> - @@ -208,7 +210,7 @@ import { dlsDetails, deleteDtls, updateDtls, addScriptDtls, checkDataList } from import { useDictStore } from '@/stores/modules/dict' import { useHandleData } from '@/hooks/useHandleData' import { scriptDtlsCheckDataList } from '@/api/device/testScript/index' -import viewRow from './viewRow.vue' +import ViewRow from '@/views/machine/testScript/components/viewRow.vue' interface TabOption { label?: string name?: string @@ -230,6 +232,7 @@ const props = defineProps({ } }) const showDialog = ref(false) +const viewDialog = ref(false) const dictStore = useDictStore() const activeName = ref('') const childActiveName = ref('') @@ -397,8 +400,11 @@ const view = (row: Partial = {}) => { }) } }) - console.log(tabData.value) - viewRowRef.value?.open(row,communicationList.value,parentTabName,childrenTabName.value) + viewDialog.value = true + setTimeout(() => { + viewRowRef.value?.open(row, communicationList.value, parentTabName, childrenTabName.value) + }, 0) + } // 删除 const deleteRow = async (row: any) => { diff --git a/frontend/src/views/machine/testScript/components/viewRow.vue b/frontend/src/views/machine/testScript/components/viewRow.vue index 67acfb6..bd9b005 100644 --- a/frontend/src/views/machine/testScript/components/viewRow.vue +++ b/frontend/src/views/machine/testScript/components/viewRow.vue @@ -8,8 +8,8 @@ 相对值 --> - - + +
@@ -172,7 +172,7 @@
- +