Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

src/pages/platformCenter/dictionary/AppDic.js → src/pages/dataCenter/dictionary/AppDic.js

 import React, { useState, useEffect } from 'react';
 import {
   Table,
+  Tooltip,
   Spin,
   Modal,
   Form,
@@ -11,7 +12,8 @@ import {
   notification,
   message,
 } from 'antd';
-import { get } from '@/services/index';
+import { get } from '@/services';
+import { EditTwoTone, DeleteOutlined } from '@ant-design/icons';
 import styles from './AppDic.less';
 
 const AppDic = () => {
@@ -53,40 +55,40 @@ const AppDic = () => {
     {
       title: '操作',
       key: 'action',
-      width: 200,
+      width: 100,
       render: record => (
         <Space>
-          <Button
-            type="primary"
-            size="small"
-            onClick={() => {
-              setSelect(record);
-              setEditVisible(true);
-              editForm.setFieldsValue({
-                label: record.Label,
-                key: record.Key,
-                value: record.Value,
-                description: record.Description,
-              });
-            }}
-          >
-            修改
-          </Button>
+          <Tooltip title="编辑">
+            <EditTwoTone
+              onClick={() => {
+                setSelect(record);
+                setEditVisible(true);
+                editForm.setFieldsValue({
+                  label: record.Label,
+                  key: record.Key,
+                  value: record.Value,
+                  description: record.Description,
+                });
+              }}
+              style={{ fontSize: '16px' }}
+            />
+          </Tooltip>
           <Popconfirm
             title="是否删除该数据？"
             okText="确认"
             cancelText="取消"
             onConfirm={submitDelete}
           >
-            <Button
-              size="small"
-              danger
+            <DeleteOutlined
               onClick={() => {
                 setSelect(record);
               }}
-            >
-              删除
-            </Button>
+              style={{
+                fontSize: '16px',
+                margin: '0px 10px',
+                color: '#e86060',
+              }}
+            />
           </Popconfirm>
         </Space>
       ),

src/pages/platformCenter/dictionary/WebDic.js → src/pages/dataCenter/dictionary/WebDic.js

@@ -15,7 +15,7 @@ import {
   Col,
 } from 'antd';
 import { EditTwoTone, DeleteOutlined } from '@ant-design/icons';
-import { get } from '@/services/index';
+import { get } from '@/services';
 import styles from './WebDic.less';
 
 const WebDic = () => {

src/pages/userCenter/UserManage.js

@@ -257,7 +257,7 @@ const UserManage = () => {
               <Tooltip title="冻结用户">
                 <StopOutlined
                   onClick={() => freezeUser(record)}
-                  style={{ fontSize: '16px', color: '#1890FF' }}
+                  style={{ fontSize: '16px', color: '#e86060' }}
                 />
               </Tooltip>
             </>
@@ -267,15 +267,15 @@ const UserManage = () => {
               <Tooltip title="解冻用户">
                 <StopOutlined
                   onClick={() => freezeUser(record)}
-                  style={{ fontSize: '16px' }}
+                  style={{ fontSize: '16px', color: '#1890FF' }}
                 />
               </Tooltip>
             </>
           )}
           <Tooltip title="删除用户">
-            <DeleteTwoTone
+            <DeleteOutlined
               onClick={() => deleteUser(record)}
-              style={{ fontSize: '16px' }}
+              style={{ fontSize: '16px', color: '#e86060' }}
             />
           </Tooltip>
         </Space>
@@ -285,8 +285,6 @@ const UserManage = () => {
   const [selectionType] = useState('checkbox');
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
-      console.log(selectedRowKeys.toString());
-      console.log(selectedRows.map(item => item.OUID).toString());
       setUserIDs(selectedRowKeys.toString()); // 数组转字符串，逗号连接
       setOrgIDs(selectedRows.map(item => item.OUID).toString());
       // 选中行数大于0时设置批量操作可行
@@ -1414,14 +1412,22 @@ const UserManage = () => {
               label="新密码"
               rules={[{ required: true, message: '不能为空' }]}
             >
-              <Input placeholder="请输入新密码" />
+              <Input
+                placeholder="请输入新密码"
+                type="password"
+                autoComplete="off"
+              />
             </Form.Item>
             <Form.Item
               name="passwordConfirm"
               label="确认密码"
               rules={[{ required: true, message: '不能为空' }]}
             >
-              <Input placeholder="再次确认新密码" />
+              <Input
+                placeholder="再次确认新密码"
+                type="password"
+                autoComplete="off"
+              />
             </Form.Item>
           </Form>
         </Modal>

src/routes/config.js

@@ -7,6 +7,7 @@ import {
   SolutionOutlined,
   //   AndroidOutlined,
   //   CommentOutlined,
+  TableOutlined,
   CopyOutlined,
 } from '@ant-design/icons';
 import UserLayout from '../layouts/UserLayout';
@@ -21,7 +22,7 @@ import CurrentSolution from '@/pages/database/CurrentSolution';
 import UserManage from '../pages/userCenter/UserManage';
 import RoleManage from '@/pages/userCenter/roleManage/RoleManage';
 import SiteManage from '../pages/userCenter/siteManage/SiteManage';
-import Dictionary from '../pages/platformCenter/dictionary';
+import Dictionary from '../pages/dataCenter/dictionary';
 import ServiceLog from '../pages/log/serviceLog';
 import LoginLog from '../pages/log/loginLog';
 import OmsLog from '../pages/log/omsLog';
@@ -207,13 +208,14 @@ export default {
                 '/web4/?widget=product/oms/MqttConfig/MqttConfig.js|hideMap=true',
               component: BaseFrameContainer,
             },
-            {
-              path: '/platformCenter/dictionary',
-              name: '数据中心',
-              component: Dictionary,
-            },
           ],
         },
+        {
+          path: '/dataCenter/dictionary',
+          name: '数据中心',
+          icon: <TableOutlined style={iconStyle} />,
+          component: Dictionary,
+        },
         {
           path: '/productCenter',
           component: BlankLayout,