设备管理

config/proxy.ts

@@ -17,8 +17,28 @@ export default {
     //   changeOrigin: true,
     //   pathRewrite: { '^': '' },
     // },
+    '/v1/elec/eval/placearea/list': { // /v1/elec/eval/placearea/uset/list
+      target: 'http://localhost:18017', //连接天宫的ng
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/eval/device/queryPageByParam': {
+      target: 'http://localhost:18017', //连接天宫的ng
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/eval/room/reserve/cancel': {
+      target: 'http://localhost:18017',//连接本地
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
     '/v1/eval/room/reserve/list': {
-      target: 'http://localhost:18017',//连接天宫的ng
+      target: 'http://localhost:18017',//连接本地
+      changeOrigin: true,
+      pathRewrite: { '^': '' },
+    },
+    '/v1/elec/eval/room/list': {
+      target: 'http://localhost:18017',//连接本地
       changeOrigin: true,
       pathRewrite: { '^': '' },
     },

config/router.config.ts

@@ -109,7 +109,12 @@ export default [
             path: '/',
             redirect: '/userexpert/login',
           },
-          {//委托撤回
+          {//设备管理
+            name: 'Device',
+            path: '/Device',
+            component: './Device',
+          },
+          {//评标室查看预约
             name: 'ElecEvalReserve',
             path: '/ElecEvalReserve',
             component: './ElecEvalReserve',

src/pages/Device/index.tsx

@@ -1,62 +1,95 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { Button, Tabs, PageHeader,message } from 'antd';
+import { Button, Tabs, Tree} from 'antd';
 import ProTable, { ActionType } from '@ant-design/pro-table';
-import { reserveList, roomList, cancelReserve } from './service';
+import { deviceList, getplaceareaList, roomList } from './service';
 import '@/assets/ld_style.less';
 import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
-import { btnAuthority } from '@/utils/authority';
+import ProCard from "@ant-design/pro-card";
 
-const { TabPane } = Tabs;
 
+const deviceTypeEnum = {
+  'resource_door': { text: '门禁点' },
+  'resource_camera': { text: '监控点' },
+  'resource_nvr': { text: 'nvr' },
+  'resource_encodeDevice': { text: '编码设备' },
+  'resource_oneMachine': { text: '门禁一体机' },
+
+}
+const deviceStatusEnum = {
+  'online_0': { text: '离线' },
+  'online_1': { text: '在线' },
+  'online_9': { text: '无此设备' },
+}
 const Index: React.FC<{}> = () => {
   const checkRelationRef = useRef<ActionType>(); //操作数据后刷新列表
+  const [treeData, setTreeData] = useState<any>();
+  const [treeId, setTreeId] = useState<any>();
 
-  const [areaNameList, setAreaNameList] = useState({});
   /*拉取数据*/
   useEffect(() => {
-    initAreaNameList();
+    getplaceareaList().then((res: { code: number; data: any[] | undefined; }) => {
-  }, []);
+      if (res.code == 200) {
-  const initAreaNameList = async () => {
+        let data: any = [];
-    await roomList().then((res) => {
+        if (res.data != undefined) {
-      if (res.success ==true) {
+          res.data.map((item: any, index: any) => {
-        // let areaNameList: any[] = [];
+            const title1 = item.placeName;
-        // console.log(res.data)
+            const key1 = item.id;
-      //   res.data.forEach((item: { areaName: string; id: string; }) => {
+            let children1: any = [];
-      //     const tempDetail = { label: '', value: '', };
+            if (item.roomList != undefined) {
-      //     tempDetail.label = item.areaName;
+              const children = item.roomList.map((item: any, index: any) => {
-      //     tempDetail.value = item.id;
+                const title2 = item.areaName;
-      //     areaNameList.push(tempDetail);
+                const key2 = item.id;
-      // })
+              
-        let areaNameList = {};
+                return { title: title2, key: key2}
-        //将拿到的返回值遍历
+              });
-        res.data.map((item: { id: string | number; areaName: any; })=>{
+              children1 = children;
-          //使用接口返回值的id做为 代替原本的0，1
+            }
-          areaNameList[item.id]={
+            const first = { title: title1, key: key1, children: children1 }
-          //使用接口返回值中的overdueValue属性作为原本的text:后面的值
+            data.push(first);
-            text: item.areaName,
+          });
-          }
+        }
-        })
+        setTreeData(data);
-        setAreaNameList(areaNameList)
       }
     })
-  };
+  }, []);
+
   /**
-   *  取消预约
+   *  设备管理
    * @param record
    */
-     const cancel = async (record: any) => {
+  const cancel = async (record: any) => {};
-      
-      cancelReserve(record.id).then(res => {
-        if (res.code == 200 && res.data) {
-          message.success('预约取消成功');
-        }
-      });
-    };
   const current = getURLInformation('current');
+  //列表页loading
+  const [spinLoading, setSpinLoading] = useState<boolean>(false);
+  //新建应答格式
+  const toCreate = async () => {
+    // const id = getProId();
+    // const param = {
+    //   tpId: id,
+    //   roomType: getURLInformation('roomType'),
+    // };
+    // await getSectionList(param).then((res) => {
+    //   if ((res.code = 200)) {
+    //     if (res.data.length == 0) {
+    //       message.info(`当前项目无可选${sectionName}，无法新增`);
+    //     } else {
+    //       setSectionList(res.data);
+    //       setCreateVisible(true);
+    //     }
+    //   }
+    // });
+  };
+  //编辑应答格式
+  const toEdit = (values: any, param: any) => {
+    
+  };
+  const onSelect = (selectedKeys: any, info: any) => {
+    selectedKeys.length == 0 ? setTreeId(null) : setTreeId(selectedKeys[0])
 
-
+    console.log(selectedKeys)
+  }
   const columns: any[] = [
-    //会议室预约
+    //设备管理
 
     {
       title: '序号',
@@ -67,171 +100,151 @@ const Index: React.FC<{}> = () => {
     },
     {
       title: '评标场所名称',
-      dataIndex: 'reserveBy',
+      dataIndex: 'placeName',
       width: '10%',
       search: false,
     },
     {
       title: '评标区域名称',
-      dataIndex: 'reserveBy',
+      dataIndex: 'areaName',
       width: '10%',
       search: false,
     },
     {
       title: '设备类型',
-      dataIndex: 'reserveBy',
+      dataIndex: 'deviceType',
       width: '10%',
+      valueType: 'select',
+      valueEnum: deviceTypeEnum,
       search: false,
     },
     {
       title: '设备名称',
-      dataIndex: 'meetingName',
+      dataIndex: 'deviceName',
       search: true,
       width: '10%',
     },
     {
       title: '设备标识',
-      dataIndex: 'meetingName',
+      dataIndex: 'deviceCode',
       search: true,
       width: '10%',
     },
-    
+
     {
       title: '网络IP',
-      dataIndex: 'meetingName',
+      dataIndex: 'deviceManagementIp',
       search: true,
       width: '10%',
     },
     {
       title: '设备状态',
-      dataIndex: 'reserveBy',
+      dataIndex: 'deviceStatus',
       width: '10%',
+      valueType: 'select',
+      valueEnum: deviceStatusEnum,
       search: true,
     },
-    
+
     {
       title: '操作',
       width: '7%',
       search: false,
       render: (text: any, record: any) => {
-        
         return (
           <>
-            <Button  type="text" onClick={() => cancel(record)} danger>
+            <Button type="text" onClick={() => {}} danger>
               编辑
             </Button>
-            <Button  type="text" onClick={() => cancel(record)} danger>
+            <Button type="text" onClick={() => {}} danger>
               删除
             </Button>
           </>
         );
-        
-
-
       },
     },
   ];
-
+  
   return (
     <>
-      <PageHeader title="预约管理" />
+    <ProCard  split="vertical" bordered headerBordered>
+        <ProCard colSpan="300px">
+            {treeData == undefined ? null : (
+              <Tree
+                defaultExpandAll
+                onSelect={onSelect}
+                treeData={treeData}
+              />
+            )}
+        </ProCard>
 
-      <Tabs defaultActiveKey="1">
+    
-        <TabPane tab="评标预约" key="1">
+      <ProCard bodyStyle={{ width: "100%" }} >
-          <ProTable
+        <ProTable
-            actionRef={checkRelationRef}
+                actionRef={checkRelationRef}
-            className="proSearch"
+                className="proSearch"
-            columns={columns}
+                columns={columns}
-            params={{ reserveType: 'eval' }}
+                params={{ treeId: treeId }}
-            size="small"
+                size="small"
-            request={async (params) =>
+                
-              await reserveList(params).then((res) => {
+                request={async (params) =>
-                if (res.code == 200) {
+                  await deviceList(params).then((res) => {
-                  let data = res.data;
+                    if (res.code == 200) {
-                  return Promise.resolve({
+                      let data = res.data;
-                    data: data.records,
+                      return Promise.resolve({
-                    success: res.success,
+                        data: data.records,
-                    total: res.data.total,
+                        success: res.success,
-                    current: res.data.current,
+                        total: res.data.total,
-                  });
+                        current: res.data.current,
-                }
-                return Promise.resolve({
-                  data: [],
-                  success: false,
-                  total: 0,
-                  current: 1,
-                });
-              })
-            }
-            search={{
-              filterType: 'query',
-              optionRender: (searchConfig: any, { form }) => {
-                return [
-                  <Button
-                    key="resetText"
-                    onClick={() => {
-                      form?.setFieldsValue({
-                        current: 1,
                       });
-                      form?.submit();
+                    }
-                    }}
+                    return Promise.resolve({
-                  >
+                      data: [],
-                    {searchConfig?.resetText}
+                      success: false,
-                  </Button>,
+                      total: 0,
-                  <Button
+                      current: 1,
-                    key="searchText"
+                    });
-                    type="primary"
+                  })
-                    onClick={() => {
-                      form?.submit();
-                    }}
-                  >
-                    {searchConfig?.searchText}
-                  </Button>,
-                ];
-              },
-            }}
-            pagination={{
-              defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
-              defaultPageSize: 10,
-              showSizeChanger: false,
-            }} //默认显示条数
-            toolBarRender={false}
-          />
-        </TabPane>
-        <TabPane tab="会议预约" key="2">
-          <ProTable
-            className="proSearch"
-            columns={otherColumns}
-            params={{ reserveType: 'meeting' }}
-            size="small"
-            request={async (params) =>
-              await reserveList(params).then((res) => {
-                if (res.code == 200) {
-                  let data = res.data;
-                  return Promise.resolve({
-                    data: data.records,
-                    success: res.success,
-                    total: res.data.total,
-                    current: res.data.current,
-                  });
                 }
-                return Promise.resolve({
+                search={{
-                  data: [],
+                  filterType: 'query',
-                  success: false,
+                  optionRender: (searchConfig: any, { form }) => {
-                  total: 0,
+                    return [
-                  current: 1,
+                      <Button
-                });
+                        key="resetText"
-              })
+                        onClick={() => {
-            }
+                          form?.setFieldsValue({
-            pagination={{
+                            current: 1,
-              defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
+                          });
-              defaultPageSize: 10,
+                          form?.submit();
-              showSizeChanger: false,
+                        }}
-            }} //默认显示条数
+                      >
-            toolBarRender={false}
+                        {searchConfig?.resetText}
-          />
+                      </Button>,
-        </TabPane>
+                      <Button
-      </Tabs>
+                        key="searchText"
+                        type="primary"
+                        onClick={() => {
+                          form?.submit();
+                        }}
+                      >
+                        {searchConfig?.searchText}
+                      </Button>,
+                       <Button key="toCreate" onClick={() => toCreate()}>
+                       新建
+                     </Button>,
+                    ];
+                  },
+                }}
+                pagination={{
+                  defaultCurrent: isNotEmpty(current) ? Number(current) : 1,
+                  defaultPageSize: 10,
+                  showSizeChanger: false,
+                }} //默认显示条数
+                toolBarRender={false}
+              />
+      </ProCard>
+    </ProCard>
     </>
   );
 };

src/pages/Device/service.ts

@@ -15,3 +15,20 @@ export async function roomList() { // 查询评标室列表
   });
 }
 
+
+export async function deviceList(data: any) {
+  // 查询设备列表
+  return request('/v1/eval/device/queryPageByParam', {
+    method: 'post',
+    data: { ...data, pageNo: data.current },
+  });
+}
+
+export async function getplaceareaList() { 
+  // 查询场所、区域列表
+  /// /v1/elec/eval/placearea/uset/list
+  return request('/v1/elec/eval/placearea/list', {
+    method: 'get',
+    params: {}
+  });
+}

src/pages/ElecEvalReserve/index.tsx

@@ -4,7 +4,6 @@ import ProTable, { ActionType } from '@ant-design/pro-table';
 import { reserveList, roomList, cancelReserve } from './service';
 import '@/assets/ld_style.less';
 import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
-import { btnAuthority } from '@/utils/authority';
 
 const { TabPane } = Tabs;