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

src/components/page/Container.jsx

@@ -1,10 +0,0 @@
-import React from 'react';
-import './style.less'
-
-export default (props) => {
-  return (
-    <div className="page-container">
-      {props.children}
-    </div>
-  )
-}

src/components/page/index.jsx

@@ -1,14 +0,0 @@
-import React, { useEffect } from 'react';
-// import { PageHeader } from 'antd';
-import { useModel } from '@/store';
-import Container from './Container';
-
-export default (props) => {
-  // const { children, ...headerProps } = props;
-  
-  return (
-    <Container>
-      {props.children}
-    </Container>
-  )
-}

src/components/page/style.less

@@ -1,5 +0,0 @@
-
-.page-container {
-  margin: 24px;
-  margin-bottom: 0;
-}

src/layouts/AuthLayout/components/Container.jsx

@@ -6,25 +6,15 @@ import Footer from './Footer';
 
 const { Content } = Layout;
 
-export default (props) => {  
-  const [footerHeight, setFooterHeight] = useState(0);
-
-  // 24 是 marginTop 的值
-  const contentStyle = useMemo(() => ({ height: footerHeight > 0 ? `calc(100% - ${footerHeight + 24}px)` : '100%' }), [footerHeight]);
-  
-  useEffect(() => {
-    const footerHeight = (document.querySelector('.ant-layout-footer') || {}).offsetHeight || 0;
-    setFooterHeight(footerHeight);
-  });
-
+export default (props) => {
   return (
     <div className='layout-container'>
-      <Content style={contentStyle}>
+      {/* <Content style={{ height: '100%' }}> */}
         {/* <PageTransition location={props.location}> */}
           <Outlet />
         {/* </PageTransition> */}
-      </Content>
-      {!props.noFooter && <Footer />}      
+      {/* </Content> */}
+      {/* {!noFooter && <Footer />} */}
     </div>
   )
 }

src/layouts/Container.jsx → src/layouts/PageContainer.jsx

@@ -4,8 +4,9 @@ import { Outlet } from 'react-router-dom';
 import useRoute from '@/utils/hooks/useRoute';
 
 const containerStyle = {
-  margin: '24px 24px 0 24px',
-  height: '100%',
+  // margin: '24px 24px 0 24px',
+  margin: '24px',
+  minHeight: 'calc(100% - 48px)',
 }
 const { Title } = Typography;
 

src/pages/dish/edit/index.jsx

@@ -36,7 +36,7 @@ export default (props) => {
     console.log(values, '===');
 
     addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {
-      message.success('添加成功');
+      // message.success('添加成功');
       navigate(-1);
     });
 

src/pages/dish/list/index.jsx

@@ -15,7 +15,7 @@ const DishList = (props) => {
   const updata = (row) => {
     if (row.id) {
       updataDish(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         actionRef.current.reload();
       });
     }
@@ -24,7 +24,7 @@ const DishList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteDish(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/evaluate/index.jsx

@@ -21,7 +21,7 @@ const GuaranteeTaskList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteGuaranteeTask(id).then((res) => {
-        message.success("删除成功");
+        // message.success("删除成功");
         actionRef.current.reload();
       });
     }

src/pages/guaranteeTask/Edit/BasicForm.jsx

@@ -41,7 +41,7 @@ export default (props) => {
     func({ ...values, startDate, endDate }, id).then(res => {
       setLoading(false);
       setDataSource(res);
-      notification.success({ message: '操作成功' })
+      // notification.success({ message: '操作成功' })
     }).catch(() => {
       setLoading(false);
     });

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -85,7 +85,7 @@ export default (props) => {
     addGuaranteeDetailBatch(list, dataSource.id).then(res => {
       setLoading(false);
       setList(res);
-      notification.success({ message: '操作成功' });
+      // notification.success({ message: '操作成功' });
     }).catch(() => {
       setLoading(false);
     });

src/pages/guaranteeTask/index.jsx

@@ -21,7 +21,7 @@ const GuaranteeTaskList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteGuaranteeTask(id).then((res) => {
-        message.success("删除成功");
+        // message.success("删除成功");
         actionRef.current.reload();
       });
     }

src/pages/package/BasicForm.jsx

@@ -18,7 +18,7 @@ export default (props) => {
     func(data, current.id).then(res => {
       setLoading(false);
       onChange(res);
-      notification.success({ message: '操作成功' })
+      // notification.success({ message: '操作成功' })
     }).catch(() => {
       setLoading(false);
     });

src/pages/rotationChart/edit/index.jsx

@@ -40,13 +40,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataBanner(id, { ...values }).then((res) => {
-        message.success("修改成功");
+        // message.success("修改成功");
         navigate(-1);
       });
     } else {
       // 新增
       addBanner({ ...values }).then((res) => {
-        message.success("添加成功");
+        // message.success("添加成功");
         navigate(-1);
       });
     }

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

@@ -1,27 +1,29 @@
-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) => {
     //添加,修改
     addRegulation({ ...values, id }).then((res) => {
-      message.success('成功');
+      // message.success('成功');
       navigate(-1);
     });
     return false;
@@ -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/pages/rotationChart/introduction/index.jsx

@@ -12,7 +12,7 @@ const IntroductionList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteRegulation(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/rotationChart/list/index.jsx

@@ -15,7 +15,7 @@ const RotationChartList = (props) => {
   const updata = (row) => {
     if (row.id) {
       updataBanner(row.id, { state: row.state === '1' ? '2' : '1' }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         actionRef.current.reload();
       });
     }
@@ -24,7 +24,7 @@ const RotationChartList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteBanner(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/sample/form/index.jsx

@@ -1,353 +0,0 @@
-import {
-  AutoComplete,
-  Button,
-  Cascader,
-  Checkbox,
-  Col,
-  Form,
-  Input,
-  InputNumber,
-  Row,
-  Select,
-  Card,
-} from 'antd';
-import React, { useState } from 'react';
-import Page from '@/components/page';
-
-const { Option } = Select;
-const residences = [
-  {
-    value: 'zhejiang',
-    label: 'Zhejiang',
-    children: [
-      {
-        value: 'hangzhou',
-        label: 'Hangzhou',
-        children: [
-          {
-            value: 'xihu',
-            label: 'West Lake',
-          },
-        ],
-      },
-    ],
-  },
-  {
-    value: 'jiangsu',
-    label: 'Jiangsu',
-    children: [
-      {
-        value: 'nanjing',
-        label: 'Nanjing',
-        children: [
-          {
-            value: 'zhonghuamen',
-            label: 'Zhong Hua Men',
-          },
-        ],
-      },
-    ],
-  },
-];
-const formItemLayout = {
-  labelCol: {
-    xs: {
-      span: 24,
-    },
-    sm: {
-      span: 8,
-    },
-  },
-  wrapperCol: {
-    xs: {
-      span: 24,
-    },
-    sm: {
-      span: 16,
-    },
-  },
-};
-const tailFormItemLayout = {
-  wrapperCol: {
-    xs: {
-      span: 24,
-      offset: 0,
-    },
-    sm: {
-      span: 16,
-      offset: 8,
-    },
-  },
-};
-
-
-const BasicForm = () => {
-  const [form] = Form.useForm();
-
-  const onFinish = (values) => {
-    console.log('Received values of form: ', values);
-  };
-
-  const prefixSelector = (
-    <Form.Item name="prefix" noStyle>
-      <Select
-        style={{
-          width: 70,
-        }}
-      >
-        <Option value="86">+86</Option>
-        <Option value="87">+87</Option>
-      </Select>
-    </Form.Item>
-  );
-  const suffixSelector = (
-    <Form.Item name="suffix" noStyle>
-      <Select
-        style={{
-          width: 70,
-        }}
-      >
-        <Option value="USD">$</Option>
-        <Option value="CNY">¥</Option>
-      </Select>
-    </Form.Item>
-  );
-  const [autoCompleteResult, setAutoCompleteResult] = useState([]);
-
-  const onWebsiteChange = (value) => {
-    if (!value) {
-      setAutoCompleteResult([]);
-    } else {
-      setAutoCompleteResult(['.com', '.org', '.net'].map((domain) => `${value}${domain}`));
-    }
-  };
-
-  const websiteOptions = autoCompleteResult.map((website) => ({
-    label: website,
-    value: website,
-  }));
-  return (
-    <Form
-      {...formItemLayout}
-      form={form}
-      name="register"
-      onFinish={onFinish}
-      initialValues={{
-        residence: ['zhejiang', 'hangzhou', 'xihu'],
-        prefix: '86',
-      }}
-      scrollToFirstError
-      style={{ background: '#fff', boxSizing: 'border-box', padding: '24px' }}
-    >
-      <Form.Item
-        name="email"
-        label="E-mail"
-        rules={[
-          {
-            type: 'email',
-            message: 'The input is not valid E-mail!',
-          },
-          {
-            required: true,
-            message: 'Please input your E-mail!',
-          },
-        ]}
-      >
-        <Input />
-      </Form.Item>
-
-      <Form.Item
-        name="password"
-        label="Password"
-        rules={[
-          {
-            required: true,
-            message: 'Please input your password!',
-          },
-        ]}
-        hasFeedback
-      >
-        <Input.Password />
-      </Form.Item>
-
-      <Form.Item
-        name="confirm"
-        label="Confirm Password"
-        dependencies={['password']}
-        hasFeedback
-        rules={[
-          {
-            required: true,
-            message: 'Please confirm your password!',
-          },
-          ({ getFieldValue }) => ({
-            validator(_, value) {
-              if (!value || getFieldValue('password') === value) {
-                return Promise.resolve();
-              }
-
-              return Promise.reject(new Error('The two passwords that you entered do not match!'));
-            },
-          }),
-        ]}
-      >
-        <Input.Password />
-      </Form.Item>
-
-      <Form.Item
-        name="nickname"
-        label="Nickname"
-        tooltip="What do you want others to call you?"
-        rules={[
-          {
-            required: true,
-            message: 'Please input your nickname!',
-            whitespace: true,
-          },
-        ]}
-      >
-        <Input />
-      </Form.Item>
-
-      <Form.Item
-        name="residence"
-        label="Habitual Residence"
-        rules={[
-          {
-            type: 'array',
-            required: true,
-            message: 'Please select your habitual residence!',
-          },
-        ]}
-      >
-        <Cascader options={residences} />
-      </Form.Item>
-
-      <Form.Item
-        name="phone"
-        label="Phone Number"
-        rules={[
-          {
-            required: true,
-            message: 'Please input your phone number!',
-          },
-        ]}
-      >
-        <Input
-          addonBefore={prefixSelector}
-          style={{
-            width: '100%',
-          }}
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="donation"
-        label="Donation"
-        rules={[
-          {
-            required: true,
-            message: 'Please input donation amount!',
-          },
-        ]}
-      >
-        <InputNumber
-          addonAfter={suffixSelector}
-          style={{
-            width: '100%',
-          }}
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="website"
-        label="Website"
-        rules={[
-          {
-            required: true,
-            message: 'Please input website!',
-          },
-        ]}
-      >
-        <AutoComplete options={websiteOptions} onChange={onWebsiteChange} placeholder="website">
-          <Input />
-        </AutoComplete>
-      </Form.Item>
-
-      <Form.Item
-        name="intro"
-        label="Intro"
-        rules={[
-          {
-            required: true,
-            message: 'Please input Intro',
-          },
-        ]}
-      >
-        <Input.TextArea showCount maxLength={100} />
-      </Form.Item>
-
-      <Form.Item
-        name="gender"
-        label="Gender"
-        rules={[
-          {
-            required: true,
-            message: 'Please select gender!',
-          },
-        ]}
-      >
-        <Select placeholder="select your gender">
-          <Option value="male">Male</Option>
-          <Option value="female">Female</Option>
-          <Option value="other">Other</Option>
-        </Select>
-      </Form.Item>
-
-      <Form.Item label="Captcha" extra="We must make sure that your are a human.">
-        <Row gutter={8}>
-          <Col span={12}>
-            <Form.Item
-              name="captcha"
-              noStyle
-              rules={[
-                {
-                  required: true,
-                  message: 'Please input the captcha you got!',
-                },
-              ]}
-            >
-              <Input />
-            </Form.Item>
-          </Col>
-          <Col span={12}>
-            <Button>Get captcha</Button>
-          </Col>
-        </Row>
-      </Form.Item>
-
-      <Form.Item
-        name="agreement"
-        valuePropName="checked"
-        rules={[
-          {
-            validator: (_, value) =>
-              value ? Promise.resolve() : Promise.reject(new Error('Should accept agreement')),
-          },
-        ]}
-        {...tailFormItemLayout}
-      >
-        <Checkbox>
-          I have read the <a href="">agreement</a>
-        </Checkbox>
-      </Form.Item>
-      <Form.Item {...tailFormItemLayout}>
-        <Button type="primary" htmlType="submit">
-          Register
-        </Button>
-      </Form.Item>
-    </Form>
-  );
-};
-
-export default () => <Page><Card><BasicForm /></Card></Page>;

src/pages/sample/table/index.jsx

@@ -1,169 +0,0 @@
-import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons';
-import { ProTable, TableDropdown } from '@ant-design/pro-components';
-import { Button, Dropdown, Menu, Space, Tag } from 'antd';
-import { useRef, useEffect } from 'react';
-import Page from '@/components/page';
-import { useModel } from '@/store';
-
-// import request from 'umi-request';
-const columns = [
-    {
-        dataIndex: 'index',
-        valueType: 'indexBorder',
-        width: 48,
-    },
-    {
-        title: '标题',
-        dataIndex: 'title',
-        copyable: true,
-        ellipsis: true,
-        tip: '标题过长会自动收缩',
-        formItemProps: {
-            rules: [
-                {
-                    required: true,
-                    message: '此项为必填项',
-                },
-            ],
-        },
-    },
-    {
-        disable: true,
-        title: '状态',
-        dataIndex: 'state',
-        filters: true,
-        onFilter: true,
-        ellipsis: true,
-        valueType: 'select',
-        valueEnum: {
-            all: { text: '超长'.repeat(50) },
-            open: {
-                text: '未解决',
-                status: 'Error',
-            },
-            closed: {
-                text: '已解决',
-                status: 'Success',
-                disabled: true,
-            },
-            processing: {
-                text: '解决中',
-                status: 'Processing',
-            },
-        },
-    },
-    {
-        disable: true,
-        title: '标签',
-        dataIndex: 'labels',
-        search: false,
-        renderFormItem: (_, { defaultRender }) => {
-            return defaultRender(_);
-        },
-        render: (_, record) => (<Space>
-        {record.labels.map(({ name, color }) => (<Tag color={color} key={name}>
-            {name}
-          </Tag>))}
-      </Space>),
-    },
-    {
-        title: '创建时间',
-        key: 'showTime',
-        dataIndex: 'created_at',
-        valueType: 'date',
-        sorter: true,
-        hideInSearch: true,
-    },
-    {
-        title: '创建时间',
-        dataIndex: 'created_at',
-        valueType: 'dateRange',
-        hideInTable: true,
-        search: {
-            transform: (value) => {
-                return {
-                    startTime: value[0],
-                    endTime: value[1],
-                };
-            },
-        },
-    },
-    {
-        title: '操作',
-        valueType: 'option',
-        key: 'option',
-        render: (text, record, _, action) => [
-            <a key="editable" onClick={() => {
-                    var _a;
-                    (_a = action === null || action === void 0 ? void 0 : action.startEditable) === null || _a === void 0 ? void 0 : _a.call(action, record.id);
-                }}>
-        编辑
-      </a>,
-            <a href={record.url} target="_blank" rel="noopener noreferrer" key="view">
-        查看
-      </a>,
-            <TableDropdown key="actionGroup" onSelect={() => action === null || action === void 0 ? void 0 : action.reload()} menus={[
-                    { key: 'copy', name: '复制' },
-                    { key: 'delete', name: '删除' },
-                ]}/>,
-        ],
-    },
-];
-const menu = (<Menu items={[
-        {
-            label: '1st item',
-            key: '1',
-        },
-        {
-            label: '2nd item',
-            key: '1',
-        },
-        {
-            label: '3rd item',
-            key: '1',
-        },
-    ]}/>);
-export default () => {
-
-    const actionRef = useRef();
-    return (<Page><ProTable columns={columns} actionRef={actionRef} cardBordered request={async (params = {}, sort, filter) => {
-            console.log(sort, filter);
-            // return request('https://proapi.azurewebsites.net/github/issues', {
-            //     params,
-            // });
-        }} editable={{
-            type: 'multiple',
-        }} columnsState={{
-            persistenceKey: 'pro-table-singe-demos',
-            persistenceType: 'localStorage',
-            onChange(value) {
-                console.log('value: ', value);
-            },
-        }} rowKey="id" search={{
-            labelWidth: 'auto',
-        }} options={{
-            setting: {
-                listsHeight: 400,
-            },
-        }} form={{
-            // 由于配置了 transform，提交的参与与定义的不同这里需要转化一下
-            syncToUrl: (values, type) => {
-                if (type === 'get') {
-                    return Object.assign(Object.assign({}, values), { created_at: [values.startTime, values.endTime] });
-                }
-                return values;
-            },
-        }} pagination={{
-            pageSize: 5,
-            onChange: (page) => console.log(page),
-        }} dateFormatter="string" headerTitle="高级表格" toolBarRender={() => [
-            <Button key="button" icon={<PlusOutlined />} type="primary">
-          新建
-        </Button>,
-            <Dropdown key="menu" overlay={menu}>
-          <Button>
-            <EllipsisOutlined />
-          </Button>
-        </Dropdown>,
-        ]}/></Page>);
-};

src/pages/stock/edit/index.jsx

@@ -26,13 +26,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataStore(id, { ...values }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         navigate(-1);
       });
     } else {
       // 新增
       addStore({ ...values }).then((res) => {
-        message.success('添加成功');
+        // message.success('添加成功');
         navigate(-1);
       });
     }

src/pages/stock/list/index.jsx

@@ -20,7 +20,7 @@ const StockList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteStore(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/pages/stockClassification/edit/index.jsx

@@ -24,13 +24,13 @@ export default (props) => {
     if (id) {
       // 修改
       updataStoreType(id, { ...values }).then((res) => {
-        message.success('修改成功');
+        // message.success('修改成功');
         navigate(-1);
       });
     } else {
       // 新增;
       addStoreType({ ...values }).then((res) => {
-        message.success('添加成功');
+        // message.success('添加成功');
         navigate(-1);
       });
     }

src/pages/stockClassification/list/index.jsx

@@ -15,7 +15,7 @@ const StockList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteStoreType(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/regulation/edit/index.jsx

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

src/regulation/index.jsx

@@ -16,7 +16,7 @@ const RegulationList = (props) => {
   const handleDelete = (id) => {
     if (id) {
       deleteRegulation(id).then((res) => {
-        message.success('删除成功');
+        // message.success('删除成功');
         actionRef.current.reload();
       });
     }

src/routes/routes.jsx

@@ -9,12 +9,10 @@ import {
 } from "@ant-design/icons";
 import { Navigate } from "react-router-dom";
 import AuthLayout from "@/layouts/AuthLayout";
-import Container from "@/layouts/Container";
+import PageContainer from "@/layouts/PageContainer";
 import Login from "@/pages/login";
 import Page404 from "@/pages/404";
-import Home from "@/pages/sample/home";
-import BasicForm from "@/pages/sample/form";
-import BasicTable from "@/pages/sample/table";
+import Home from "@/pages/home";
 import GuaranteeTaskList from "@/pages/guaranteeTask";
 import GuaranteeTaskEdit from "@/pages/guaranteeTask/Edit";
 import GuaranteeTaskPrint from "@/pages/guaranteeTask/print";
@@ -65,9 +63,19 @@ import StatisCharts from "@/pages/statis/charts";
  */
 
 export const authRoutes = [
+  {
+    path: "static",
+    element: <StatisCharts />,
+    meta: {
+      title: "数据分析",
+      noSiderBar: true,
+      noFooter: true,
+      permission: 'static',
+    },
+  },
   {
     path: "task",
-    element: <Container />,
+    element: <PageContainer />,
     meta: {
       title: "军供任务",
       permission: 'task',
@@ -125,7 +133,7 @@ export const authRoutes = [
   },
   {
     path: "stock",
-    element: <Container />,
+    element: <PageContainer />,
     meta: {
       title: "库存物资",
       permission: 'stock',
@@ -180,7 +188,7 @@ export const authRoutes = [
   },
   {
     path: "purchase",
-    element: <Container />,
+    element: <PageContainer />,
     meta: {
       title: "采购管理",
       permission: 'purchase',
@@ -232,11 +240,20 @@ export const authRoutes = [
           permission: 'purchase.instore',
         },
       },
+      {
+        path: "inStore/edit",
+        element: <PurchaseInStoreEdit />,
+        meta: {
+          title: "采购详情",
+          permission: 'purchase.detail',
+          hideInMenu: true,
+        },
+      },
     ],
   },
   {
     path: "cms",
-    element: <Container />,
+    element: <PageContainer />,
     meta: {
       title: "公告文件",
       permission: 'cms',
@@ -247,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',
@@ -334,19 +351,9 @@ export const authRoutes = [
       },
     ],
   },
-  {
-    path: "static",
-    element: <StatisCharts />,
-    meta: {
-      title: "数据分析",
-      noSiderBar: true,
-      noFooter: true,
-      permission: 'static',
-    },
-  },
   {
     path: "system",
-    element: <Container />,
+    element: <PageContainer />,
     meta: {
       title: "系统管理",
       permission: 'system',
@@ -474,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);
@@ -483,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/dish.js

@@ -12,7 +12,7 @@ export const getDishList = (params) => request('/dishes', { params,successTip:fa
  * @param {*} params
  * @returns
  */
-export const getFoodIngredientsList = (params) => request('/foodIngredients', { params });
+export const getFoodIngredientsList = (params) => request('/foodIngredients', { params, successTip: false });
 
 /**
  * 详情

src/services/package.js

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getPackageList = (params) => request('/package', { params,successTip:false });
+export const getPackageList = (params) => request('/package', { params, successTip: false });
 
 
 /**
@@ -36,7 +36,7 @@ export const deletePackage = id => request(`/package/${id}`, { method: 'delete'
  * @param {*} params 
  * @returns 
  */
-export const getPackageDetailList = params => request('/packageDetail', { params });
+export const getPackageDetailList = params => request('/packageDetail', { params, successTip: false });
 
 
 /**

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' });