Merge branch 'dev' of http://git.ycjcjy.com/jgz/admin into dev

src/pages/rotationChart/introduction/edit/index.jsx

@@ -1,4 +1,4 @@
-import { addRegulation, getRegulationList } from '@/services/regulation';
+import { addRegulation, getRegulationList, getRegulationById } from '@/services/regulation';
 import { PageContainer, ProForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Card, Col, message, Row, Space } from 'antd';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -6,27 +6,25 @@ import { useEffect, useRef, useState } from 'react';
 import { queryTable } from '@/utils/request';
 
 export default (props) => {
-
-  const [searchParams, setSearchParams] = useSearchParams();
-  const id = searchParams.get('id');
-  const [data, setData] = useState({});
   const formRef = useRef();
+  const idRef = useRef();
   const navigate = useNavigate();
 
   useEffect(() => {
     getRegulationList({ type: `station` }).then((res) => {
       formRef.current.setFieldsValue(res.records[0]);
-      console.log('tt', res)
+      idRef.current = res.records[0].id;
     });
   }, []);
 
   const onFinish = async (values) => {
-    //添加,修改
+    //修改
+    const id = idRef.current;
+    console.log('id', id)
     addRegulation({ ...values, id }).then((res) => {
-      // message.success('成功');
       navigate(-1);
-    });
-    return false;
+      return false;
+    })
   };
 
   return (
@@ -42,7 +40,7 @@ export default (props) => {
             searchConfig: {
               resetText: '返回',
             },
-            // onReset: () => navigate(-1),
+            onReset: () => navigate(-1),
             render: (props, doms) => {
               return (
                 <Row>
@@ -61,7 +59,6 @@ export default (props) => {
             allowClear={false}
             width={750}
             name="detail"
-            onFinish={onFinish}
             request={queryTable(getRegulationList)}
           />
         </ProForm>

src/regulation/edit/index.jsx

@@ -17,34 +17,37 @@ export default (props) => {
   const navigate = useNavigate();
 
   const formRef = useRef();
-
   useEffect(() => {
     if (id) {
       getPostsDetail(id).then((res) => {
         formRef.current.setFieldsValue({
           ...res,
-          filesList: res.filesList?.map((x) => x.fileAddr)[0]||null,
+          filesList: res.filesList?.map((x) => x.fileAddr)[0] || null,
         });
       });
     }
   }, [id]);
 
   const onFinish = async (values) => {
+    console.log(values);
+
+    //添加,修改
+    // addRegulation({ ...values, id }).then((res) => {
     savePosts({
       ...values,
       type: 'regulation',
       filesList: values.filesList
         ? [
-            {
-              fileAddr: values.filesList,
-              fileName: values.filesList?.substring(
-                values.filesList?.lastIndexOf("/") + 1
-              ),
-            },
-          ]
+          {
+            fileAddr: values.filesList,
+            fileName: values.filesList?.substring(
+              values.filesList?.lastIndexOf("/") + 1
+            ),
+          },
+        ]
         : null,
       status: Number(values.status),
-      ...(id?{id}:{}),
+      ...(id ? { id } : {}),
     }).then((res) => {
       navigate(-1);
     });