fix: '图片'

.env

 # PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
-PROXY=/PandaGIS:http://192.168.10.167:8072;/PandaWorkFlow:http://192.168.10.167:8072;/PandaCore:http://192.168.10.167:8072;/Cityinterface:http://192.168.10.167:8072;/PandaOMS:http://192.168.10.167:8072;/Publish:http://192.168.10.167:8072;/Web4:http://192.168.10.167:8072;/CityTemp:http://192.168.10.167:8072
+PROXY=/PandaGIS:http://192.168.12.178:8083;/PandaView:http://192.168.12.178:8083;/PandaMonitor:http://192.168.12.178:8083;/PandaWorkFlow:http://192.168.12.178:8083;/PandaCore:http://192.168.12.178:8083;/Cityinterface:http://192.168.12.178:8083;/PandaOMS:http://192.168.12.178:8083;/Publish:http://192.168.12.178:8083;/Web4:http://192.168.12.178:8083;/CityTemp:http://192.168.12.178:8083
 #  PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
 # 可设置第二个代理，test为转发前缀，后面为代理转发的地址
 # PROXY2 = test : http://localhost:8006/
 
 # 本地应用启动的host域名
-HOST = 192.168.12.154
+HOST = 192.168.12.78
 
 # 本地应用启动的端口
- PORT = 3001
+PORT = 3002
+

src/components/PersonnelSelector/index.jsx

@@ -88,7 +88,7 @@ const SelectUser = props => {
         // console.log(checkValueList);
         let listCheck = [];
         console.log(checkValueList);
-        debugger
+        debugger;
         checkValueList &&
           checkValueList.map(item => {
             let data = item.userId || item.value;

src/pages/bsmanager/base/tablemanager/components/TableView.jsx

@@ -89,6 +89,7 @@ const EditableCell = ({
   }, [dataSource]);
 
   useEffect(() => {
+    console.log(inputRef.current);
     if (editing && inputRef.current) {
       inputRef.current.focus();
     }

src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.jsx

@@ -853,12 +853,12 @@ const maintenance = () => {
           <div style={{ height: '50px', backgroundColor: 'white' }}>
             <div className={styles.tabs}>
               <div
-                className={activeName === 'template' ? styles.active : ''}
+                className={activeName === 'project' ? styles.active : ''}
                 onClick={() => {
-                  setActiveName('template');
+                  setActiveName('project');
                 }}
               >
-                维保模板
+                方案制定
               </div>
               <div
                 className={activeName === 'configuration' ? styles.active : ''}
@@ -867,12 +867,12 @@ const maintenance = () => {
                 设备库配置
               </div>
               <div
-                className={activeName === 'project' ? styles.active : ''}
+                className={activeName === 'template' ? styles.active : ''}
                 onClick={() => {
-                  setActiveName('project');
+                  setActiveName('template');
                 }}
               >
-                方案制定
+                维保模板
               </div>
             </div>
             <span

src/pages/database/InitDataBase/InitDataBase.jsx

@@ -59,43 +59,28 @@ const InitDataBase = props => {
     dbName: '',
     password: '',
     userName: '',
+    providerType: '',
     inUse: '',
   });
   const [data, setData] = useState([]); // 数据库链接记录
-  const [upData, setUpData] = useState(1); // 列表刷新标记
   const [option, setOption] = useState([]); // 下拉列表数据
   const [desc, setDesc] = useState(''); // 修改描述
-  const [allSqlDir, setAllSqulDir] = useState([]); // 修改产品方案
-  const [defaultSqlDir, setDefaultSqlDir] = useState(''); // 修改产品方案默认值
   const [modalVisible, setModalVisible] = useState({
     describeVisible: false, // 描述弹窗
     versionVisible: false, // 检查版本弹窗
     initVisible: false, // 初始化选择产品弹窗
   }); // 修改弹窗
-  const [initVisible, setInitVisible] = useState(false); // 数据库初始化弹窗
-  const [initContent, setInitContent] = useState(''); // 数据库初始化内容
+
   const [cardLoading, setCardLoading] = useState(false); // 初始化card Loading
-  const [finish, setFinish] = useState(false);
-  const [initLoading, setInitLoading] = useState(false);
-  const [initList, setInitList] = useState([]); // 数据库初始化产品数据
-  const [dbExists, setDbExists] = useState(false); // 数据库是否存在
-  const [visibleModel, setVisibleModel] = useState(false);
-  const [keepDb, setKeepDb] = useState([]);
-  const [keepProduct, setKeepProduct] = useState([]);
-  const scroll = useRef(null);
-  const [keep, setKeep] = useState([]);
   const [flag, setFlag] = useState(0);
   const [keepData, setKeepData] = useState({});
   const chooseDb = useRef({});
   const key = CryptoJS.enc.Utf8.parse('1p2a3n4d5a6o7m8s9a10n1e2t3c4o5re'); //十六位十六进制数作为密钥
   const iv = CryptoJS.enc.Utf8.parse('1234567890000000');
+  const [pickItem, setPickItem] = useState();
 
   // 获取数据库配置信息
   useEffect(() => {
-    // setTimeout(() => {
-    //   document.getElementById('pwd').removeAttribute('value');
-    // }, 0);
-
     setCardLoading(true);
     // 数据库连接记录初始化
     getConnRecordData();
@@ -111,14 +96,6 @@ const InitDataBase = props => {
         });
         form.setFieldsValue({ ...obj });
         setDbForm(val => ({ ...val, ...obj }));
-        setAllSqulDir(res.allSqlDir);
-        if (res.allSqlDir.some(item => item === inUse)) {
-          setDefaultSqlDir(res.tableSQLDirName);
-        } else {
-          // 默认切换到第一个产品方案
-          handeleChangeSQLDirName(res.allSqlDir[0]);
-          setDefaultSqlDir(res.allSqlDir[0]);
-        }
       }
     });
     return () => {
@@ -174,72 +151,9 @@ const InitDataBase = props => {
       })
       .catch(err => {
         setTableLoading(false);
-        console.error(err);
-      });
-  };
-  // 获取日志
-  const doInitLog = () => {
-    setInitLoading(true);
-    getInitDBLogNew()
-      .then(res => {
-        if (res.code === 0) {
-          if (res.data.content) {
-            setInitLoading(false);
-            let arr = [];
-            arr.push(
-              res.data.content.split(/(\r\n)|(\n)/).map((item, index) => (
-                // eslint-disable-next-line react/no-danger
-                <p key={index} dangerouslySetInnerHTML={{ __html: item }} />
-              )),
-            );
-            console.log(arr);
-            setInitContent(arr);
-            scroll.current.scrollTop = scroll.current.scrollHeight;
-          }
-          if (!res.data.finish) {
-            time = setTimeout(() => {
-              doInitLog();
-            }, 600);
-          } else {
-            setInitLoading(false);
-            if (time) {
-              clearTimeout(time);
-              time = null;
-            }
-          }
-        }
-      })
-      .catch(err => {
-        setFinish(true);
-      });
-  };
-  // 数据库初始化
-  const initClick = () => {
-    setInitContent('');
-    setCardLoading(true);
-    setInitVisible(true);
-    let obj = form.getFieldsValue();
-    doInitLog();
-    initDBv4new({
-      ...obj,
-    })
-      .then(res => {
-        setCardLoading(false);
-        if (res.code == 0) {
-          console.log(res);
-        } else {
-          notification.error({
-            message: '提示',
-            duration: 15,
-            description: res.msg || '初始化失败',
-          });
-        }
-      })
-      .catch(err => {
-        setCardLoading(false);
-        console.log(err);
       });
   };
+
   const onValuesChange = (value, b) => {
     form.setFieldsValue(value);
   };
@@ -262,6 +176,7 @@ const InitDataBase = props => {
       dbName: obj.dbName,
       userName: obj.userName,
       password: pwd,
+      providerType: obj.providerType,
       desc: chooseDb.current.desc,
     })
       .then(resnew => {
@@ -291,7 +206,11 @@ const InitDataBase = props => {
       })
       .catch(err => {
         setCardLoading(false);
-        console.log(err);
+        notification.error({
+          message: '提示',
+          duration: 15,
+          description: err,
+        });
       });
   };
   // 测试连接
@@ -306,6 +225,7 @@ const InitDataBase = props => {
       ip: obj.ip,
       dbName: obj.dbName,
       userName: obj.userName,
+      providerType: obj.providerType,
       password: pwd,
     })
       .then(res => {
@@ -340,6 +260,7 @@ const InitDataBase = props => {
       userName: params.userName || '',
       password: pwd || '',
       ip: params.ip || '',
+      providerType: params.providerType || '',
     })
       .then(res => {
         if (res.code == 0) {
@@ -366,33 +287,7 @@ const InitDataBase = props => {
     chooseDb.current = item;
     form.setFieldsValue({ ...obj });
   };
-  // 产品方案选择框回调
-  const handleSelect = value => {
-    handeleChangeSQLDirName(value);
-  };
-  const handeleChangeSQLDirName = val => {
-    setTableSQLDirName({
-      dirName: val,
-    })
-      .then(res => {
-        if (res.code === 0) {
-          notification.success({
-            message: '提示',
-            duration: 3,
-            description: `已切换初始化脚本为:${val}`,
-          });
-        } else {
-          notification.error({
-            message: '提示',
-            duration: 15,
-            description: res.message,
-          });
-        }
-      })
-      .catch(err => {
-        console.error(err);
-      });
-  };
+
   // 展示修改描述
   const changeDesc = val => {
     setDesc(val);
@@ -402,300 +297,35 @@ const InitDataBase = props => {
     const { value } = e.target;
     setDesc(value);
   };
-  // 关闭弹窗
-  const handleClick = () => {
-    setInitVisible(false);
-    setInitContent('');
-    setFinish(false);
-    // deleteInitDBLog({
-    //   _version: 9999,
-    //   _dc: Date.now(),
-    // });
-    deleteInitDBLogNew();
-  };
+
   // 弹窗确认回调
   const modalOkCallback = () => {
-    const obj = form.getFieldsValue();
     // 更新描述
     updateConnDescNew({
-      ip: obj.ip,
-      dbName: obj.dbName,
-      userName: obj.userName,
-      password: obj.password,
+      ip: pickItem.ip,
+      dbName: pickItem.dbName,
+      userName: pickItem.userName,
+      password: pickItem.password,
+      providerType: pickItem.providerType,
       desc,
     })
       .then(res => {
-        handleShowModal('describeVisible', false);
-        // setUpData(upData + 1);
-        getConnRecordData();
-      })
-      .catch(err => {
-        console.error(err);
-        handleShowModal('describeVisible', false);
-      });
-  };
-  // 删除数据库连接记录
-  const delConfirm = value => {
-    const { key = '' } = value;
-    setTableLoading(true);
-    deleteConnNew({
-      rowIndex: key,
-    })
-      .then(res => {
-        setTableLoading(false);
         if (res.code === 0) {
-          // setUpData(upData + 1);
+          handleShowModal('describeVisible', false);
           getConnRecordData();
-          notification.success({
-            message: '提示',
-            duration: 3,
-            description: '操作成功',
-          });
         } else {
           notification.error({
             message: '提示',
-            duration: 15,
+            duration: 5,
             description: res.msg,
           });
         }
       })
       .catch(err => {
-        setTableLoading(false);
-        console.error(err);
+        handleShowModal('describeVisible', false);
       });
   };
 
-  const GetDb = () => {
-    let obj = form.getFieldsValue();
-    GetDbProduct({ ...obj }).then(res => {
-      if (res.code === 0) {
-        console.log(res.data);
-        if (res.data.Product) {
-          console.log(res.data.Product);
-          let aa = [];
-          res.data.Product.map(i => {
-            aa.push(i.name);
-          });
-          console.log(aa);
-          setKeep(res.data.IsAuthorize);
-          setKeepProduct(aa);
-        }
-        setDbExists(res.data.DBExists);
-        setKeepDb(res.data);
-        if (!res.data.DBExists) {
-          setVisibleModel(true);
-        } else if (res.data.DBExists && res.data.Product.length > 0) {
-          setVisibleModel(true);
-        } else {
-          notification.warning({
-            message: '提示',
-            duration: 15,
-            description: '当前数据库不可初始化',
-          });
-        }
-      } else {
-        notification.warning({
-          message: '提示',
-          duration: 15,
-          description: res.msg,
-        });
-      }
-    });
-  };
-  // 获取数据库初始化回显列表
-  const getInitList = () => {
-    setInitList([]);
-    handleShowModal('initVisible', true);
-    setInitLoading(true);
-    let obj = form.getFieldsValue();
-    let req1 = GetProductList();
-    let req2 = GetDbProduct({ ...obj });
-    Promise.all([req1, req2])
-      .then(res => {
-        if (res[1].code !== 0 || res[0].code !== 0) {
-          setInitLoading(false);
-          notification.error({
-            message: '提示',
-            duration: 3,
-            description: '连接失败',
-          });
-          return;
-        }
-        setDbExists(res[1].data.DBExists);
-        let fileList = res[0].data ? res[0].data : [];
-        let dataList = res[1].data.Product ? res[1].data.Product : [];
-        // 没有库或者dataList为[]直接用fileList作为回显
-        if (!res[1].data.DBExists || dataList.length === 0) {
-          setInitList(fileList);
-          setInitLoading(false);
-          return;
-        }
-        let mapList = new Map();
-        // 通过map给数据库中中的节点中的key的值当作key，checkVersion当作value进行存储
-        dataList.forEach(element => {
-          // 存入一级目录是否有选中项的key
-          mapList.set(element.key, element.check);
-          element.modularSolutions.forEach(item => {
-            // 存入二级目录对应的选中的checkVersion跟check
-            mapList.set(item.key, {
-              checkVersion: item.checkVersion,
-              check: item.check,
-            });
-            item.functionrSolutions.forEach(val => {
-              // 存入三级目录对应的选中的checkVersion跟check
-              mapList.set(val.key, val.isCheck);
-            });
-          });
-        });
-        console.log(mapList, 'mapList');
-        fileList.forEach(element => {
-          // 根据key来获取第一级目录tab的check
-          let tabKey = mapList.get(element.key);
-          element.check = tabKey === undefined ? null : tabKey;
-          element.modularSolutions.forEach(item => {
-            let mapCheckVersion = mapList.get(item.key);
-            if (mapCheckVersion === undefined) {
-              mapCheckVersion = { checkVersion: null, check: null };
-            }
-            // 根据key值去匹配对应的checkVersion
-            item.checkVersion =
-              mapCheckVersion.checkVersion === undefined ? null : mapCheckVersion.checkVersion;
-            // 根据key值去匹配对应的二级目录的check
-            item.check = mapCheckVersion.check === undefined ? null : mapCheckVersion.check;
-            if (item.check) {
-              item.hasCheck = true;
-            }
-            item.functionrSolutions.forEach(val => {
-              // 根据三级目录对应的选中key匹配isCheck
-              let isCheck = mapList.get(val.key);
-              val.isCheck = isCheck === undefined ? null : isCheck;
-              // 版本号低于当前版本号禁止选用
-              if (item.checkVersion && val.version < item.checkVersion) {
-                val.disabled = true;
-              } else {
-                val.disabled = false;
-              }
-            });
-          });
-        });
-        setInitList(fileList);
-        setInitLoading(false);
-      })
-      .catch(err => {
-        console.log(err, 'err');
-        notification.error({
-          message: '提示',
-          duration: 3,
-          description: '连接失败',
-        });
-        setInitLoading(false);
-      });
-  };
-  // 初始化产品列表渲染
-  const renderInitListItem = (tabItem, index) => (
-    <TabPane tab={tabItem.productName} key={index}>
-      <div className={styles.tabContainer}>
-        {tabItem.modularSolutions.map((item, num) => (
-          <React.Fragment key={item.key}>
-            {item.functionrSolutions.length > 0 ? (
-              <RadioBox
-                radioTitle={item.modularName}
-                radioOptions={item.functionrSolutions}
-                currentVal={item.checkVersion}
-                currentIndex={{ tabIndex: index, radioIndex: num }}
-                callBack={radioChange}
-              />
-            ) : null}
-          </React.Fragment>
-        ))}
-      </div>
-    </TabPane>
-  );
-  // 单选选后的回调，改变数据
-  const radioChange = (index, value) => {
-    setInitList(val => {
-      const list = JSON.parse(JSON.stringify(val));
-      const secondList = list[index.tabIndex].modularSolutions[index.radioIndex];
-      // 取消功能 一开始未选中的才能取消
-      if (value === secondList.checkVersion && !secondList.hasCheck) {
-        secondList.checkVersion = null;
-        value = null;
-        secondList.check = false;
-      } else {
-        // 修改选中的checkVersion值
-        secondList.checkVersion = value;
-        // 修改二级菜单的check字段
-        secondList.check = true;
-      }
-      // 修改一级菜单的check字段
-      list[index.tabIndex].check = !list[index.tabIndex].modularSolutions.every(
-        version => version.checkVersion === null,
-      );
-      // 修改单选isCheck字段
-      secondList.functionrSolutions.forEach(item => {
-        if (item.version === value) {
-          item.isCheck = true;
-        } else {
-          item.isCheck = false;
-        }
-      });
-      return list;
-    });
-  };
-  const onOK = (arr, code) => {
-    initDatabasePro(arr, code);
-  };
-  // 数据库初始化
-  const initDatabasePro = (e, j) => {
-    let productSetting = e;
-    let obj = form.getFieldsValue();
-    // 数据库存在调用编辑接口否则调用新增接口
-    setInitLoading(true);
-    setVisibleModel(false);
-    handleShowModal('initVisible', false);
-    setInitVisible(true);
-    doInitLog();
-    if (dbExists) {
-      InitEditDataBase({
-        ...obj,
-        productSetting,
-        license: j,
-        password: obj.password,
-      }).then(res => {
-        setInitLoading(false);
-        if (res.code === 0) {
-          notification.success({
-            message: '提示',
-            duration: 3,
-            description: '数据库初始化成功',
-          });
-        } else {
-          notification.error({
-            message: '提示',
-            duration: 5,
-            description: res.msg,
-          });
-        }
-      });
-      return;
-    }
-    InitAddDataBase({ ...obj, productSetting, license: j }).then(res => {
-      setInitLoading(false);
-      if (res.code === 0) {
-        notification.success({
-          message: '提示',
-          duration: 3,
-          description: '数据库初始化成功',
-        });
-      } else {
-        notification.error({
-          message: '提示',
-          duration: 5,
-          description: res.msg,
-        });
-      }
-    });
-  };
   const columns = [
     {
       title: '服务器名或IP地址',
@@ -703,6 +333,7 @@ const InitDataBase = props => {
       key: 'ip',
       width: 180,
       ellipsis: true,
+      align: 'center',
     },
     {
       title: '数据库名称',
@@ -710,6 +341,7 @@ const InitDataBase = props => {
       key: 'dbName',
       width: 180,
       ellipsis: true,
+      align: 'center',
     },
     {
       title: '数据库用户名称',
@@ -717,6 +349,7 @@ const InitDataBase = props => {
       key: 'userName',
       width: 180,
       ellipsis: true,
+      align: 'center',
     },
     {
       title: '保存时间',
@@ -724,12 +357,22 @@ const InitDataBase = props => {
       key: 'saveTime',
       width: 180,
       ellipsis: true,
+      align: 'center',
+    },
+    {
+      title: '数据库类型',
+      dataIndex: 'providerType',
+      key: 'providerType',
+      width: 180,
+      ellipsis: true,
+      align: 'center',
     },
     {
       title: '描述',
       dataIndex: 'desc',
       key: 'desc',
       ellipsis: true,
+      align: 'center',
     },
     {
       title: '操作',
@@ -737,64 +380,33 @@ const InitDataBase = props => {
       key: 'action',
       width: 250,
       ellipsis: true,
+      align: 'center',
       render: (text, record) => (
         <Space>
           <Button
             type="primary"
             size="small"
-            onClick={() => {
+            onClick={e => {
+              e.stopPropagation();
               changeDesc(record.desc);
+              setPickItem(record);
             }}
           >
             修改描述
           </Button>
-          {/* <div onClick={e => e.stopPropagation()}>
-            <Popconfirm
-              title="是否删除该连接的历史记录？"
-              okText="确认"
-              cancelText="取消"
-              onConfirm={() => {
-                delConfirm(record);
-              }}
-            >
-              <Button size="small" danger>
-                删除
-              </Button>
-            </Popconfirm>
-          </div> */}
         </Space>
       ),
     },
   ];
 
-  const flagChange = () => {
-    const obj = form.getFieldsValue();
-    console.log(keepData);
-    console.log(obj);
-    if (
-      keepData.ip == obj.ip &&
-      keepData.dbName == obj.dbName &&
-      keepData.userName == obj.userName &&
-      keepData.password == obj.password
-    ) {
-      GetDb();
-      deleteInitDBLogNew();
-    } else {
-      notification.warning({
-        message: '提示',
-        duration: 15,
-        description: '请先保存连接',
-      });
-    }
-  };
   return (
     <>
       <PageContainer className={styles.InitDataBaseContainer}>
-        <Card>
+        <Card className={styles.cardTop}>
           <Spin tip="loading..." spinning={cardLoading}>
             {/* <div className={styles.tableTitle}>数据库初始化</div> */}
             <Form
-              className={styles.mgTop20}
+              className={styles.cardBottom}
               layout="horizontal"
               labelAlign="left"
               labelCol={{ span: 3 }}
@@ -803,6 +415,25 @@ const InitDataBase = props => {
               onValuesChange={onValuesChange}
               autoComplete="off"
             >
+              <Form.Item
+                label="数据库类型"
+                name="providerType"
+                rules={[
+                  {
+                    validator: (rule, value) => {
+                      if (form.getFieldValue().providerType == '') {
+                        return Promise.reject('ip必填');
+                      }
+                      return Promise.resolve();
+                    },
+                  },
+                ]}
+              >
+                <Select placeholder="请选择数据库类型">
+                  <Select.Option value="SqlServer">SqlServer</Select.Option>
+                  <Select.Option value="Dm">Dm</Select.Option>
+                </Select>
+              </Form.Item>
               <Form.Item
                 label={`${formLables.ip}：`}
                 name="ip"
@@ -863,7 +494,6 @@ const InitDataBase = props => {
                 rules={[
                   {
                     validator: (rule, value) => {
-                      console.log(form.getFieldValue().dbName);
                       if (
                         form.getFieldValue().dbName == '' ||
                         form.getFieldValue().dbName == undefined
@@ -888,7 +518,6 @@ const InitDataBase = props => {
                   }}
                   // eslint-disable-next-line no-shadow
                   filterOption={(input, option) => {
-                    console.log(option);
                     return (
                       option.children &&
                       option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -913,20 +542,6 @@ const InitDataBase = props => {
                         保存连接
                       </Button>
                     </Space>
-                    <Space>
-                      {/* <Button
-                        type="primary"
-                        // onClick={() => {
-                        //   getInitList();
-                        //   deleteInitDBLogNew();
-                        // }}
-                        onClick={() => {
-                          flagChange();
-                        }}
-                      >
-                        数据库初始化
-                      </Button> */}
-                    </Space>
                   </Space>
                 </div>
               </Form.Item>
@@ -934,7 +549,7 @@ const InitDataBase = props => {
           </Spin>
         </Card>
 
-        <Card className={styles.mgTop20}>
+        <Card className={styles.cardBottom}>
           <div className={styles.recordBox}>
             <div className={styles.tableTitle}>近期保存的数据库连接</div>
             <Table
@@ -955,54 +570,6 @@ const InitDataBase = props => {
             />
           </div>
         </Card>
-        <Modal
-          title="初始化数据库"
-          visible={initVisible}
-          onCancel={() => {
-            setInitVisible(false);
-            setInitContent('');
-            // deleteInitDBLog({
-            //   _version: 9999,
-            //   _dc: Date.now(),
-            // });
-            deleteInitDBLogNew();
-          }}
-          width={800}
-          maskClosable={false}
-          bodyStyle={{
-            height: '500px',
-            // overflowY: 'auto',
-          }}
-          footer={[
-            <Button
-              onClick={() => {
-                handleClick();
-              }}
-              key="back"
-              type="primary"
-            >
-              关闭窗口
-            </Button>,
-          ]}
-        >
-          <div
-            ref={scroll}
-            style={{
-              maxHeight: '470px',
-              overflowY: 'auto',
-              marginRight: ' -24px',
-            }}
-          >
-            {initContent || (
-              <Spin
-                spinning={initLoading}
-                tip="loading..."
-                style={{ width: '100%', marginTop: '40px' }}
-              />
-            )}
-          </div>
-        </Modal>
-
         <Modal
           title="修改链接描述"
           visible={modalVisible.describeVisible}
@@ -1033,47 +600,6 @@ const InitDataBase = props => {
             </Col>
           </Row>
         </Modal>
-        <InitModal
-          visible={visibleModel}
-          onCancel={() => setVisibleModel(false)}
-          keepDb={keepDb}
-          callBackSubmit={onOK}
-          keepProduct={keepProduct}
-          keep={keep}
-        />
-        {/* 初始化选择产品弹窗 */}
-        <Modal
-          title="初始化"
-          maskClosable={false}
-          visible={modalVisible.initVisible}
-          onCancel={() => handleShowModal('initVisible', false)}
-          footer={[
-            <Button key="back" onClick={() => handleShowModal('initVisible', false)}>
-              取消
-            </Button>,
-            <Popconfirm
-              placement="topLeft"
-              title="是否确认初始化"
-              onConfirm={initDatabasePro}
-              okText="确认"
-              key="submit"
-              cancelText="取消"
-            >
-              <Button type="primary" loading={initLoading}>
-                确认
-              </Button>
-            </Popconfirm>,
-          ]}
-          width={900}
-        >
-          <Spin spinning={initLoading}>
-            <div className={styles.cardContainer}>
-              <Tabs defaultActiveKey="1" type="card" tabBarGutter={-1}>
-                {initList.map((item, index) => renderInitListItem(item, index))}
-              </Tabs>
-            </div>
-          </Spin>
-        </Modal>
       </PageContainer>
     </>
   );

src/pages/database/InitDataBase/InitDataBase.less

@@ -2,8 +2,6 @@
   font-size: 16px;
 }
 
-
-
 .tCenter {
   text-align: center;
 
@@ -22,24 +20,26 @@
   height: 70px;
 }
 
-
-
 .InitDataBaseContainer {
-
+  width: 100%;
+  height: 100%;
 
   .ant-card-body {
     padding-bottom: 0px !important;
   }
 
-  .mgTop20 {
-    margin-top: 20px;
+  .cardTop {
+    height: 350px;
+    width: 100%;
+  }
+
+  .cardBottom {
     height: calc(100% - 350px);
   }
 
   // .recordBox {
   //   height: calc(100% - 20px);
   // }
-
 }
 
 .cardContainer {
@@ -113,4 +113,4 @@
   .view:hover {
     cursor: not-allowed;
   }
-}
\ No newline at end of file
+}

src/pages/database/databaseConfig/DatabaseConfig.jsx

-import React, { useState, useEffect } from 'react';
-import { Card, Tabs, Form, Input, Button, notification } from 'antd';
-import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
-import { SaveMainServer, GetMainServer, DeleteMainServer } from '@/services/database/api';
+import React, { useEffect } from 'react';
+import { Card, notification } from 'antd';
 import PageContainer from '@/components/BasePageContainer';
 import SQLServerTable from './sqlServer/SQLServerTable';
+import DmTable from './dm/DmTable';
 import OracleTable from './oracle/OracleTable';
 import MongDBTable from './mongDB/MongDBTable';
 import MySQLTable from './mysqltable/MySQLTable';
 import MasterTable from './master/MasterTable';
 
-const { TabPane } = Tabs;
-const dataArr = [
-  {
-    title: 'SQLServer数据库连接',
-    key: '0',
-    component: <SQLServerTable />,
-  },
-  {
-    title: 'Oracle数据库连接',
-    key: '1',
-    component: <OracleTable />,
-  },
-  {
-    title: 'MongoDB数据库连接',
-    key: '2',
-    component: <MongDBTable />,
-  },
-  {
-    title: 'MySQL数据库连接',
-    key: '3',
-    component: <MySQLTable />,
-  },
-];
-const Hr = () => <hr style={{ width: 'calc( 100% - 40px)' }} />;
 const DatabaseConnectConfig = props => {
-  const [form] = Form.useForm();
-  const [flag, setFlag] = useState(false);
-  const [active, setActive] = useState('0');
-  const [isLink, setIsLink] = useState(false); //主站配置是否连接
-  useEffect(() => {
-    getData();
-  }, []);
-
-  const handleChange = e => {
-    setActive(e);
-  };
-  const getData = () => {
-    GetMainServer().then(res => {
-      if (res.code === 0) {
-        form.setFieldsValue({ url: res.data });
-        // if (res.data) {
-        //   setIsLink(true);
-        //   form.setFieldsValue({ url: res.data });
-        // } else {
-        //   setIsLink(false);
-        //   form.setFieldsValue({ url: window.location.origin });
-        // }
-      }
-    });
-  };
-  const deleteConfig = () => {
-    DeleteMainServer().then(res => {
-      if (res.code === 0) {
-        notification.success({ message: '提示', duration: 3, description: '删除成功' });
-        getData();
-      } else {
-        notification.error({ message: '提示', duration: 3, description: res.msg });
-      }
-    });
-  };
-  // 提交主站配置
-  const onFinish = values => {
-    console.log('Success:', values);
-    SaveMainServer(values).then(res => {
-      if (res.code === 0) {
-        notification.success({
-          message: '提示',
-          duration: 3,
-          description: '保存成功',
-        });
-        getData();
-      } else {
-        notification.error({
-          message: '提示',
-          duration: 3,
-          description: res.msg,
-        });
-      }
-    });
-  };
-
   return (
     <PageContainer>
       <div style={{ width: '100%', height: '100%', overflowY: 'scroll' }}>
         <Card>
-          {/* <Tabs activeKey={active} onChange={e => handleChange(e)}>
-          {dataArr.map(item => (
-            <TabPane tab={item.title} key={item.key}>
-              {active === item.key && item.component}
-            </TabPane>
-          ))}
-        </Tabs> */}
           <div style={{ marginBottom: '15px' }}>
             <SQLServerTable />
           </div>
+          <div style={{ marginBottom: '15px' }}>
+            <DmTable />
+          </div>
           <div style={{ marginBottom: '15px' }}>
             <OracleTable />
           </div>

src/pages/database/databaseConfig/mysqltable/AddModal.jsx

@@ -42,11 +42,15 @@ const AddModal = props => {
       if (validate) {
         setLoading(true);
         let obj = form.getFieldsValue();
+        let pwd =
+          Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+            ? Encrypt(obj.password)
+            : obj.password;
         if (type === 'add') {
           AddConnString({
             type: 'mysql',
             ...obj,
-            password: Encrypt(obj.password),
+            password: pwd,
           })
             .then(res => {
               setLoading(false);
@@ -78,11 +82,15 @@ const AddModal = props => {
   };
   const handleEdit = () => {
     let obj = form.getFieldsValue();
+    let pwd =
+      Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+        ? Encrypt(obj.password)
+        : obj.password;
     EditConnString({
       type: 'mysql',
       ...obj,
       oldName: formObj.name,
-      password: Encrypt(obj.password),
+      password: pwd,
     })
       .then(res => {
         setLoading(false);
@@ -112,7 +120,7 @@ const AddModal = props => {
           form.setFieldsValue({ port: 3306 });
           break;
         case 'edit':
-          form.setFieldsValue({ ...formObj, password: Decrypt(formObj.password) });
+          form.setFieldsValue({ ...formObj, password: formObj.password });
           if (!formObj.port) {
             form.setFieldsValue({ port: 3306 });
           }

src/pages/database/databaseConfig/oracle/AddModal.jsx

@@ -42,11 +42,15 @@ const AddModal = props => {
       if (validate) {
         setLoading(true);
         let obj = form.getFieldsValue();
+        let pwd =
+          Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+            ? Encrypt(obj.password)
+            : obj.password;
         if (type === 'add') {
           AddConnString({
             ...obj,
             type: 'oracle',
-            password: Encrypt(obj.password),
+            password: pwd,
           })
             .then(res => {
               setLoading(false);
@@ -78,11 +82,15 @@ const AddModal = props => {
   };
   const handleEdit = () => {
     let obj = form.getFieldsValue();
+    let pwd =
+      Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+        ? Encrypt(obj.password)
+        : obj.password;
     EditConnString({
       type: 'oracle',
       ...obj,
       oldName: formObj.name,
-      password: Encrypt(obj.password),
+      password: pwd,
     })
       .then(res => {
         setLoading(false);
@@ -111,7 +119,7 @@ const AddModal = props => {
         form.resetFields();
         break;
       case 'edit':
-        form.setFieldsValue({ ...formObj, password: Decrypt(formObj.password) });
+        form.setFieldsValue({ ...formObj, password: formObj.password });
         break;
       default:
         break;

src/pages/database/databaseConfig/sqlServer/AddModal.jsx

@@ -42,11 +42,15 @@ const AddModal = props => {
       if (validate) {
         setLoading(true);
         let obj = form.getFieldsValue();
+        let pwd =
+          Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+            ? Encrypt(obj.password)
+            : obj.password;
         if (type === 'add') {
           AddConnString({
             ...obj,
             type: 'sqlserver',
-            password: Encrypt(obj.password),
+            password: pwd,
           })
             .then(res => {
               setLoading(false);
@@ -78,11 +82,15 @@ const AddModal = props => {
   };
   const handleEdit = () => {
     let obj = form.getFieldsValue();
+    let pwd =
+      Decrypt(obj.password) === '' || Decrypt(obj.password).indexOf('\u0004') !== -1
+        ? Encrypt(obj.password)
+        : obj.password;
     EditConnString({
       ...obj,
       oldName: formObj.name,
       type: 'sqlserver',
-      password: Encrypt(obj.password),
+      password: pwd,
     })
       .then(res => {
         setLoading(false);
@@ -111,7 +119,7 @@ const AddModal = props => {
         form.resetFields();
         break;
       case 'edit':
-        form.setFieldsValue({ ...formObj, password: Decrypt(formObj.password) });
+        form.setFieldsValue({ ...formObj, password: formObj.password });
         break;
       default:
         break;

src/pages/homePage/index.jsx

@@ -275,6 +275,7 @@ const HomePage = () => {
       dbName: str.dbName,
       userName: str.userName,
       password: str.password,
+      providerType: str.providerType,
     })
       .then(res => {
         setLoadingDatabase(false);

src/pages/platformCenter/messageManage/projectManage/components/EditModal.jsx

@@ -333,7 +333,6 @@ const EditModal = props => {
                   <Item label="功能路径" name="web_path">
                     <Input placeholder="请输入功能路径" />
                   </Item>
-                 
                 </div>
               </div>
             )}

src/pages/platformCenter/scheduledTasks/index.jsx

@@ -35,6 +35,7 @@ import {
 import AddModal from './components/AddModal';
 import LookModal from './components/LookModal';
 import PushTest from './components/PushTest/PushTest';
+import logWorker from './components/logWorker';
 
 const { Option } = Select;
 let timer = null;
@@ -54,6 +55,7 @@ const ScheduledTasks = () => {
   const listRef = useRef();
   const [logList, setLogList] = useState([]);
   const keepLength = useRef(0);
+  const [loadingLog, setLoadingLog] = useState(false);
 
   const columns = [
     {
@@ -183,14 +185,50 @@ const ScheduledTasks = () => {
     getTableList();
     setColumnsData(columns);
     getIISAgentLog();
+    updateInfo();
     return () => {
       clearInterval(timer);
       timer = null;
     };
   }, []);
 
+  const updateInfo = () => {
+    let worker = new Worker('logWorker');
+    debugger;
+    worker.onmessage = m => {
+      debugger;
+      console.log(m);
+    };
+    debugger;
+    worker.postMessage('123');
+  };
+
+  // updateInfo(payload={}){
+  //   debugger
+  //   this._updateInfo(payload);
+  //   let worker = new Worker(worker, {name: 'myWorker'});
+  //   const {pressions} = payload;
+  //   worker.onmessage = (event) =>{
+  //     debugger
+  //     const { routeMap={}, codeMap = {}} = event.data;
+  //     console.log(routeMap, "routeMap", event.data);
+  //     this.updateRouteMap(routeMap);
+  //     this.updateCodeMap(codeMap);
+  //     worker.terminate();
+  //   }
+  //   if(pressions&&pressions.length>0){
+  //     debugger
+  //     worker.postMessage(pressions);
+  //   }
+  // }
+
   const getIISAgentLog = () => {
+    if (loadingLog) {
+      return;
+    }
+    setLoadingLog(true);
     GetIISAgentLog().then(res => {
+      setLoadingLog(false);
       if (res.code === 0) {
         let arr = [];
         let list = res.data

src/pages/productCenter/webConfig/index.less

@@ -20,7 +20,7 @@
     }
   }
 
-  .ant-tabs-content-holder>.ant-tabs-content.ant-tabs-content-top {
+  .ant-tabs-content-holder > .ant-tabs-content.ant-tabs-content-top {
     position: absolute;
     width: 100%;
     // height: calc(100% - 40px);
@@ -39,28 +39,28 @@
   }
 }
 
-.webConfigContainer>.ant-tabs-card .ant-tabs-content {
+.webConfigContainer > .ant-tabs-card .ant-tabs-content {
   height: 100%;
   margin-top: -16px;
 }
 
-.webConfigContainer>.ant-tabs-card .ant-tabs-content>.ant-tabs-tabpane {
+.webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane {
   background: #fff;
   padding: 16px;
 }
 
-.webConfigContainer>.ant-tabs-card>.ant-tabs-nav::before {
+.webConfigContainer > .ant-tabs-card > .ant-tabs-nav::before {
   display: none;
 }
 
-.webConfigContainer>.ant-tabs-card .ant-tabs-tab,
-[data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab {
+.webConfigContainer > .ant-tabs-card .ant-tabs-tab,
+[data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab {
   border-color: transparent;
   background: transparent;
 }
 
-.webConfigContainer>.ant-tabs-card .ant-tabs-tab-active,
-[data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab-active {
+.webConfigContainer > .ant-tabs-card .ant-tabs-tab-active,
+[data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active {
   border-color: #fff;
   background: #fff;
 }
@@ -71,12 +71,12 @@
   padding: 24px;
 }
 
-[data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-content {
+[data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-content {
   height: 120px;
   margin-top: -8px;
 }
 
-[data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab {
+[data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab {
   border-color: transparent;
   background: transparent;
 }
@@ -85,11 +85,11 @@
   background: #000;
 }
 
-[data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-content>.ant-tabs-tabpane {
+[data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane {
   background: #141414;
 }
 
-[data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab-active {
+[data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active {
   border-color: #141414;
   background: #141414;
-}
\ No newline at end of file
+}

src/pages/productCenter/webConfig/menuconfig/TreeSelect.jsx

@@ -116,6 +116,7 @@ const TreeSelect = (props, ref) => {
     }
     let keys = new Set([]);
     let list = lodash.cloneDeep(menuWebList).filter(item => {
+      console.log(item);
       keys.add(item.model);
       keys.add(item.moduleName + item.model);
       return item.shortName.includes(val) || item.path?.includes(val) || val?.includes(item.path);
@@ -125,7 +126,6 @@ const TreeSelect = (props, ref) => {
     let tree = arrayToTree(list, 'model', 'moduleName');
     console.log(menuWebList);
     console.log(tree);
-    debugger;
     setTreeList(tree);
   };
   const changeValue = e => {

src/pages/userCenter/userManage/UserManage.jsx

@@ -539,7 +539,6 @@ const UserManage = () => {
 
   useEffect(() => {
     setExpendKey(menuID);
-    console.log(expendKey);
   }, [menuID]);
   // 获取用户机构树
   useEffect(() => {
@@ -643,8 +642,6 @@ const UserManage = () => {
   const rowSelection = {
     selectedRowKeys,
     onChange: (RowKeys, Rows) => {
-      console.log(RowKeys);
-      console.log(Rows);
       setSelectedRowKeys(RowKeys);
       getCheckList(RowKeys);
       setUserIDs(RowKeys.toString()); // 数组转字符串，逗号连接
@@ -1037,8 +1034,6 @@ const UserManage = () => {
   // 删除机构
   const deleteOrg = () => {
     setDeleteOrgVisible(true);
-    console.log(orgID);
-    console.log(keep1);
     if (orgID.id == keep1) {
       setTreeState(true);
     } else {
@@ -1082,7 +1077,6 @@ const UserManage = () => {
   const relateRole = record => {
     // getEmptyRoleList(record.userId);
     setMult('No');
-    console.log(record);
     getRoleList(record);
     setRoleVisible(true);
     setCurrentUser(record);
@@ -1110,12 +1104,10 @@ const UserManage = () => {
   };
   // 冻结用户
   const freezeUser = record => {
-    console.log(currentUser);
     // setFreezeUserVisible(true);
     setCurrentUser(record);
     setSelectColor(record);
     let state = '';
-    console.log(record);
     if (record.state === '0' || record.state === null) {
       state = '1';
     } else {
@@ -1145,7 +1137,6 @@ const UserManage = () => {
   };
   // 删除用户
   const deleteUser = record => {
-    console.log(record.userName);
     setCurrentUser(record.userName);
     setSelectColor(record);
     DeleteUserNew({
@@ -1222,30 +1213,73 @@ const UserManage = () => {
     }
     setTableLoading(true);
     let data = searchWord != '' ? { key: searchWord } : '';
-    GetUserByKeyNew(data)
+    // GetUserByKeyNew(data)
+    //   .then(res => {
+    //     setSearchFlag(1);
+    //     setTableLoading(false);
+    //     if (res.code === 0) {
+    //       setTotalSearch(res.data.length);
+    //       setSelectedRowKeys([]); // 重置选中用户数
+    //       setCurrentOrgOperate(true); // 禁止当前机构操作
+    //       setMultiOperate(true); // 禁用批量操作
+    //       setOrgTitle('全部机构搜索结果'); // 设置表头
+    //       setCurrentSelectOrg('-1'); // 清空选中机构
+    //       setShowSearchStyle(true);
+    //       setTableData(res.data);
+    //       setTableLength(res.data.length);
+    //     } else {
+    //       notification.error({
+    //         message: '提示',
+    //         duration: 3,
+    //         description: res.msg,
+    //       });
+    //     }
+    //   })
+    //   .catch(err => {
+    //     message.error(err);
+    //   });
+
+    getOneOUUserListNew(0, pageSize, 1, searchWord)
       .then(res => {
         setSearchFlag(1);
         setTableLoading(false);
         if (res.code === 0) {
-          setTotalSearch(res.data.length);
+          setTotal(res.data.count);
           setSelectedRowKeys([]); // 重置选中用户数
           setCurrentOrgOperate(true); // 禁止当前机构操作
           setMultiOperate(true); // 禁用批量操作
           setOrgTitle('全部机构搜索结果'); // 设置表头
           setCurrentSelectOrg('-1'); // 清空选中机构
-          console.log(res.data);
           setShowSearchStyle(true);
-          setTableData(res.data);
-          setTableLength(res.data.length);
+
+          // 返回用户表数据结构处理，扁平化
+          let temp = res.data.data;
+          // 设置过滤字段
+          let arr = temp.map(item => item.groupName);
+          arr = arr.filter((value, index) => arr.indexOf(value) === index);
+          setOrgFilters(arr.map(item => ({ text: item, value: item })));
+          setTableLength(temp.length);
+          let datalist = [];
+          const table = temp.map((item, index) => {
+            if (item.loginName == 'panda' || item.loginName == 'admin') {
+              datalist.push(item.userId);
+            }
+            item.key = index;
+            return item;
+          });
+          setKeepDataList(datalist);
+
+          setTableData(table);
         } else {
+          setTableLoading(false);
           notification.error({
-            message: '提示',
-            duration: 3,
+            message: '获取失败',
             description: res.msg,
           });
         }
       })
       .catch(err => {
+        setTableLoading(false);
         message.error(err);
       });
   };
@@ -1256,16 +1290,12 @@ const UserManage = () => {
     setLoading(true);
     GetUserRelationListNew({ userId: e.userId })
       .then(res => {
-        console.log(111);
-
         if (res.code === 0) {
           const { roleList, stationList } = res.data;
-          console.log(roleList);
           setRolelist(roleList);
           setStationlist(stationList);
           setLoading(false);
         } else {
-          console.log(res);
           setLoading(false);
         }
       })
@@ -1280,14 +1310,12 @@ const UserManage = () => {
     setLoading(true);
     GetUserRelationListNew({ userId: 0 })
       .then(res => {
-        console.log(222);
         if (res.code === 0) {
           const { roleList, stationList } = res.data;
           setRolelist(roleList);
           setStationlist(stationList);
           setLoading(false);
         } else {
-          console.log(res.msg);
           setLoading(false);
         }
       })
@@ -1299,7 +1327,6 @@ const UserManage = () => {
   };
 
   const getCheckList = e => {
-    console.log(e);
     let aa = [];
     let bb = [];
     loadAllUserRole(e).then(res => {
@@ -1316,8 +1343,6 @@ const UserManage = () => {
             bb.push(item1);
           });
         }
-        console.log(aa);
-        console.log(bb);
         setMultiRoleList(aa);
         setMultiStationList(bb);
       }
@@ -1346,7 +1371,6 @@ const UserManage = () => {
     // .catch(err => {
     //   message.error(err);
     // });
-    console.log(currentUser);
     JumpToAnotherOUNew({
       userId: currentUser.userId,
       oldOUID: currentUser.groupId,
@@ -1488,12 +1512,10 @@ const UserManage = () => {
     keepDataList.length > 0 &&
       keepDataList.map(i => {
         let aa = userIDs.split(',').indexOf(i);
-        console.log(aa);
         if (aa !== -1) {
           data.push(aa);
         }
       });
-    console.log(data);
     if (data.length > 0) {
       notification.error({
         message: '操作失败',
@@ -1557,10 +1579,6 @@ const UserManage = () => {
   // 更改机构范围
   const submitExtent = (extent, areaName, flags) => {
     setTreeLoading(true);
-    console.log(extent);
-    console.log(areaName);
-    console.log(flags);
-    console.log(currentSelectOrg1);
     if (flags === 0) {
       setTreeLoading(false);
       notification.warn({
@@ -1599,15 +1617,12 @@ const UserManage = () => {
   };
   // 树的拖拽
   const handleDrop = infos => {
-    console.log(infos);
     const dropKey = infos.node.key;
     const dragKey = infos.dragNode.key;
     const dropPos = infos.node.pos.split('-');
     const dropPosition = infos.dropPosition - Number(dropPos[dropPos.length - 1]);
 
     const datas = JSON.parse(JSON.stringify(treeData));
-    console.log(dropKey, 'dropKey');
-    console.log(dragKey, 'dragKey');
     // 找到拖拽的元素
     let dragObj;
     let dropObj;
@@ -1624,7 +1639,6 @@ const UserManage = () => {
     });
     // 将节点插入到正确的位置
     if (!infos.dropToGap) {
-      console.log('33333333333');
       dropObj.children = dropObj.children || [];
       // 在哪里插入,示例添加到头部，可以是随意位置
       dropObj.children.unshift(dragObj);
@@ -1898,21 +1912,19 @@ const UserManage = () => {
               marginRight: '5px',
             }}
           >
-            {searchFlag === 0 && (
-              <Pagination
-                total={total}
-                showTotal={(totals, range) => `第${range[0]}-${range[1]} 条/共 ${totals} 条`}
-                defaultPageSize={pageSize}
-                defaultCurrent={1}
-                showSizeChanger
-                pageSizeOptions={[10, 20, 50, 100]}
-                current={currentPage}
-                onChange={paginationChange}
-                style={{ marginBottom: '10px' }}
-                size="small"
-                showQuickJumper
-              />
-            )}
+            <Pagination
+              total={total}
+              showTotal={(totals, range) => `第${range[0]}-${range[1]} 条/共 ${totals} 条`}
+              defaultPageSize={pageSize}
+              defaultCurrent={1}
+              showSizeChanger
+              pageSizeOptions={[10, 20, 50, 100]}
+              current={currentPage}
+              onChange={paginationChange}
+              style={{ marginBottom: '10px' }}
+              size="small"
+              showQuickJumper
+            />
           </div>
         </div>
 

src/services/userManage/api.js

@@ -15,11 +15,12 @@ export const getUserTree = (selectOU, node) =>
 //     OUID,
 //   });
 
-export const getOneOUUserListNew = (OUID, size, index) =>
+export const getOneOUUserListNew = (OUID, size, index, keywords) =>
   get(`${PUBLISH_SERVICE}/UserCenter/GroupUserList`, {
     groupId: OUID,
     pageSize: size,
     pageIndex: index,
+    key: keywords,
   });
 
 /**