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

src/pages/dataCenter/dictionary/WebDic.js

@@ -18,6 +18,7 @@ import { EditTwoTone, DeleteOutlined } from '@ant-design/icons';
 import { get, CITY_SERVICE } from '@/services';
 import styles from './WebDic.less';
 
+const {Search} = Input;
 const WebDic = () => {
   const [loading, setLoading] = useState(false);
   const [level, setLevel] = useState(0); // 设置级别，一级1，二级2,添加条目时使用
@@ -272,6 +273,9 @@ const WebDic = () => {
     showQuickJumper: true,
     showSizeChanger: true,
   };
+  const onSearch = (key)=>{
+
+  }
 
   return (
     <div className={styles.WebDic}>
@@ -283,6 +287,7 @@ const WebDic = () => {
               <Button type="primary" size="small" onClick={() => setItem(1)}>
                 添加
               </Button>
+              <Search style={{width:"300px",marginLeft:"10px"}} onSearch={onSearch}/>
             </div>
             {/* 一级条目 表格 */}
             <Table

src/pages/platformCenter/hostmanager/baseConfig/BaseConfig.jsx

 import React, { useState, useEffect } from 'react'
-import { Descriptions } from 'antd'
+import { Button, Descriptions, Input } from 'antd'
 import styles from './BaseConfig.less'
 import { S_GetDataBaseConfig, GetTCPConfigInfo, GetDataBaseConfig, GetBasicInfo } from '@/services/platform/hostmanager'
 
@@ -72,9 +72,16 @@ const BaseConfig = () => {
     }
     return (
         <div className={styles.base_container}>
-            <div style={{ backgroundColor: "white", padding: "10px", width: "400px" }}>
+            <div style={{ backgroundColor: "white", padding: "10px", width: "100%" }}>
                 <Descriptions title="" bordered >
-                    <Descriptions.Item label="站点编号" span={3}>{currentSiteInfo}</Descriptions.Item>
+                    <Descriptions.Item label="站点编号" span={3}>
+                        {
+                            !currentSiteInfo?<Input value={currentSiteInfo} disabled={true} style={{with:"200px"}}/>:<div>
+                                <Input value={currentSiteInfo} style={{with:"200px"}} disabled={true}/>
+                               <Button>生成编号</Button>
+                            </div>
+                        }
+                    </Descriptions.Item>
                     <Descriptions.Item label="服务器IP" span={3}>{currentDataBase.ip}</Descriptions.Item>
                     <Descriptions.Item label="数据库名称" span={3}>{currentDataBase.dbName}</Descriptions.Item>
                     <Descriptions.Item label="登录名" span={1}>{currentDataBase.userName}</Descriptions.Item>

src/pages/userCenter/userManage/UserManage.js

@@ -871,8 +871,8 @@ const UserManage = () => {
     //     message.error(err);
     //   });
       DeleteUserNew({
-        userID:`"${currentUser.userID}"`,
-        ouID:`"${currentUser.OUID}"`
+        userID:currentUser.userID,
+        ouID:currentUser.OUID
       }).then(res => {
         if (res.code == 0) {
           setDeleteUserVisible(false);

src/routes/config.js

@@ -199,11 +199,11 @@ export default {
                 },
               ],
             },
-            {
-              path: '/platformCenter/order',
-              name: '业务平台',
-              component: JumpContainer,
-            },
+            // {
+            //   path: '/platformCenter/order',
+            //   name: '业务平台',
+            //   component: JumpContainer,
+            // },
             {
               path: '/platformCenter/notify',
               name: '消息平台',