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

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

@@ -1,22 +1,24 @@
-import { addRegulation, getRegulationById } from '@/services/regulation';
+import { addRegulation, getRegulationList } 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';
 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 navigate = useNavigate();
 
   useEffect(() => {
-    if (id) {
-      getRegulationById(id).then((res) => {
-        formRef.current.setFieldsValue(res);
-      });
-    }
-  }, [id]);
+    getRegulationList({ type: `station` }).then((res) => {
+      formRef.current.setFieldsValue(res.records[0]);
+      console.log('tt', res)
+    });
+  }, []);
 
   const onFinish = async (values) => {
     //添加,修改
@@ -40,7 +42,7 @@ export default (props) => {
             searchConfig: {
               resetText: '返回',
             },
-            onReset: () => navigate(-1),
+            // onReset: () => navigate(-1),
             render: (props, doms) => {
               return (
                 <Row>
@@ -53,12 +55,14 @@ export default (props) => {
           }}
         >
           <ProFormTextArea
-            name="detail"
             label="发布内容"
             placeholder="请输入发布内容"
             rules={[{ required: true, message: '请输入发布内容' }]}
             allowClear={false}
             width={750}
+            name="detail"
+            onFinish={onFinish}
+            request={queryTable(getRegulationList)}
           />
         </ProForm>
       </Card>

src/regulation/edit/index.jsx

@@ -22,7 +22,6 @@ export default (props) => {
   const onFinish = async (values) => {
     console.log(values);
 
-    // if (id) {
     //添加,修改
     addRegulation({ ...values, id }).then((res) => {
       // message.success('成功');

src/routes/routes.jsx

@@ -264,8 +264,8 @@ export const authRoutes = [
         element: <Navigate to="rotationChart/list" replace />,
       },
       {
-        path: "station",
-        element: null,
+        path: "rotationChart/introduction",
+        element: <RotationChartIntroductionEdit />,
         meta: {
           title: "本站信息",
           permission: 'station',
@@ -481,7 +481,7 @@ export const defaultRoutes = [
   },
 ];
 
-export function mergeAuthRoutes(r1, r2) {
+export function mergeAuthRoutes (r1, r2) {
   const r = r1.slice();
   const children = r1[0].children.slice();
   r[0].children = children.concat(r2);
@@ -490,7 +490,7 @@ export function mergeAuthRoutes(r1, r2) {
 
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
-function getPath(parent = "/", current = "") {
+function getPath (parent = "/", current = "") {
   if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
     return current;
   return `${parent}/${current}`.replace(/\/\//g, "/");

src/services/regulation.js

@@ -1,4 +1,4 @@
-import request, { restful } from '@/utils/request';
+import request from '@/utils/request';
 
 /**
  * 查询列表
@@ -27,12 +27,4 @@ export const getRegulationById = (id) => request(`/posts/${id}`);
  * @param {*} id
  * @returns
  */
-export const deleteRegulation = (id) => request(`/posts/${id}`, { method: 'delete' });
-
-//标题
-/**
- * 查询列表
- * @param {*} params
- * @returns
- */
-export const getRegulationTitleList = (params) => request('/posts', { params, successTip: false });
+export const deleteRegulation = (id) => request(`/posts/${id}`, { method: 'delete' });