From 5c24e996153dae75eacc85dc7cb0aae2c67abc64 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 18 Feb 2025 15:27:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E8=AE=A2=E5=88=B0=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- src/views/hard/hard-order/index.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 6480b17..06c6a70 100644 --- a/.env.development +++ b/.env.development @@ -8,18 +8,18 @@ VITE_OPEN = true ENV = 'development' # ADMIN 服务地址 -VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 +# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -# VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境 # 图片访问基础地址 -VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 +# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -# VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 # 代码生成服务地址 diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index ce38ec0..5f82509 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -348,7 +348,7 @@ const print = async (row: any) => { // 导出excel const exportExcel = () => { - downBlobFile("/hard/hardwareOrder/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardwareOrder.xlsx") + downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单.xlsx") } // 多选事件 From 4e481ff8c7d06a906d18145692086bc192e510db Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 18 Feb 2025 15:34:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 0a5bbf9..a1ec5a6 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -252,7 +252,9 @@ const handleNodeClick = (clickedNode: any) => { // 树节点勾选改变 const treeNodeCheckChange = (checkedNodes: any) => { - state.queryForm.deptId = checkedNodes.map((item: any) => item.id) + state.queryForm.deptIds = checkedNodes.map((item: any) => item.id) + state.queryForm.deptId = "" + state.queryForm.isDeepDept = false getDataList() }