From 78d49ff16eebd02f3c46e9f79efdc86bdf04acec Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Fri, 5 Jul 2024 12:04:17 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=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/deviceManage.ts | 11 +-
hx-ai-intelligent/src/api/index.ts | 3 +
hx-ai-intelligent/src/api/origanizemanage.ts | 3 +-
hx-ai-intelligent/src/components/ns-modal-form.vue | 88 ++++++++++++++
.../src/view/equipmentManage/group/config.ts | 128 +++++++++++++++------
.../src/view/equipmentManage/group/index.vue | 107 ++++++++++++++++-
lib/component/form/form/form.vue | 10 +-
lib/component/tree/tree-api.vue | 4 +-
lib/saas/config/form.config.ts | 11 ++
9 files changed, 311 insertions(+), 54 deletions(-)
create mode 100644 hx-ai-intelligent/src/components/ns-modal-form.vue
diff --git a/hx-ai-intelligent/src/api/deviceManage.ts b/hx-ai-intelligent/src/api/deviceManage.ts
index b044e78..ea91ef7 100644
--- a/hx-ai-intelligent/src/api/deviceManage.ts
+++ b/hx-ai-intelligent/src/api/deviceManage.ts
@@ -1,10 +1,11 @@
-const BASE_URL = '/carbon-smart';
+import { BASE_URL } from './index';
export enum device {
- queryDeviceTree = `${BASE_URL}/deviceInfo/queryDeviceTree`,
- queryDevicePage = `${BASE_URL}/deviceInfo/queryDevicePage`,
- dropArea = `${BASE_URL}/deviceInfo/dropArea`,
+ queryDeviceTree = `${BASE_URL}/deviceInfo/queryDeviceTree`, // 左侧树
+ queryDevicePage = `${BASE_URL}/deviceInfo/queryDevicePage`, // 列表
+ dropArea = `${BASE_URL}/deviceInfo/dropArea`, // 查询下拉区域
}
export enum group {
- queryDeviceGroupTree = `${BASE_URL}/deviceGroup/queryDeviceGroupTree`,
+ queryDeviceGroupTree = `${BASE_URL}/deviceGroup/queryDeviceGroupTree`, // 左侧树
+ creatOrUpdate = `${BASE_URL}/deviceGroup/creatOrUpdate`, // 左侧树节点新增编辑
}
diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index 6ae56cc..a2e9325 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -4,3 +4,6 @@
export const apiModule = {
parking: ['User', 'CurrentUser', 'Organizational'],
};
+
+export const BASE_URL = '/carbon-smart';
+export const dict = `${BASE_URL}/client/dict/listByKey`;
diff --git a/hx-ai-intelligent/src/api/origanizemanage.ts b/hx-ai-intelligent/src/api/origanizemanage.ts
index 17ce885..de7e06d 100644
--- a/hx-ai-intelligent/src/api/origanizemanage.ts
+++ b/hx-ai-intelligent/src/api/origanizemanage.ts
@@ -1,4 +1,5 @@
-const BASE_URL = '/carbon-smart';
+import { BASE_URL } from './index';
+
export enum permission {
add = `${BASE_URL}/admin/permission/save`,
queryOrgPermission = `${BASE_URL}/api/dept/queryOrgPermission`,
diff --git a/hx-ai-intelligent/src/components/ns-modal-form.vue b/hx-ai-intelligent/src/components/ns-modal-form.vue
new file mode 100644
index 0000000..24af74c
--- /dev/null
+++ b/hx-ai-intelligent/src/components/ns-modal-form.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index c45b566..83a911a 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -2,6 +2,8 @@ import { dateUtil } from '/nerv-lib/util/date-util';
import data from './mock.json';
import { http } from '/nerv-lib/util';
import { ref } from 'vue';
+import { group } from '/@/api/deviceManage';
+import { dict } from '/@/api';
const tableKeyMap = [
{
title: '来源企业',
@@ -57,49 +59,105 @@ const doWnload = (url) => {
};
const mockData = ref(data.listData);
-export const treeConfig = {
- defaultExpandAll: true,
- header: {
- icon: 'orgLink',
- title: '能耗分组',
+export const formSchema = [
+ {
+ field: 'isCreate',
+ component: 'NsInput',
+ show: false,
},
-
- api: () => {
- return new Promise((resolve) => {
- setTimeout(() => {
- resolve(data);
- }, 100);
- });
+ {
+ field: 'orgId',
+ component: 'NsInput',
+ show: false,
+ },
+ {
+ field: 'isCreatSon',
+ component: 'NsInput',
+ show: false,
},
- formConfig: {
- schemas: [
+ {
+ label: '节点名称',
+ field: 'pointName',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入节点名称(必填)',
+ },
+ rules: [
{
- field: 'type',
- label: '',
- component: 'NsSelect',
- autoSubmit: true,
- defaultValue: 1,
- componentProps: {
- options: [
- { label: '碳排', value: 1 },
- { label: '用电量', value: 2 },
- { label: '用水量', value: 3 },
- { label: '燃气量', value: 4 },
- { label: '供热量', value: 5 },
- ],
- },
+ required: true,
+ message: '请输入节点名称',
},
+ ],
+ },
+ {
+ label: '节点类型',
+ field: 'pointType',
+ component: 'NsSelectApi',
+ componentProps: {
+ placeholder: '请选择节点类型(必填)',
+ api: dict,
+ params: { dicKey: 'COUNT_POINT' },
+ immediate: true,
+ resultField: 'data.COUNT_POINT',
+ labelField: 'cnValue',
+ valueField: 'cnValue',
+ },
+ rules: [
{
- field: 'name',
- label: '',
- component: 'NsInput',
- autoSubmit: true,
- componentProps: {
- placeholder: '请输入',
- },
+ required: true,
+ message: '请输入节点类型',
},
],
},
+];
+export const treeConfig = (orgId) => {
+ return {
+ defaultExpandAll: true,
+ header: {
+ icon: 'orgLink',
+ title: '能耗分组',
+ },
+ params: { orgId },
+ api: group.queryDeviceGroupTree,
+ // api: () => {
+ // return new Promise((resolve) => {
+ // setTimeout(() => {
+ // resolve({ data: [{ title: '全部', key: 'all', children: data.data }] });
+ // }, 100);
+ // });
+ // },
+ transform: (data) => {
+ return [{ title: '全部', key: 'all', selectable: false, children: data }];
+ },
+ formConfig: {
+ schemas: [
+ {
+ field: 'energyType',
+ label: '',
+ component: 'NsSelectApi',
+ autoSubmit: true,
+ componentProps: {
+ api: dict,
+ params: { dicKey: 'ENERGY_TYPE' },
+ immediate: true,
+ resultField: 'data.ENERGY_TYPE',
+ labelField: 'cnValue',
+ valueField: 'cnValue',
+ placeholder: '请选择能耗种类',
+ },
+ },
+ {
+ field: 'pointName',
+ label: '',
+ component: 'NsInput',
+ autoSubmit: true,
+ componentProps: {
+ placeholder: '请输入节点名称',
+ },
+ },
+ ],
+ },
+ };
};
export const tableConfig = (el, elGroup, elFormula) => {
return {
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index d88f11e..997394e 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -2,29 +2,113 @@
+
+
+
+
-
+
+
+
+
{{ data.title }}
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue
new file mode 100644
index 0000000..b3a735b
--- /dev/null
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue
new file mode 100644
index 0000000..c775cc9
--- /dev/null
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/table/index.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
new file mode 100644
index 0000000..a5b4740
--- /dev/null
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
@@ -0,0 +1,225 @@
+
+
+
+ 设备列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+