From 83d93907860af44cb5700a7d8c1495109150bad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=E7=82=B3=E8=BE=89?= <972108913@qq.com>
Date: Wed, 10 Jul 2024 19:40:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/dasadmin/src/api/backend/index.ts | 28 ++
.../src/views/backend/auth/menu/index.vue | 1 +
.../src/views/backend/auth/user/index.vue | 4 +-
.../equipment/equipmentManagement/index.vue | 444 +++++++++++-------
4 files changed, 317 insertions(+), 160 deletions(-)
diff --git a/ui/dasadmin/src/api/backend/index.ts b/ui/dasadmin/src/api/backend/index.ts
index 880ffa85..7a14ab76 100644
--- a/ui/dasadmin/src/api/backend/index.ts
+++ b/ui/dasadmin/src/api/backend/index.ts
@@ -237,3 +237,31 @@ export function equipExport(params: object = {}) {
responseType: 'blob',
})
}
+
+// 设备类型
+export function equipType(params: object = {}) {
+ return createAxios({
+ url: '/api/equipment/type',
+ method: 'POST',
+ data: params,
+ })
+}
+
+
+// 设备详情物模型
+export function equipDetailsModel(params: object = {}) {
+ return createAxios({
+ url: '/api/equipment/model/list',
+ method: 'POST',
+ data: params,
+ })
+}
+
+// 设备详情机构
+export function equipDetailsOrg(params: object = {} ) {
+ return createAxios({
+ url: '/api/org/list',
+ method: 'POST',
+ data: params,
+ })
+}
\ No newline at end of file
diff --git a/ui/dasadmin/src/views/backend/auth/menu/index.vue b/ui/dasadmin/src/views/backend/auth/menu/index.vue
index 0273be75..9c618496 100644
--- a/ui/dasadmin/src/views/backend/auth/menu/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/menu/index.vue
@@ -14,6 +14,7 @@
:load="loadNode"
lazy
@node-click="handleNodeClick"
+ :default-expanded-keys="['1']"
/>
diff --git a/ui/dasadmin/src/views/backend/auth/user/index.vue b/ui/dasadmin/src/views/backend/auth/user/index.vue
index 43b115a4..51c4d3ed 100644
--- a/ui/dasadmin/src/views/backend/auth/user/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/user/index.vue
@@ -15,6 +15,7 @@
:load="loadNode"
lazy
@node-click="handleNodeClick"
+ :default-expanded-keys="['1']"
/>
@@ -231,7 +232,8 @@ const getTree = () => {
console.log(treeQuery, 'treeQuery')
userList(treeQuery).then((res) => {
- console.log(res, '树')
+ console.log(res.data[0].id, '树用户111')
+ formQuery.orgId = res.data[0].id
userData.value = res.data
})
}
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 4e899c8e..94ee2f79 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -51,10 +51,10 @@
查看
|
删除
- |
+
@@ -74,24 +74,26 @@
-
+
-
+
-
-
+
+
+
+
@@ -108,43 +110,58 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
+
@@ -180,24 +197,26 @@
-
+
-
+
-
-
+
+
+
+
@@ -214,43 +233,58 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
+
@@ -302,9 +336,19 @@