feats

public/config.js

@@ -3,4 +3,4 @@
 DH_MONITOR = 'http://192.168.3.2';
 
 // 海康监控
-HK_MONITOR = 'http://192.168.3.2';
+HK_MONITOR = 'http://192.168.3.3';

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,6 +16,7 @@ export default (props) => {
     confirm({
       title: '确认退出系统?',
       onOk: () => {
+        logout();
         sessionStorage.removeItem('token');
         setUser();
         navigate('/login?back=true');

src/layouts/AuthLayout/components/Header/SplitMenu.jsx

@@ -13,12 +13,10 @@ export default (props) => {
     }
 
     return [homeIndex].concat(items);
-    return items;
   }, [items]);
+  
   const selectedKeys = React.useMemo(() => `/${location.pathname.split('/')[1]}`, [location.pathname]);
 
-  console.log(menus, items)
-
   return (
     <Menu className='split-menu' mode="horizontal" items={menus} selectedKeys={selectedKeys} />
   )

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>

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>

src/layouts/AuthLayout/index.jsx

@@ -34,7 +34,7 @@ export default (props) => {
             ? <Outlet />
             : (
               <Layout style={{ height: '100vh' }}>
-                <Header theme={theme} menus={splitMenus} location={location} />
+                <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} />

src/pages/dish/edit/index.jsx

@@ -1,6 +1,6 @@
 import { addDish, getDishById } from '@/services/dish';
 import { getStoreList } from '@/services/stock';
-import { PageContainer, ProForm, ProFormSelect, ProFormText, ProFormMoney } 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';
@@ -98,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>

src/pages/guaranteeTask/Edit/BasicForm.jsx

@@ -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>

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 [

src/utils/request.js

@@ -42,7 +42,7 @@ instance.interceptors.response.use(function (response) {
       sessionStorage.setItem('token', data.data.token);
     }
 
-    if (config.successTip) {
+    if (config.successTip && !config.silent) {
       message.success(typeof success === 'string' ? successTip : '操作成功');
     }