From 1fb77f533d23fd333b22eb96694f8598d4819f13 Mon Sep 17 00:00:00 2001 From: zyl <731870902@qq.com> Date: Wed, 19 Nov 2025 11:14:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E9=9A=90?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=94=B6=E5=9B=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8B=96=E6=8B=BD=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E5=99=A8=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/icons/svg/closeLeftTs.svg | 1 + src/renderer/src/icons/svg/closeRightTs.svg | 1 + src/renderer/src/views/TS/cabin.vue | 130 ++++++++++++---- .../src/views/TS/components/chart.vue | 5 +- src/renderer/src/views/TS/deduction.vue | 64 +++++++- src/renderer/src/views/TS/edit.vue | 27 ++++ src/renderer/src/views/TS/element.vue | 145 +++++++++++++----- src/renderer/src/views/TS/entity.ts | 10 ++ src/renderer/src/views/TS/list.vue | 17 +- src/renderer/src/views/TS/newEvent.vue | 80 +++++----- src/renderer/src/views/TS/sdk/Store.ts | 2 + .../src/views/TS/util/dragLeftRight.js | 50 +++++- .../src/views/components/tree/entityClick.ts | 13 +- 13 files changed, 418 insertions(+), 127 deletions(-) create mode 100644 src/renderer/src/icons/svg/closeLeftTs.svg create mode 100644 src/renderer/src/icons/svg/closeRightTs.svg diff --git a/src/renderer/src/icons/svg/closeLeftTs.svg b/src/renderer/src/icons/svg/closeLeftTs.svg new file mode 100644 index 0000000..11f96c9 --- /dev/null +++ b/src/renderer/src/icons/svg/closeLeftTs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/closeRightTs.svg b/src/renderer/src/icons/svg/closeRightTs.svg new file mode 100644 index 0000000..b0747b2 --- /dev/null +++ b/src/renderer/src/icons/svg/closeRightTs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue index c1820c9..412d0ba 100644 --- a/src/renderer/src/views/TS/cabin.vue +++ b/src/renderer/src/views/TS/cabin.vue @@ -1,32 +1,45 @@ From 96f8ae2af043f901481a20a0f6fb7a224fbf90cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=A4=A7=E8=83=86?= <1101282782@qq.com> Date: Wed, 19 Nov 2025 16:50:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/java/app/application.yml | 2 +- src/renderer/components.d.ts | 2 -- src/renderer/src/axios/index.ts | 2 +- .../setPup/components/equipment.vue | 16 ++++++++++--- .../setPup/components/materials.vue | 22 ++++++++++++++---- .../setPup/components/modelManage.vue | 13 ++++++++--- .../components/propertyBox/addDevice.vue | 1 + .../components/propertyBox/addMaterials.vue | 23 +++++++++++++------ .../views/components/propertyBox/imagePop.vue | 10 +++++++- 9 files changed, 68 insertions(+), 23 deletions(-) diff --git a/resources/java/app/application.yml b/resources/java/app/application.yml index 7753f07..41e4c70 100644 --- a/resources/java/app/application.yml +++ b/resources/java/app/application.yml @@ -1,7 +1,7 @@ server: host: 127.0.0.1 port: 8848 - path: C:\Users\MSI\AppData\Roaming\dzsp_shijingjun_offline_Y_save + path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save poi: global: enabled: false diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 37cb211..0c43d34 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -20,12 +20,10 @@ declare module 'vue' { ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSlider: typeof import('element-plus/es')['ElSlider'] diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts index bba3cd4..2d3650d 100644 --- a/src/renderer/src/axios/index.ts +++ b/src/renderer/src/axios/index.ts @@ -104,7 +104,7 @@ service.interceptors.response.use( pendingRequests.delete(key) } // 统一错误处理 - const {response} = error + const { response } = error if (response) { return Promise.reject(response) diff --git a/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue b/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue index c6b7068..512154e 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/equipment.vue @@ -147,9 +147,20 @@ const getTableList = async () => { } getTableList() - -eventBus.on('addOptionResuit', () => { +let func = () => { + console.log('111111') getTableList() +} +// eventBus.on('addOptionResuit', () => { +// console.log('111111') +// getTableList() +// }) + +onMounted(() => { + eventBus.on('addOptionResuit', func) +}) +onUnmounted(() => { + eventBus.off('addOptionResuit', func) }) //------------------添加-------------------- @@ -232,7 +243,6 @@ const attachUpload = async () => { const params = new URLSearchParams() params.append('filePath', path[0]) deviceApi.uploadSingle(params).then((res) => { - console.log(res, 'res') ElMessage.success('导入成功') getTableList() }) diff --git a/src/renderer/src/views/components/headers/components/setPup/components/materials.vue b/src/renderer/src/views/components/headers/components/setPup/components/materials.vue index 6b83dd8..dacb808 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/materials.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/materials.vue @@ -23,10 +23,16 @@
- + - + + @@ -132,7 +132,7 @@ - +