From 7d5d128b54bc5033af2ff82c6b571ba52fad9a51 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 5 Dec 2024 09:55:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/element.scss | 2 +- .../resource/components/resourcePopup.vue | 6 +- .../machine/device/components/devicePopup.vue | 55 +++++++++---------- frontend/src/views/machine/device/index.vue | 8 +-- .../testSource/components/testSourcePopup.vue | 16 +++--- .../src/views/machine/testSource/index.vue | 4 +- 6 files changed, 45 insertions(+), 46 deletions(-) diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index ab4ce1e..1435e59 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -441,7 +441,7 @@ .dialog-small { .el-dialog__body { - max-height: 260px; + max-height: 320px; } } diff --git a/frontend/src/views/authority/resource/components/resourcePopup.vue b/frontend/src/views/authority/resource/components/resourcePopup.vue index 211082e..4f798ba 100644 --- a/frontend/src/views/authority/resource/components/resourcePopup.vue +++ b/frontend/src/views/authority/resource/components/resourcePopup.vue @@ -19,7 +19,7 @@ - + - + - + diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index e2f0cc0..00b8d48 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -148,18 +148,19 @@ - + + - + - + @@ -230,7 +231,7 @@ import MonitorTable from '@/views/machine/device/components/monitorTab.vue'; const MonIsShow = ref(false) const DevIsShow = ref(false) -const IsPasswordShow = ref(false) +// const IsPasswordShow = ref(false) const dictStore = useDictStore() const mode = ref() // 定义弹出组件元信息 @@ -258,7 +259,7 @@ const disabledDate = (time: Date) => { protocol: 'MMS', ip: '192.168.1.200', port: 102, - encryptionFlag: 1, + encryptionFlag: 0, reCheckNum:0, state: 1, }) @@ -284,7 +285,7 @@ const disabledDate = (time: Date) => { protocol: 'MMS', ip: '192.168.1.200', port: 102, - encryptionFlag: 1, + encryptionFlag: 0, reCheckNum:0, state: 1, } @@ -344,12 +345,10 @@ const disabledDate = (time: Date) => { try { dialogFormRef.value?.validate(async (valid: boolean) => { - if (formContent.value.encryptionFlag === 1) { - handleEncryptionChange(1) - } else { - handleEncryptionChange(0) + if (formContent.value.encryptionFlag === 0) { + formContent.value.series = '' + formContent.value.devKey = '' } - if (valid) { formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD'); if (formContent.value.arrivedDate) @@ -401,34 +400,34 @@ const open = (sign: string, data: Device.ResPqDev,currentMode: string) => { } if (data.encryptionFlag === 1) { - handleEncryptionChange(1) + //handleEncryptionChange(1) } else { - handleEncryptionChange(0) + //handleEncryptionChange(0) } if (data.id) { formContent.value = { ...data } } else { resetFormContent() - handleEncryptionChange(1) + //handleEncryptionChange(1) } // 重置表单 dialogFormRef.value?.resetFields() } - const handleEncryptionChange = (value: number) => { - // 根据是否加密来显示或隐藏识别码和密钥 - if(value === 1){ - IsPasswordShow.value = true - - }else - { - IsPasswordShow.value = false - // formContent.value.series = '' - // formContent.value.devKey = '' - // rules.value.series = []; - // rules.value.devKey = []; - } -} +// const handleEncryptionChange = (value: number) => { +// // 根据是否加密来显示或隐藏识别码和密钥 +// if(value === 1){ +// IsPasswordShow.value = true +// +// }else +// { +// IsPasswordShow.value = false +// // formContent.value.series = '' +// // formContent.value.devKey = '' +// // rules.value.series = []; +// // rules.value.devKey = []; +// } +// } // 对外映射 defineExpose({ open }) diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue index b7d1db7..f18c3c1 100644 --- a/frontend/src/views/machine/device/index.vue +++ b/frontend/src/views/machine/device/index.vue @@ -69,19 +69,19 @@ const columns = reactive[]>([ prop: 'name', label: '设备名称', search: { el: 'input' }, - minWidth: 180, + minWidth: 200, }, { prop: 'devType', label: '设备类型', - minWidth: 180, + minWidth: 200, enum: dictStore.getDictData('Dev_Type'), fieldNames: { label: 'name', value: 'id' }, }, { prop: 'createDate', label: '生产日期', - minWidth: 180, + minWidth: 200, search: { span: 2, render: () => { @@ -120,7 +120,7 @@ const columns = reactive[]>([ enum: dictStore.getDictData('Dev_Manufacturers'), search: { el: 'select', props: { filterable: true }, order: 1 }, fieldNames: { label: 'name', value: 'id' }, - minWidth: 190, + minWidth: 200, }, { prop: 'operation', label: '操作', fixed: 'right', width: 200 }, ]) diff --git a/frontend/src/views/machine/testSource/components/testSourcePopup.vue b/frontend/src/views/machine/testSource/components/testSourcePopup.vue index 8cdc2b8..87b326a 100644 --- a/frontend/src/views/machine/testSource/components/testSourcePopup.vue +++ b/frontend/src/views/machine/testSource/components/testSourcePopup.vue @@ -3,13 +3,13 @@
+ + + + + - - - - - - + - - + + item.name=== modeStore.currentMode)?.code), fieldNames: { label: 'name', value: 'id' }, search: { el: 'select' }, @@ -75,7 +75,7 @@ }, { prop: 'type', - label: '源类型', + label: '检测源类型', enum: dictStore.getDictData('Pq_Source_Type'), fieldNames: { label: 'name', value: 'id' }, search: { el: 'select' }, From 92df9274537cc147b65ee1989731efdcd1612588 Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Thu, 5 Dec 2024 11:07:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/element.scss | 20 +- .../views/home/components/channelsTest.vue | 8 +- .../src/views/home/components/preTest.vue | 289 +++++++++--------- .../src/views/home/components/timeTest.vue | 5 +- frontend/src/views/home/tabs/dashboard.vue | 14 +- 5 files changed, 185 insertions(+), 151 deletions(-) diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index 1435e59..71a9d53 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -489,4 +489,22 @@ font-size: 12px !important; // color: var(--ba-bg-color-overlay) !important; } -} \ No newline at end of file +} +.el-message-box{ + padding: 0px !important; + .el-message-box__header{ + background-color: var(--el-color-primary); + .el-message-box__title{ + color: #fff; + padding: 10px 10px 0; + } + + } + .el-message-box__content{ + padding: 10px ; + border-bottom: 1px solid #cccccc; + } + .el-message-box__btns { + + padding: 10px;} + } \ No newline at end of file diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index c7f2ba0..6e6da25 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -346,7 +346,7 @@ emit('update:testStatus',ts.value) margin-bottom: 10px; } .right-content{ - max-height: 400px; + /* max-height: 400px; */ } .custom-tabs-label .el-icon { @@ -356,4 +356,10 @@ emit('update:testStatus',ts.value) vertical-align: middle; margin-left: 4px; } +.dialog-content{ + height: 472px; +} +.el-tabs--border-card { + height: 435px; +} diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue index 88a1f9d..366fdf5 100644 --- a/frontend/src/views/home/components/preTest.vue +++ b/frontend/src/views/home/components/preTest.vue @@ -1,131 +1,130 @@ - diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue index 709ce3e..1cc2daa 100644 --- a/frontend/src/views/home/components/timeTest.vue +++ b/frontend/src/views/home/components/timeTest.vue @@ -224,8 +224,9 @@ watch(ts, function (newValue, oldValue) { display: flex; flex-direction: row; /* 横向排列 */ - margin-top: 20px; - min-height: 300px; + /* margin-top: 20px; */ + /* min-height: 300px; */ + height: 472px; /* .dialog-left{ margin-right: 20px; } */ diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index 5ea7397..470f4bd 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -353,9 +353,9 @@ const resizeObserver = new ResizeObserver(entries => { chartsWidth.value = entry.contentRect.width; console.log('Charts Info Width:', chartsWidth.value); - pieRef1.value.reSize(chartsWidth.value * 0.95,145,true); - pieRef2.value.reSize(chartsWidth.value * 0.95,145,true); - pieRef3.value.reSize(chartsWidth.value * 0.95,145,true); + pieRef1.value.reSize(chartsWidth.value * 0.95,180,true); + pieRef2.value.reSize(chartsWidth.value * 0.95,180,true); + pieRef3.value.reSize(chartsWidth.value * 0.95,180,true); } }); @@ -631,4 +631,12 @@ onUnmounted(() => { } } } +:deep(.el-collapse-item__conten){ + // background-color:#f6f6f6; + padding-bottom: 0px !important; +} +:deep(.el-collapse-item__content ){ + // background-color:#f6f6f6; + padding-bottom: 0px !important; +}