Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

src/utils/request.js

@@ -43,7 +43,7 @@ async function send(url, options) {
         if (code === 401) {
             //debugger;
             //window.location.href = '/mgr/home';// /mgr/home    /login
-            window.location.href = '/xfflood/#/login';
+            window.location.href = '/tsg/#/login';
             // window.location.hash = '#/login';
         }
         return res.data;

src/views/rcgl/jdkh/khzbgl/toolbar.js

@@ -28,7 +28,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
       <div style={{display:'flex',justifyContent:'space-between'}}>
         <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
         {
-            (onSave && addBtn) ?
+            (onSave) ?
               <Form.Item>
                 <Button onClick={onSave} type='primary'>新增</Button>
               </Form.Item>

src/views/rcgl/xcxj/xjxpz/toolbar.js

@@ -28,7 +28,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
       <div style={{display:'flex',justifyContent:'space-between'}}>
         <Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
         {
-            (onSave && addBtn) ?
+            (onSave) ?
               <Form.Item>
                 <Button onClick={onSave} type='primary'>新增</Button>
               </Form.Item>

src/views/sz/pxjlgl/chartToolbar.js

@@ -7,11 +7,11 @@ const ToolBar = ({ setSearchVal }) => {
   const [form] = Form.useForm();
   const types = [
     {
-      label: '培训期数',
+      label: '培训人次',
       value: 1
     },
     {
-      label: '培训人次',
+      label: '培训期数',
       value: 2
     },
   ]

src/views/sz/pxjlgl/index.js

@@ -91,6 +91,9 @@ const Page = () => {
         } else {
           setStaData({...res.data,list:res.data.list2})
         }
+      }else{
+        message.error(res.description)
+        setStaData([])
       }
     } catch (error) {
       console.log(error);