全局样式修改

src/api/request.js

@@ -31,6 +31,8 @@ const request = {
     getUserById: '/security-center/userManage/getUserById',//查看用户
     disableUser: '/security-center/userManage/disableUser',//禁用用户
     deleteUser: '/security-center/userManage/deleteUser',//删除用户
+    resetPasswordUser: '/security-center/userManage/resetPassword',//重置密码
+    
 
 
     //数据权限相关接口

src/common/common.less

@@ -103,4 +103,15 @@ body{
   top: 24px;
   background: #FE9748;
   border-radius: 50%;
+}
+
+.disable{
+  color: #FB8537 ;
+}
+.delete{
+  color:#FF4D4D
+}
+.menuItem:hover{
+  color: #1690FF;
+  background: #DBEEFF;
 }

src/components/DataManager/index.js

@@ -228,8 +228,8 @@ function DataManager() {
       title: '操作', dataIndex: 'key', render: (text, record) => (
         <Space size="middle">
           <a onClick={e => showModal(3, record.id)}>修改</a>
-          {record.status === '1' ? (<a onClick={() => messageBox(2, record.id)}>禁用</a>) : (<a onClick={() => disableAuth(record.id, 1)}>启用</a>)}
-          <a onClick={() => messageBox(1, record.id)} >删除</a>
+          {record.status === '1' ? (<a className="disable" onClick={() => messageBox(2, record.id)}>禁用</a>) : (<a onClick={() => disableAuth(record.id, 1)}>启用</a>)}
+          <a className="delete" onClick={() => messageBox(1, record.id)} >删除</a>
         </Space>
       )
     }

src/components/FuncManager/index.js

@@ -171,10 +171,10 @@ function OrgManager() {
           }
           const menu = (
             <Menu>
-              <Menu.Item key="0" >
+              <Menu.Item key="0" className="menuItem">
                 {row.status === '1' ? (<a onClick={() => messageBox(2, row.id)}>禁用</a>) : (<a onClick={() => enable(1, row.id)}>启用</a>)}
               </Menu.Item>
-              <Menu.Item key="1" onClick={() => messageBox(1, row.id)}>删除</Menu.Item>
+              <Menu.Item className="menuItem" key="1" onClick={() => messageBox(1, row.id)}>删除</Menu.Item>
             </Menu>
           );
           return (<Space size="middle">

src/components/OrgManager/AddSubOrg.js

@@ -16,7 +16,7 @@ function AddSubOrg(props) {
     const [current, setCurrent] = useState(0);
     const [isChange, setIsChange] = useState(false);
     const [visible, setVisible] = useState(false);
-    
+
     const { back } = props
     const steps = [
         {
@@ -40,20 +40,20 @@ function AddSubOrg(props) {
     const pre = () => {
         setCurrent(current - 1);
     };
-    function handleOk(){
+    function handleOk() {
         back()
     }
-    function handleCancel(){
+    function handleCancel() {
         setVisible(false)
     }
-    const goback = () => { 
-        if (form.getFieldsValue().name != undefined || form.getFieldsValue().type != undefined){
+    const goback = () => {
+        if (form.getFieldsValue().name != undefined || form.getFieldsValue().type != undefined) {
             setVisible(true)
-        }else{
+        } else {
             back()
         }
     };
-    
+
     return (
         <>
             <Breadcrumb separator="">
@@ -92,7 +92,7 @@ function AddSubOrg(props) {
 }
 
 function StepContent(props) {
-    
+
     const [treeDatas, setTreeDatas] = useState([]);
     const [tabDatas, setTabDatas] = useState([]);
     const [activeTab, setActiveTab] = useState('');
@@ -290,14 +290,13 @@ function StepContent(props) {
                     type="password"
                     hidden={current !== 1}
                     name={['addHospitalUserVO', 'password']}
-                    rules={[
-                        {
-                            required: true,
-                            message: '8-12位大小写字母、数字、特殊字符',
-                        },
-
-                    ]}
-                    >
+                    rules={[{ required: true }, {
+                        min: 8,
+                        message: '密码不能少于8个字符',
+                    }, {
+                        max: 12,
+                        message: '密码不能大于12个字符',
+                    }]}>
                     <Input placeholder='8-12位大小写字母、数字、特殊字符' autoComplete='off' disabled={type == 2 ? true : false} />
                 </Form.Item>
                 <Form.Item

src/components/RoleManager/index.js

@@ -192,8 +192,8 @@ function RoleManager(){
                     }
                     return (<Space size="middle">
                         <a onClick={()=>editRole(row.id)}>修改</a>
-                        {row.status==='1'?(<a onClick={()=>showModal(row.hasUserFlag?4:3,row.id)}>禁用</a>):(<a onClick={()=>enable(1,row.id)}>启用</a>)}
-                        <a onClick={()=>showModal(row.hasUserFlag?2:1,row.id)}>删除</a>
+                        {row.status === '1' ? (<a className="disable" onClick={()=>showModal(row.hasUserFlag?4:3,row.id)}>禁用</a>):(<a onClick={()=>enable(1,row.id)}>启用</a>)}
+                        <a className="delete" onClick={()=>showModal(row.hasUserFlag?2:1,row.id)}>删除</a>
                     </Space>) }},
         ];
         return (

src/components/UserManager/addUser.js

@@ -227,13 +227,13 @@ function AddUser(props) {
               required: true,
               message: '8-12位大小写字母、数字、特殊字符',
             }, 
-            ({ getFieldValue }) => ({
-              validator(_, value) {
-                if (value.length < 8 || value.length > 12) {
-                  return Promise.reject(new Error('密码长度8-12位'));
-                }
-              },
-            }),
+            {
+              min: 8,
+              message: '密码不能少于8个字符',
+            }, {
+              max: 12,
+              message: '密码不能大于12个字符',
+            }
           ]}
         >
           {type == 3 ?

src/components/UserManager/index.js

@@ -131,18 +131,18 @@ function UserManager() {
     });
   }
   //重置密码
-  function onResetPsd() {
-    // const param = { HospitalId: operId };
-    // xPost(api.disableHospital, param).then((res) => {
-    //   if (res.data.code === 200) {
-    //     getUserPage();
-    //     message.success("重置成功");
-    //   } else {
-    //     message.warning(res.data.msg || '操作失败');
-    //   }
-    // }).catch(() => {
-    //   message.error("接口出错");
-    // });
+  function onResetPsd(userId) {
+    const param = { userId: userId };
+    xPost(api.resetPasswordUser, param).then((res) => {
+      if (res.data.code === 200) {
+        getUserPage();
+        message.success("重置成功");
+      } else {
+        message.warning(res.data.msg || '操作失败');
+      }
+    }).catch(() => {
+      message.error("接口出错");
+    });
   }
   //删除
   function deleteUser() {
@@ -193,7 +193,7 @@ function UserManager() {
     } else if (modalType == 2) {
       disableUser(userId, 0)
     } else if (modalType == 3) {
-      onResetPsd();
+      onResetPsd(userId);
     }
   }
   //提示框取消
@@ -240,16 +240,16 @@ function UserManager() {
   const menu = (record) => {
     return (
       <Menu>
-        <Menu.Item key="0">
-          <a target="_blank" rel="noopener noreferrer" href="https://www.antgroup.com">
+        <Menu.Item key="0" className="menuItem" >
+          <a onClick={() => messageBox(3, record.userId)}>
             重置密码
           </a>
         </Menu.Item>
-        <Menu.Item key="1">
-          {record.status === '1' ? (<a onClick={() => messageBox(2, record.userId)}>禁用</a>) : (<a onClick={() => disableUser(record.userId, 1)}>启用</a>)}
+        <Menu.Item key="1" className="menuItem" >
+          {record.status === '1' ? (<a onClick={() => messageBox(2, record.userId)}>禁用</a>) : (<a  onClick={() => disableUser(record.userId, 1)}>启用</a>)}
         </Menu.Item>
-        <Menu.Item key="2">
-          <a target="_blank" onClick={() => messageBox(1, record.userId)}>
+        <Menu.Item key="2" className="menuItem" >
+          <a  onClick={() => messageBox(1, record.userId)}>
             删除
           </a>
         </Menu.Item>