diff --git a/frontend/src/components/echarts/pie/default.vue b/frontend/src/components/echarts/pie/default.vue index 576a852..fd04731 100644 --- a/frontend/src/components/echarts/pie/default.vue +++ b/frontend/src/components/echarts/pie/default.vue @@ -131,7 +131,7 @@ const reSize = (widthValue: number,heightValue: number,silentValue: boolean) => } }; const resizeCharts = () => { - console.log(chart.value,111111); + //console.log(chart.value,111111); if (chart.value) { chart.value.resize(); diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index d0cc594..8a10dcc 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -444,7 +444,7 @@ .dialog-small { .el-dialog__body { - max-height: 320px; + max-height: 340px; } } diff --git a/frontend/src/views/machine/testSource/components/testSourcePopup.vue b/frontend/src/views/machine/testSource/components/testSourcePopup.vue index a146f61..96c492d 100644 --- a/frontend/src/views/machine/testSource/components/testSourcePopup.vue +++ b/frontend/src/views/machine/testSource/components/testSourcePopup.vue @@ -144,6 +144,7 @@ const save = () => { // 打开弹窗,可能是新增,也可能是编辑 const open = async (sign: string, data: TestSource.ResTestSource, currentMode: string) => { +console.log('打开弹窗', sign, data) titleType.value = sign dialogVisible.value = true mode.value = currentMode diff --git a/frontend/src/views/machine/testSource/index.vue b/frontend/src/views/machine/testSource/index.vue index 7eacaad..3c222fe 100644 --- a/frontend/src/views/machine/testSource/index.vue +++ b/frontend/src/views/machine/testSource/index.vue @@ -89,6 +89,7 @@ // 打开 drawer(新增、编辑) const openDialog = (titleType: string, row: Partial = {}) => { + testSourcePopup.value?.open(titleType, row,modeStore.currentMode) } diff --git a/frontend/src/views/plan/planList/components/moreButtons.vue b/frontend/src/views/plan/planList/components/moreButtons.vue index be1603c..851c6ab 100644 --- a/frontend/src/views/plan/planList/components/moreButtons.vue +++ b/frontend/src/views/plan/planList/components/moreButtons.vue @@ -48,7 +48,7 @@ import type { ErrorSystem } from '@/api/error/interface' const props = defineProps<{ isShow: boolean; }>(); - console.log(props.isShow,1111) + //console.log(props.isShow,1111) const handleCommand = (command: string | number | object) => { detail_dialogTitle.value = command as string; detail_dialogFormVisible.value = true // 显示对话框 diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue index f91154b..6f6c79a 100644 --- a/frontend/src/views/plan/planList/index.vue +++ b/frontend/src/views/plan/planList/index.vue @@ -55,7 +55,7 @@ :dialogTitle="dialogTitle" :is-read-only="isReadOnly" @update:visible="dialogFormVisible = $event" - ref='testSourcePopup' + /> + + ({ id: '', name: '', @@ -272,7 +275,7 @@ function openFileDialog() { function isVisible(row: Plan.PlanAndSourceBO) { - console.log(row) + //console.log(row) if(!row.hasOwnProperty('testSourceList') || !Array.isArray(row.testSourceList)) return false else if(row.testSourceList.length <= 1) @@ -292,7 +295,6 @@ function showData(row: string) { } const testSourcePopup = ref() function showTestSource(row: string) { - //testSourcePopup.value?.open('view', row,'模拟式') }