12011507

src/pages/device/account/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-10 09:39:56
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-01 13:59:27
+ * @Last Modified time: 2022-12-01 15:05:17
  */
 
 import * as React from 'react';
@@ -772,6 +772,7 @@ function Model(props) {
             break;
         }
       };
+      const [request, setrequest] = useState();
       useEffect(() => {
         const fn = async () => {
             let res = await doFetch({
@@ -781,12 +782,7 @@ function Model(props) {
               },
             });
             if (res?.data?.dataList) {
-            let column = [
-              {
-                title: '扩展字段',
-                valueType: 'split',
-              },
-            ];
+              let column = [];
               res?.data?.dataList?.forEach((el) => {
                 column.push({
                   ...selectValueType(el.fieldChar, el.valueList),
@@ -795,42 +791,41 @@ function Model(props) {
                   key: el.id,
                 });
               });
-            setnewfieldscolumns(columns.concat(column));
+              setnewfieldscolumns(column);
             }
-        };
-        fn();
-      }, []);
-      return (
-        <>
-          <ProDescriptions
-            request={async () => {
+          },
+          fn2 = async () => {
             const res = await doFetch({
               url: urlParams.detail,
               params: { id: drawer?.item?.id },
             });
+            console.log(res?.data?.data);
             let obj = {};
-              res?.data?.data[equipmentCharList]?.forEach((it) => {
+            res?.data?.data['equipmentCharList']?.forEach((it) => {
               obj[it?.fieldId] = it?.fieldRealValue;
             });
-
             console.log('drawerpro:', {
               ...(res?.data?.data ?? {}),
               ...obj,
             });
-
-              return {
-                success: true,
-                data:
+            setrequest(
               {
                 ...(res?.data?.data ?? {}),
                 ...obj,
               } ?? {},
+            );
           };
-            }}
-            columns={newfieldscolumns}
-          />
+        fn();
+        fn2();
+      }, []);
+      return (
+        <>
+          <ProDescriptions dataSource={request} columns={columns} />
           <Divider />
-          <h3 className="page-title">扩展字段</h3>
+          <h3 className="page-title" style={{ marginBottom: 16 }}>
+            扩展字段
+          </h3>
+          <ProDescriptions dataSource={request} columns={newfieldscolumns} />
         </>
       );
     };