From 2df90c2ab1772a2ecb7af1b3718dff7561074d19 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 11:23:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?poi=E5=AF=BC=E5=85=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setPup/components/engineering.vue | 152 ++++++++++++------ 1 file changed, 100 insertions(+), 52 deletions(-) diff --git a/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue b/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue index a2bf269..c5eab19 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue @@ -38,28 +38,31 @@
{{ item.name }} - {{ item.createdAt }} + {{ item.path }}
- 已启用 + {{ item.createdAt }} +
+ 已启用 - - 启用 - - - 删除 - + + 启用 + + + 删除 + +
@@ -91,28 +94,32 @@
{{ item.name }} - {{ item.createdAt }} + + {{ item.path }}
- 已启用 + {{ item.createdAt }} +
+ 已启用 - - 启用 - - - 删除 - + + 启用 + + + 删除 + +
@@ -242,6 +249,10 @@ const poiImport = () => { if (res.code === 200) { PoiApi.getPoiList().then((list) => { poiList.splice(0, poiList.length, ...list.data) + poiList.map((item) => { + let arr = item.path.split('/') + item.name = arr[arr.length - 1] + }) //只有一个poi时默认启用 if (poiList.length == 1) { let formData = new FormData() @@ -390,6 +401,10 @@ var routeList: any = reactive([]) const getList = async () => { let list = await RouteApi.getRouteList() routeList.splice(0, routeList.length, ...list.data) + routeList.map((item) => { + let arr = item.path.split('/') + item.name = arr[arr.length - 1] + }) } getList() @@ -398,6 +413,10 @@ var poiList: any = reactive([]) const getPoiList = async () => { let list = await PoiApi.getPoiList() poiList.splice(0, poiList.length, ...list.data) + poiList.map((item) => { + let arr = item.path.split('/') + item.name = arr[arr.length - 1] + }) } getPoiList() @@ -680,7 +699,7 @@ function derive() { box-sizing: border-box; display: flex; line-height: 32px; // padding: 20px 0; - padding: 0 0 20px 0; + padding: 0 0 15px 0; .fankuai { width: 10px; height: 10px; @@ -723,10 +742,10 @@ function derive() { .fileList { width: 100%; // height: 20vh; - max-height: 20vh; + max-height: 15vh; box-sizing: border-box; - padding: 0 0 20px 0; - + // padding: 0 0 16px 0; + overflow-y: auto; .fileList_nav { width: 100%; height: 100%; @@ -734,7 +753,7 @@ function derive() { overflow-y: auto; /* 垂直方向超出时显示滚动条 */ .fileList_nav_item { width: 100%; - height: 8vh; + height: 7vh; // background-color: aqua; box-sizing: border-box; padding: 10px; @@ -759,28 +778,57 @@ function derive() { display: flex; flex-direction: column; padding-left: 10px; + width: calc(100% - 45px); } } } } // 滚动条优化 - .fileList_nav::-webkit-scrollbar { - width: 5px; - height: 5px; - } + // .fileList::-webkit-scrollbar { + // width: 5px; + // height: 5px; + // } - .fileList_nav::-webkit-scrollbar-thumb { - background-color: rgba(var(--color-base1), 1); - border-radius: 5px; - } + // .fileList::-webkit-scrollbar-thumb { + // background-color: rgba(var(--color-base1), 1); + // border-radius: 5px; + // } - .fileList_nav::-webkit-scrollbar-track { - background-color: rgba(var(--color-base1), 0.2); - } + // .fileList::-webkit-scrollbar-track { + // background-color: rgba(var(--color-base1), 0.2); + // } +} +// 滚动条优化 +.fileList::-webkit-scrollbar { + width: 5px; + height: 5px; +} + +.fileList::-webkit-scrollbar-thumb { + background-color: rgba(var(--color-base1), 1); + border-radius: 5px; +} + +.fileList::-webkit-scrollbar-track { + background-color: rgba(var(--color-base1), 0.2); } .line { width: 100%; height: 1px; background-color: rgba(204, 204, 204, 0.2); } +.pdfPath { + display: inline-block; + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: rgba(var(--color-text2), 1); +} +.but { + display: inline-block; + width: 140px; + text-align: right; + margin-left: 10px; +} 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 2/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 @@ - +