feat(设备分组): 设备分组重构

树形分组

re #214

config/proxy.ts

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/jetlinks': {
-      target: 'http://192.168.3.183:8844/',
-      ws: 'ws://192.168.3.183:8844/',
+      target: 'http://192.168.3.146:8844/',
+      ws: 'ws://192.168.3.146:8844/',
       // target: 'http://water.zlkjhb.com:9000/jetlinks',
       // ws: 'http://water.zlkjhb.com:9000/jetlinks',
       // ws: 'ws://demo.jetlinks.cn/jetlinks',

config/routes.ts

@@ -178,6 +178,12 @@ export const routes = [
                                 iconfont: 'icon-shebeifenzuguanli',
                                 component: './device/group',
                             },
+                            {
+                                path: '/device/tree',
+                                name: '设备树',
+                                icon: 'gold',
+                                component: './device/tree'
+                            },
                             {
                                 hideInMenu: true,
                                 path: '/device/instance/add',

src/pages/device/tree/index.tsx

@@ -0,0 +1,58 @@
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import { Card, Col, Divider, Icon, Row, Table } from "antd";
+import React, { Fragment, useEffect, useState } from "react";
+import Service from "./service";
+
+interface Props { }
+const DeviceTree: React.FC<Props> = (props) => {
+
+    const [data, setData] = useState<any[]>([]);
+    const service = new Service('device');
+
+    useEffect(() => {
+        service.groupTree({}).subscribe((resp) => {
+            setData(resp);
+        })
+    }, []);
+    return (
+        <PageHeaderWrapper title="设备分组">
+            <Card>
+                <Row gutter={24}>
+                    <Col span={8}>
+                        <Table
+                            key="id"
+                            dataSource={data}
+                            size="small"
+                            columns={[
+                                { title: '序号', dataIndex: 'id' },
+                                { title: '名称', dataIndex: 'name' },
+                                {
+                                    title: '操作', render: (_, record) => (
+                                        <Fragment>
+                                            <Icon type="edit" />
+                                            <Divider type="vertical" />
+                                            <Icon type="plus" />
+                                            <Divider type="vertical" />
+                                            <Icon type="close" />
+                                        </Fragment>
+                                    )
+                                }
+                            ]} />
+                    </Col>
+                    <Col span={16}>
+                        <Table
+                            size="small"
+                            columns={[
+                                { title: '序号', dataIndex: 'id' },
+                                { title: '名称', dataIndex: 'name' },
+                                { title: '状态', dataIndex: 'status' },
+                                { title: '操作', }
+                            ]}
+                        />
+                    </Col>
+                </Row>
+            </Card>
+        </PageHeaderWrapper>
+    )
+}
+export default DeviceTree;

src/pages/device/tree/service.ts

@@ -0,0 +1,19 @@
+import BaseService from "@/services/crud";
+import request from "@/utils/request";
+import { defer, from } from "rxjs";
+import { map } from "rxjs/operators";
+
+
+
+class Service extends BaseService<any>{
+
+    public groupTree = (param: any) => defer(
+        () => from(request(`/jetlinks/device/group/_query/tree`, {
+            method: 'GET',
+        })).pipe(
+            map(resp => resp.result)
+        ));
+
+}
+
+export default Service;

src/pages/user/login2/index.tsx

@@ -15,7 +15,6 @@ interface Props {
 const Login: React.FC<Props> = props => {
   const { dispatch, settings, location: { query } } = props;
 
-  console.log(location, query.code, 'local');
   const service = new Service('');
   const [username, setUsername] = useState<string>('');
   const [password, setPassword] = useState<string>('');