2 年前 · c0035cca54
--- a/index.html
+++ b/index.html
@@ -2,9 +2,10 @@
 
				 <html lang="en">
			
 
				   <head>
			
 
				     <meta charset="UTF-8" />
			
 
				-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
			
 
				+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
			
 
				-    <title>Vite + React</title>
			
 
				+    <script src="/config.js"></script>
			
 
				+    <title>海安军供保障信息管理系统</title>
			
 
				   </head>
			
 
				   <body>
			
 
				     <div id="root"></div>
			
--- a/public/config.js
+++ b/public/config.js
@@ -0,0 +1,6 @@
 
				+
			
 
				+// 大华监控
			
 
				+DH_MONITOR = 'http://192.168.3.2';
			
 
				+
			
 
				+// 海康监控
			
 
				+HK_MONITOR = 'http://192.168.3.3';
			
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/vite.svg
+++ b/public/vite.svg
@@ -1 +0,0 @@
 
				-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
			
--- a/src/assets/avatar.png
+++ b/src/assets/avatar.png
--- a/src/components/Money/float.js
+++ b/src/components/Money/float.js
@@ -0,0 +1,4 @@
 
				+const epsilonN = N => num => Math.round( num * N + Number.EPSILON ) / N;
			
 
				+const epsilon2 = epsilonN(1e2);
			
 
				+
			
 
				+export default epsilon2;
			
--- a/src/components/Money/index.jsx
+++ b/src/components/Money/index.jsx
@@ -0,0 +1,30 @@
 
				+import { InputNumber } from "antd"
			
 
				+import { useEffect, useState } from "react"
			
 
				+import epsilon2 from './float'
			
 
				+
			
 
				+export default (props) => {
			
 
				+
			
 
				+  const { value, onChange, ...leftProps } = props
			
 
				+
			
 
				+  const [money, setMoney] = useState(0)
			
 
				+
			
 
				+  useEffect(() => {
			
 
				+    setMoney(epsilon2(value / 100))
			
 
				+  }, [value])
			
 
				+
			
 
				+  const handleChange = (val) => {
			
 
				+    onChange(epsilon2(val * 100))
			
 
				+  }
			
 
				+
			
 
				+  return (
			
 
				+    <InputNumber
			
 
				+      min='0'
			
 
				+      {...leftProps}
			
 
				+      value={money}
			
 
				+      onChange={handleChange}
			
 
				+      precision={2}
			
 
				+      formatter={value => `￥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
			
 
				+      parser={value => value.replace(/\￥\s?|(,*)/g, '')}
			
 
				+    />
			
 
				+  )
			
 
				+}
			
--- a/src/components/Wangeditor/index.jsx
+++ b/src/components/Wangeditor/index.jsx
@@ -7,16 +7,12 @@ import { Editor, Toolbar } from "@wangeditor/editor-for-react";
 
				 
			
 
				 function MyEditor(props) {
			
 
				   const {
			
 
				-    value,
			
 
				+    value = "",
			
 
				     onChange = (e) => {
			
 
				       setHtml(e);
			
 
				     },
			
 
				     toolbarConfig = {
			
 
				-      excludeKeys: [
			
 
				-
			
 
				-        "group-image",
			
 
				-        "group-video",
			
 
				-      ],
			
 
				+      excludeKeys: ["group-image", "group-video"],
			
 
				     },
			
 
				     editorConfig = {
			
 
				       placeholder: "请输入内容...",
			
@@ -25,15 +21,10 @@ function MyEditor(props) {
 
				   } = props;
			
 
				   const [editor, setEditor] = useState(null); // 存储 editor 实例
			
 
				   const [html, setHtml] = useState("");
			
 
				-  console.log(props, "MyEditor");
			
 
				+ 
			
 
				   // 模拟 ajax 请求，异步设置 html
			
 
				   useEffect(() => {
			
 
				-    if(editor){
			
 
				-      console.log(editor,editor.getConfig(),editor.getAllMenuKeys(),editor.getMenuConfig('image')) ;
			
 
				-    }
			
 
				-   
			
 
				-
			
 
				-    setHtml(value);
			
 
				+    setHtml(value || "");
			
 
				   }, [value]);
			
 
				 
			
 
				   // 及时销毁 editor
			
--- a/src/components/evaluateItem/index.jsx
+++ b/src/components/evaluateItem/index.jsx
@@ -5,8 +5,8 @@ function MyEditor(props) {
 
				     // value,
			
 
				     // onChange = (e) => {},
			
 
				     options = [
			
 
				-      { value: 2, label: "优" },
			
 
				-      { value: 1, label: "良" },
			
 
				+      { value: 2, label: "满意" },
			
 
				+      { value: 1, label: "一般" },
			
 
				       { value: 0, label: "差" },
			
 
				     ],
			
 
				     ...leftProps
			
--- a/src/components/page/style.less
+++ b/src/components/page/style.less
@@ -1,5 +1,5 @@
 
				 
			
 
				 .page-container {
			
 
				   margin: 24px;
			
 
				-  margin-bottom: 0;
			
 
				+  // margin-bottom: 0;
			
 
				 }
			
--- a/src/index.less
+++ b/src/index.less
@@ -45,7 +45,23 @@ html, body, #root {
 
				 
			
 
				   .ant-menu {
			
 
				     font-size: 16px;
			
 
				-    background: var(--theme-color);
			
 
				+    background: #0D267C;
			
 
				+  }
			
 
				+
			
 
				+  .ant-menu-item {
			
 
				+    overflow: hidden;
			
 
				+    border-top-right-radius: 20px;
			
 
				+    border-bottom-right-radius: 20px;
			
 
				+  }
			
 
				+
			
 
				+  .ant-menu-title-content {
			
 
				+    padding-left: 2em;
			
 
				+  }
			
 
				+
			
 
				+  &.ant-layout-sider-collapsed {
			
 
				+    .ant-menu-title-content {
			
 
				+      padding-left: 0;
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 
			
--- a/src/layouts/AuthLayout/components/Container.jsx
+++ b/src/layouts/AuthLayout/components/Container.jsx
@@ -6,25 +6,15 @@ import Footer from './Footer';
 
				 
			
 
				 const { Content } = Layout;
			
 
				 
			
 
				-export default (props) => {  
			
 
				-  const containerRef = useRef();
			
 
				-  const [minHeight, setMinHeight] = useState(0);
			
 
				-  const contentStyle = useMemo(() => ({ minHeight: `${minHeight}px` }), [minHeight]);
			
 
				-  
			
 
				-  useEffect(() => {
			
 
				-    const containerHeight = containerRef.current.offsetHeight;
			
 
				-    const footerHeight = (document.querySelector('.ant-layout-footer') || {}).offsetHeight || 0;
			
 
				-    setMinHeight(containerHeight - footerHeight);
			
 
				-  }, []);
			
 
				-
			
 
				+export default (props) => {
			
 
				   return (
			
 
				-    <div className='layout-container' ref={containerRef}>
			
 
				-      <Content style={contentStyle}>
			
 
				+    <div className='layout-container'>
			
 
				+      {/* <Content style={{ height: '100%' }}> */}
			
 
				         {/* <PageTransition location={props.location}> */}
			
 
				           <Outlet />
			
 
				         {/* </PageTransition> */}
			
 
				-      </Content>
			
 
				-      {!props.noFooter && <Footer />}      
			
 
				+      {/* </Content> */}
			
 
				+      {/* {!noFooter && <Footer />} */}
			
 
				     </div>
			
 
				   )
			
 
				 }
			
--- a/src/layouts/AuthLayout/components/Footer.jsx
+++ b/src/layouts/AuthLayout/components/Footer.jsx
@@ -1,14 +1,16 @@
 
				 import React from 'react';
			
 
				 import { Layout, Spin } from 'antd';
			
 
				+import { useModel } from '@/store';
			
 
				 
			
 
				 const { Footer } = Layout;
			
 
				-
			
 
				 const year = new Date().getFullYear();
			
 
				+
			
 
				 export default (props) => {
			
 
				 
			
 
				-  const copyRight = `南京云致 @${year}`
			
 
				+  const { app } = useModel('system');
			
 
				+  const copyRight = `${app.company} @ ${year}`
			
 
				 
			
 
				   return (
			
 
				-    <Footer style={{ textAlign: 'center' }}>{copyRight}</Footer>
			
 
				+    <Footer style={{ textAlign: 'center', color: 'rgba(0,0,0, 0.3)' }}>{copyRight}</Footer>
			
 
				   )
			
 
				 }
			
--- a/src/layouts/AuthLayout/components/Header/Exit.jsx
+++ b/src/layouts/AuthLayout/components/Header/Exit.jsx
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 
				 import { LogoutOutlined } from '@ant-design/icons';
			
 
				 import { Button, Modal } from 'antd';
			
 
				 import { useModel } from '@/store';
			
 
				+import { logout } from '@/services/user';
			
 
				 
			
 
				 const { confirm } = Modal;
			
 
				 
			
@@ -15,7 +16,8 @@ export default (props) => {
 
				     confirm({
			
 
				       title: '确认退出系统?',
			
 
				       onOk: () => {
			
 
				-        sessionStorage.removeItem('token');
			
 
				+        logout();
			
 
				+        localStorage.removeItem('token');
			
 
				         setUser();
			
 
				         navigate('/login?back=true');
			
 
				       }
			
--- a/src/layouts/AuthLayout/components/Header/SplitMenu.jsx
+++ b/src/layouts/AuthLayout/components/Header/SplitMenu.jsx
@@ -1,12 +1,23 @@
 
				 import React from 'react';
			
 
				 import { Menu } from 'antd';
			
 
				+import { Link } from 'react-router-dom';
			
 
				 
			
 
				 export default (props) => {
			
 
				   const { items, location } = props;
			
 
				 
			
 
				+  const menus = React.useMemo(() => {
			
 
				+    const homeIndex = {
			
 
				+      key: '/',
			
 
				+      label: <Link to='/'>首页</Link>,
			
 
				+      title: '首页',
			
 
				+    }
			
 
				+
			
 
				+    return [homeIndex].concat(items);
			
 
				+  }, [items]);
			
 
				+  
			
 
				   const selectedKeys = React.useMemo(() => `/${location.pathname.split('/')[1]}`, [location.pathname]);
			
 
				 
			
 
				   return (
			
 
				-    <Menu className='split-menu' mode="horizontal" items={items} selectedKeys={selectedKeys} />
			
 
				+    <Menu className='split-menu' mode="horizontal" items={menus} selectedKeys={selectedKeys} />
			
 
				   )
			
 
				 }
			
--- a/src/layouts/AuthLayout/components/Header/User.jsx
+++ b/src/layouts/AuthLayout/components/Header/User.jsx
@@ -1,12 +1,17 @@
 
				 import React, { useState, forwardRef, useRef, useImperativeHandle } from 'react';
			
 
				-import { Avatar, Button, Dropdown, Menu, Form, Input, Modal } from 'antd';
			
 
				-import { useModel } from '@/store'
			
 
				+import { Avatar, Button, Dropdown, Menu, Form, Input, Modal, message } from 'antd';
			
 
				+import avatarImg from '@/assets/avatar.png';
			
 
				+import { changePassword } from '@/services/user'
			
 
				+import md5 from 'md5';
			
 
				 
			
 
				 const ChangePassword = forwardRef((props, ref) => {
			
 
				   const [visible, setVisible] = useState(false);
			
 
				 
			
 
				   const onFinish = (values) => {
			
 
				-    console.log('Success:', values);
			
 
				+    changePassword({
			
 
				+      originPassword: md5(values.password),
			
 
				+      newPassword: md5(values.newPassword)
			
 
				+    }).then(() => setVisible(false));
			
 
				   };
			
 
				 
			
 
				   useImperativeHandle(ref, () => {
			
@@ -16,7 +21,12 @@ const ChangePassword = forwardRef((props, ref) => {
 
				   });
			
 
				 
			
 
				   return (
			
 
				-    <Modal title="修改密码" visible={visible} onCancel={() => setVisible(false)}>
			
 
				+    <Modal
			
 
				+      title="修改密码"
			
 
				+      visible={visible}
			
 
				+      onCancel={() => setVisible(false)}
			
 
				+      footer={null}
			
 
				+    >
			
 
				       <Form
			
 
				         labelCol={{ span: 8 }}
			
 
				         wrapperCol={{ span: 16 }}
			
@@ -66,7 +76,7 @@ export default (props) => {
 
				   ];
			
 
				 
			
 
				   const passRef = useRef();
			
 
				-  const { user = {} } = useModel('user');
			
 
				+  const { user = {} } = props;
			
 
				 
			
 
				   const onClick = ({ key }) => {
			
 
				     if (key === 'changePassword') {
			
@@ -79,7 +89,7 @@ export default (props) => {
 
				   return (
			
 
				     <Dropdown overlay={menu}>
			
 
				       <div className="user-info">
			
 
				-        <Avatar size={24} src="https://joeschmoe.io/api/v1/random" />
			
 
				+        <Avatar size={24} src={avatarImg} style={{background: '#fff'}} />
			
 
				         <span className='font'>{user.name}</span>
			
 
				         <ChangePassword ref={passRef} />
			
 
				       </div>
			
--- a/src/layouts/AuthLayout/components/Header/index.jsx
+++ b/src/layouts/AuthLayout/components/Header/index.jsx
@@ -10,7 +10,7 @@ import SplitMenu from './SplitMenu';
 
				 const { Header } = Layout;
			
 
				 
			
 
				 export default (props) => {
			
 
				-  const { menus, theme, location } = props;
			
 
				+  const { menus, theme, location, user } = props;
			
 
				 
			
 
				   const className = useMemo(() => classNames({
			
 
				     'layout-header': true,
			
@@ -22,7 +22,7 @@ export default (props) => {
 
				       <Logo />
			
 
				       <SplitMenu items={menus} location={location} />
			
 
				       <Space>
			
 
				-        <User />
			
 
				+        <User user={user} />
			
 
				         <Exit />
			
 
				       </Space>
			
 
				     </Header>
			
--- a/src/layouts/AuthLayout/components/SiderBar.jsx
+++ b/src/layouts/AuthLayout/components/SiderBar.jsx
@@ -13,7 +13,7 @@ export default (props) => {
 
				   }, []);
			
 
				 
			
 
				   return (
			
 
				-    <Sider className='layout-sidebar' theme={theme} collapsible width={width}>
			
 
				+    <Sider className='layout-sidebar' theme={theme} width={width}>
			
 
				       <Menus theme={theme} items={menus} location={location} />
			
 
				     </Sider>
			
 
				   );
			
--- a/src/layouts/AuthLayout/index.jsx
+++ b/src/layouts/AuthLayout/index.jsx
@@ -33,9 +33,9 @@ export default (props) => {
 
				           noLayout
			
 
				             ? <Outlet />
			
 
				             : (
			
 
				-              <Layout style={{ minHeight: '100vh' }}>
			
 
				-                <Header theme={theme} menus={splitMenus} location={location} />
			
 
				-                <Layout>
			
 
				+              <Layout style={{ height: '100vh' }}>
			
 
				+                <Header user={user} theme={theme} menus={splitMenus} location={location} />
			
 
				+                <Layout style={{ height: 'calc(100vh - var(--header-height))' }}>
			
 
				                   { !noSiderBar && <SiderBar theme={theme} menus={siderMenus} location={location} /> }
			
 
				                   <Container location={location} noFooter={noFooter} />
			
 
				                 </Layout>
			
--- a/src/layouts/AuthLayout/style.less
+++ b/src/layouts/AuthLayout/style.less
@@ -10,7 +10,8 @@
 
				 
			
 
				   .split-menu {
			
 
				     flex: 0;
			
 
				-    max-width: 1000px;
			
 
				+    min-width: 900px;
			
 
				+    // max-width: 1000px;
			
 
				     background: transparent;
			
 
				     font-size: 20px;
			
 
				     color: #fff;
			
@@ -93,6 +94,7 @@
 
				 }
			
 
				 
			
 
				 .layout-container {
			
 
				+  height: 100%;
			
 
				   flex: 1;
			
 
				 
			
 
				   overflow-y: auto;
			
--- a/src/layouts/Container.jsx
+++ b/src/layouts/Container.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;
			
 
				 
			
@@ -15,7 +16,7 @@ export default (props) => {
 
				 
			
 
				   return (
			
 
				     <div style={style}>
			
 
				-      {/* { meta.title && !meta.noLayout && <Title level={4} style={{ paddingBottom: '12px' }}>{ meta.title }</Title> } */}
			
 
				+      { meta.title && !meta.noLayout && <Title level={4} style={{ paddingBottom: '12px' }}>{ meta.title }</Title> }
			
 
				       <Outlet />
			
 
				     </div>
			
 
				   )
			
--- a/src/pages/cms/emergencyPlan/detail/index.jsx
+++ b/src/pages/cms/emergencyPlan/detail/index.jsx
@@ -30,7 +30,7 @@ export default (props) => {
 
				   }, [id]);
			
 
				 
			
 
				   return (
			
 
				-    <Card extra={<Button onClick={() => navigate(-1)}> 返回</Button>}>
			
 
				+    <Card title={<Button onClick={() => navigate(-1)}> 返回</Button>}>
			
 
				       <Title level={2} style={{ marginBottom: "2em" }}>
			
 
				         {data.title}
			
 
				       </Title>
			
--- a/src/pages/cms/emergencyPlan/edit/index.jsx
+++ b/src/pages/cms/emergencyPlan/edit/index.jsx
@@ -32,17 +32,9 @@ export default (props) => {
 
				   }, [id]);
			
 
				 
			
 
				   const onFinish = async (values) => {
			
 
				-    console.log(values, "===");
			
 
				-
			
 
				-    // if (id) {
			
 
				-    //   updatePosts(id, { ...values, status: Number(values.status) }).then(
			
 
				-    //     (res) => {
			
 
				-    //       navigate(-1);
			
 
				-    //     }
			
 
				-    //   );
			
 
				-    // } else {
			
 
				     savePosts({
			
 
				       ...values,
			
 
				+      type: 'emergency-plan',
			
 
				       filesList: values.filesList
			
 
				         ? [
			
 
				             {
			
--- a/src/pages/cms/emergencyPlan/list/index.jsx
+++ b/src/pages/cms/emergencyPlan/list/index.jsx
@@ -4,7 +4,6 @@ import { PageContainer, ProTable } from "@ant-design/pro-components";
 
				 import { useNavigate } from "react-router-dom";
			
 
				 import { Button, message, Popconfirm } from "antd";
			
 
				 import { useRef, useState, useEffect } from "react";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				 
			
 
				 const regex = /(<([^>]+)>)/gi;
			
 
				 
			
@@ -126,6 +125,7 @@ const EmergencyPlanList = (props) => {
 
				           </Button>,
			
 
				         ]}
			
 
				         // search={false}
			
 
				+        params={{ type: 'emergency-plan' }}
			
 
				         request={queryTable(getPostsList)}
			
 
				         columns={columns}
			
 
				       />
			
--- a/src/pages/cms/files/list/addFiles.jsx
+++ b/src/pages/cms/files/list/addFiles.jsx
@@ -17,7 +17,7 @@ export default ({onsuccess=()=>{}}) => {
 
				     console.log(values);
			
 
				     // await waitTime(2000);
			
 
				 
			
 
				-    await savePostsFiles(values);
			
 
				+    await savePostsFiles({...values, fileType: 'pure'});
			
 
				     onsuccess()
			
 
				     return true;
			
 
				   };
			
--- a/src/pages/cms/files/list/index.jsx
+++ b/src/pages/cms/files/list/index.jsx
@@ -4,7 +4,6 @@ import { PageContainer, ProTable, ProList } from "@ant-design/pro-components";
 
				 import { useNavigate } from "react-router-dom";
			
 
				 import { Button, message, Popconfirm } from "antd";
			
 
				 import { useRef, useState, useEffect } from "react";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				 import AddFiles from "./addFiles";
			
 
				 
			
 
				 const FilesList = (props) => {
			
@@ -24,6 +23,7 @@ const FilesList = (props) => {
 
				   return (
			
 
				     <PageContainer>
			
 
				       <ProList
			
 
				+        headerTitle="文件名称"
			
 
				         toolBarRender={() => {
			
 
				           return [
			
 
				             <AddFiles
			
@@ -34,12 +34,11 @@ const FilesList = (props) => {
 
				           ];
			
 
				         }}
			
 
				         actionRef={actionRef}
			
 
				+        params={{ fileType: 'pure' }}
			
 
				         request={queryTable(getPostsFilesList)}
			
 
				         search={{}}
			
 
				         rowKey="id"
			
 
				-        // headerTitle="基础列表"
			
 
				         pagination={true}
			
 
				-        // showActions="hover"
			
 
				         metas={{
			
 
				           title: {
			
 
				             dataIndex: "fileName",
			
--- a/src/pages/dish/edit/index.jsx
+++ b/src/pages/dish/edit/index.jsx
@@ -1,9 +1,10 @@
 
				 import { addDish, getDishById } from '@/services/dish';

			
 
				 import { getStoreList } from '@/services/stock';

			
 
				-import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';

			
 
				+import { PageContainer, ProForm, ProFormSelect, ProFormText, ProFormMoney, ProFormDigit } from '@ant-design/pro-components';

			
 
				 import { useNavigate, useSearchParams } from 'react-router-dom';

			
 
				 import { Card, Col, message, Row, Space } from 'antd';

			
 
				 import { useEffect, useRef, useState } from 'react';

			
 
				+import { floatMultiply, floatDivide } from "@/utils/float";

			
 
				 

			
 
				 export default (props) => {

			
 
				   const [searchParams] = useSearchParams();

			
@@ -26,7 +27,7 @@ export default (props) => {
 
				   useEffect(() => {

			
 
				     if (id) {

			
 
				       getDishById(id).then((res) => {

			
 
				-        formRef.current.setFieldsValue(res);

			
 
				+        formRef.current.setFieldsValue({ ...res, price: floatDivide(res.price, 100) });

			
 
				       });

			
 
				     }

			
 
				   }, [id]);

			
@@ -34,8 +35,8 @@ export default (props) => {
 
				   const onFinish = async (values) => {

			
 
				     console.log(values, '===');

			
 
				 

			
 
				-    addDish({ ...values, id }).then((res) => {

			
 
				-      message.success('添加成功');

			
 
				+    addDish({ ...values, price: floatMultiply(values.price, 100), id }).then((res) => {

			
 
				+      // message.success('添加成功');

			
 
				       navigate(-1);

			
 
				     });

			
 
				 

			
@@ -82,6 +83,12 @@ export default (props) => {
 
				             rules={[{ required: true, message: '请输入菜肴单位' }]}

			
 
				             width={460}

			
 
				           />

			
 
				+          <ProFormMoney

			
 
				+            name="price"

			
 
				+            label="价格"

			
 
				+            rules={[{ required: true, message: '请输入菜肴价格' }]}

			
 
				+            width={460}

			
 
				+          />

			
 
				           <ProFormSelect

			
 
				             mode="multiple"

			
 
				             name="ingredientsIdList"

			
@@ -91,6 +98,17 @@ export default (props) => {
 
				             width={460}

			
 
				             options={foodDict}

			
 
				           />

			
 
				+          <ProFormDigit

			
 
				+            label="元素"

			
 
				+            name="calorie"

			
 
				+            min={0}

			
 
				+            width={460}

			
 
				+            placeholder="卡路里"

			
 
				+            fieldProps={{

			
 
				+              addonAfter: '卡',

			
 
				+              precision: '4'

			
 
				+            }}

			
 
				+          />

			
 
				         </ProForm>

			
 
				       </Card>

			
 
				     </PageContainer>

			
--- a/src/pages/dish/list/index.jsx
+++ b/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();

			
 
				       });

			
 
				     }

			
@@ -57,7 +57,7 @@ const DishList = (props) => {
 
				           style={{ padding: 0 }}

			
 
				           type="link"

			
 
				           onClick={() => {

			
 
				-            navigate(`/material/dish/edit?id=${record.id}`);

			
 
				+            navigate(`/stock/dish/edit?id=${record.id}`);

			
 
				           }}

			
 
				         >

			
 
				           修改

			
@@ -90,7 +90,7 @@ const DishList = (props) => {
 
				             key="2"

			
 
				             type="primary"

			
 
				             onClick={() => {

			
 
				-              navigate('/material/dish/edit');

			
 
				+              navigate('/stock/dish/edit');

			
 
				             }}

			
 
				           >

			
 
				             新增

			
--- a/src/pages/evaluate/evaluateList/index.jsx
+++ b/src/pages/evaluate/evaluateList/index.jsx
@@ -18,16 +18,17 @@ const EvaluateList = (props) => {
 
				   const formRef = useRef();
			
 
				 
			
 
				   const  valueEnum= {
			
 
				-    2: { text: "优", status: "Success" },
			
 
				-    1: { text: "良", status: "Processing" },
			
 
				-    0: { text: "差", status: "Default" },
			
 
				+    2: { text: "满意", status: "Success" },
			
 
				+    1: { text: "一般", status: "Processing" },
			
 
				+    0: { text: "差", status: "Error" },
			
 
				   }
			
 
				 
			
 
				   const columns = [
			
 
				-    // {
			
 
				-    //   title: "任务ID",
			
 
				-    //   dataIndex: "taskId",
			
 
				-    // },
			
 
				+    {
			
 
				+      title: "日期",
			
 
				+      dataIndex: "createDate",
			
 
				+      valueType: 'date',
			
 
				+    },
			
 
				 
			
 
				     {
			
 
				       title: "服务质量",
			
@@ -75,6 +76,7 @@ const EvaluateList = (props) => {
 
				         search={false}
			
 
				         params={{ taskId: id }}
			
 
				         rowKey="id"
			
 
				+        headerTitle={<Link to={-1}>返回</Link>}
			
 
				         toolBarRender={() => [
			
 
				           <AddeValuate
			
 
				             taskId={id}
			
--- a/src/pages/evaluate/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
--- a/src/pages/guaranteeTask/Edit/BasicForm.jsx
+++ b/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);
			
 
				     });
			
@@ -201,8 +201,8 @@ export default (props) => {
 
				         <Col offset={6} span={12}>
			
 
				           <Button type="primary" htmlType="submit" loading={loading}>提交</Button>
			
 
				           <Button style={{ marginLeft: '48px' }} onClick={() => navigate(-1)}>返回</Button>
			
 
				-          <Button style={{ marginLeft: '48px' }}>
			
 
				-            <Link target="_blank" to={`/guaranteeTask/print?id=${id}`}>打印预览</Link>
			
 
				+          <Button style={{ marginLeft: '48px' }} disabled={!id}>
			
 
				+            <a target="_blank" href={`${window.location.pathname}#/task/guaranteeTask/print?id=${id}`}>打印预览</a>
			
 
				           </Button>
			
 
				         </Col>
			
 
				       </Row>
			
--- a/src/pages/guaranteeTask/Edit/DishList.jsx
+++ b/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);
			
 
				     });
			
--- a/src/pages/guaranteeTask/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
--- a/src/pages/package/BasicForm.jsx
+++ b/src/pages/package/BasicForm.jsx
@@ -1,6 +1,7 @@
 
				 import React, { useState, useEffect } from 'react';
			
 
				 import { Button, Checkbox, Card, Form, Input, notification } from 'antd';
			
 
				 import { addPackage, updataPackage } from '@/services/package';
			
 
				+import Money from '@/components/Money';
			
 
				 
			
 
				 export default (props) => {
			
 
				   const { current, onChange } = props;
			
@@ -17,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);
			
 
				     });
			
@@ -27,6 +28,7 @@ export default (props) => {
 
				     form.setFieldsValue({
			
 
				       name: current.name,
			
 
				       unit: current.unit,
			
 
				+      price: current.price,
			
 
				     });
			
 
				   }, [form, current])
			
 
				 
			
@@ -54,6 +56,13 @@ export default (props) => {
 
				           <Input placeholder='请输入套餐单位' />
			
 
				         </Form.Item>
			
 
				 
			
 
				+        <Form.Item
			
 
				+          label="价格"
			
 
				+          name="price"
			
 
				+        >
			
 
				+          <Money style={{ width: '100%' }} />
			
 
				+        </Form.Item>
			
 
				+
			
 
				         <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
			
 
				           <Button type="primary" htmlType="submit" loading={loading}>
			
 
				             保存
			
--- a/src/pages/purchase/bill/edit/index.jsx
+++ b/src/pages/purchase/bill/edit/index.jsx
@@ -15,7 +15,7 @@ import { useNavigate, useSearchParams } from "react-router-dom";
 
				 import { Card, Col, message, Row, Space, Form, Button } from "antd";
			
 
				 import { useEffect, useRef, useState } from "react";
			
 
				 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				+import { floatMultiply, floatDivide } from "@/utils/float";
			
 
				 
			
 
				 export default (props) => {
			
 
				   const [searchParams] = useSearchParams();
			
--- a/src/pages/purchase/inStore/edit/index.jsx
+++ b/src/pages/purchase/inStore/edit/index.jsx
@@ -14,7 +14,7 @@ import { useNavigate, useSearchParams } from "react-router-dom";
 
				 import { Card, Col, message, Row, Space, Form, Button } from "antd";
			
 
				 import { useEffect, useRef, useState } from "react";
			
 
				 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				+import { floatMultiply, floatDivide } from "@/utils/float";
			
 
				 
			
 
				 export default (props) => {
			
 
				   const [searchParams] = useSearchParams();
			
--- a/src/pages/purchase/plan/edit/index.jsx
+++ b/src/pages/purchase/plan/edit/index.jsx
@@ -15,7 +15,7 @@ import { useNavigate, useSearchParams } from "react-router-dom";
 
				 import { Card, Col, message, Row, Space, Form, Button } from "antd";
			
 
				 import { useEffect, useRef, useState } from "react";
			
 
				 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				+import { floatMultiply, floatDivide } from "@/utils/float";
			
 
				 
			
 
				 export default (props) => {
			
 
				   const [searchParams] = useSearchParams();
			
--- a/src/pages/purchase/plan/list/index.jsx
+++ b/src/pages/purchase/plan/list/index.jsx
@@ -10,7 +10,7 @@ import { PageContainer, ProTable } from "@ant-design/pro-components";
 
				 import { useNavigate } from "react-router-dom";
			
 
				 import { Button, message, Popconfirm } from "antd";
			
 
				 import { useRef, useState, useEffect } from "react";
			
 
				-import { floatMultiply, floatDivide } from "@/utils";
			
 
				+import { floatMultiply, floatDivide } from "@/utils/float";
			
 
				 
			
 
				 // type plan 采购计划  bill 采购账单  inStore  采购入库
			
 
				 const StockList = (props) => {
			
@@ -91,6 +91,7 @@ const StockList = (props) => {
 
				             key={4}
			
 
				             style={{ padding: 0 }}
			
 
				             type="link"
			
 
				+            disabled={record?.isCompleted}
			
 
				             onClick={() => {
			
 
				               navigate(`/purchase/bill/edit?id=${record.id}`);
			
 
				             }}
			
@@ -104,6 +105,7 @@ const StockList = (props) => {
 
				             key={5}
			
 
				             style={{ padding: 0 }}
			
 
				             type="link"
			
 
				+            disabled={record?.isInStore}
			
 
				             onClick={() => {
			
 
				               navigate(`/purchase/inStore/edit?id=${record.id}`);
			
 
				             }}
			
@@ -135,7 +137,7 @@ const StockList = (props) => {
 
				       <ProTable
			
 
				         actionRef={actionRef}
			
 
				         rowKey="id"
			
 
				-        params={type === "inStore"? {isCompleted:true}:{}}
			
 
				+        params={type === "inStore" ? { isCompleted: true } : {}}
			
 
				         toolBarRender={() => [
			
 
				           type === "plan" ? (
			
 
				             <Button
			
--- a/src/pages/roles/list.jsx
+++ b/src/pages/roles/list.jsx
@@ -61,10 +61,10 @@ export default (props) => {
 
				     startLoading();
			
 
				     const data = { name: inText };
			
 
				 
			
 
				-    if (currentRef.current) {
			
 
				+    if (current) {
			
 
				       // 修改角色
			
 
				-      updateRole(currentRef.current.id, data).then(res => {
			
 
				-        setList(list.map(x => x.id === currentRef.current.id ? res : x));
			
 
				+      updateRole(current.id, data).then(res => {
			
 
				+        setList(list.map(x => x.id === current.id ? res : x));
			
 
				         cancelLoading();
			
 
				         hideModel();
			
 
				       }).catch(() => {
			
--- a/src/pages/rotationChart/detail/index.jsx
+++ b/src/pages/rotationChart/detail/index.jsx
@@ -0,0 +1,37 @@
 
				+import { getBannerdById } from "@/services/rotationChart";
			
 
				+import { useNavigate, useSearchParams } from "react-router-dom";
			
 
				+import { Card, Button } from "antd";
			
 
				+import { useEffect, useState } from "react";
			
 
				+
			
 
				+export default (props) => {
			
 
				+  const [searchParams] = useSearchParams();
			
 
				+  const id = searchParams.get("id");
			
 
				+  const [data, setData] = useState({});
			
 
				+
			
 
				+  const navigate = useNavigate();
			
 
				+
			
 
				+  useEffect(() => {
			
 
				+    if (id) {
			
 
				+      getBannerdById(id).then((res) => {
			
 
				+        setData(res);
			
 
				+      });
			
 
				+    }
			
 
				+  }, [id]);
			
 
				+
			
 
				+  return (
			
 
				+    <Card title={<Button onClick={() => navigate(-1)}> 返回</Button>}>
			
 
				+      <div dangerouslySetInnerHTML={{ __html: data?.desc }}></div>
			
 
				+      {data?.type === "1" && data?.image && (
			
 
				+        <img src={data?.image} alt="" style={{ width: "100%" }}></img>
			
 
				+      )}
			
 
				+      {data?.type === "2" && data?.video && (
			
 
				+        <video
			
 
				+          src={data?.video}
			
 
				+          autoPlay={false}
			
 
				+          controls="controls"
			
 
				+          style={{ width: "100%" }}
			
 
				+        ></video>
			
 
				+      )}
			
 
				+    </Card>
			
 
				+  );
			
 
				+};
			
--- a/src/pages/rotationChart/edit/index.jsx
+++ b/src/pages/rotationChart/edit/index.jsx
@@ -1,7 +1,10 @@
 
				-import UploadImage from '@/components/UploadImage';
			
 
				-import UploadVideo from '@/components/UploadVideo';
			
 
				-import UploadFile from '@/components/UploadFile';
			
 
				-import { addBanner, getBannerdById, updataBanner } from '@/services/rotationChart';
			
 
				+
			
 
				+import UploadFile from "@/components/UploadFile";
			
 
				+import {
			
 
				+  addBanner,
			
 
				+  getBannerdById,
			
 
				+  updataBanner,
			
 
				+} from "@/services/rotationChart";
			
 
				 import {
			
 
				   PageContainer,
			
 
				   ProForm,
			
@@ -9,16 +12,17 @@ import {
 
				   ProFormRadio,
			
 
				   ProFormSelect,
			
 
				   ProFormTextArea,
			
 
				-} from '@ant-design/pro-components';
			
 
				-import { useNavigate, useSearchParams } from 'react-router-dom';
			
 
				-import { Card, Col, message, Row, Space, Image } from 'antd';
			
 
				-import { useEffect, useRef, useState } from 'react';
			
 
				+} from "@ant-design/pro-components";
			
 
				+import { useNavigate, useSearchParams } from "react-router-dom";
			
 
				+import { Card, Col, message, Row, Space, Image } from "antd";
			
 
				+import { useEffect, useRef, useState } from "react";
			
 
				+import Wangeditor from "@/components/Wangeditor";
			
 
				 
			
 
				 export default (props) => {
			
 
				   const [searchParams, setSearchParams] = useSearchParams();
			
 
				-  const id = searchParams.get('id');
			
 
				+  const id = searchParams.get("id");
			
 
				   const [data, setData] = useState({});
			
 
				-  const [imgLabel, setImgLabel] = useState('图片');
			
 
				+  const [imgLabel, setImgLabel] = useState("图片");
			
 
				   const formRef = useRef();
			
 
				   const navigate = useNavigate();
			
 
				 
			
@@ -36,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);
			
 
				       });
			
 
				     }
			
@@ -55,14 +59,14 @@ export default (props) => {
 
				       <Card>
			
 
				         <ProForm
			
 
				           formRef={formRef}
			
 
				-          layout={'horizontal'}
			
 
				+          layout={"horizontal"}
			
 
				           labelCol={{ span: 8 }}
			
 
				           wrapperCol={{ span: 16 }}
			
 
				           onFinish={onFinish}
			
 
				-          initialValues={{ type: '1', state: '1' }}
			
 
				+          initialValues={{ type: "1", state: "1" }}
			
 
				           submitter={{
			
 
				             searchConfig: {
			
 
				-              resetText: '返回',
			
 
				+              resetText: "返回",
			
 
				             },
			
 
				             onReset: () => navigate(-1),
			
 
				             render: (props, doms) => {
			
@@ -81,12 +85,14 @@ export default (props) => {
 
				             width="md"
			
 
				             label="轮播图类型"
			
 
				             valueEnum={{
			
 
				-              1: '图片',
			
 
				-              2: '视频',
			
 
				+              1: "图片",
			
 
				+              2: "视频",
			
 
				             }}
			
 
				             placeholder="轮播图类型"
			
 
				-            rules={[{ required: true, message: 'Please select your country!' }]}
			
 
				-            onChange={({ value }) =>  setImgLabel(value === '1' ? '图片' : '封面')}
			
 
				+            rules={[{ required: true, message: "Please select your country!" }]}
			
 
				+            onChange={({ value }) =>
			
 
				+              setImgLabel(value === "1" ? "图片" : "封面")
			
 
				+            }
			
 
				           />
			
 
				           <ProForm.Item
			
 
				             width="md"
			
@@ -97,12 +103,16 @@ export default (props) => {
 
				           >
			
 
				             <UploadFile
			
 
				               accept="image/*"
			
 
				-              preview={src => <div style={{ marginTop: '2em' }}><Image width={200} src={src} /></div>}
			
 
				+              preview={(src) => (
			
 
				+                <div style={{ marginTop: "2em" }}>
			
 
				+                  <Image width={200} src={src} />
			
 
				+                </div>
			
 
				+              )}
			
 
				             />
			
 
				           </ProForm.Item>
			
 
				           <ProForm.Item noStyle shouldUpdate>
			
 
				             {(form) => {
			
 
				-              return form.getFieldValue('type') == '1' ? null : (
			
 
				+              return form.getFieldValue("type") == "1" ? null : (
			
 
				                 <ProForm.Item
			
 
				                   width="md"
			
 
				                   name="video"
			
@@ -112,7 +122,11 @@ export default (props) => {
 
				                 >
			
 
				                   <UploadFile
			
 
				                     accept="video/*"
			
 
				-                    preview={src => <div style={{ marginTop: '6px' }}><video height={360} width={480} src={src} controls /></div>}
			
 
				+                    preview={(src) => (
			
 
				+                      <div style={{ marginTop: "6px" }}>
			
 
				+                        <video height={360} width={480} src={src} controls />
			
 
				+                      </div>
			
 
				+                    )}
			
 
				                   />
			
 
				                 </ProForm.Item>
			
 
				               );
			
@@ -124,17 +138,24 @@ export default (props) => {
 
				             radioType="button"
			
 
				             options={[
			
 
				               {
			
 
				-                label: '上架',
			
 
				-                value: '1',
			
 
				+                label: "上架",
			
 
				+                value: "1",
			
 
				               },
			
 
				               {
			
 
				-                label: '下架',
			
 
				-                value: '2',
			
 
				+                label: "下架",
			
 
				+                value: "2",
			
 
				               },
			
 
				             ]}
			
 
				           />
			
 
				           <ProFormDigit name="qz" label="权重" width="md" />
			
 
				-          <ProFormTextArea width="md" name="desc" label="描述" placeholder="请输入描述" />
			
 
				+          <ProForm.Item
			
 
				+            name="desc"
			
 
				+            label="详情"
			
 
				+            placeholder="请输入详情"
			
 
				+            // rules={[{ required: true, message: "请输入详情" }]}
			
 
				+          >
			
 
				+            <Wangeditor></Wangeditor>
			
 
				+          </ProForm.Item>
			
 
				         </ProForm>
			
 
				       </Card>
			
 
				     </PageContainer>
			
--- a/src/pages/rotationChart/introduction/edit/index.jsx
+++ b/src/pages/rotationChart/introduction/edit/index.jsx
@@ -23,7 +23,8 @@ export default (props) => {
 
				   const onFinish = async (values) => {

			
 
				     //添加,修改

			
 
				     addRegulation({ ...values, id }).then((res) => {

			
 
				-      message.success('成功');

			
 
				+      // message.success('成功');

			
 
				+      navigate(-1);

			
 
				     });

			
 
				     return false;

			
 
				   };

			
--- a/src/pages/rotationChart/introduction/index.jsx
+++ b/src/pages/rotationChart/introduction/index.jsx
@@ -0,0 +1,93 @@
 
				+import { getRegulationList, deleteRegulation } from '@/services/regulation';

			
 
				+import { ProFormTextArea, ProForm, PageContainer, ProTable } from '@ant-design/pro-components';

			
 
				+import { Button, message, Popconfirm } from 'antd';

			
 
				+import { useNavigate } from 'react-router-dom';

			
 
				+import { queryTable } from '@/utils/request';

			
 
				+import { useRef, useState, useEffect } from 'react';

			
 
				+

			
 
				+const IntroductionList = (props) => {

			
 
				+  const actionRef = useRef();

			
 
				+  const navigate = useNavigate();

			
 
				+

			
 
				+  const handleDelete = (id) => {

			
 
				+    if (id) {

			
 
				+      deleteRegulation(id).then((res) => {

			
 
				+        // message.success('删除成功');

			
 
				+        actionRef.current.reload();

			
 
				+      });

			
 
				+    }

			
 
				+  };

			
 
				+

			
 
				+  const columns = [

			
 
				+    {

			
 
				+      title: 'id',

			
 
				+      dataIndex: 'id',

			
 
				+      width: 100,

			
 
				+      search: false,

			
 
				+      hideInTable: true,

			
 
				+    },

			
 
				+

			
 
				+    {

			
 
				+      title: '内容',

			
 
				+      dataIndex: 'detail',

			
 
				+      width: 400,

			
 
				+      search: false,

			
 
				+    },

			
 
				+    {

			
 
				+      title: '操作',

			
 
				+      valueType: 'option',

			
 
				+      width: 100,

			
 
				+      render: (_, record) => [

			
 
				+        <Button

			
 
				+          key={2}

			
 
				+          style={{ padding: 0 }}

			
 
				+          type="link"

			
 
				+          onClick={() => {

			
 
				+            console.log(record, ']]');

			
 
				+            navigate(`/cms/rotationChart/introduction/edit?id=${record.id}`);

			
 
				+          }}

			
 
				+        >

			
 
				+          编辑

			
 
				+        </Button>,

			
 
				+

			
 
				+        <Popconfirm

			
 
				+          key={3}

			
 
				+          title="您是否确认删除 ?"

			
 
				+          onConfirm={() => handleDelete(record.id)}

			
 
				+          okText="确定"

			
 
				+          cancelText="取消"

			
 
				+        >

			
 
				+          {/* manualPush */}

			
 
				+          <Button style={{ padding: 0 }} type="link">

			
 
				+            删除

			
 
				+          </Button>

			
 
				+        </Popconfirm>,

			
 
				+      ],

			
 
				+    },

			
 
				+  ];

			
 
				+

			
 
				+  return (

			
 
				+    <PageContainer>

			
 
				+      <ProTable

			
 
				+        search={false}

			
 
				+        actionRef={actionRef}

			
 
				+        rowKey="id"

			
 
				+        toolBarRender={() => [

			
 
				+          <Button

			
 
				+            key="2"

			
 
				+            type="primary"

			
 
				+            onClick={() => {

			
 
				+              navigate('/cms/rotationChart/introduction/edit');

			
 
				+            }}

			
 
				+          >

			
 
				+            新增

			
 
				+          </Button>,

			
 
				+        ]}

			
 
				+        request={queryTable(getRegulationList)}

			
 
				+        columns={columns}

			
 
				+      />

			
 
				+    </PageContainer>

			
 
				+  );

			
 
				+}

			
 
				+

			
 
				+export default IntroductionList;

			
--- a/src/pages/rotationChart/list/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
@@ -92,12 +92,23 @@ const RotationChartList = (props) => {
 
				         >
			
 
				           {record.state === '1' ? '下架' : '上架'}
			
 
				         </Button>,
			
 
				+         <Button
			
 
				+         key={4}
			
 
				+         style={{ padding: 0 }}
			
 
				+         type="link"
			
 
				+         onClick={() => {
			
 
				+      
			
 
				+           navigate(`/cms/rotationChart/detail?id=${record.id}`);
			
 
				+         }}
			
 
				+       >
			
 
				+         详情
			
 
				+       </Button>,
			
 
				         <Button
			
 
				           key={2}
			
 
				           style={{ padding: 0 }}
			
 
				           type="link"
			
 
				           onClick={() => {
			
 
				-            console.log(record, ']]');
			
 
				+            
			
 
				             navigate(`/cms/rotationChart/add?id=${record.id}`);
			
 
				           }}
			
 
				         >
			
--- a/src/pages/sample/home/components/AreaChart.jsx
+++ b/src/pages/sample/home/components/AreaChart.jsx
@@ -1,191 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Card } from 'antd';
			
 
				-import * as echarts from 'echarts/core';
			
 
				-import Chart from '@/components/chart';
			
 
				-
			
 
				-export default (props) => {
			
 
				-  const option = {
			
 
				-    color: ['#80FFA5', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],
			
 
				-    // title: {
			
 
				-    //   text: 'Gradient Stacked Area Chart'
			
 
				-    // },
			
 
				-    tooltip: {
			
 
				-      trigger: 'axis',
			
 
				-      axisPointer: {
			
 
				-        type: 'cross',
			
 
				-        label: {
			
 
				-          backgroundColor: '#6a7985'
			
 
				-        }
			
 
				-      }
			
 
				-    },
			
 
				-    legend: {
			
 
				-      data: ['Line 1', 'Line 2', 'Line 3', 'Line 4', 'Line 5']
			
 
				-    },
			
 
				-    grid: {
			
 
				-      left: '3%',
			
 
				-      right: '4%',
			
 
				-      bottom: '3%',
			
 
				-      containLabel: true
			
 
				-    },
			
 
				-    xAxis: [
			
 
				-      {
			
 
				-        type: 'category',
			
 
				-        boundaryGap: false,
			
 
				-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
			
 
				-      }
			
 
				-    ],
			
 
				-    yAxis: [
			
 
				-      {
			
 
				-        type: 'value'
			
 
				-      }
			
 
				-    ],
			
 
				-    series: [
			
 
				-      {
			
 
				-        name: 'Line 1',
			
 
				-        type: 'line',
			
 
				-        stack: 'Total',
			
 
				-        smooth: true,
			
 
				-        lineStyle: {
			
 
				-          width: 0
			
 
				-        },
			
 
				-        showSymbol: false,
			
 
				-        areaStyle: {
			
 
				-          opacity: 0.8,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            {
			
 
				-              offset: 0,
			
 
				-              color: 'rgb(128, 255, 165)'
			
 
				-            },
			
 
				-            {
			
 
				-              offset: 1,
			
 
				-              color: 'rgb(1, 191, 236)'
			
 
				-            }
			
 
				-          ])
			
 
				-        },
			
 
				-        emphasis: {
			
 
				-          focus: 'series'
			
 
				-        },
			
 
				-        data: [140, 232, 101, 264, 90, 340, 250]
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'Line 2',
			
 
				-        type: 'line',
			
 
				-        stack: 'Total',
			
 
				-        smooth: true,
			
 
				-        lineStyle: {
			
 
				-          width: 0
			
 
				-        },
			
 
				-        showSymbol: false,
			
 
				-        areaStyle: {
			
 
				-          opacity: 0.8,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            {
			
 
				-              offset: 0,
			
 
				-              color: 'rgb(0, 221, 255)'
			
 
				-            },
			
 
				-            {
			
 
				-              offset: 1,
			
 
				-              color: 'rgb(77, 119, 255)'
			
 
				-            }
			
 
				-          ])
			
 
				-        },
			
 
				-        emphasis: {
			
 
				-          focus: 'series'
			
 
				-        },
			
 
				-        data: [120, 282, 111, 234, 220, 340, 310]
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'Line 3',
			
 
				-        type: 'line',
			
 
				-        stack: 'Total',
			
 
				-        smooth: true,
			
 
				-        lineStyle: {
			
 
				-          width: 0
			
 
				-        },
			
 
				-        showSymbol: false,
			
 
				-        areaStyle: {
			
 
				-          opacity: 0.8,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            {
			
 
				-              offset: 0,
			
 
				-              color: 'rgb(55, 162, 255)'
			
 
				-            },
			
 
				-            {
			
 
				-              offset: 1,
			
 
				-              color: 'rgb(116, 21, 219)'
			
 
				-            }
			
 
				-          ])
			
 
				-        },
			
 
				-        emphasis: {
			
 
				-          focus: 'series'
			
 
				-        },
			
 
				-        data: [320, 132, 201, 334, 190, 130, 220]
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'Line 4',
			
 
				-        type: 'line',
			
 
				-        stack: 'Total',
			
 
				-        smooth: true,
			
 
				-        lineStyle: {
			
 
				-          width: 0
			
 
				-        },
			
 
				-        showSymbol: false,
			
 
				-        areaStyle: {
			
 
				-          opacity: 0.8,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            {
			
 
				-              offset: 0,
			
 
				-              color: 'rgb(255, 0, 135)'
			
 
				-            },
			
 
				-            {
			
 
				-              offset: 1,
			
 
				-              color: 'rgb(135, 0, 157)'
			
 
				-            }
			
 
				-          ])
			
 
				-        },
			
 
				-        emphasis: {
			
 
				-          focus: 'series'
			
 
				-        },
			
 
				-        data: [220, 402, 231, 134, 190, 230, 120]
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'Line 5',
			
 
				-        type: 'line',
			
 
				-        stack: 'Total',
			
 
				-        smooth: true,
			
 
				-        lineStyle: {
			
 
				-          width: 0
			
 
				-        },
			
 
				-        showSymbol: false,
			
 
				-        label: {
			
 
				-          show: true,
			
 
				-          position: 'top'
			
 
				-        },
			
 
				-        areaStyle: {
			
 
				-          opacity: 0.8,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            {
			
 
				-              offset: 0,
			
 
				-              color: 'rgb(255, 191, 0)'
			
 
				-            },
			
 
				-            {
			
 
				-              offset: 1,
			
 
				-              color: 'rgb(224, 62, 76)'
			
 
				-            }
			
 
				-          ])
			
 
				-        },
			
 
				-        emphasis: {
			
 
				-          focus: 'series'
			
 
				-        },
			
 
				-        data: [220, 302, 181, 234, 210, 290, 150]
			
 
				-      }
			
 
				-    ]
			
 
				-  };
			
 
				-  
			
 
				-
			
 
				-  return (
			
 
				-    <Card title='Gradient Stacked Area Chart'>
			
 
				-      <Chart option={option} style={props.style}></Chart>
			
 
				-    </Card>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/Banner.jsx
+++ b/src/pages/sample/home/components/Banner.jsx
@@ -1,44 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Row, Col, Card, Statistic } from 'antd';
			
 
				-import { ArrowDownOutlined, ArrowUpOutlined, LikeOutlined } from '@ant-design/icons';
			
 
				-
			
 
				-export default (props) => {
			
 
				-  return (
			
 
				-    <Row gutter={24}>
			
 
				-      <Col span={6}>
			
 
				-        <Card>
			
 
				-          <Statistic title="Feedback" value={1128} prefix={<LikeOutlined />} />
			
 
				-        </Card>
			
 
				-      </Col>
			
 
				-      <Col span={6}>
			
 
				-        <Card>
			
 
				-          <Statistic title="Unmerged" value={93} suffix="/ 100" />
			
 
				-        </Card>
			
 
				-      </Col>
			
 
				-      <Col span={6}>
			
 
				-        <Card>
			
 
				-          <Statistic
			
 
				-            title="Active"
			
 
				-            value={11.28}
			
 
				-            precision={2}
			
 
				-            valueStyle={{ color: '#3f8600' }}
			
 
				-            prefix={<ArrowUpOutlined />}
			
 
				-            suffix="%"
			
 
				-          />
			
 
				-        </Card>
			
 
				-      </Col>
			
 
				-      <Col span={6}>
			
 
				-        <Card>
			
 
				-          <Statistic
			
 
				-            title="Idle"
			
 
				-            value={9.3}
			
 
				-            precision={2}
			
 
				-            valueStyle={{ color: '#cf1322' }}
			
 
				-            prefix={<ArrowDownOutlined />}
			
 
				-            suffix="%"
			
 
				-          />
			
 
				-        </Card>
			
 
				-      </Col>
			
 
				-    </Row>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/BarChart.jsx
+++ b/src/pages/sample/home/components/BarChart.jsx
@@ -1,37 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Card } from 'antd';
			
 
				-import Chart from '@/components/chart';
			
 
				-
			
 
				-export default (props) => {
			
 
				-
			
 
				-  const option = {
			
 
				-    legend: {},
			
 
				-    tooltip: {},
			
 
				-    dataset: {
			
 
				-      source: [
			
 
				-        ['product', '2015', '2016', '2017'],
			
 
				-        ['Matcha Latte', 43.3, 85.8, 93.7],
			
 
				-        ['Milk Tea', 83.1, 73.4, 55.1],
			
 
				-        ['Cheese Cocoa', 86.4, 65.2, 82.5],
			
 
				-        ['Walnut Brownie', 72.4, 53.9, 39.1]
			
 
				-      ]
			
 
				-    },
			
 
				-    xAxis: { type: 'category' },
			
 
				-    yAxis: {},
			
 
				-    grid: {
			
 
				-      left: '3%',
			
 
				-      right: '4%',
			
 
				-      bottom: '3%',
			
 
				-      containLabel: true
			
 
				-    },
			
 
				-    // Declare several bar series, each will be mapped
			
 
				-    // to a column of dataset.source by default.
			
 
				-    series: [{ type: 'bar' }, { type: 'bar' }, { type: 'bar' }]
			
 
				-  };
			
 
				-
			
 
				-  return (
			
 
				-    <Card title='Bar Chart'>
			
 
				-      <Chart option={option} style={props.style}></Chart>
			
 
				-    </Card>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/PictorialBar.jsx
+++ b/src/pages/sample/home/components/PictorialBar.jsx
@@ -1,112 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Card } from 'antd';
			
 
				-import * as echarts from 'echarts/core';
			
 
				-import Chart from '@/components/chart';
			
 
				-
			
 
				-
			
 
				-export default (props) => {
			
 
				-  let category = [];
			
 
				-  let dottedBase = +new Date();
			
 
				-  let lineData = [];
			
 
				-  let barData = [];
			
 
				-  for (let i = 0; i < 20; i++) {
			
 
				-    let date = new Date((dottedBase += 3600 * 24 * 1000));
			
 
				-    category.push(
			
 
				-      [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-')
			
 
				-    );
			
 
				-    let b = Math.random() * 200;
			
 
				-    let d = Math.random() * 200;
			
 
				-    barData.push(b);
			
 
				-    lineData.push(d + b);
			
 
				-  }
			
 
				-
			
 
				-  const option = {
			
 
				-    backgroundColor: '#0f375f',
			
 
				-    tooltip: {
			
 
				-      trigger: 'axis',
			
 
				-      axisPointer: {
			
 
				-        type: 'shadow'
			
 
				-      }
			
 
				-    },
			
 
				-    legend: {
			
 
				-      data: ['line', 'bar'],
			
 
				-      textStyle: {
			
 
				-        color: '#ccc'
			
 
				-      }
			
 
				-    },
			
 
				-    xAxis: {
			
 
				-      data: category,
			
 
				-      axisLine: {
			
 
				-        lineStyle: {
			
 
				-          color: '#ccc'
			
 
				-        }
			
 
				-      }
			
 
				-    },
			
 
				-    yAxis: {
			
 
				-      splitLine: { show: false },
			
 
				-      axisLine: {
			
 
				-        lineStyle: {
			
 
				-          color: '#ccc'
			
 
				-        }
			
 
				-      }
			
 
				-    },
			
 
				-    series: [
			
 
				-      {
			
 
				-        name: 'line',
			
 
				-        type: 'line',
			
 
				-        smooth: true,
			
 
				-        showAllSymbol: true,
			
 
				-        symbol: 'emptyCircle',
			
 
				-        symbolSize: 15,
			
 
				-        data: lineData
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'bar',
			
 
				-        type: 'bar',
			
 
				-        barWidth: 10,
			
 
				-        itemStyle: {
			
 
				-          borderRadius: 5,
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            { offset: 0, color: '#14c8d4' },
			
 
				-            { offset: 1, color: '#43eec6' }
			
 
				-          ])
			
 
				-        },
			
 
				-        data: barData
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'line',
			
 
				-        type: 'bar',
			
 
				-        barGap: '-100%',
			
 
				-        barWidth: 10,
			
 
				-        itemStyle: {
			
 
				-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
			
 
				-            { offset: 0, color: 'rgba(20,200,212,0.5)' },
			
 
				-            { offset: 0.2, color: 'rgba(20,200,212,0.2)' },
			
 
				-            { offset: 1, color: 'rgba(20,200,212,0)' }
			
 
				-          ])
			
 
				-        },
			
 
				-        z: -12,
			
 
				-        data: lineData
			
 
				-      },
			
 
				-      {
			
 
				-        name: 'dotted',
			
 
				-        type: 'pictorialBar',
			
 
				-        symbol: 'rect',
			
 
				-        itemStyle: {
			
 
				-          color: '#0f375f'
			
 
				-        },
			
 
				-        symbolRepeat: true,
			
 
				-        symbolSize: [12, 4],
			
 
				-        symbolMargin: 1,
			
 
				-        z: -10,
			
 
				-        data: lineData
			
 
				-      }
			
 
				-    ]
			
 
				-  };
			
 
				-
			
 
				-  return (
			
 
				-    <Card title='Pictorial Chart'>
			
 
				-      <Chart option={option} style={props.style}></Chart>
			
 
				-    </Card>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/PieChart.jsx
+++ b/src/pages/sample/home/components/PieChart.jsx
@@ -1,48 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Card } from 'antd';
			
 
				-import Chart from '@/components/chart';
			
 
				-
			
 
				-export default (props) => {
			
 
				-
			
 
				-  const option = {
			
 
				-    // title: {
			
 
				-    //   text: 'Referer of a Website',
			
 
				-    //   subtext: 'Fake Data',
			
 
				-    //   left: 'center'
			
 
				-    // },
			
 
				-    tooltip: {
			
 
				-      trigger: 'item'
			
 
				-    },
			
 
				-    legend: {
			
 
				-      orient: 'vertical',
			
 
				-      left: 'left'
			
 
				-    },
			
 
				-    series: [
			
 
				-      {
			
 
				-        name: 'Access From',
			
 
				-        type: 'pie',
			
 
				-        radius: '50%',
			
 
				-        data: [
			
 
				-          { value: 1048, name: 'Search Engine' },
			
 
				-          { value: 735, name: 'Direct' },
			
 
				-          { value: 580, name: 'Email' },
			
 
				-          { value: 484, name: 'Union Ads' },
			
 
				-          { value: 300, name: 'Video Ads' }
			
 
				-        ],
			
 
				-        emphasis: {
			
 
				-          itemStyle: {
			
 
				-            shadowBlur: 10,
			
 
				-            shadowOffsetX: 0,
			
 
				-            shadowColor: 'rgba(0, 0, 0, 0.5)'
			
 
				-          }
			
 
				-        }
			
 
				-      }
			
 
				-    ]
			
 
				-  };
			
 
				-
			
 
				-  return (
			
 
				-    <Card title='Basic Pie Chart'>
			
 
				-      <Chart option={option} style={props.style}></Chart>
			
 
				-    </Card>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/RadarChart.jsx
+++ b/src/pages/sample/home/components/RadarChart.jsx
@@ -1,48 +0,0 @@
 
				-import React from 'react';
			
 
				-import { Card } from 'antd';
			
 
				-import Chart from '@/components/chart';
			
 
				-
			
 
				-export default (props) => {
			
 
				-
			
 
				-  const option = {
			
 
				-    // title: {
			
 
				-    //   text: 'Basic Radar Chart'
			
 
				-    // },
			
 
				-    legend: {
			
 
				-      data: ['Allocated Budget', 'Actual Spending']
			
 
				-    },
			
 
				-    radar: {
			
 
				-      // shape: 'circle',
			
 
				-      indicator: [
			
 
				-        { name: 'Sales', max: 6500 },
			
 
				-        { name: 'Administration', max: 16000 },
			
 
				-        { name: 'Information Technology', max: 30000 },
			
 
				-        { name: 'Customer Support', max: 38000 },
			
 
				-        { name: 'Development', max: 52000 },
			
 
				-        { name: 'Marketing', max: 25000 }
			
 
				-      ]
			
 
				-    },
			
 
				-    series: [
			
 
				-      {
			
 
				-        name: 'Budget vs spending',
			
 
				-        type: 'radar',
			
 
				-        data: [
			
 
				-          {
			
 
				-            value: [4200, 3000, 20000, 35000, 50000, 18000],
			
 
				-            name: 'Allocated Budget'
			
 
				-          },
			
 
				-          {
			
 
				-            value: [5000, 14000, 28000, 26000, 42000, 21000],
			
 
				-            name: 'Actual Spending'
			
 
				-          }
			
 
				-        ]
			
 
				-      }
			
 
				-    ]
			
 
				-  };
			
 
				-
			
 
				-  return (
			
 
				-    <Card title='Basic Radar Chart'>
			
 
				-      <Chart option={option} style={props.style}></Chart>
			
 
				-    </Card>
			
 
				-  )
			
 
				-}
			
--- a/src/pages/sample/home/components/VideoPlay.jsx
+++ b/src/pages/sample/home/components/VideoPlay.jsx
@@ -0,0 +1,52 @@
 
				+import { Row, Col, Card, Statistic, Carousel } from "antd";
			
 
				+import {
			
 
				+  ArrowDownOutlined,
			
 
				+  ArrowUpOutlined,
			
 
				+  LikeOutlined,
			
 
				+} from "@ant-design/icons";
			
 
				+import React, { useState } from "react";
			
 
				+
			
 
				+import { useRef } from "react";
			
 
				+import { useEffect } from "react";
			
 
				+
			
 
				+// https://image.baidu.com/search/albumsdetail?tn=albumsdetail&word=%E5%AE%A0%E7%89%A9%E5%9B%BE%E7%89%87&fr=albumslist&album_tab=%E5%8A%A8%E7%89%A9&album_id=688&rn=30
			
 
				+
			
 
				+// https://image.baidu.com/search/albumsdetail?tn=albumsdetail&word=%E5%9F%8E%E5%B8%82%E5%BB%BA%E7%AD%91%E6%91%84%E5%BD%B1%E4%B8%93%E9%A2%98&fr=searchindex_album%20&album_tab=%E5%BB%BA%E7%AD%91&album_id=7&rn=30
			
 
				+const VideoPlay = (props) => {
			
 
				+  const { url, index, current, isVideoPlayRef, style } = props;
			
 
				+
			
 
				+  const ref = useRef();
			
 
				+
			
 
				+  useEffect(() => {
			
 
				+    if (current == index) {
			
 
				+      ref.current
			
 
				+        ?.play()
			
 
				+        .then((res) => {
			
 
				+          isVideoPlayRef.current = true;
			
 
				+        })
			
 
				+        .catch((err) => {
			
 
				+          console.log(err)
			
 
				+          isVideoPlayRef.current = false;
			
 
				+        });
			
 
				+    } else {
			
 
				+      ref.current.pause();
			
 
				+      isVideoPlayRef.current = false;
			
 
				+    }
			
 
				+  }, [current, index]);
			
 
				+
			
 
				+  useEffect(() => {}, []);
			
 
				+
			
 
				+  return (
			
 
				+    <video
			
 
				+      ref={ref}
			
 
				+      autoPlay={false}
			
 
				+      src={url}
			
 
				+      controls="controls"
			
 
				+      onEnded={() => {
			
 
				+        isVideoPlayRef.current = false;
			
 
				+      }}
			
 
				+      style={style}
			
 
				+    ></video>
			
 
				+  );
			
 
				+};
			
 
				+export default VideoPlay;
			
--- a/src/pages/sample/home/index.jsx
+++ b/src/pages/sample/home/index.jsx
@@ -1,41 +1,115 @@
 
				-import React from 'react';
			
 
				-import { Row, Col, Card, Space, Statistic } from 'antd';
			
 
				-import Container from '@/components/page/Container';
			
 
				-import Banner from './components/Banner';
			
 
				-import AreaChart from './components/AreaChart';
			
 
				-import BarChart from './components/BarChart';
			
 
				-import PictorialBar from './components/PictorialBar';
			
 
				-import RadarChart from './components/RadarChart';
			
 
				-import PieChart from './components/PieChart';
			
 
				+import { Carousel } from "antd";
			
 
				+import React, { useState, useRef, useEffect, useMemo } from "react";
			
 
				+import { getBannerList } from "@/services/rotationChart";
			
 
				+
			
 
				+import VideoPlay from "./components/VideoPlay";
			
 
				+import { useNavigate } from "react-router-dom";
			
 
				+const height = "100%";
			
 
				+const contentStyle = {
			
 
				+  height,
			
 
				+  margin: "0 auto",
			
 
				+  width: "100%",
			
 
				+};
			
 
				 
			
 
				 export default (props) => {
			
 
				+  const navigate = useNavigate();
			
 
				+  const [height, setHeight] = useState("100%");
			
 
				+  const [current, setCurrent] = useState(0);
			
 
				+  const [mouse, setMouse] = useState(false);
			
 
				+  const [mediaList, setMediaList] = useState([]);
			
 
				+
			
 
				+  const ref = useRef();
			
 
				+  const boxRef = useRef();
			
 
				+  const mouseRef = useRef(false);
			
 
				+  const isVideoRef = useRef(false);
			
 
				+  const isVideoPlayRef = useRef(false);
			
 
				+
			
 
				+  const itemStyle = useMemo(
			
 
				+    () => ({
			
 
				+      height,
			
 
				+      overflow: "hidden",
			
 
				+      width: "100%",
			
 
				+      objectFit: "contain",
			
 
				+    }),
			
 
				+    [height]
			
 
				+  );
			
 
				+
			
 
				+  useEffect(() => {
			
 
				+    getBannerList().then((res) => {
			
 
				+      setMediaList(
			
 
				+        res?.records?.map((x) => {
			
 
				+          if (x.type === "2") {
			
 
				+            return {
			
 
				+              ...x,
			
 
				+              type: "video",
			
 
				+              url: x.video,
			
 
				+            };
			
 
				+          } else {
			
 
				+            return {
			
 
				+              ...x,
			
 
				+              type: "image",
			
 
				+              url: x.image,
			
 
				+            };
			
 
				+          }
			
 
				+        })
			
 
				+      );
			
 
				+    });
			
 
				+    handNext();
			
 
				+
			
 
				+    const boxHeight = boxRef.current.offsetHeight;
			
 
				+    setHeight(boxHeight ? `${boxHeight}px` : "100%");
			
 
				+  }, []);
			
 
				+
			
 
				+  const handNext = () => {
			
 
				+    setTimeout(() => {
			
 
				+      if (!mouseRef.current && !isVideoRef.current && !isVideoPlayRef.current) {
			
 
				+        ref.current?.next();
			
 
				+      }
			
 
				+      handNext();
			
 
				+    }, 3000);
			
 
				+  };
			
 
				+
			
 
				+  const onMouseEnter = () => {
			
 
				+    mouseRef.current = true;
			
 
				+  };
			
 
				+  const onMouseLeave = () => {
			
 
				+    mouseRef.current = false;
			
 
				+  };
			
 
				 
			
 
				-  const chartStyle = {
			
 
				-    height: '360px',
			
 
				-    width: '100%',
			
 
				-  }
			
 
				+  const onClick = (row) => {
			
 
				+    if (row.id) {
			
 
				+      navigate(`/cms/rotationChart/detail?id=${row.id}`);
			
 
				+    }
			
 
				+  };
			
 
				 
			
 
				   return (
			
 
				-    <Container>
			
 
				-      <Banner />
			
 
				-
			
 
				-      <Row gutter={24} style={{ marginTop: '24px' }}>
			
 
				-        <Col span={16}>
			
 
				-          <AreaChart style={chartStyle}/>
			
 
				-        </Col>
			
 
				-        <Col span={8}>
			
 
				-          <RadarChart style={chartStyle}/>
			
 
				-        </Col>
			
 
				-      </Row>
			
 
				-
			
 
				-      <Row gutter={24} style={{ marginTop: '24px' }}>
			
 
				-        <Col span={8}>
			
 
				-          <PieChart style={chartStyle}/>
			
 
				-        </Col>
			
 
				-        <Col span={16}>
			
 
				-          <BarChart style={chartStyle}/>
			
 
				-        </Col>
			
 
				-      </Row>
			
 
				-    </Container>
			
 
				-  )
			
 
				-}
			
 
				+    <div
			
 
				+      onMouseEnter={onMouseEnter}
			
 
				+      onMouseLeave={onMouseLeave}
			
 
				+      style={{ height, overflow: "hidden", background: "#081A48" }}
			
 
				+      ref={boxRef}
			
 
				+    >
			
 
				+      <Carousel
			
 
				+        ref={ref}
			
 
				+        afterChange={(cur) => {
			
 
				+          setCurrent(cur);
			
 
				+        }}
			
 
				+      >
			
 
				+        {mediaList?.map((x, index) => (
			
 
				+          <div key={index} onClick={()=>onClick(x)}>
			
 
				+            {x.type === "image" && <img src={x.url} style={itemStyle}></img>}
			
 
				+            {x.type === "video" && (
			
 
				+              <VideoPlay
			
 
				+                url={x.url}
			
 
				+                isVideoPlayRef={isVideoPlayRef}
			
 
				+                index={index}
			
 
				+                current={current}
			
 
				+                style={itemStyle}
			
 
				+              />
			
 
				+            )}
			
 
				+          </div>
			
 
				+        ))}
			
 
				+      </Carousel>
			
 
				+    </div>
			
 
				+  );
			
 
				+};
			
--- a/src/pages/statis/charts.jsx
+++ b/src/pages/statis/charts.jsx
@@ -3,8 +3,9 @@ import { Row, Col } from 'antd';
 
				 import Sumary from './components/Sumary';
			
 
				 import Task from './components/Task';
			
 
				 import DeviceType from './components/DeviceType';
			
 
				-import StoreCost from './components/StoreCost';
			
 
				+import StoreType from './components/StoreType';
			
 
				 import User from './components/User';
			
 
				+import StoreCost from './components/StoreCost';
			
 
				 import Styles from './style.module.less';
			
 
				 
			
 
				 const mtp = {
			
@@ -27,7 +28,7 @@ export default (props) => {
 
				       </Row>
			
 
				       <Row gutter={gutter} style={mtp}>
			
 
				         <Col span={12}>
			
 
				-          <StoreCost />
			
 
				+          <StoreType />
			
 
				         </Col>
			
 
				         <Col span={12}>
			
 
				           <User />
			
@@ -35,7 +36,7 @@ export default (props) => {
 
				       </Row>
			
 
				       <Row gutter={gutter} style={mtp}>
			
 
				         <Col span={24}>
			
 
				-          <Task />
			
 
				+          <StoreCost />
			
 
				         </Col>
			
 
				       </Row>
			
 
				     </div>
			
--- a/src/pages/statis/components/Age.jsx
+++ b/src/pages/statis/components/Age.jsx
@@ -1,24 +1,31 @@
 
				 import React from 'react';
			
 
				 import * as echarts from 'echarts/core';
			
 
				 import Chart from '@/components/chart';
			
 
				+import { getUserAge } from '@/services/statis';
			
 
				 
			
 
				 let dataIndex = 0;
			
 
				 export default (props) => {
			
 
				 
			
 
				   const chartRef = React.useRef();
			
 
				-  const option = getOption({"20(含)至29岁": 10, "20(含)至39岁": 20, "40(含)至49岁": 30, "50(含)岁以上": 40});
			
 
				+  const [option, setOption] = React.useState({});
			
 
				 
			
 
				   React.useEffect(() => {
			
 
				-    const t = setTimeout(() => {
			
 
				-      const chart = chartRef.current;
			
 
				-      chart.on('mousemove', function(e) {
			
 
				-        chart.dispatchAction({ type: 'downplay', dataIndex });
			
 
				-        chart.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
			
 
				-        dataIndex = e.dataIndex
			
 
				-      });
			
 
				-      chart.dispatchAction({ type: 'highlight', dataIndex });
			
 
				-      clearTimeout(t);
			
 
				-    }, 300);
			
 
				+    getUserAge().then(res => {
			
 
				+      // [{ age: 'xxx', cnt: 12 }] => { 'xxx': 12 }
			
 
				+      const dataSource = (res || []).reduce((acc, x) => ({ ...acc, [x.age]: x.cnt }), {});
			
 
				+      setOption(getOption(dataSource));
			
 
				+
			
 
				+      const t = setTimeout(() => {
			
 
				+        const chart = chartRef.current;
			
 
				+        chart.on('mousemove', function(e) {
			
 
				+          chart.dispatchAction({ type: 'downplay', dataIndex });
			
 
				+          chart.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
			
 
				+          dataIndex = e.dataIndex
			
 
				+        });
			
 
				+        chart.dispatchAction({ type: 'highlight', dataIndex });
			
 
				+        clearTimeout(t);
			
 
				+      }, 300);
			
 
				+    });
			
 
				   }, []);
			
 
				 
			
 
				   const onInited = (chart) => chartRef.current = chart;
			
--- a/src/pages/statis/components/DeviceType.jsx
+++ b/src/pages/statis/components/DeviceType.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 
				 import * as echarts from 'echarts/core';
			
 
				 import icon from '@/assets/images/statistic/设备分类统计.png';
			
 
				 import Chart from '@/components/chart';
			
 
				+import { getDeviceType } from '@/services/statis';
			
 
				 import StatisCard from './StatisCard';
			
 
				 
			
 
				 let dataIndex = 0;
			
@@ -9,19 +10,26 @@ let dataIndex = 0;
 
				 export default (props) => {
			
 
				 
			
 
				   const chartRef = React.useRef();
			
 
				-  const option = getOption({ "制餐设备": 20, "运输设备": 33, "野外保障设备": 10 });
			
 
				+  const [option, setOption] = React.useState({});
			
 
				 
			
 
				   React.useEffect(() => {
			
 
				-    const t = setTimeout(() => {
			
 
				-      const chart = chartRef.current;
			
 
				-      chart.on('mousemove', function(e) {
			
 
				-        chart.dispatchAction({ type: 'downplay', dataIndex });
			
 
				-        chart.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
			
 
				-        dataIndex = e.dataIndex
			
 
				-      });
			
 
				-      chart.dispatchAction({ type: 'highlight', dataIndex });
			
 
				-      clearTimeout(t);
			
 
				-    }, 300);
			
 
				+    getDeviceType().then(res => {
			
 
				+      // 转换 [{ name: 'aaa', cnt: 10 }] 为 { 'aa': 10 }
			
 
				+      const dataSource = (res || []).reduce((acc, x) => ({ ...acc, [x.name]: x.cnt }), {})
			
 
				+      setOption(getOption(dataSource));
			
 
				+
			
 
				+      const t = setTimeout(() => {
			
 
				+        const chart = chartRef.current;
			
 
				+        chart.on('mousemove', function(e) {
			
 
				+          chart.dispatchAction({ type: 'downplay', dataIndex });
			
 
				+          chart.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
			
 
				+          dataIndex = e.dataIndex
			
 
				+        });
			
 
				+        chart.dispatchAction({ type: 'highlight', dataIndex });
			
 
				+        clearTimeout(t);
			
 
				+      }, 300);
			
 
				+    });
			
 
				+
			
 
				   }, []);
			
 
				 
			
 
				   const onInited = (chart) => chartRef.current = chart;
			
--- a/src/pages/statis/components/Edu.jsx
+++ b/src/pages/statis/components/Edu.jsx
@@ -1,10 +1,19 @@
 
				 import React from 'react';
			
 
				 import * as echarts from 'echarts/core';
			
 
				 import Chart from '@/components/chart';
			
 
				+import { getUserEdu } from '@/services/statis';
			
 
				 
			
 
				 export default (props) => {
			
 
				 
			
 
				-  const option = getOption(["本科以上", "本科及大专", "大专以下"], [10, 20, 30]);
			
 
				+  const [option, setOption] = React.useState({});
			
 
				+
			
 
				+  React.useEffect(() => {
			
 
				+    getUserEdu().then(res => {
			
 
				+      const keys = (res || []).map(x => x.name);
			
 
				+      const vals = (res || []).map(x => x.cnt);
			
 
				+      setOption(getOption(keys, vals));
			
 
				+    });
			
 
				+  }, [])
			
 
				 
			
 
				   return (
			
 
				     <Chart option={option} style={{ height: '300px' }} />
			
--- a/src/pages/statis/components/Filter.jsx
+++ b/src/pages/statis/components/Filter.jsx
@@ -5,14 +5,18 @@ import 'moment/locale/zh-cn';
 
				 import locale from 'antd/es/date-picker/locale/zh_CN';
			
 
				 
			
 
				 const { RangePicker } = DatePicker;
			
 
				-const radioOptions = [
			
 
				+const radioDateOptions = [
			
 
				   { label: '本月', value: '1' },
			
 
				   // { label: '本季', value: '2' },
			
 
				   { label: '本年', value: '3' },
			
 
				 ];
			
 
				+const radioUnitOptions = [
			
 
				+  { label: '按天', value: '1' },
			
 
				+  { label: '按月', value: '2' },
			
 
				+];
			
 
				 
			
 
				-export const last30Days = [
			
 
				-  moment().subtract(30, 'days'),
			
 
				+export const lastDays = [
			
 
				+  moment().subtract(15, 'days'),
			
 
				   moment(),
			
 
				 ];
			
 
				 
			
@@ -30,20 +34,13 @@ export const monthRange = [
 
				 ]
			
 
				 
			
 
				 export default (props) => {
			
 
				-  const [dateRange, setDateRange] = React.useState([]);
			
 
				+  const [dateRange, setDateRange] = React.useState(lastDays);
			
 
				   const [radioValue, setRadioValue] = React.useState();
			
 
				-
			
 
				-  const onChange = (val) => {
			
 
				-    console.log(val);
			
 
				-    if (typeof props.onChange === 'function') {
			
 
				-      props.onChange(getStrValue(val));
			
 
				-    }
			
 
				-  }
			
 
				+  const [unitValue, setUnitValue] = React.useState('1');
			
 
				 
			
 
				   const onPickerChange = val => {
			
 
				     setDateRange(val);
			
 
				     setRadioValue();
			
 
				-    onChange(val);
			
 
				   }
			
 
				 
			
 
				   const onRadioChange = e => {
			
@@ -59,23 +56,50 @@ export default (props) => {
 
				         break;
			
 
				       case '3':
			
 
				         dateRange = yearRange;
			
 
				+        setUnitValue('2');
			
 
				         break;
			
 
				       default:
			
 
				         break;
			
 
				     }
			
 
				     
			
 
				     setDateRange(dateRange);
			
 
				-    onChange(dateRange);
			
 
				   }
			
 
				 
			
 
				+  const onUnitChange = e => {
			
 
				+    const val = e.target.value;
			
 
				+    setUnitValue(val);
			
 
				+  }
			
 
				+
			
 
				+  React.useEffect(() => {
			
 
				+    if (typeof props.onChange === 'function') {
			
 
				+      const dt = getStrValue(dateRange);
			
 
				+      props.onChange({
			
 
				+        startDate: dt[0],
			
 
				+        endDate: dt[1],
			
 
				+        unit: unitValue,
			
 
				+      });
			
 
				+    }
			
 
				+  }, [dateRange, unitValue, props.onChange]);
			
 
				+
			
 
				   return (
			
 
				-    <Row style={{ width: '460px' }} gutter={8}>
			
 
				-      <Col span={14}>
			
 
				-        <RangePicker locale={locale} value={dateRange} onChange={onPickerChange} />
			
 
				+    <Row style={{ width: '500px' }} gutter={8}>
			
 
				+      <Col span={7}>
			
 
				+        {
			
 
				+          !props.hideUnit && (
			
 
				+            <Radio.Group
			
 
				+              options={radioUnitOptions}
			
 
				+              value={unitValue}
			
 
				+              onChange={onUnitChange}
			
 
				+            />
			
 
				+          )
			
 
				+        }
			
 
				       </Col>
			
 
				       <Col span={10}>
			
 
				+        <RangePicker locale={locale} value={dateRange} onChange={onPickerChange} />
			
 
				+      </Col>
			
 
				+      <Col span={7}>
			
 
				         <Radio.Group
			
 
				-          options={radioOptions}
			
 
				+          options={radioDateOptions}
			
 
				           value={radioValue}
			
 
				           onChange={onRadioChange}
			
 
				           optionType="button"
			
--- a/src/pages/statis/components/StoreCost.jsx
+++ b/src/pages/statis/components/StoreCost.jsx
@@ -1,29 +1,49 @@
 
				 import React from 'react';
			
 
				-import icon from '@/assets/images/statistic/社会保障机构分类统计.png';
			
 
				+import * as echarts from 'echarts/core';
			
 
				+import icon from '@/assets/images/statistic/任务统计.png';
			
 
				 import Chart from '@/components/chart';
			
 
				+import { getStoreCosts } from '@/services/statis';
			
 
				 import StatisCard from './StatisCard';
			
 
				 import Filter from './Filter';
			
 
				 
			
 
				 export default (props) => {
			
 
				 
			
 
				-  const [year, setYear] = React.useState();
			
 
				-  const option = getOption(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], [0, 0, 0, 0, 0, 0, 8, 9, 10, 1, 1, 6])
			
 
				+  const [filter, setFilter] = React.useState();
			
 
				+  const [option, setOption] = React.useState({});
			
 
				+  // const option = getOption(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], [0, 0, 0, 0, 0, 0, 8, 9, 10, 1, 1, 6])
			
 
				+
			
 
				+  React.useEffect(() => {
			
 
				+    if (filter) {
			
 
				+      getStoreCosts(filter).then(res => {
			
 
				+        const { purchase, taskCosts } = res;
			
 
				+
			
 
				+        const keys = (purchase || []).map(x => x.dt);
			
 
				+        const data1 = (purchase || []).map(x => x.price / 100); // 数据返回的单位是 分
			
 
				+        const data2 = (taskCosts || []).map(x => x.price / 100);
			
 
				+  
			
 
				+        const opt = getOption(keys, data1, data2);
			
 
				+        const dataZoom = keys.length > 31 ? { show: true, height: 20, bottom: 6 } : { show: false };
			
 
				+  
			
 
				+        setOption({ ...opt, dataZoom });
			
 
				+      });
			
 
				+    }
			
 
				+  }, [filter]);
			
 
				 
			
 
				   return (
			
 
				     <StatisCard
			
 
				       title="成本分析"
			
 
				       icon={icon}
			
 
				-      extra={<Filter />}
			
 
				+      extra={<Filter onChange={setFilter} />}
			
 
				     >
			
 
				       <Chart option={option} style={{ height: '300px' }} />
			
 
				     </StatisCard>
			
 
				   )
			
 
				 }
			
 
				 
			
 
				-function getOption(xAxisData, seriesData) {
			
 
				+function getOption(xAxisData, data1, data2) {
			
 
				   var axisLabel = {
			
 
				     fontSize: 14,
			
 
				-    color: 'rgba(255,255,255, .6)'
			
 
				+    color: 'rgba(255,255,255, .6)',
			
 
				   };
			
 
				   var lineStyle = {
			
 
				     color: 'rgba(255,255,255, .16)',
			
@@ -31,52 +51,63 @@ function getOption(xAxisData, seriesData) {
 
				   };
			
 
				 
			
 
				   return {
			
 
				+    tooltip : {
			
 
				+      trigger: 'axis',
			
 
				+      axisPointer : {
			
 
				+        type : 'shadow'
			
 
				+      },
			
 
				+      valueFormatter: v => `￥ ${v}`
			
 
				+    },
			
 
				     xAxis: {
			
 
				       type: 'category',
			
 
				-      axisLabel: Object.assign({
			
 
				-        rotate: 45
			
 
				-      }, axisLabel),
			
 
				+      axisLabel: { ...axisLabel, rotate: 45 },
			
 
				       axisLine: {
			
 
				         show: true,
			
 
				         lineStyle: lineStyle
			
 
				       },
			
 
				       data: xAxisData
			
 
				     },
			
 
				-    yAxis: {
			
 
				-      axisLabel: axisLabel,
			
 
				-      axisLine: {
			
 
				-        show: true,
			
 
				-        lineStyle: lineStyle
			
 
				-      },
			
 
				-      splitLine: {
			
 
				-        lineStyle: lineStyle
			
 
				+    yAxis: [
			
 
				+      {
			
 
				+        type: 'value',
			
 
				+        axisLabel: axisLabel,
			
 
				+        axisLine: {
			
 
				+          show: true,
			
 
				+          lineStyle: lineStyle
			
 
				+        },
			
 
				+        splitLine: {
			
 
				+          lineStyle: lineStyle
			
 
				+        },
			
 
				       },
			
 
				-      type: 'value'
			
 
				-    },
			
 
				-    tooltip : {
			
 
				-      trigger: 'axis',
			
 
				-      axisPointer : {
			
 
				-        type : 'shadow'
			
 
				-      }
			
 
				-    },
			
 
				+    ],
			
 
				+    // dataZoom: [
			
 
				+    //   {
			
 
				+    //     show: true,
			
 
				+    //   }
			
 
				+    // ],
			
 
				     grid: {
			
 
				       top: 20,
			
 
				       left: 50,
			
 
				       right: 20,
			
 
				-      bottom: 70,
			
 
				+      bottom: 100,
			
 
				     },
			
 
				-    color: ['#9242D1'],
			
 
				-    animationEasing: 'elasticOut',
			
 
				     series: [
			
 
				       {
			
 
				-        data: seriesData,
			
 
				-        type: 'pictorialBar',
			
 
				-        barWidth: 16,
			
 
				-        symbol: 'rect',
			
 
				-        symbolRepeat: true,
			
 
				-        animationDuration: 6000,
			
 
				-        animationDelay: function (dataIndex, params) {
			
 
				-          return params.index * 30;
			
 
				+        name: '用料成本',
			
 
				+        data: data1,
			
 
				+        type: 'line',
			
 
				+        smooth: true,
			
 
				+        itemStyle: {
			
 
				+          color: '#1EAED1'
			
 
				+        }
			
 
				+      },
			
 
				+      {
			
 
				+        name: '采购成本',
			
 
				+        data: data2,
			
 
				+        type: 'line',
			
 
				+        smooth: true,
			
 
				+        itemStyle: {
			
 
				+          color: '#6F39B9'
			
 
				         }
			
 
				       }
			
 
				     ]
			
--- a/src/pages/statis/components/StoreType.jsx
+++ b/src/pages/statis/components/StoreType.jsx
@@ -0,0 +1,99 @@
 
				+import React from 'react';
			
 
				+import icon from '@/assets/images/statistic/社会保障机构分类统计.png';
			
 
				+import Chart from '@/components/chart';
			
 
				+import { getStoreType } from '@/services/statis';
			
 
				+import StatisCard from './StatisCard';
			
 
				+import Filter from './Filter';
			
 
				+
			
 
				+export default (props) => {
			
 
				+
			
 
				+  const [filter, setFilter] = React.useState();
			
 
				+  const [option, setOption] = React.useState({});
			
 
				+
			
 
				+  React.useEffect(() => {
			
 
				+    if (filter) {
			
 
				+      getStoreType(filter).then(res => {
			
 
				+        const keys = (res || []).map(x => x.name);
			
 
				+        const vals = (res || []).map(x => x.cnt);
			
 
				+        
			
 
				+        const dataZoom = res.length > 31 ? { show: true, height: 20, bottom: 6 } : { show: false };
			
 
				+        const opt = getOption(keys, vals);
			
 
				+
			
 
				+        setOption({ ...opt, dataZoom });
			
 
				+      });
			
 
				+    }
			
 
				+  }, [filter]);
			
 
				+
			
 
				+  return (
			
 
				+    <StatisCard
			
 
				+      title="物资分析"
			
 
				+      icon={icon}
			
 
				+      extra={<Filter hideUnit onChange={setFilter} />}
			
 
				+    >
			
 
				+      <Chart option={option} style={{ height: '300px' }} />
			
 
				+    </StatisCard>
			
 
				+  )
			
 
				+}
			
 
				+
			
 
				+function getOption(xAxisData, seriesData) {
			
 
				+  var axisLabel = {
			
 
				+    fontSize: 14,
			
 
				+    color: 'rgba(255,255,255, .6)'
			
 
				+  };
			
 
				+  var lineStyle = {
			
 
				+    color: 'rgba(255,255,255, .16)',
			
 
				+    type: 'dashed'
			
 
				+  };
			
 
				+
			
 
				+  return {
			
 
				+    xAxis: {
			
 
				+      type: 'category',
			
 
				+      axisLabel: Object.assign({
			
 
				+        rotate: 45
			
 
				+      }, axisLabel),
			
 
				+      axisLine: {
			
 
				+        show: true,
			
 
				+        lineStyle: lineStyle
			
 
				+      },
			
 
				+      data: xAxisData
			
 
				+    },
			
 
				+    yAxis: {
			
 
				+      axisLabel: axisLabel,
			
 
				+      axisLine: {
			
 
				+        show: true,
			
 
				+        lineStyle: lineStyle
			
 
				+      },
			
 
				+      splitLine: {
			
 
				+        lineStyle: lineStyle
			
 
				+      },
			
 
				+      type: 'value'
			
 
				+    },
			
 
				+    tooltip : {
			
 
				+      trigger: 'axis',
			
 
				+      axisPointer : {
			
 
				+        type : 'shadow'
			
 
				+      }
			
 
				+    },
			
 
				+    grid: {
			
 
				+      top: 20,
			
 
				+      left: 50,
			
 
				+      right: 20,
			
 
				+      bottom: 70,
			
 
				+    },
			
 
				+    color: ['#9242D1'],
			
 
				+    animationEasing: 'elasticOut',
			
 
				+    series: [
			
 
				+      {
			
 
				+        data: seriesData,
			
 
				+        type: 'pictorialBar',
			
 
				+        barWidth: 16,
			
 
				+        symbol: 'rect',
			
 
				+        symbolRepeat: true,
			
 
				+        animationDuration: 6000,
			
 
				+        animationDelay: function (dataIndex, params) {
			
 
				+          return params.index * 30;
			
 
				+        }
			
 
				+      }
			
 
				+    ]
			
 
				+  }
			
 
				+}
			
--- a/src/pages/statis/components/Task.jsx
+++ b/src/pages/statis/components/Task.jsx
@@ -4,31 +4,33 @@ import icon from '@/assets/images/statistic/任务统计.png';
 
				 import Chart from '@/components/chart';
			
 
				 import { getTaskInfo } from '@/services/statis';
			
 
				 import StatisCard from './StatisCard';
			
 
				-import Filter, { last30Days, getStrValue } from './Filter';
			
 
				+import Filter from './Filter';
			
 
				 
			
 
				-const defaultValue = getStrValue(last30Days);
			
 
				 export default (props) => {
			
 
				 
			
 
				-  const [dateRange, setDateRange] = React.useState(defaultValue);
			
 
				+  const [filter, setFilter] = React.useState();
			
 
				   const [option, setOption] = React.useState({});
			
 
				   // const option = getOption(["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], [0, 0, 0, 0, 0, 0, 8, 9, 10, 1, 1, 6])
			
 
				 
			
 
				   React.useEffect(() => {
			
 
				-    getTaskInfo({ startDate: dateRange[0], endDate: dateRange[1] }).then(res => {
			
 
				-      const keys = res.map(x => x.dt);
			
 
				-      const vals = res.map(x => x.cnt);
			
 
				-
			
 
				-      const opt = getOption(keys, vals);
			
 
				-
			
 
				-      setOption(res.length > 30 ? { ...opt, dataZoom: { height: 20, bottom: 6 } } : opt);
			
 
				-    });
			
 
				-  }, [dateRange]);
			
 
				+    if (filter) {
			
 
				+      getTaskInfo(filter).then((res = []) => {
			
 
				+        const keys = res.map(x => x.dt);
			
 
				+        const vals = res.map(x => x.cnt);
			
 
				+  
			
 
				+        const opt = getOption(keys, vals);
			
 
				+        const dataZoom = res.length > 31 ? { show: true, height: 20, bottom: 6 } : { show: false };
			
 
				+  
			
 
				+        setOption({ ...opt, dataZoom });
			
 
				+      });
			
 
				+    }
			
 
				+  }, [filter]);
			
 
				 
			
 
				   return (
			
 
				     <StatisCard
			
 
				       title="任务统计"
			
 
				       icon={icon}
			
 
				-      extra={<Filter onChange={setDateRange} />}
			
 
				+      extra={<Filter onChange={setFilter} />}
			
 
				     >
			
 
				       <Chart option={option} style={{ height: '300px' }} />
			
 
				     </StatisCard>
			
--- a/src/pages/statis/components/style.global.less
+++ b/src/pages/statis/components/style.global.less
@@ -13,7 +13,7 @@
 
				     border-bottom: none;
			
 
				   }
			
 
				 
			
 
				-  .ant-picker, .ant-radio-button-wrapper, .ant-picker-separator {
			
 
				+  .ant-picker, .ant-radio-wrapper, .ant-radio-button-wrapper, .ant-picker-separator {
			
 
				     background: transparent !important;
			
 
				     color: #bbb !important;
			
 
				   }
			
--- a/src/pages/stock/edit/index.jsx
+++ b/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);
			
 
				       });
			
 
				     }
			
@@ -91,6 +91,15 @@ export default (props) => {
 
				             allowClear={false}
			
 
				             width={460}
			
 
				           />
			
 
				+          <ProFormText
			
 
				+            initialValue={1}
			
 
				+            name="warnAmount"
			
 
				+            label="预警库存"
			
 
				+            extra="库存低于此设置将会自动预警"
			
 
				+            placeholder="请输入预警库存"
			
 
				+            allowClear={false}
			
 
				+            width={460}
			
 
				+          />
			
 
				           <ProFormText
			
 
				             name="amount"
			
 
				             label="库存"
			
--- a/src/pages/stock/list/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
--- a/src/pages/stockClassification/edit/index.jsx
+++ b/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);
			
 
				       });
			
 
				     }
			
--- a/src/pages/stockClassification/list/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
@@ -26,17 +26,22 @@ const StockList = (props) => {
 
				       title: '分类名称',
			
 
				       dataIndex: 'name',
			
 
				     },
			
 
				-
			
 
				     {
			
 
				-      title: '排序',
			
 
				+      title: '是否食材',
			
 
				       dataIndex: 'isFood',
			
 
				-      search: false,
			
 
				       valueEnum: {
			
 
				         1: '是',
			
 
				         0: '否',
			
 
				       },
			
 
				     },
			
 
				-
			
 
				+    {
			
 
				+      title: '是否设备',
			
 
				+      dataIndex: 'isDevice',
			
 
				+      valueEnum: {
			
 
				+        1: '是',
			
 
				+        0: '否',
			
 
				+      },
			
 
				+    },
			
 
				     {
			
 
				       title: '操作',
			
 
				       valueType: 'option',
			
--- a/src/pages/user/Edit.jsx
+++ b/src/pages/user/Edit.jsx
@@ -80,7 +80,7 @@ export default (props) => {
 
				 
			
 
				   return (
			
 
				     <Card loading={loading}>
			
 
				-      <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError>
			
 
				+      <Form onFinish={onFinish} form={form} {...formItemLayout} scrollToFirstError style={{ maxWidth: '1000px' }}>
			
 
				         <Form.Item
			
 
				           name="name"
			
 
				           label="姓名"
			
@@ -152,17 +152,15 @@ export default (props) => {
 
				             style={{ width: '100%' }}
			
 
				             placeholder="请选择文化程度"
			
 
				           >
			
 
				-            <Option value="半文盲">半文盲</Option>
			
 
				-            <Option value="文盲">文盲</Option>
			
 
				-            <Option value="小学">小学</Option>
			
 
				-            <Option value="初中">初中</Option>
			
 
				-            <Option value="高中">高中</Option>
			
 
				-            <Option value="中专">中专</Option>
			
 
				-            <Option value="大专">大专</Option>
			
 
				-            <Option value="本科">本科</Option>
			
 
				-            <Option value="硕士">硕士</Option>
			
 
				-            <Option value="博士">博士</Option>
			
 
				-            <Option value="博士后">博士后</Option>
			
 
				+            <Option value="90">文盲/半文盲</Option>
			
 
				+            <Option value="80">小学</Option>
			
 
				+            <Option value="70">初中</Option>
			
 
				+            <Option value="60">高中</Option>
			
 
				+            <Option value="40">中专</Option>
			
 
				+            <Option value="30">大专</Option>
			
 
				+            <Option value="20">本科</Option>
			
 
				+            <Option value="10">硕士</Option>
			
 
				+            <Option value="1">博士/博士后</Option>
			
 
				           </Select>
			
 
				         </Form.Item>
			
 
				         <Form.Item
			
--- a/src/regulation/edit/index.jsx
+++ b/src/regulation/edit/index.jsx
@@ -24,7 +24,7 @@ export default (props) => {
 
				 

			
 
				     //添加,修改

			
 
				     addRegulation({ ...values, id }).then((res) => {

			
 
				-      message.success('成功');

			
 
				+      // message.success('成功');

			
 
				       navigate(-1);

			
 
				     });

			
 
				     return false;

			
--- a/src/regulation/index.jsx
+++ b/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();
			
 
				       });
			
 
				     }
			
--- a/src/routes/menus.jsx
+++ b/src/routes/menus.jsx
@@ -30,7 +30,10 @@ export const getMenuItems = (routes = [], fullPath = '/') => {
 
				     // 坑爹 react-router v6 不支持 hash 路由的 target 跳转
			
 
				     const label = target === '_blank' ?
			
 
				       <a href={`${window.location.pathname}#${path}`} target={target}>{title}</a>
			
 
				-      : <Link to={path} target={target}>{title}</Link>;
			
 
				+      : (
			
 
				+        path.indexOf('http') === 0  ? <a href={path} target="_blank">{title}</a>
			
 
				+        : <Link to={path} target={target}>{title}</Link>
			
 
				+      );
			
 
				 
			
 
				     return Object.assign(
			
 
				       {
			
--- a/src/routes/routes.jsx
+++ b/src/routes/routes.jsx
@@ -6,38 +6,39 @@ import {
 
				   MenuFoldOutlined,
			
 
				   MenuUnfoldOutlined,
			
 
				   PieChartOutlined,
			
 
				-} from '@ant-design/icons';
			
 
				-import { Navigate } from 'react-router-dom';
			
 
				-import AuthLayout from '@/layouts/AuthLayout';
			
 
				-import Container from '@/layouts/Container';
			
 
				-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 GuaranteeTaskList from '@/pages/guaranteeTask';
			
 
				-import GuaranteeTaskEdit from '@/pages/guaranteeTask/Edit';
			
 
				-import GuaranteeTaskPrint from '@/pages/guaranteeTask/print';
			
 
				+} from "@ant-design/icons";
			
 
				+import { Navigate } from "react-router-dom";
			
 
				+import AuthLayout from "@/layouts/AuthLayout";
			
 
				+import Container from "@/layouts/Container";
			
 
				+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 GuaranteeTaskList from "@/pages/guaranteeTask";
			
 
				+import GuaranteeTaskEdit from "@/pages/guaranteeTask/Edit";
			
 
				+import GuaranteeTaskPrint from "@/pages/guaranteeTask/print";
			
 
				 import GuaranteeTaskEvaluate from "@/pages/evaluate";
			
 
				 import GuaranteeTaskEvaluateList from "@/pages/evaluate/evaluateList";
			
 
				-import DishList from '@/pages/dish/list';
			
 
				-import DishEdit from '@/pages/dish/edit';
			
 
				-import PackageList from '@/pages/package/List';
			
 
				-import StockList from '@/pages/stock/list';
			
 
				-import StockEdit from '@/pages/stock/edit';
			
 
				-import StockInOut from '@/pages/stock/outAndIn';
			
 
				-import StockLog from '@/pages/stock/stockLog';
			
 
				-import StockClassificationList from '@/pages/stockClassification/list';
			
 
				-import StockClassificationEdit from '@/pages/stockClassification/edit';
			
 
				-import RotationChartList from '@/pages/rotationChart/list';
			
 
				-import RotationChartEdit from '@/pages/rotationChart/edit';
			
 
				-import RotationChartIntroduction from '@/pages/rotationChart/introduction';
			
 
				-import RotationChartIntroductionEdit from '@/pages/rotationChart/introduction/edit';
			
 
				-import Roles from '@/pages/roles/index';
			
 
				-import RegulationList from '@/regulation';
			
 
				-import RegulationEdit from '@/regulation/edit';
			
 
				-import UserList from '@/pages/user';
			
 
				-import UserEdit from '@/pages/user/Edit';
			
 
				+import DishList from "@/pages/dish/list";
			
 
				+import DishEdit from "@/pages/dish/edit";
			
 
				+import PackageList from "@/pages/package";
			
 
				+import StockList from "@/pages/stock/list";
			
 
				+import StockEdit from "@/pages/stock/edit";
			
 
				+import StockInOut from "@/pages/stock/outAndIn";
			
 
				+import StockLog from "@/pages/stock/stockLog";
			
 
				+import StockClassificationList from "@/pages/stockClassification/list";
			
 
				+import StockClassificationEdit from "@/pages/stockClassification/edit";
			
 
				+import RotationChartList from "@/pages/rotationChart/list";
			
 
				+import RotationChartEdit from "@/pages/rotationChart/edit";
			
 
				+import RotationChartIntroduction from "@/pages/rotationChart/introduction";
			
 
				+import RotationChartIntroductionEdit from "@/pages/rotationChart/introduction/edit";
			
 
				+import RotationChartDetail from "@/pages/rotationChart/detail";
			
 
				+import Roles from "@/pages/roles/index";
			
 
				+import RegulationList from "@/regulation";
			
 
				+import RegulationEdit from "@/regulation/edit";
			
 
				+import UserList from "@/pages/user";
			
 
				+import UserEdit from "@/pages/user/Edit";
			
 
				 import PurchasePlanList from "@/pages/purchase/plan/list";
			
 
				 import PurchasePlanEdit from "@/pages/purchase/plan/edit";
			
 
				 import PurchaseBillEdit from "@/pages/purchase/bill/edit";
			
@@ -46,9 +47,9 @@ import EmergencyPlanList from "@/pages/cms/emergencyPlan/list";
 
				 import EmergencyPlanEdit from "@/pages/cms/emergencyPlan/edit";
			
 
				 import EmergencyPlanDetail from "@/pages/cms/emergencyPlan/detail";
			
 
				 import FilesList from "@/pages/cms/files/list";
			
 
				-import MessageList from '@/pages/message';
			
 
				-import MessageDetail from '@/pages/message/detail';
			
 
				-import StatisCharts from '@/pages/statis/charts';
			
 
				+import MessageList from "@/pages/message";
			
 
				+import MessageDetail from "@/pages/message/detail";
			
 
				+import StatisCharts from "@/pages/statis/charts";
			
 
				 
			
 
				 /**
			
 
				  * meta 用来扩展自定义数据数据
			
@@ -57,18 +58,29 @@ import StatisCharts from '@/pages/statis/charts';
 
				  *    hideInMenu: 布尔值, 如果为 false, 菜单不会显示
			
 
				  *    noLayout: 布尔值, 如果为 true, 将不会使用默认布局
			
 
				  *    noSiderBar: 布尔值, 如果为 true, 将没有左侧菜单栏
			
 
				- *    noFooter: 布尔值, 如果为 true, 将没有底部 footer 
			
 
				+ *    noFooter: 布尔值, 如果为 true, 将没有底部 footer
			
 
				  *    target: 字符串, 如果为 _blank, 将在新窗口打开
			
 
				+ *    permission: 对应服务器端权限名称
			
 
				  * }
			
 
				  */
			
 
				 
			
 
				 export const authRoutes = [
			
 
				+  {
			
 
				+    path: "static",
			
 
				+    element: <StatisCharts />,
			
 
				+    meta: {
			
 
				+      title: "数据分析",
			
 
				+      noSiderBar: true,
			
 
				+      noFooter: true,
			
 
				+      permission: 'static',
			
 
				+    },
			
 
				+  },
			
 
				   {
			
 
				     path: "task",
			
 
				     element: <Container />,
			
 
				     meta: {
			
 
				       title: "军供任务",
			
 
				-      icon: <AppstoreOutlined />,
			
 
				+      permission: 'task',
			
 
				     },
			
 
				     children: [
			
 
				       {
			
@@ -79,7 +91,8 @@ export const authRoutes = [
 
				         path: "guaranteeTask",
			
 
				         element: <GuaranteeTaskList />,
			
 
				         meta: {
			
 
				-          title: "任务通报",
			
 
				+          title: "军供通报",
			
 
				+          permission: 'guaranteeTask',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -87,6 +100,7 @@ export const authRoutes = [
 
				         element: <GuaranteeTaskEdit />,
			
 
				         meta: {
			
 
				           title: "任务配置",
			
 
				+          permission: 'guaranteeTask.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -97,6 +111,7 @@ export const authRoutes = [
 
				           noLayout: true,
			
 
				           target: "_blank",
			
 
				           title: "任务执行",
			
 
				+          permission: 'guaranteeTask.print',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -104,6 +119,7 @@ export const authRoutes = [
 
				         element: <GuaranteeTaskEvaluate />,
			
 
				         meta: {
			
 
				           title: "任务评价",
			
 
				+          permission: 'guaranteeTask.evaluate',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -112,16 +128,17 @@ export const authRoutes = [
 
				         meta: {
			
 
				           title: "任务评价",
			
 
				           hideInMenu: true,
			
 
				+          permission: 'guaranteeTask.evaluate.list',
			
 
				         },
			
 
				       },
			
 
				     ],
			
 
				   },
			
 
				   {
			
 
				-    path: "material",
			
 
				+    path: "stock",
			
 
				     element: <Container />,
			
 
				     meta: {
			
 
				-      title: "物资管理",
			
 
				-      icon: <AppstoreOutlined />,
			
 
				+      title: "库存物资",
			
 
				+      permission: 'stock',
			
 
				     },
			
 
				     children: [
			
 
				       {
			
@@ -133,6 +150,7 @@ export const authRoutes = [
 
				         element: <DishList />,
			
 
				         meta: {
			
 
				           title: "菜肴管理",
			
 
				+          permission: 'dish',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -141,6 +159,7 @@ export const authRoutes = [
 
				         meta: {
			
 
				           hideInMenu: true,
			
 
				           title: "菜肴维护",
			
 
				+          permission: 'dish.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -148,34 +167,88 @@ export const authRoutes = [
 
				         element: <PackageList />,
			
 
				         meta: {
			
 
				           title: "套餐管理",
			
 
				+          permission: 'package',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "list",
			
 
				+        element: <StockList />,
			
 
				+        meta: {
			
 
				+          title: "库存列表",
			
 
				+          permission: 'stock.list',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "add",
			
 
				+        element: <StockEdit />,
			
 
				+        meta: {
			
 
				+          title: "库存维护",
			
 
				+          permission: 'stock.edit',
			
 
				         },
			
 
				       },
			
 
				     ],
			
 
				   },
			
 
				   {
			
 
				-    path: "stock",
			
 
				+    path: "purchase",
			
 
				     element: <Container />,
			
 
				     meta: {
			
 
				-      title: "库存管理",
			
 
				-      icon: <AppstoreOutlined />,
			
 
				+      title: "采购管理",
			
 
				+      permission: 'purchase',
			
 
				     },
			
 
				     children: [
			
 
				       {
			
 
				         index: true,
			
 
				-        element: <Navigate to="list" replace />,
			
 
				+        element: <Navigate to="plan/list" replace />,
			
 
				       },
			
 
				       {
			
 
				-        path: "list",
			
 
				-        element: <StockList />,
			
 
				+        path: "plan/list",
			
 
				+        element: <PurchasePlanList type="plan" />,
			
 
				         meta: {
			
 
				-          title: "库存列表",
			
 
				+          title: "采购计划",
			
 
				+          permission: 'purchase.plan',
			
 
				         },
			
 
				       },
			
 
				       {
			
 
				-        path: "add",
			
 
				-        element: <StockEdit />,
			
 
				+        path: "plan/edit",
			
 
				+        element: <PurchasePlanEdit />,
			
 
				         meta: {
			
 
				-          title: "库存维护",
			
 
				+          title: "采购计划维护",
			
 
				+          hideInMenu: true,
			
 
				+          permission: 'purchase.plan.edit',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "bill/list",
			
 
				+        element: <PurchasePlanList type="bill" />,
			
 
				+        meta: {
			
 
				+          title: "采购账单",
			
 
				+          permission: 'purchase.bill',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "bill/edit",
			
 
				+        element: <PurchaseBillEdit />,
			
 
				+        meta: {
			
 
				+          title: "采购账单维护",
			
 
				+          hideInMenu: true,
			
 
				+          permission: 'purchase.bill.edit',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "inStore/list",
			
 
				+        element: <PurchasePlanList type="inStore" />,
			
 
				+        meta: {
			
 
				+          title: "采购入库",
			
 
				+          permission: 'purchase.instore',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "inStore/edit",
			
 
				+        element: <PurchaseInStoreEdit />,
			
 
				+        meta: {
			
 
				+          title: "采购详情",
			
 
				+          permission: 'purchase.detail',
			
 
				+          hideInMenu: true,
			
 
				         },
			
 
				       },
			
 
				     ],
			
@@ -185,6 +258,7 @@ export const authRoutes = [
 
				     element: <Container />,
			
 
				     meta: {
			
 
				       title: "公告文件",
			
 
				+      permission: 'cms',
			
 
				     },
			
 
				     children: [
			
 
				       {
			
@@ -196,13 +270,15 @@ export const authRoutes = [
 
				         element: <RotationChartIntroductionEdit />,
			
 
				         meta: {
			
 
				           title: "本站信息",
			
 
				+          permission: 'station',
			
 
				         },
			
 
				       },
			
 
				       {
			
 
				         path: "rotationChart/list",
			
 
				         element: <RotationChartList />,
			
 
				         meta: {
			
 
				-          title: "公告内容",
			
 
				+          title: "公告管理",
			
 
				+          permission: 'rotationChart',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -210,22 +286,34 @@ export const authRoutes = [
 
				         element: <RotationChartEdit />,
			
 
				         meta: {
			
 
				           title: "公告维护",
			
 
				+          hideInMenu: true,
			
 
				+          permission: 'rotationChart.edit',
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: "rotationChart/detail",
			
 
				+        element: <RotationChartDetail />,
			
 
				+        meta: {
			
 
				+          title: "公告详情",
			
 
				+          hideInMenu: true,
			
 
				+          permission: 'rotationChart.detail',
			
 
				         },
			
 
				       },
			
 
				-
			
 
				       {
			
 
				-        path: 'regulation',
			
 
				+        path: "regulation",
			
 
				         element: <RegulationList />,
			
 
				         meta: {
			
 
				           title: "规章制度",
			
 
				+          permission: 'regulation',
			
 
				         },
			
 
				       },
			
 
				       {
			
 
				-        path: 'regulation/add',
			
 
				+        path: "regulation/add",
			
 
				         element: <RegulationEdit />,
			
 
				         meta: {
			
 
				           hideInMenu: true,
			
 
				-          title: '规章制度维护',
			
 
				+          title: "规章制度维护",
			
 
				+          permission: 'regulation.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -233,6 +321,7 @@ export const authRoutes = [
 
				         element: <EmergencyPlanList />,
			
 
				         meta: {
			
 
				           title: "应急预案",
			
 
				+          permission: 'emergency-plan',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -241,6 +330,7 @@ export const authRoutes = [
 
				         meta: {
			
 
				           title: "应急预案维护",
			
 
				           hideInMenu: true,
			
 
				+          permission: 'emergency-plan.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -249,6 +339,7 @@ export const authRoutes = [
 
				         meta: {
			
 
				           title: "应急预案详情",
			
 
				           hideInMenu: true,
			
 
				+          permission: 'emergency-plan.detail',
			
 
				         },
			
 
				       },
			
 
				 
			
@@ -257,35 +348,43 @@ export const authRoutes = [
 
				         element: <FilesList />,
			
 
				         meta: {
			
 
				           title: "文件管理",
			
 
				+          permission: 'files',
			
 
				         },
			
 
				       },
			
 
				     ],
			
 
				   },
			
 
				-  {
			
 
				-    path: 'static',
			
 
				-    element: <StatisCharts />,
			
 
				-    meta: {
			
 
				-      title: '数据分析',
			
 
				-      noSiderBar: true,
			
 
				-      noFooter: true,
			
 
				-    },
			
 
				-  },
			
 
				   {
			
 
				     path: "system",
			
 
				     element: <Container />,
			
 
				     meta: {
			
 
				       title: "系统管理",
			
 
				+      permission: 'system',
			
 
				     },
			
 
				     children: [
			
 
				       {
			
 
				         index: true,
			
 
				         element: <Navigate to="stockClassification/list" replace />,
			
 
				       },
			
 
				+      {
			
 
				+        path: DH_MONITOR,
			
 
				+        element: null,
			
 
				+        meta: {
			
 
				+          title: "大华监控",
			
 
				+        },
			
 
				+      },
			
 
				+      {
			
 
				+        path: DH_MONITOR,
			
 
				+        element: null,
			
 
				+        meta: {
			
 
				+          title: "海康监控",
			
 
				+        },
			
 
				+      },
			
 
				       {
			
 
				         path: "stockClassification/list",
			
 
				         element: <StockClassificationList />,
			
 
				         meta: {
			
 
				           title: "库存分类",
			
 
				+          permission: 'stockClassification',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -294,13 +393,15 @@ export const authRoutes = [
 
				         meta: {
			
 
				           title: "库存分类维护",
			
 
				           hideInMenu: true,
			
 
				+          permission: 'stockClassification.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
 
				         path: "log",
			
 
				         element: <StockLog />,
			
 
				         meta: {
			
 
				-          title: "操作日志",
			
 
				+          title: "库存日志",
			
 
				+          permission: 'stock.log',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -308,6 +409,7 @@ export const authRoutes = [
 
				         element: <Roles />,
			
 
				         meta: {
			
 
				           title: "角色管理",
			
 
				+          permission: 'role',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -315,6 +417,7 @@ export const authRoutes = [
 
				         element: <UserList />,
			
 
				         meta: {
			
 
				           title: "用户管理",
			
 
				+          permission: 'user',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -323,6 +426,7 @@ export const authRoutes = [
 
				         meta: {
			
 
				           hideInMenu: true,
			
 
				           title: "系统用户编辑",
			
 
				+          permission: 'user.edit',
			
 
				         },
			
 
				       },
			
 
				       {
			
@@ -330,72 +434,14 @@ export const authRoutes = [
 
				         element: <MessageList />,
			
 
				         meta: {
			
 
				           title: "消息列表",
			
 
				+          permission: 'message',
			
 
				         },
			
 
				       },
			
 
				       {
			
 
				-        path: "message/detail",
			
 
				-        element: <MessageDetail />,
			
 
				-        meta: {
			
 
				-          title: "消息详情",
			
 
				-          hideInMenu: true,
			
 
				-        },
			
 
				-      },
			
 
				-    ],
			
 
				-  },
			
 
				-  {
			
 
				-    path: "purchase",
			
 
				-    element: <Container />,
			
 
				-    meta: {
			
 
				-      title: "采购管理",
			
 
				-    },
			
 
				-    children: [
			
 
				-      {
			
 
				-        index: true,
			
 
				-        element: <Navigate to="plan/list" replace />,
			
 
				-      },
			
 
				-      {
			
 
				-        path: "plan/list",
			
 
				-        element: <PurchasePlanList type="plan" />,
			
 
				-        meta: {
			
 
				-          title: "采购计划",
			
 
				-        },
			
 
				-      },
			
 
				-      {
			
 
				-        path: "plan/edit",
			
 
				-        element: <PurchasePlanEdit />,
			
 
				+        path: "foo",
			
 
				+        element: null,
			
 
				         meta: {
			
 
				-          title: "采购计划维护",
			
 
				-          hideInMenu: true,
			
 
				-        },
			
 
				-      },
			
 
				-      {
			
 
				-        path: "bill/list",
			
 
				-        element: <PurchasePlanList type="bill" />,
			
 
				-        meta: {
			
 
				-          title: "采购账单",
			
 
				-        },
			
 
				-      },
			
 
				-      {
			
 
				-        path: "bill/edit",
			
 
				-        element: <PurchaseBillEdit />,
			
 
				-        meta: {
			
 
				-          title: "采购账单维护",
			
 
				-          hideInMenu: true,
			
 
				-        },
			
 
				-      },
			
 
				-      {
			
 
				-        path: "inStore/list",
			
 
				-        element: <PurchasePlanList type="inStore" />,
			
 
				-        meta: {
			
 
				-          title: "采购入库",
			
 
				-        },
			
 
				-      },
			
 
				-      {
			
 
				-        path: "inStore/edit",
			
 
				-        element: <PurchaseInStoreEdit />,
			
 
				-        meta: {
			
 
				-          title: "采购入库维护",
			
 
				-          hideInMenu: true,
			
 
				+          title: "操作手册",
			
 
				         },
			
 
				       },
			
 
				     ],
			
@@ -409,7 +455,7 @@ export const defaultRoutes = [
 
				     children: [
			
 
				       {
			
 
				         index: true,
			
 
				-        element: <Home />,
			
 
				+        element: <Navigate to="home" replace />,
			
 
				       },
			
 
				       {
			
 
				         path: "home",
			
@@ -417,6 +463,8 @@ export const defaultRoutes = [
 
				         meta: {
			
 
				           title: "首页",
			
 
				           icon: <DesktopOutlined />,
			
 
				+          noSiderBar: true,
			
 
				+          noFooter: true,
			
 
				         },
			
 
				       },
			
 
				       {
			
--- a/src/services/dish.js
+++ b/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 });

			
 
				 

			
 
				 /**

			
 
				  * 详情

			
--- a/src/services/package.js
+++ b/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 });

			
 
				 

			
 
				 

			
 
				 /**

			
--- a/src/services/rotationChart.js
+++ b/src/services/rotationChart.js
@@ -1,25 +1,27 @@
 
				-import request from '@/utils/request';
			
 
				+import request from "@/utils/request";
			
 
				 
			
 
				 /**
			
 
				  * 查询列表
			
 
				  * @param {*} params
			
 
				  * @returns
			
 
				  */
			
 
				-export const getBannerList = (params) => request('/banner', { params });
			
 
				+export const getBannerList = (params) =>
			
 
				+  request("/banner", { params, successTip: false });
			
 
				 
			
 
				 /**
			
 
				  * 详情
			
 
				  * @param {*} id
			
 
				  * @returns
			
 
				  */
			
 
				-export const getBannerdById = (id) => request(`/banner/${id}`);
			
 
				+export const getBannerdById = (id) =>
			
 
				+  request(`/banner/${id}`, { successTip: false });
			
 
				 
			
 
				 /**
			
 
				  * 新增
			
 
				  * @param {*} data
			
 
				  * @returns
			
 
				  */
			
 
				-export const addBanner = (data) => request('/banner', { method: 'post', data });
			
 
				+export const addBanner = (data) => request("/banner", { method: "post", data });
			
 
				 
			
 
				 /**
			
 
				  * 新增
			
@@ -27,18 +29,21 @@ export const addBanner = (data) => request('/banner', { method: 'post', data });
 
				  * @param {*} data
			
 
				  * @returns
			
 
				  */
			
 
				-export const updataBanner = (id, data) => request(`/banner/${id}`, { method: 'put', data });
			
 
				+export const updataBanner = (id, data) =>
			
 
				+  request(`/banner/${id}`, { method: "put", data });
			
 
				 
			
 
				 /**
			
 
				  * 删除
			
 
				  * @param {*} id
			
 
				  * @returns
			
 
				  */
			
 
				-export const deleteBanner = (id) => request(`/banner/${id}`, { method: 'delete' });
			
 
				+export const deleteBanner = (id) =>
			
 
				+  request(`/banner/${id}`, { method: "delete" });
			
 
				 
			
 
				 /**
			
 
				  * 上传文件
			
 
				  * @param {*} id
			
 
				  * @returns
			
 
				  */
			
 
				- export const uploadFile = (data) => request(`/upload`, { method: 'POST', data });
			
 
				+export const uploadFile = (data) =>
			
 
				+  request(`/upload`, { method: "POST", data });
			
--- a/src/services/statis.js
+++ b/src/services/statis.js
@@ -3,3 +3,13 @@ import request from '@/utils/request';
 
				 export const getSummary = () => request('/statis/summary', { successTip: false });
			
 
				 
			
 
				 export const getTaskInfo = (params) => request('/statis/taskInfo', { params, successTip: false });
			
 
				+
			
 
				+export const getDeviceType = () => request('/statis/deviceType', { successTip: false });
			
 
				+
			
 
				+export const getStoreType = (params) => request('/statis/deviceType', { params, successTip: false });
			
 
				+
			
 
				+export const getUserEdu = () => request('/statis/userEdu', { successTip: false });
			
 
				+
			
 
				+export const getUserAge = () => request('/statis/userAge', { successTip: false });
			
 
				+
			
 
				+export const getStoreCosts = (params) => request('/statis/store-cost', { params, successTip: false });
			
--- a/src/services/user.js
+++ b/src/services/user.js
@@ -16,6 +16,20 @@ import request, { restful } from '@/utils/request';
 
				   * @returns
			
 
				   */
			
 
				   export const login = (data) => request('/login', { data, method: 'post' });
			
 
				+  
			
 
				+ /**
			
 
				+  * 登出
			
 
				+  * @param {*} 
			
 
				+  * @returns
			
 
				+  */
			
 
				+  export const logout = () => request.post('/logout', { silent: true });
			
 
				+  
			
 
				+ /**
			
 
				+  * 修改密码
			
 
				+  * @param {*} 
			
 
				+  * @returns
			
 
				+  */
			
 
				+  export const changePassword = (data) => request.put('/change-password', data, { successTip: '密码修改成功' });
			
 
				 
			
 
				 
			
 
				   const [
			
--- a/src/store/models/system.js
+++ b/src/store/models/system.js
@@ -6,9 +6,9 @@ export default function useSystem() {
 
				 
			
 
				   // 其他配置
			
 
				   const [app, setApp] = useState({
			
 
				-    fullName: '云致科技信息管理系统',
			
 
				-    shorName: '云致科技',
			
 
				-    company: '云致科技'
			
 
				+    fullName: '海安军供保障信息管理系统',
			
 
				+    shorName: '海安军供',
			
 
				+    company: '南京云致'
			
 
				   });
			
 
				 
			
 
				   return {
			
--- a/src/utils/index.jsx
+++ b/src/utils/index.jsx
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ const instance = axios.create({
 
				 // 添加请求拦截器
			
 
				 instance.interceptors.request.use(function (config) {
			
 
				   const { headers = {}, responseType = 'json', download = false, successTip = true } = config;
			
 
				-  const token = sessionStorage.getItem('token') || '';
			
 
				+  const token = localStorage.getItem('token') || '';
			
 
				 
			
 
				   // 在发送请求之前做些什么
			
 
				   return {
			
@@ -39,10 +39,10 @@ instance.interceptors.response.use(function (response) {
 
				   
			
 
				   if (data.code === 1000) {
			
 
				     if (data.data.token) {
			
 
				-      sessionStorage.setItem('token', data.data.token);
			
 
				+      localStorage.setItem('token', data.data.token);
			
 
				     }
			
 
				 
			
 
				-    if (config.successTip) {
			
 
				+    if (config.successTip && !config.silent) {
			
 
				       message.success(typeof success === 'string' ? successTip : '操作成功');
			
 
				     }
			
 
				 
			
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,10 +6,11 @@ import vitePluginImp from 'vite-plugin-imp'
 
				 // https://vitejs.dev/config/
			
 
				 export default defineConfig({
			
 
				   server: {
			
 
				+    host: '0.0.0.0',
			
 
				     proxy: {
			
 
				       '/api/': {
			
 
				         // 要代理的地址
			
 
				-        target: 'http://192.168.89.147:8087',
			
 
				+        target: 'http://127.0.0.1:8087',
			
 
				         // 配置了这个可以从 http 代理到 https
			
 
				         // 依赖 origin 的功能可能需要这个，比如 cookie
			
 
				         changeOrigin: true,