+
setCurrMenu(record)}
diff --git a/src/base.less b/src/base.less
index 6f5334b..9e293ff 100644
--- a/src/base.less
+++ b/src/base.less
@@ -39,6 +39,7 @@
text-align: left;
text-transform: none;
}
+
.head5 {
color: #333333;
font-weight: bold;
@@ -61,6 +62,3 @@
text-align: left;
text-transform: none;
}
-
-body {
-}
diff --git a/src/components/MenuBar/index.css b/src/components/MenuBar/index.css
index b3f42fd..22158f9 100644
--- a/src/components/MenuBar/index.css
+++ b/src/components/MenuBar/index.css
@@ -1,11 +1,11 @@
.menubar_wrap {
position: fixed;
- left: 0;
top: 0;
- height: 100vh;
- display: flex;
+ left: 0;
z-index: 999;
+ display: flex;
width: 200px;
+ height: 100vh;
padding: 0;
background-color: #fff;
border-radius: 0px 0px 32px 0px;
@@ -46,7 +46,6 @@
display: flex;
flex: 1;
width: 100%;
- padding-top: 10px;
}
.menubar_wrap .menu_bottom {
width: 96px;
diff --git a/src/components/MenuBar/index.less b/src/components/MenuBar/index.less
index 5cb0639..7cdd32f 100644
--- a/src/components/MenuBar/index.less
+++ b/src/components/MenuBar/index.less
@@ -52,7 +52,6 @@
display: flex;
flex: 1;
width: 100%;
- padding-top: 10px;
}
.menu_bottom {
width: 96px;
diff --git a/src/components/MenuBar/index.tsx b/src/components/MenuBar/index.tsx
index ded5dd3..8270ed9 100644
--- a/src/components/MenuBar/index.tsx
+++ b/src/components/MenuBar/index.tsx
@@ -2,19 +2,20 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-03-27 16:03:20
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-23 10:48:58
+ * @LastEditTime: 2024-04-28 09:44:23
* @FilePath: \general-ai-manage\src\components\Header\index.tsx
* @Description: 内层layout菜单配置
*/
import { useBusinessInfo } from '@/hooks/useBusinessInfo';
import { history, useIntl } from '@umijs/max';
+import { ReactComponent as BusinessLogoIcon } from '/public/home/business_logo.svg';
import type { MenuProps } from 'antd';
import { Menu } from 'antd';
import React, { useEffect, useState } from 'react';
-import { ReactComponent as BusinessLogoIcon } from '/public/home/business_logo.svg';
+import { ReactComponent as BusinessBigLogo } from '/public/home/business_big_logo.svg';
// import menuFooter from '/public/menuFooter.svg';
import './index.less';
@@ -104,10 +105,21 @@ const MenuBar: React.FC = ({ menuData, changeMenu }) => {
return (
- = (props) => {
+ /**state */
+ // const { token } = theme.useToken();
+
+ const { treeData, ...defaultProps } = props;
+ console.log(treeData, 'treeData', defaultProps);
+ const [currTreeData, setCurrTreeData] = useState([
+ // { title: '节点1', key: '1' },
+ // { title: '节点2', key: '2', children: [{ title: '子节点1', key: '3' }] },
+ ]);
+
+ const [visible, setVisible] = useState(false);
+ const [editNodeKey, setEditNodeKey] = useState(null);
+ const [form] = Form.useForm();
+ const action_add_key = '';
+
+ /**工具方法集 */
+ // 柯里化-树的节点数值
+ function formatTreeValByNodeKey(
+ key: 'title' | 'key' | 'children',
+ node: Record,
+ ): any {
+ return formatTreeValByKey(key, node, props.fieldNames);
+ }
+
+ /**查询树节点 */
+ // 定义一个防抖处理函数，500ms 后执行 handleChange 函数
+ const debouncedHandleChange = _debounce((value) => {
+ // TODO 查询所有匹配的节点
+ console.log('debouncedHandleChange_value:', value);
+ }, 500);
+ // 搜索节点
+ function handleSearch(val) {
+ debouncedHandleChange(val);
+ }
+
+ const handleAddNode = () => {
+ // setVisible(true);
+ // form.resetFields();
+ };
+
+ // const getNodeByKey = (key) => {
+ // return currTreeData.find((node) => node.key === key);
+ // };
+
+ // const removeNodeByKey = (data, key) => {
+ // return data.filter((node) => {
+ // if (node.key === key) {
+ // return false;
+ // }
+ // if (node.children) {
+ // node.children = removeNodeByKey(node.children, key);
+ // }
+ // return true;
+ // });
+ // };
+
+ // const handleEditNode = (key) => {
+ // setEditNodeKey(key);
+ // setVisible(true);
+ // form.setFieldsValue({ nodeTitle: getNodeByKey(key).title });
+ // };
+
+ // const handleDeleteNode = (key) => {
+ // const newData = removeNodeByKey(currTreeData, key);
+ // setCurrTreeData(newData);
+ // };
+
+ // const handleAddChildNode = (key) => {
+ // setEditNodeKey(key);
+ // setVisible(true);
+ // form.resetFields();
+ // };
+
+ // 组装节点数据
+ const handleModalOk = () => {
+ form.validateFields().then((values) => {
+ const { nodeTitle } = values;
+ let newData;
+ if (editNodeKey) {
+ // 编辑节点标题
+ newData = currTreeData.map((node) => {
+ if (node.key === editNodeKey) {
+ return { ...node, title: nodeTitle };
+ }
+ return node;
+ });
+ } else if (editNodeKey === null) {
+ // 新增根节点
+ newData = [...currTreeData, { title: nodeTitle, key: Date.now().toString() }];
+ } else {
+ // 新增子节点
+ newData = currTreeData.map((node) => {
+ if (node.key === editNodeKey) {
+ return {
+ ...node,
+ children: [
+ ...(node.children || []),
+ { title: nodeTitle, key: Date.now().toString() },
+ ],
+ };
+ }
+ return node;
+ });
+ }
+ console.log('handleModalOk_newData', newData);
+ setCurrTreeData(newData);
+ setVisible(false);
+ setEditNodeKey('');
+ });
+ };
+
+ const handleModalCancel = () => {
+ setVisible(false);
+ setEditNodeKey('');
+ };
+
+ // render 新增节点操作
+ const renderAddAction = (node?: Record) => {
+ // console.log(node, 'renderAddAction_node');
+ return props?.addRender ? (
+ props?.addRender(node)
+ ) : (
+
+ {formatTreeValByNodeKey('children', node) &&
+ renderTreeNodes(formatTreeValByNodeKey('children', node))}
+
+
+ );
+ });
+ }
+ return <>;
+ };
+ // 渲染每个节点内容
+ const renderTreeItem = (node) => {
+ return (
+ = (props) => {
+ const { token } = theme.useToken();
+ console.log('token', token);
+
+ // async function loadTree() {
+ // const resp = await getDeviceGroupSettingTree()
+ // setDeviceGroupList(resp.data)
+ // }
+
+ // useEffect(()=>{
+ // loadTree()
+ // },[])
+
+ // const [expandedKeys] = useState(['0-0', '0-0-0', '0-0-0-0']);
+ function handleAdd(node) {
+ // 当前节点的父节点 可以添加数据
+ console.log(node, 'handleAdd_node');
+ props.addTreeNode(node);
+ }
+
+ return (
+ ) => void;
+ selectTree: (arg1: any, arg2: any) => void;
+}
diff --git a/src/enums/deviceGroup.ts b/src/enums/deviceGroup.ts
new file mode 100644
index 0000000..9e8f4e6
--- /dev/null
+++ b/src/enums/deviceGroup.ts
@@ -0,0 +1,23 @@
+/*
+ * @Author: donghao donghao@supervision.ltd
+ * @Date: 2024-04-28 15:30:31
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-28 15:32:43
+ * @FilePath: \general-ai-platform-web\src\enums\device.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+// 告警规则
+export const deviceGroupEnums: Record[] = [
+ {
+ label: '设备列表',
+ key: '1',
+ },
+ {
+ label: '业务模型部署',
+ key: '2',
+ },
+ {
+ label: '告警设置',
+ key: '3',
+ },
+];
diff --git a/src/global.css b/src/global.css
index fe98fc1..1137dec 100644
--- a/src/global.css
+++ b/src/global.css
@@ -88,6 +88,9 @@ ol {
.gn_form .ant-pro-form-group-container {
gap: 0px 12px !important;
}
+.gn_modal_form {
+ margin-top: 16px;
+}
.gn_table_query_filter {
padding: 20px 0;
}
@@ -114,14 +117,12 @@ ol {
margin-right: 0;
}
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-container {
+ position: relative;
display: flex;
align-items: center;
justify-content: center;
margin: 8px 0;
}
-.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-tail {
- display: none;
-}
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-icon {
margin: 0 8px;
}
@@ -137,6 +138,21 @@ ol {
color: #666666;
font-size: 12px;
}
+.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-tail {
+ position: absolute;
+ top: auto;
+ left: calc(100% - 30px);
+ width: 16px;
+ height: 16px;
+ margin: 0;
+ padding: 0;
+ background: url('../public/home/business_arrow_default.svg') no-repeat;
+ background-size: cover;
+ border: none;
+}
+.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item .ant-steps-item-tail:after {
+ background: transparent;
+}
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-finish {
background: #e5edff;
border: 1px solid #154ddd;
@@ -153,6 +169,10 @@ ol {
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-finish .ant-steps-item-description {
color: #154ddd;
}
+.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-finish .ant-steps-item-tail {
+ background: url('../public/home/business_arrow.svg') no-repeat;
+ background-size: cover;
+}
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active {
background: #e5edff;
border: 1px solid #154ddd;
@@ -163,10 +183,15 @@ ol {
.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active .ant-steps-item-description {
color: #154ddd;
}
+.gn_model_steps_form .ant-modal-content .ant-modal-body .ant-steps .ant-steps-item-active .ant-steps-item-tail {
+ background: url('../public/home/business_arrow.svg') no-repeat;
+ background-size: cover;
+}
/* Descriptions */
.gn_table_descriptions {
padding: 16px 16px 0;
background: #ffffff;
+ border: 1px solid rgba(21, 77, 221, 0.1);
border-radius: 8px;
}
/* ProTable ProList */
@@ -188,6 +213,21 @@ ol {
padding: 0;
}
/* 主题样式 */
+.ant-btn-primary,
+.ant-btn-primary:not(:disabled):not(.ant-btn-disabled):hover {
+ background-color: #154ddd;
+}
+.ant-btn-default:not(:disabled):not(.ant-btn-disabled):hover,
+.ant-btn-link {
+ color: #154ddd;
+}
+:where(.css-dev-only-do-not-override-42nv3w).ant-btn-default:not(:disabled):not(
+ .ant-btn-disabled
+ ):hover {
+ color: #154ddd;
+ background: #ffffff;
+ border-color: #154ddd;
+}
/* 单行文本溢出显示省略号 */
.single_line {
overflow: hidden;
diff --git a/src/global.less b/src/global.less
index 37f1a3f..f9b5053 100644
--- a/src/global.less
+++ b/src/global.less
@@ -114,6 +114,9 @@ ol {
gap: 0px 12px !important;
}
}
+.gn_modal_form {
+ margin-top: 16px;
+}
// 筛选表单
.gn_table_query_filter {
@@ -147,14 +150,13 @@ ol {
}
.ant-steps-item-container {
+ position: relative;
display: flex;
align-items: center;
justify-content: center;
margin: 8px 0;
}
- .ant-steps-item-tail {
- display: none;
- }
+
.ant-steps-item-icon {
margin: 0 8px;
}
@@ -170,6 +172,25 @@ ol {
color: #666666;
font-size: 12px;
}
+
+ .ant-steps-item-tail {
+ // display: none;
+ position: absolute;
+ top: auto;
+ left: calc(100% - 30px);
+ width: 16px;
+ height: 16px;
+ margin: 0;
+ padding: 0;
+ // background-color: red;
+ background: url('../public/home/business_arrow_default.svg') no-repeat;
+ background-size: cover;
+ border: none;
+ // right: -10px;
+ &:after {
+ background: transparent;
+ }
+ }
}
// 已完成
@@ -188,6 +209,10 @@ ol {
.ant-steps-item-description {
color: #154ddd;
}
+ .ant-steps-item-tail {
+ background: url('../public/home/business_arrow.svg') no-repeat;
+ background-size: cover;
+ }
}
// 当前选中
.ant-steps-item-active {
@@ -199,6 +224,10 @@ ol {
.ant-steps-item-description {
color: #154ddd;
}
+ .ant-steps-item-tail {
+ background: url('../public/home/business_arrow.svg') no-repeat;
+ background-size: cover;
+ }
}
}
}
@@ -208,6 +237,7 @@ ol {
.gn_table_descriptions {
padding: 16px 16px 0;
background: #ffffff;
+ border: 1px solid rgba(21, 77, 221, 0.1);
border-radius: 8px;
}
@@ -235,21 +265,21 @@ ol {
}
/* 主题样式 */
-// .ant-btn-primary,
-// .ant-btn-primary:not(:disabled):not(.ant-btn-disabled):hover {
-// background-color: @theme_color;
-// }
-// .ant-btn-default:not(:disabled):not(.ant-btn-disabled):hover,
-// .ant-btn-link {
-// color: @theme_color;
-// }
-// :where(.css-dev-only-do-not-override-42nv3w).ant-btn-default:not(:disabled):not(
-// .ant-btn-disabled
-// ):hover {
-// color: @theme_color;
-// background: #ffffff;
-// border-color: @theme_color;
-// }
+.ant-btn-primary,
+.ant-btn-primary:not(:disabled):not(.ant-btn-disabled):hover {
+ background-color: @theme_color;
+}
+.ant-btn-default:not(:disabled):not(.ant-btn-disabled):hover,
+.ant-btn-link {
+ color: @theme_color;
+}
+:where(.css-dev-only-do-not-override-42nv3w).ant-btn-default:not(:disabled):not(
+ .ant-btn-disabled
+ ):hover {
+ color: @theme_color;
+ background: #ffffff;
+ border-color: @theme_color;
+}
/* 单行文本溢出显示省略号 */
.single_line {
diff --git a/src/locales/zh-CN/device.ts b/src/locales/zh-CN/device.ts
index e0a575b..36647e9 100644
--- a/src/locales/zh-CN/device.ts
+++ b/src/locales/zh-CN/device.ts
@@ -1,28 +1,74 @@
/*
* @Author: zhoux zhouxia@supervision.ltd
* @Date: 2023-11-01 13:56:33
- * @LastEditors: zhoux zhouxia@supervision.ltd
- * @LastEditTime: 2023-11-21 14:23:38
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-29 17:37:55
* @FilePath: \general-ai-platform-web\src\locales\zh-CN\device.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @Description: 设备相关
*/
-export const device: { [key: string]: string } = {
- 'device.device.table.list.id': 'ID',
- 'device.device.table.list.name': '设备名称',
- 'device.device.table.list.code': '设备代码',
- 'device.device.table.list.position': '位置',
- 'device.device.table.list.param': '设备参数',
- 'device.device.table.list.spec': '设备规格',
- 'device.device.table.list.categoryFkId': '设备类别',
- 'device.device.table.list.groupFkId': '设备分组',
- 'device.device.table.list.isEnable': '是否启用',
- 'device.device.table.list.remark': '备注',
- 'device.device.table.list.createTime': '创建时间',
- 'device.device.table.list.updateTime': '更新时间',
- 'device.device.table.rule.required.name': '设备名称为必填项',
- 'device.device.table.rule.required.code': '设备代码为必填项',
- 'device.device.table.list.add': '新建设备',
- 'device.device.table.list.update': '更新设备',
+// 节点设置
+export const device_group: { [key: string]: string } = {
+ 'device_group.tree_node.name': '节点名称',
+ 'device_group.tree_node.rule.required.name': '请填写节点名称',
+ 'device_group.tree_node.fatherName': '上级节点',
+ 'device_group.tree_node.lon': '经度',
+ 'device_group.tree_node.lat': '纬度',
+ 'device_group.tree_node.address': '地址',
+ 'device_group.tree_node.lonlat': '经纬度',
+ 'device_group.tree_node.managerName': '负责人',
+ 'device_group.tree_node.managerPhone': '联系方式',
+ 'device_group.tree_node.remark': '简介',
+ 'device_group.tree_node.createForm.add': '新建节点',
+ // 未启用
+
+ 'device_group.table.list.id': 'ID',
+ 'device_group.table.list.name': '分组名称',
+ 'device_group.table.list.code': '分组代码',
+ 'device_group.table.list.address': '地址',
+ 'device_group.table.list.telephone': '电话',
+ 'device_group.table.list.lon': '经度',
+ 'device_group.table.list.lat': '纬度',
+ 'device_group.table.list.managerName': '负责人姓名',
+ 'device_group.table.list.managerPhone': '负责人联系方式',
+ 'device_group.table.list.isEnable': '是否启用',
+ 'device_group.table.list.parentFkId': '父节点',
+ 'device_group.table.list.remark': '备注',
+ 'device_group.table.list.createTime': '创建时间',
+ 'device_group.table.list.updateTime': '更新时间',
+ 'device_group.table.rule.required.name': '分组名称为必填项',
+ 'device_group.table.rule.required.code': '分组代码为必填项',
+ 'device_group.table.rule.required.managerName': '负责人姓名为必填项',
+ 'device_group.table.rule.required.managerPhone': '负责人联系方式为必填项',
+ 'device_group.table.rule.required.parentFkId': '父节点为必填项',
+ 'device_group.table.list.add': '新建设备分组',
+ 'device_group.table.list.update': '更新设备分组',
+ 'device_group.table.list.treeAdd': '添加根节点',
+};
+
+export const device_group_list: { [key: string]: string } = {
+ 'device_group_list.table.list.name': '设备名称',
+ 'device_group_list.table.list.deviceType': '设备类型',
+ 'device_group_list.table.list.isEnable': '模型部署',
+ 'device_group_list.table.list.deployed.isEnable': '已部署',
+ 'device_group_list.table.list.undeployed.isEnable': '未部署',
+ 'device_group_list.table.list.action.setModel': '基础模型配置',
+ 'device_group_list.table.list.action.new': '新建设备',
+ 'device_group_list.table.list.action.modelType': '设备分类',
+
+ // 未启用
+ 'device_group_list.table.list.code': '设备代码',
+ 'device_group_list.table.list.position': '位置',
+ 'device_group_list.table.list.param': '设备参数',
+ 'device_group_list.table.list.spec': '设备规格',
+ 'device_group_list.table.list.categoryFkId': '设备类别',
+ 'device_group_list.table.list.groupFkId': '设备分组',
+ 'device_group_list.table.list.remark': '备注',
+ 'device_group_list.table.list.createTime': '创建时间',
+ 'device_group_list.table.list.updateTime': '更新时间',
+ 'device_group_list.table.rule.required.name': '设备名称为必填项',
+ 'device_group_list.table.rule.required.code': '设备代码为必填项',
+ 'device_group_list.table.list.add': '新建设备',
+ 'device_group_list.table.list.update': '更新设备',
};
export const device_category: { [key: string]: string } = {
'device.device_category.table.list.id': 'ID',
@@ -36,30 +82,7 @@ export const device_category: { [key: string]: string } = {
'device.device_category.table.list.add': '新建设备类别',
'device.device_category.table.list.update': '更新设备类别',
};
-export const device_group: { [key: string]: string } = {
- 'device.device_group.table.list.id': 'ID',
- 'device.device_group.table.list.name': '分组名称',
- 'device.device_group.table.list.code': '分组代码',
- 'device.device_group.table.list.address': '地址',
- 'device.device_group.table.list.telephone': '电话',
- 'device.device_group.table.list.lon': '经度',
- 'device.device_group.table.list.lat': '纬度',
- 'device.device_group.table.list.managerName': '负责人姓名',
- 'device.device_group.table.list.managerPhone': '负责人联系方式',
- 'device.device_group.table.list.isEnable': '是否启用',
- 'device.device_group.table.list.parentFkId': '父节点',
- 'device.device_group.table.list.remark': '备注',
- 'device.device_group.table.list.createTime': '创建时间',
- 'device.device_group.table.list.updateTime': '更新时间',
- 'device.device_group.table.rule.required.name': '分组名称为必填项',
- 'device.device_group.table.rule.required.code': '分组代码为必填项',
- 'device.device_group.table.rule.required.managerName': '负责人姓名为必填项',
- 'device.device_group.table.rule.required.managerPhone': '负责人联系方式为必填项',
- 'device.device_group.table.rule.required.parentFkId': '父节点为必填项',
- 'device.device_group.table.list.add': '新建设备分组',
- 'device.device_group.table.list.update': '更新设备分组',
- 'device.device_group.table.list.treeAdd': '添加根节点',
-};
+
export const device_relation: { [key: string]: string } = {
'device.device_relation.table.list.id': 'ID',
'device.device_relation.table.list.deviceParentFkId': '设备父节点',
diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts
index 253d18f..4d81026 100644
--- a/src/locales/zh-CN/menu.ts
+++ b/src/locales/zh-CN/menu.ts
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-01 11:20:09
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-23 10:51:24
+ * @LastEditTime: 2024-04-26 09:36:38
* @FilePath: \uighur-recognition-web2\src\locales\zh-CN\menu.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -64,7 +64,7 @@ export default {
'menu.model-runtime-lib': '模型运行库',
'menu.business-info-index': '企业信息',
- 'menu.business-node-setting': '节点设置',
+ 'menu.business-device-group': '节点设置',
'menu.business-model-index': '业务模型',
// 待废弃
'menu.realTime': '实时分析',
diff --git a/src/pages/Business/DeviceGroup/components/baseInfo.tsx b/src/pages/Business/DeviceGroup/components/baseInfo.tsx
new file mode 100644
index 0000000..e44801c
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/components/baseInfo.tsx
@@ -0,0 +1,62 @@
+/*
+ * @Author: donghao donghao@supervision.ltd
+ * @Date: 2024-04-23 17:00:00
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-28 17:55:58
+ * @FilePath: \general-ai-platform-web\src\pages\Business\DeviceGroup\components\baseInfo.tsx
+ * @Description: 基本信息展示
+ *
+ */
+
+import { ProDescriptions } from '@ant-design/pro-components';
+import { FormattedMessage } from '@umijs/max';
+
+type BaseInfoProps = {
+ info: Record;
+};
+
+const BaseInfo: React.FC = ({ info }) => {
+ // 设备基本信息
+ const DeviceDetailColumns = [
+ {
+ title: = (props) => {
+ const intl = useIntl();
+ // const [isAuto, setIsAuto] = useState(true);
+ const [form] = Form.useForm();
+
+ return (
+
+ className="gn_modal_form gn_form"
+ width={proFormSmallModelWidth}
+ title={intl.formatMessage({
+ id: 'device_group.tree_node.CreateDeviceForm.add',
+ defaultMessage: '新建',
+ })}
+ open={props.createModalOpen}
+ form={form}
+ autoFocusFirstInput
+ modalProps={{
+ destroyOnClose: true,
+ onCancel: () => props.handleModal(),
+ }}
+ submitTimeout={2000}
+ onFinish={async (values) => {
+ console.log(values, 'add_finish_values');
+ // TODO 对接新增接口
+ // postModelCategoryCreateModelCategory(values)
+ // .then(() => {
+ // message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
+ // props.reload();
+ // })
+ // .catch(() => {
+ // message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
+ // });
+ props.handleModal();
+ return true;
+ }}
+ >
+
+
+
+ );
+};
+export default CreateDeviceForm;
diff --git a/src/pages/Business/DeviceGroup/components/createForm.tsx b/src/pages/Business/DeviceGroup/components/createForm.tsx
new file mode 100644
index 0000000..abaabd3
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/components/createForm.tsx
@@ -0,0 +1,176 @@
+// import { postModelCategoryCreateModelCategory } from '@/services/resource/ModelCategory';
+import { ModalForm, ProForm, ProFormText, ProFormTextArea } from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
+import { Form } from 'antd';
+import React from 'react';
+import {
+ proFormSmallItemStyleProps,
+ proFormSmallModelWidth,
+} from '../../../../../config/defaultForm';
+// @ts-ignore
+
+export type CreateFormProps = {
+ createModalOpen: boolean;
+ handleModal: () => void;
+ parentInfo?: Record;
+ reload: any;
+};
+const CreateForm: React.FC = (props) => {
+ const intl = useIntl();
+ // const [isAuto, setIsAuto] = useState(true);
+ const [form] = Form.useForm();
+
+ return (
+
+ className="gn_modal_form gn_form"
+ width={proFormSmallModelWidth}
+ title={intl.formatMessage({
+ id: 'device_group.tree_node.createForm.add',
+ defaultMessage: '新建',
+ })}
+ open={props.createModalOpen}
+ form={form}
+ autoFocusFirstInput
+ modalProps={{
+ destroyOnClose: true,
+ onCancel: () => props.handleModal(),
+ }}
+ submitTimeout={2000}
+ onFinish={async (values) => {
+ console.log(values, 'add_finish_values');
+ // TODO 对接新增接口
+ // postModelCategoryCreateModelCategory(values)
+ // .then(() => {
+ // message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
+ // props.reload();
+ // })
+ // .catch(() => {
+ // message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
+ // });
+ props.handleModal();
+ return true;
+ }}
+ >
+
+
+
+ );
+};
+export default CreateForm;
diff --git a/src/pages/Business/DeviceGroup/components/deviceList.tsx b/src/pages/Business/DeviceGroup/components/deviceList.tsx
new file mode 100644
index 0000000..6e412ba
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/components/deviceList.tsx
@@ -0,0 +1,246 @@
+import TableActionCard from '@/components/TableActionCard';
+import { getDeviceListByGroup } from '@/services/testApi/device';
+import { ProTable } from '@ant-design/pro-components';
+import { Access, FormattedMessage, history, useAccess } from '@umijs/max';
+import { Button } from 'antd';
+import { useRef, useState } from 'react';
+
+import { proTablePaginationOptions } from '../../../../../config/defaultTable';
+
+import IsDelete from '@/components/TableActionCard/isDelete';
+import CreateDeviceForm from './createDeviceForm';
+
+type DeviceListProps = {
+ info: Record;
+};
+
+const DeviceList: React.FC = () => {
+ const access = useAccess();
+ // const intl = useIntl();
+ const actionRef = useRef();
+
+ const [createModalOpen, setCreateModalOpen] = useState(false);
+ // const [categoryFkIdIds, setCategoryFkIdIds] = useState([]);
+ // 动态设置每页数量
+ const [currentPageSize, setCurrentPageSize] = useState(10);
+
+ /**新增 编辑 删除 */
+ // 新增
+ const handleCreateModal = () => {
+ setCreateModalOpen(!createModalOpen);
+ };
+
+ function reloadList() {
+ actionRef.current?.reload();
+ }
+
+ const columns: ProColumns>[] = [
+ {
+ title: {
+ // setCurrentRow(record);
+ // history.push('/home/model-detail');
+ // doToDetail(record);
+ // setShowDetail(true);
+ }}
+ >
+ {
+ handleDestroy(record).then(() => {});
+ }}
+ >
+ ),
+ },
+ ]}
+ > ,
+ ],
+ },
+ ];
+
+ return (
+ []>([]);
+ const [nodeInfo, setNodeInfo] = useState>({}); // 当前节点信息
+ const [createModalOpen, setCreateModalOpen] = useState(false); // 创建新增窗口是否打开
+
+ // 切换模块
+ const [tabKey, setTabKey] = useState(deviceGroupEnums[0].key);
+ const [tabs] = useState([...deviceGroupEnums]);
+ const changeTabMode = (key: string) => {
+ setTabKey(key);
+ console.log(key);
+ // eslint-disable-next-line @typescript-eslint/no-use-before-define
+ // initList(key);
+ };
+ /**节点列表 */
+ // 设备节点树
+ async function loadDeviceTree() {
+ const resp = await getDeviceGroupList({ page: 1, pageSize: 100 });
+ console.log(resp.data, 'loadDeviceTree');
+ setDeviceTreeList(resp?.data.results);
+ setNodeInfo(resp?.data.results[0]);
+ }
+
+ // 新增
+ const handleCreateModal = () => {
+ setCreateModalOpen(!createModalOpen);
+ };
+
+ // 节点信息展示
+
+ // 切换
+
+ // 初始化加载
+ useEffect(() => {
+ loadDeviceTree();
+ }, []);
+
+ return (
+ = ({ info }) => {
},
];
return (
-
-
);
};
diff --git a/src/components/Tree/index.ts b/src/components/Tree/index.ts
new file mode 100644
index 0000000..53c59fd
--- /dev/null
+++ b/src/components/Tree/index.ts
@@ -0,0 +1,3 @@
+import deviceGroupTree from './src/deviceGroupTree';
+
+export const DeviceGroupTree = deviceGroupTree;
diff --git a/src/components/Tree/src/baseTree.css b/src/components/Tree/src/baseTree.css
new file mode 100644
index 0000000..e309232
--- /dev/null
+++ b/src/components/Tree/src/baseTree.css
@@ -0,0 +1,47 @@
+.base_tree_wrap {
+ font-size: 14px;
+}
+.base_tree_wrap > .ant-form-item {
+ margin-bottom: 0;
+}
+.base_tree_wrap > .ant-form-item .ant-input-outlined {
+ border: none;
+}
+.base_tree_wrap > .ant-form-item .ant-input:focus,
+.base_tree_wrap > .ant-form-item .ant-input-focused {
+ border: none;
+ box-shadow: none;
+ /* 去掉聚焦时的阴影效果 */
+ /* 如果需要，你也可以调整其他聚焦时的样式 */
+}
+.base_tree_wrap > .ant-form-item .ant-input-outlined:focus,
+.base_tree_wrap > .ant-form-item .ant-input-outlined:focus-within {
+ box-shadow: none;
+ /* 去掉聚焦时的阴影效果 */
+}
+.base_tree_wrap .tree_node_1 {
+ width: 100%;
+ margin: 12px 0;
+ padding: 8px 17px;
+ background: #f5f5f5;
+ border-radius: 4px;
+ cursor: pointer;
+}
+.base_tree_wrap .tree_node_1 .ant-tree-switcher-noop {
+ opacity: 0;
+}
+.base_tree_wrap .tree_node_item .action_list {
+ display: none;
+}
+.base_tree_wrap .tree_node_1:hover,
+.base_tree_wrap .ant-tree-treenode-selected {
+ color: #154ddd;
+ background: rgba(21, 77, 221, 0.1);
+ border-radius: 8px;
+}
+.base_tree_wrap .tree_node_item:hover .action_list {
+ display: block;
+}
+.base_tree_wrap .tree_node_item:hover .action_list .anticon-delete {
+ color: #e80d0d;
+}
diff --git a/src/components/Tree/src/baseTree.less b/src/components/Tree/src/baseTree.less
new file mode 100644
index 0000000..ddc6b68
--- /dev/null
+++ b/src/components/Tree/src/baseTree.less
@@ -0,0 +1,53 @@
+.base_tree_wrap {
+ font-size: 14px;
+ & > .ant-form-item {
+ margin-bottom: 0;
+ .ant-input-outlined {
+ border: none;
+ }
+ .ant-input:focus,
+ .ant-input-focused {
+ border: none;
+ box-shadow: none; /* 去掉聚焦时的阴影效果 */
+ /* 如果需要，你也可以调整其他聚焦时的样式 */
+ }
+ .ant-input-outlined:focus,
+ .ant-input-outlined:focus-within {
+ box-shadow: none; /* 去掉聚焦时的阴影效果 */
+ }
+ }
+
+ .tree_node_1 {
+ width: 100%;
+ margin: 12px 0;
+ padding: 8px 17px;
+ background: #f5f5f5;
+ border-radius: 4px;
+ cursor: pointer;
+ .ant-tree-switcher-noop {
+ opacity: 0;
+ }
+ }
+ .tree_node_item {
+ .action_list {
+ display: none;
+ }
+ }
+ .tree_node_1:hover,
+ .ant-tree-treenode-selected {
+ color: #154ddd;
+ background: rgba(21, 77, 221, 0.1);
+ border-radius: 8px;
+ }
+ .tree_node_item:hover {
+ // color: #154ddd;
+ // background: rgba(21, 77, 221, 0.1);
+ // border-radius: 8px;
+ .action_list {
+ display: block;
+ .anticon-delete {
+ color: #e80d0d;
+ }
+ }
+ }
+}
diff --git a/src/components/Tree/src/baseTree.tsx b/src/components/Tree/src/baseTree.tsx
new file mode 100644
index 0000000..7712e38
--- /dev/null
+++ b/src/components/Tree/src/baseTree.tsx
@@ -0,0 +1,247 @@
+import { formatTreeValByKey } from '@/utils/baseTree';
+import { DeleteFilled, SearchOutlined } from '@ant-design/icons';
+import { Button, Form, Input, Modal, Tree } from 'antd';
+import _debounce from 'lodash/debounce';
+import React, { useEffect, useState } from 'react';
+import { BaseTreeProps } from '../typing';
+
+import { ProFormText } from '@ant-design/pro-components';
+import './baseTree.less';
+const { TreeNode } = Tree;
+
+const BaseTree: React.FC
+
+
{/* // TODO 菜单需要补充路由聚焦状态 */}
{
+ history.replace('/');
+ }}
+ >
+
+
+
- 
-
*/}
+
+
+ );
+ };
+
+ // 定义每个节点内容 递归操作
+ const renderTreeNodes = (data) => {
+ if (Array.isArray(data) && data.length) {
+ return data.map((node) => {
+ return (
+
+ {node.title}
+ {!props?.hideInDelete ? (
+ {
+ props.handleDelete(node);
+ }}
+ >
+
+ );
+ };
+
+ useEffect(() => {
+ setCurrTreeData(props.treeData);
+ console.log(props.treeData, 'props_treeData');
+ }, [props.treeData]);
+
+ return (
+
+ {!props?.hideInSearch ? (
+ handleSearch(e.target.value)}
+ key="name"
+ name="name"
+ label=""
+ fieldProps={{
+ style: {
+ margin: 0,
+ },
+ prefix: {
+ console.log('selected', selectedKeys);
+ props.selectTree(selectedKeys, info);
+ }}
+ titleRender={(node) => {
+ if (node.title) {
+ return renderTreeItem(node);
+ }
+ return renderAddAction(node);
+ }}
+ {...defaultProps}
+ >
+ {renderTreeNodes(currTreeData)}
+
+
+
+
+
+ );
+};
+
+export default BaseTree;
diff --git a/src/components/Tree/src/deviceGroupTree.tsx b/src/components/Tree/src/deviceGroupTree.tsx
new file mode 100644
index 0000000..b0568ea
--- /dev/null
+++ b/src/components/Tree/src/deviceGroupTree.tsx
@@ -0,0 +1,72 @@
+/*
+ * @Author: donghao donghao@supervision.ltd
+ * @Date: 2024-04-26 11:11:05
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-29 16:26:05
+ * @FilePath: \general-ai-manage\src\components\Tree\src\deviceGroupTree.tsx
+ * @Description: 设备节点树
+ * @交互说明
+ * 1、树形展示
+ * 2、可新增、删除
+ * 3、可编辑
+ * 4、可拖拽
+ */
+import { PlusCircleOutlined } from '@ant-design/icons';
+import React from 'react';
+
+import { theme } from 'antd';
+import { DeviceGroupTreeProps } from '../typing';
+import BaseTree from './baseTree';
+const DeviceGroupTree: React.FC{renderAddAction()}
+ {/* 添加一级节点
*/}
+
+ {/* TODO 使用ProForm */}
+
+ {
+ return (
+
+ {/* 新增节点 修改节点 */}
+
+ );
+};
+
+export default DeviceGroupTree;
diff --git a/src/components/Tree/typing.ts b/src/components/Tree/typing.ts
new file mode 100644
index 0000000..96961cc
--- /dev/null
+++ b/src/components/Tree/typing.ts
@@ -0,0 +1,25 @@
+/*
+ * @Author: donghao donghao@supervision.ltd
+ * @Date: 2024-04-26 11:09:49
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-29 16:24:05
+ * @FilePath: \general-ai-platform-web\src\components\Tree\typing.ts
+ * @Description: 树的类型文件
+ */
+
+// 增删改查基础树
+export interface BaseTreeProps extends TreeProps {
+ hideInAdd?: boolean; // 是否隐藏新增节点
+ // hideInEdit?: boolean // 是否隐藏编辑节点
+ hideInDelete?: boolean; // 是否隐藏删除节点
+ hideInSearch?: boolean; // 是否隐藏筛选节点
+ addRender?: React.ReactNode; // 新增操作自定义
+ addText?: string | React.ReactNode; // 新增按钮文案自定义
+ deleteRender?: React.ReactNode; // 删除操作自定义
+ deleteText?: string | React.ReactNode; // 删除按钮文案自定义
+}
+// 节点树
+export interface DeviceGroupTreeProps extends BaseTreeProps {
+ addTreeNode?: (arg1: Record {
+ handleAdd(node);
+ }}
+ style={{ color: token.colorPrimary }}
+ key={node?.key || 'add'}
+ >
+
+ );
+ }}
+ handleDelete={(node) => {
+ // 提示删除
+ console.log('handleDelete_node', node);
+ }}
+ selectTree={(selectedKeys, info) => {
+ props.selectTree(selectedKeys, info);
+ }}
+ >
+
+ );
+};
+
+export default BaseInfo;
diff --git a/src/pages/Business/DeviceGroup/components/createDeviceForm.tsx b/src/pages/Business/DeviceGroup/components/createDeviceForm.tsx
new file mode 100644
index 0000000..4e8ecad
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/components/createDeviceForm.tsx
@@ -0,0 +1,175 @@
+// import { postModelCategoryCreateModelCategory } from '@/services/resource/ModelCategory';
+import { ModalForm, ProForm, ProFormText, ProFormTextArea } from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
+import { Form } from 'antd';
+import React from 'react';
+import {
+ proFormSmallItemStyleProps,
+ proFormSmallModelWidth,
+} from '../../../../../config/defaultForm';
+// @ts-ignore
+
+export type CreateDeviceFormProps = {
+ createModalOpen: boolean;
+ handleModal: () => void;
+ reload: any;
+};
+const CreateDeviceForm: React.FC
+
+
+ {record.isEnable ? (
+
+ );
+ },
+ },
+
+ {
+ title:
+ [
+
+ ,
+ ]}
+ search={false}
+ // scroll={{ y: proTableCommonOptions.commscrollY, x: proTableCommonOptions.commscrollX }}
+ options={{ fullScreen: false, setting: false, density: false, reload: false }}
+ actionRef={actionRef}
+ rowKey="key"
+ onDataSourceChange={(data) => {
+ console.log(data, 'onDataSourceChange_data');
+ // let CategoryFkIdIds: any = data.map((v) => {
+ // return v.categoryFkId;
+ // });
+ // setCategoryFkIdIds(CategoryFkIdIds);
+ }}
+ pagination={{
+ ...proTablePaginationOptions,
+ pageSize: currentPageSize,
+ onChange: (page, pageSize) => setCurrentPageSize(pageSize),
+ }}
+ columnsState={{
+ persistenceKey: 'algorithm_model_list',
+ persistenceType: 'localStorage',
+ }}
+ request={async (params = {}) => {
+ const { current, ...rest } = params;
+ const reqParams = {
+ page: current,
+ ...rest,
+ };
+ let resp = await getDeviceListByGroup({ ...reqParams });
+ console.log(resp, 'getDeviceListByGroup_resp');
+ return {
+ data: resp.data?.results.map((v: Record) => {
+ return { ...v, key: v.id };
+ }),
+ success: resp.success,
+ total: resp.data.count,
+ current: current,
+ pageSize: currentPageSize,
+ };
+ }}
+ columns={columns}
+ />
+
+ );
+};
+
+export default DeviceList;
diff --git a/src/pages/Business/DeviceGroup/index.css b/src/pages/Business/DeviceGroup/index.css
new file mode 100644
index 0000000..77af702
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/index.css
@@ -0,0 +1,37 @@
+.deviceGroup_page {
+ height: calc(100vh - 92px);
+ /* 节点列表 */
+ /* 节点信息 */
+}
+.deviceGroup_page .dg_content .gn_card {
+ height: calc(100% - 8px);
+}
+.deviceGroup_page .node_list > .gn_card {
+ box-shadow: 0px 2px 8px 0px rgba(0, 79, 178, 0.15);
+}
+.deviceGroup_page .node_info {
+ padding-left: 0;
+}
+.dg_deviceList_wrap .model_index_type_tag {
+ width: 82px;
+ height: 24px;
+ color: #52C41A;
+ background: #E8F7E6;
+ border: 1px solid #BAEEA1;
+ border-radius: 12px;
+}
+.dg_deviceList_wrap .model_index_type_tag .dot {
+ width: 6px;
+ height: 6px;
+ margin-right: 4px;
+ background: #52C41A;
+ border-radius: 50%;
+}
+.dg_deviceList_wrap .model_index_type_tag.active2 {
+ color: #E80D0D;
+ background: #FEEFEE;
+ border: 1px solid #F9B2AE;
+}
+.dg_deviceList_wrap .model_index_type_tag.active2 .dot {
+ background: #E80D0D;
+}
diff --git a/src/pages/Business/DeviceGroup/index.less b/src/pages/Business/DeviceGroup/index.less
new file mode 100644
index 0000000..b17d451
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/index.less
@@ -0,0 +1,45 @@
+.deviceGroup_page {
+ height: calc(100vh - 92px);
+ .dg_content {
+ .gn_card {
+ height: calc(100% - 8px);
+ }
+ }
+ /* 节点列表 */
+ .node_list {
+ & > .gn_card {
+ box-shadow: 0px 2px 8px 0px rgba(0, 79, 178, 0.15);
+ }
+ }
+ /* 节点信息 */
+ .node_info {
+ padding-left: 0;
+ }
+}
+
+.dg_deviceList_wrap {
+ .model_index_type_tag {
+ width: 82px;
+ height: 24px;
+ color: #52c41a;
+ background: #e8f7e6;
+ border: 1px solid #baeea1;
+ border-radius: 12px;
+
+ .dot {
+ width: 6px;
+ height: 6px;
+ margin-right: 4px;
+ background: #52c41a;
+ border-radius: 50%;
+ }
+ &.active2 {
+ color: #e80d0d;
+ background: #feefee;
+ border: 1px solid #f9b2ae;
+ .dot {
+ background: #e80d0d;
+ }
+ }
+ }
+}
diff --git a/src/pages/Business/DeviceGroup/index.tsx b/src/pages/Business/DeviceGroup/index.tsx
new file mode 100644
index 0000000..e59db12
--- /dev/null
+++ b/src/pages/Business/DeviceGroup/index.tsx
@@ -0,0 +1,136 @@
+/*
+ * @Author: donghao donghao@supervision.ltd
+ * @Date: 2024-04-22 15:23:36
+ * @LastEditors: donghao donghao@supervision.ltd
+ * @LastEditTime: 2024-04-29 16:50:22
+ * @FilePath: \general-ai-platform-web\src\pages\Business\DeviceGroup\index.tsx
+ * @Description: 设备节点设置 关键词 deviceGroup（dg）
+ * @交互说明
+ * 1、节点列表的查看、添加、删除
+ * 2、节点基本信息展示
+ * 3、设备列表分页查看、新建、编辑、删除、设备分类、基础模型配置
+ * 4、业务模型部署配置参数
+ * 5、企业告警设置
+ */
+import { DeviceGroupTree } from '@/components/Tree';
+import { deviceGroupEnums } from '@/enums/deviceGroup';
+import { getDeviceGroupList } from '@/services/testApi/deviceGroup';
+import { ProCard } from '@ant-design/pro-components';
+import { Button, Tabs } from 'antd';
+import { useEffect, useState } from 'react';
+import BaseInfo from './components/baseInfo';
+import CreateForm from './components/createForm';
+import DeviceList from './components/deviceList';
+
+import './index.less';
+
+const DeviceGroup: React.FC = () => {
+ /**state */
+ // 节点信息
+ const [deviceTreeList, setDeviceTreeList] = useState
+
+
+
+
+ {/* 节点列表 */}
+ {
+ // TODO 调用获取节点列表的接口
+ }}
+ />
+
+ );
+};
+
+export default DeviceGroup;
diff --git a/src/pages/Business/NodeSetting/index.tsx b/src/pages/Business/NodeSetting/index.tsx
deleted file mode 100644
index fc2478b..0000000
--- a/src/pages/Business/NodeSetting/index.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * @Author: donghao donghao@supervision.ltd
- * @Date: 2024-04-22 15:23:36
- * @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-22 15:34:36
- * @FilePath: \general-ai-platform-web\src\pages\Node\NodeSetting\index.tsx
- * @Description: 节点设置
- * @交互说明
- */
-const NodeSetting: React.FC = () => {
- return
+ 节点列表}>
+
+
+
+ {/* 节点信息 */}
+
+ {
+ setNodeInfo(record);
+ }}
+ addTreeNode={(node) => {
+ //TODO 判断是根节点还是子节点 调用新增接口
+ console.log('addTreeNode_node', node);
+ handleCreateModal();
+ }}
+ selectTree={(selectedKeys, info) => {
+ // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+ info?.node && setNodeInfo(info?.node);
+ // handleSelectNode(selectedKeys, info)
+ console.log('selectTree_selected', selectedKeys, info);
+ }}
+ >
+
+
+ 节点信息}
+ extra={
+
+ }
+ >
+
+
+ {/* 弹窗 */}
+
+ {
+ changeTabMode(key);
+ }}
+ >
+ {tabKey === '1' &&
+ 节点设置
;
-};
-
-export default NodeSetting;
diff --git a/src/pages/Model/ModelDetail/index.tsx b/src/pages/Model/ModelDetail/index.tsx
index 092863d..1fe0c13 100644
--- a/src/pages/Model/ModelDetail/index.tsx
+++ b/src/pages/Model/ModelDetail/index.tsx
@@ -45,11 +45,7 @@ const ModelDetail: React.FC = () => {
/**新增 编辑 删除 */
// 新增
const handleCreateModal = () => {
- if (createModalOpen) {
- setCreateModalOpen(false);
- } else {
- setCreateModalOpen(true);
- }
+ setCreateModalOpen(!createModalOpen);
};
function reloadList() {
diff --git a/src/pages/Project/BusinessInfo/components/baseInfo.tsx b/src/pages/Project/BusinessInfo/components/baseInfo.tsx
index 9f6a041..a0895e5 100644
--- a/src/pages/Project/BusinessInfo/components/baseInfo.tsx
+++ b/src/pages/Project/BusinessInfo/components/baseInfo.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-23 17:00:00
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-24 17:14:48
+ * @LastEditTime: 2024-04-28 09:33:34
* @FilePath: \general-ai-platform-web\src\pages\Project\BusinessInfo\components\baseInfo.tsx
* @Description: 基本信息展示
*
@@ -45,7 +45,7 @@ const BaseInfo: React.FC
+
, //
+ options?: { [key: string]: any },
+) {
+ return request(
+ `/api/device/listByGroup`,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ params: {
+ ...body,
+ },
+ ...(options || {}),
+ },
+ );
+}
diff --git a/src/services/testApi/deviceGroup.ts b/src/services/testApi/deviceGroup.ts
index b8491b6..60ff8d2 100644
--- a/src/services/testApi/deviceGroup.ts
+++ b/src/services/testApi/deviceGroup.ts
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-25 15:39:42
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-25 15:49:38
+ * @LastEditTime: 2024-04-28 11:19:40
* @FilePath: \general-ai-platform-web\src\services\testApi\deviceGroup.ts
* @Description: 节点设置api
*/
@@ -11,26 +11,26 @@
import { request } from '@umijs/max';
/** 节点设置分页列表 */
-// export async function getDeviceGroupList(
-// body: Record, //
-// options?: { [key: string]: any },
-// ) {
-// return request(
-// `/api/device_group/list`,
-// {
-// method: 'GET',
-// headers: {
-// 'Content-Type': 'application/json',
-// },
-// params: {
-// ...body,
-// },
-// ...(options || {}),
-// },
-// );
-// }
+export async function getDeviceGroupList(
+ body: Record, //
+ options?: { [key: string]: any },
+) {
+ return request(
+ `/api/device_group/getDeviceGroupList`,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ params: {
+ ...body,
+ },
+ ...(options || {}),
+ },
+ );
+}
-/** 获取设备组树 POST /device_group/getDeviceGroupTree */
+/** 获取设备组树 GET /device_group/getDeviceGroupTree */
export async function getDeviceGroupTree(
body: Record, //
options?: { [key: string]: any },
@@ -49,3 +49,23 @@ export async function getDeviceGroupTree(
},
);
}
+
+/** 获取节点树 GET /device_group/getDeviceGroupTree */
+export async function getDeviceGroupSettingTree(
+ body: Record, //
+ options?: { [key: string]: any },
+) {
+ return request(
+ `/api/device_group/setting_data`,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ params: {
+ ...body,
+ },
+ ...(options || {}),
+ },
+ );
+}
diff --git a/src/services/testApi/dict.ts b/src/services/testApi/dict.ts
index c91511f..5dbaada 100644
--- a/src/services/testApi/dict.ts
+++ b/src/services/testApi/dict.ts
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-09 13:46:44
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-04-17 14:09:35
+ * @LastEditTime: 2024-04-28 14:24:40
* @FilePath: \general-ai-manage\src\services\testApi\businessProject.ts
* @Description: 字典表mock数据映射
*/
@@ -10,12 +10,28 @@
/* eslint-disable */
import { request } from '@umijs/max';
-/** 企业项目分页列表 */
+/** 行业分类列表 */
export async function getDictIndustry(
body: Record, //
options?: { [key: string]: any },
) {
- return request(`/api/dict/industry/`, {
+ return request(`/api/dict/industry`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ params: {
+ ...body,
+ },
+ ...(options || {}),
+ });
+}
+/** 设备类型列表 */
+export async function getDictDeviceType(
+ body: Record, //
+ options?: { [key: string]: any },
+) {
+ return request(`/api/dict/deviceType`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
diff --git a/src/utils/baseTree.ts b/src/utils/baseTree.ts
new file mode 100644
index 0000000..58c43ff
--- /dev/null
+++ b/src/utils/baseTree.ts
@@ -0,0 +1,13 @@
+export const formatTreeValByKey = (
+ key: string,
+ node: Record,
+ fieldNames?: string,
+): any => {
+ if (fieldNames && Object.keys(fieldNames).includes(key)) {
+ return node[fieldNames[key]];
+ }
+ if (Object.keys(node).includes(key)) {
+ return node[key];
+ }
+ return null;
+};