From 06a9bdbb6c59eb3b334198252a35142ea270c431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Tue, 4 Jun 2024 14:45:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E8=A7=A3=E7=BB=91/=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 + src/api/resources-equipment/index.ts | 16 +- src/router/index.ts | 11 ++ .../equipment/components/AddEquipment.vue | 2 +- .../equipment/components/BindingCustom.vue | 149 ++++++++++++++++++ .../equipment/components/EquipmentEdit.vue | 51 +++++- src/views/resources/equipment/index.vue | 55 ++++++- 7 files changed, 277 insertions(+), 10 deletions(-) create mode 100644 src/views/resources/equipment/components/BindingCustom.vue diff --git a/src/App.vue b/src/App.vue index 8383d15..2e1819e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -47,4 +47,7 @@ const fontColor = computed(() => { .el-card__footer { padding: calc(10px - 2px) 10px !important; } +.is-horizontal { + display: none !important; +} diff --git a/src/api/resources-equipment/index.ts b/src/api/resources-equipment/index.ts index 841ecc1..c87ceb2 100644 --- a/src/api/resources-equipment/index.ts +++ b/src/api/resources-equipment/index.ts @@ -55,9 +55,23 @@ export function privateProfile( }); } -export function bindingCustomAPI(devId: number, customId: number) { +export function bindingCustomAPI(devId?: number, customId?: number) { return request({ url: `/api/equipment/v1/binding-custom/${devId}/${customId}`, method: "PUT", }); } + +export function deleteDevice(ids: number[]) { + return request({ + url: "/api/equipment/v1/delete-dev", + method: "POST", + data: ids, + }); +} +export function unbindingCustomAPI(devId?: number) { + return request({ + url: `/api/equipment/v1/unbinding-custom/${devId}`, + method: "PUT", + }); +} diff --git a/src/router/index.ts b/src/router/index.ts index ab66fce..d963773 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -160,6 +160,17 @@ export const constantRoutes: RouteRecordRaw[] = [ title: "新增设备", }, }, + { + path: "/resources/equipment-binding-custom/:devId", + name: "BindingCustom", + component: () => + import("@/views/resources/equipment/components/BindingCustom.vue"), + meta: { + hidden: true, + keepAlive: true, + title: "设备绑定客户", + }, + }, ], }, ]; diff --git a/src/views/resources/equipment/components/AddEquipment.vue b/src/views/resources/equipment/components/AddEquipment.vue index d105b1e..c769237 100644 --- a/src/views/resources/equipment/components/AddEquipment.vue +++ b/src/views/resources/equipment/components/AddEquipment.vue @@ -583,7 +583,7 @@ const queryCustomer = () => { loading.value = false; }); }; -const currentCustomerId = ref(0); +const currentCustomerId = ref(0); const handleCustomerChange = (val: CustomerVO) => { currentCustomerId.value = val.customId; }; diff --git a/src/views/resources/equipment/components/BindingCustom.vue b/src/views/resources/equipment/components/BindingCustom.vue new file mode 100644 index 0000000..56edf6d --- /dev/null +++ b/src/views/resources/equipment/components/BindingCustom.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/resources/equipment/components/EquipmentEdit.vue b/src/views/resources/equipment/components/EquipmentEdit.vue index c5c2b12..678512f 100644 --- a/src/views/resources/equipment/components/EquipmentEdit.vue +++ b/src/views/resources/equipment/components/EquipmentEdit.vue @@ -3,6 +3,9 @@