fix(多租户): 多租户资产信息

多租户资产界面数据展示
jetlinks · Jun 17, 2020 · 633d51c · 633d51c
1 parent d8bed93
commit 633d51c
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 30 deletions.
diff --git a/src/pages/system/tenant/components/assets/device/edit/add/index.tsx b/src/pages/system/tenant/components/assets/device/edit/add/index.tsx
@@ -34,7 +34,6 @@ const Add = (props: Props) => {
 
         service.member.query(data.id, {}).subscribe(resp => {
             setUserList(resp.data);
-            console.log(resp, 'res');
         });
     }, []);
 
@@ -48,10 +47,10 @@ const Add = (props: Props) => {
             assetIdList: selectedAssetsId,
             allPermission: true,
         }));
-        console.log(selectedAssetsId, checkedUserList, 'dddata');
-        service.assets.bind(data.id, bindData).subscribe(resp => {
+        service.assets.bind(data.id, bindData).subscribe(() => {
             setLoading(false);
-            message.success('绑定成功')
+            message.success('绑定成功');
+            props.close();
         });
     }
     const rowSelection = {

diff --git a/src/pages/system/tenant/components/assets/device/edit/index.tsx b/src/pages/system/tenant/components/assets/device/edit/index.tsx
@@ -19,8 +19,7 @@ const Edit = (props: Props) => {
     const { data } = props;
     const [cat, setCat] = useState<boolean>(false);
     const [asset, setAsset] = useState();
-    useEffect(() => {
-        console.log(data, 'dddd');
+    const handleSearch = () => {
         service.assets.device(encodeQueryParam({
             terms: {
                 id$assets: JSON.stringify({
@@ -32,6 +31,9 @@ const Edit = (props: Props) => {
         })).subscribe(resp => {
             setList(resp);
         })
+    }
+    useEffect(() => {
+        handleSearch();
     }, []);
     const rowSelection = {
         onChange: (selectedRowKeys: any[], selectedRows: any[]) => {
@@ -84,7 +86,10 @@ const Edit = (props: Props) => {
                     }
                 ]}
             />
-            <Button onClick={() => setAdd(true)}>添加</Button>
+            <Button
+                type="primary"
+                style={{ marginBottom: 10 }}
+                onClick={() => setAdd(true)}>添加</Button>
             <Table
                 rowKey="id"
                 rowSelection={rowSelection}
@@ -110,16 +115,22 @@ const Edit = (props: Props) => {
                 >
                     关闭
                 </Button>
-                <Button
+                {/* <Button
                     onClick={() => {
                         // autzSetting();
                     }}
                     type="primary"
                 >
                     保存
-                </Button>
+                </Button> */}
             </div>
-            {add && <Add data={data} close={() => setAdd(false)} />}
+            {add && (
+                <Add
+                    data={data} close={() => {
+                        setAdd(false);
+                        handleSearch();
+                    }} />
+            )}
             {cat && <User asset={asset} close={() => setCat(false)} />}
         </Drawer>
     )

diff --git a/src/pages/system/tenant/components/assets/device/index.tsx b/src/pages/system/tenant/components/assets/device/index.tsx
@@ -1,23 +1,22 @@
 import React, { useState, useContext, useEffect } from "react";
 import { List, Card, Tooltip, Icon } from "antd";
 import { router } from "umi";
+import encodeQueryParam from "@/utils/encodeParam";
+import IconFont from "@/components/IconFont";
 import styles from '../index.less';
 import Edit from "./edit";
 import { TenantContext } from "../../../detail";
 import Service from "../../../service";
-import encodeQueryParam from "@/utils/encodeParam";
-import IconFont from "@/components/IconFont";
 
 
 const Device = () => {
-    const avatar = 'https://tse2-mm.cn.bing.net/th/id/OIP.T1lmAIkITnIiwRmQMiUnjAAAAA?pid=Api&rs=1';
     const [visible, setVisible] = useState<boolean>(false);
     const data = useContext(TenantContext);
     const service = new Service('tenant');
 
     const [active, setActive] = useState(0);
     const [notActive, setNotActive] = useState(0);
-    useEffect(() => {
+    const getData = () => {
         service.assets.deviceCount(encodeQueryParam({
             terms: {
                 id$assets: JSON.stringify({
@@ -42,6 +41,9 @@ const Device = () => {
         })).subscribe(resp => {
             setActive(resp)
         })
+    }
+    useEffect(() => {
+        getData();
     }, []);
 
     return (
@@ -86,7 +88,10 @@ const Device = () => {
             {visible && (
                 <Edit
                     data={data}
-                    close={() => setVisible(false)} />
+                    close={() => {
+                        setVisible(false);
+                        getData();
+                    }} />
             )}
         </List.Item>
     )

diff --git a/src/pages/system/tenant/components/assets/product/edit/add/index.tsx b/src/pages/system/tenant/components/assets/product/edit/add/index.tsx
@@ -48,11 +48,17 @@ const Add = (props: Props) => {
             assetIdList: selectedAssetsId,
             allPermission: true,
         }));
-        console.log(selectedAssetsId, checkedUserList, 'dddata');
-        service.assets.bind(data.id, bindData).subscribe(resp => {
+        console.log(checkedUserList.length, bindData, 'jjj');
+        if (checkedUserList.length === 0) {
+            message.error('请选择成员');
             setLoading(false);
-            message.success('绑定成功')
-        });
+        } else {
+            service.assets.bind(data.id, bindData).subscribe(resp => {
+                setLoading(false);
+                message.success('添加成功')
+                props.close();
+            });
+        }
     }
     const rowSelection = {
         onChange: (selectedRowKeys: any[], selectedRows: any[]) => {

diff --git a/src/pages/system/tenant/components/assets/product/edit/index.tsx b/src/pages/system/tenant/components/assets/product/edit/index.tsx
@@ -19,8 +19,8 @@ const Edit = (props: Props) => {
     const [cat, setCat] = useState<boolean>(false);
     const [asset, setAsset] = useState();
     const { data } = props;
-    useEffect(() => {
-        console.log(data, 'dddd');
+
+    const handleSearch = () => {
         service.assets.product(encodeQueryParam({
             terms: {
                 id$assets: JSON.stringify({
@@ -32,6 +32,9 @@ const Edit = (props: Props) => {
         })).subscribe(resp => {
             setList(resp);
         })
+    }
+    useEffect(() => {
+        handleSearch()
     }, []);
     const rowSelection = {
         onChange: (selectedRowKeys: any[], selectedRows: any[]) => {
@@ -85,7 +88,10 @@ const Edit = (props: Props) => {
                     }
                 ]}
             />
-            <Button onClick={() => setAdd(true)}>添加</Button>
+            <Button
+                type="primary"
+                style={{ marginBottom: 10 }}
+                onClick={() => setAdd(true)}>添加</Button>
             <Table
                 rowKey="id"
                 rowSelection={rowSelection}
@@ -111,16 +117,22 @@ const Edit = (props: Props) => {
                 >
                     关闭
                 </Button>
-                <Button
+                {/* <Button
                     onClick={() => {
                         // autzSetting();
                     }}
                     type="primary"
                 >
                     保存
-                </Button>
+                </Button> */}
             </div>
-            {add && <Add data={data} close={() => setAdd(false)} />}
+            {add && (
+                <Add data={data}
+                    close={() => {
+                        setAdd(false);
+                        handleSearch();
+                    }} />
+            )}
             {cat && <User asset={asset} close={() => setCat(false)} />}
         </Drawer>
     )

diff --git a/src/pages/system/tenant/components/assets/product/index.tsx b/src/pages/system/tenant/components/assets/product/index.tsx
@@ -1,15 +1,14 @@
 import React, { useState, useContext, useEffect } from "react";
 import { List, Card, Tooltip, Icon } from "antd";
 import { router } from "umi";
+import encodeQueryParam from "@/utils/encodeParam";
+import IconFont from "@/components/IconFont";
 import styles from '../index.less';
 import Edit from "./edit";
 import { TenantContext } from "../../../detail";
 import Service from "../../../service";
-import encodeQueryParam from "@/utils/encodeParam";
-import IconFont from "@/components/IconFont";
 
 const Product = () => {
-    const avatar = 'https://tse2-mm.cn.bing.net/th/id/OIP.T1lmAIkITnIiwRmQMiUnjAAAAA?pid=Api&rs=1';
     const [visible, setVisible] = useState<boolean>(false);
     const data = useContext(TenantContext);
 
@@ -18,7 +17,7 @@ const Product = () => {
     const [pub, setPub] = useState(0);
     const [unPub, setUnPub] = useState(0)
 
-    useEffect(() => {
+    const getData = () => {
 
         service.assets.productCount(encodeQueryParam({
             terms: {
@@ -44,6 +43,9 @@ const Product = () => {
         })).subscribe(resp => {
             setUnPub(resp)
         })
+    }
+    useEffect(() => {
+        getData();
     }, [])
     return (
         <List.Item style={{ paddingRight: '10px' }}>
@@ -88,7 +90,10 @@ const Product = () => {
 
                 <Edit
                     data={data}
-                    close={() => setVisible(false)} />
+                    close={() => {
+                        setVisible(false);
+                        getData();
+                    }} />
             )}
         </List.Item>
     )