From 680855f31018d868fe1b983779b44b22939b2b4b Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Wed, 12 Jun 2024 16:41:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/api/origanizemanage.ts | 2 +- .../equipmentControl/lightingManage/indexs.vue | 3071 ++++++++++---------- .../organizationManage/departmentManage/config.ts | 3 + .../organizationManage/departmentManage/index.vue | 59 +- .../view/organizationManage/usermanage/index.vue | 2 +- hx-op/index.html | 2 +- hx-op/src/api/origanizemanage.ts | 8 +- hx-op/src/util/generateRandomString.ts | 9 + .../enterpriseManage/TreeAdd.vue | 38 +- .../organizationManage/enterpriseManage/config.ts | 114 +- .../organizationManage/enterpriseManage/index.vue | 214 +- lib/component/drawer/drawer.vue | 1 + 12 files changed, 1859 insertions(+), 1664 deletions(-) create mode 100644 hx-op/src/util/generateRandomString.ts diff --git a/hx-ai-intelligent/src/api/origanizemanage.ts b/hx-ai-intelligent/src/api/origanizemanage.ts index aa3821c..110a18a 100644 --- a/hx-ai-intelligent/src/api/origanizemanage.ts +++ b/hx-ai-intelligent/src/api/origanizemanage.ts @@ -1,7 +1,7 @@ const BASE_URL = '/carbon-smart'; export enum permission { add = `${BASE_URL}/admin/permission/save`, - permissionTree = `${BASE_URL}/api/dept/permissionTree`, + permissionTree = `${BASE_URL}/api/dept/QueryOrgPermission`, } export enum origanizemanage { diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index 9f198dc..5f06d89 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -3,7 +3,11 @@
-
+
@@ -14,8 +18,15 @@
- +
@@ -24,7 +35,9 @@
照明区域 - @@ -32,25 +45,39 @@
@@ -61,13 +88,19 @@
照明回路
- -
@@ -75,21 +108,30 @@
@@ -103,8 +145,11 @@
-
@@ -117,8 +162,11 @@
-
@@ -142,31 +190,37 @@
-
-
+
变更内容
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
@@ -557,7 +570,6 @@
-
@@ -567,7 +579,7 @@ @@ -581,21 +593,35 @@
- -

计划库

-
-
- +

计划库

+
+
+
@@ -611,7 +637,10 @@ - + {{ row.key }} {{ row.data }} {{ row.planname }} @@ -619,14 +648,22 @@ -
@@ -636,16 +673,15 @@
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
-   - 站厅照明 1区 +   + 站厅照明 1区
- - 手动 - 自动 + 手动 + + 自动
- - 100lux - - 30lux + 100lux + + 30lux
- - 手动 - - 自动 + 手动 + + 自动
- - 4000k - - 3800k + 4000k + + 3800k
@@ -1041,1191 +1038,1199 @@
- +
- +
+ + diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts index f2e5aff..dc07f58 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts @@ -7,6 +7,7 @@ export const formConfig = (disabled: Boolean) => { component: 'NsChildForm', componentProps: { schemas: [ + { label: '企业名称', field: 'orgName', show: false }, { label: '部门名称', field: 'deptName', @@ -90,6 +91,8 @@ export const formConfig2 = (disabled2: Boolean) => { component: 'NsChildForm', componentProps: { schemas: [ + { label: '部门名称', field: 'deptName', show: false }, + { label: '角色名称', field: 'zhName', diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue index 939c433..b9d2e5e 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue @@ -7,19 +7,12 @@ 新增部门 - 新增子部门 - 删除 + 新增子部门 + 删除