事件管理模块

src/components/RadioGroup/index.jsx

+import React, { useState, useEffect } from 'react';
+import { Radio } from 'antd';
+import styles from './index.less';
+
+const RadioBox = props => {
+  const {
+    radioTitle,
+    radioOptions,
+    currentVal,
+    currentIndex,
+    callBack,
+  } = props;
+  useEffect(() => {}, []);
+  // 选择时通过回调函数传回要改变数据的索引跟选中的值
+  const onChange = e => {
+    callBack(currentIndex, e.target.value);
+  };
+  return (
+    <div className={styles.radioBox}>
+      <div className={styles.radioTitle}>{radioTitle}:</div>
+      <div className={styles.radioContent}>
+        <Radio.Group value={currentVal}>
+          {radioOptions.map((item, num) => (
+            <Radio
+              disabled={item.disabled}
+              value={item.version}
+              key={num}
+              className={styles.radio}
+              onClick={onChange}
+            >
+              {item.functionName + item.version}
+            </Radio>
+          ))}
+        </Radio.Group>
+      </div>
+    </div>
+  );
+};
+
+export default RadioBox;

src/components/RadioGroup/index.less

+.radioBox {
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 20px;
+  .radioTitle {
+    width: 100px;
+  }
+  .radioContent {
+    width: 760px;
+    .radio {
+      margin-bottom: 10px;
+    }
+  }
+}

src/pages/database/InitDataBase.jsx

@@ -13,32 +13,32 @@ import {
   Col,
   Popconfirm,
   Spin,
+  Tabs,
+  Radio,
 } from 'antd';
 import PageContainer from '@/components/BasePageContainer';
+import RadioBox from '@/components/RadioGroup';
 import { connect } from 'react-redux';
 import {
   setTableSQLDirName,
-  deleteConn,
   deleteConnNew,
-  initDBv4,
   initDBv4new,
-  getInitDBLog,
   getInitDBLogNew,
-  getConnRecord,
   getConnRecordNew,
-  getDataBaseConfig,
   getDataBaseConfigNew,
-  saveConnection,
   saveConnectionNew,
   getDataBaseList,
-  updateConnDesc,
   updateConnDescNew,
-  deleteInitDBLog,
   deleteInitDBLogNew,
   connectionTest,
+  GetProductList, // 获取产品列表
+  GetDbProduct, // 获取产品方案配置
+  InitAddDataBase, // 数据库初始化
+  InitEditDataBase, // 二次初始化
 } from '@/services/database/api';
 import styles from './InitDataBase.less';
 
+const { TabPane } = Tabs;
 const { Option } = Select;
 const formLables = {
   ip: '服务器名或IP地址',
@@ -46,7 +46,7 @@ const formLables = {
   password: '数据库用户密码',
   dbName: '数据库名称',
 };
-let time = null
+let time = null;
 const InitDataBase = props => {
   const [form] = Form.useForm();
   const [tableLoading, setTableLoading] = useState(false); // 连接记录
@@ -63,91 +63,29 @@ const InitDataBase = props => {
   const [desc, setDesc] = useState(''); // 修改描述
   const [allSqlDir, setAllSqulDir] = useState([]); // 修改产品方案
   const [defaultSqlDir, setDefaultSqlDir] = useState(''); // 修改产品方案默认值
-  const [modalVisible, setModalVisible] = useState(false); // 修改秒速弹窗
+  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 scroll = useRef(null);
-  // 获取数据库链接记录
-  useEffect(() => {
-    setTableLoading(true);
-    // getConnRecord({
-    //   _version: 9999,
-    //   dc: Date.now(),
-    // })
-    //   .then(res => {
-    //     setTableLoading(false);
-    //     if (res.length > 0) {
-    //       let arr = res.map((item, index) => {
-    //         item.key = index;
-    //         return item;
-    //       });
-    //       setData(arr);
-    //     }
-    //   })
-    //   .catch(err => {
-    //     setTableLoading(false);
-    //     console.error(err);
-    //   });
-    getConnRecordNew().then(resnew => {
-      setTableLoading(false);
-      if (resnew.code == 0) {
-        let res = resnew.data
-        let arr = res.map((item, index) => {
-          item.key = index;
-          return item;
-        });
-        setData(arr);
-      }
-    }).catch(err => {
-      setTableLoading(false);
-      console.error(err);
-    });
-    return () => {
-      if (time) {
-        clearTimeout(time)
-        time = null
-      }
-    }
-  }, [upData]);
+
   // 获取数据库配置信息
   useEffect(() => {
     setCardLoading(true);
-    // getDataBaseConfig({
-    //   _version: 9999,
-    //   dc: Date.now(),
-    // })
-    //   .then(res => {
-    //     setCardLoading(false);
-    //     if (res.success) {
-    //       const { inUse } = res;
-    //       let obj = {};
-    //       Object.keys(dbForm).forEach(k => {
-    //         obj[k] = res[k];
-    //       });
-    //       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]);
-    //       }
-    //     }
-    //   })
-    //   .catch(err => {
-    //     setCardLoading(false);
-    //     console.error(err);
-    //   });
-    getDataBaseConfigNew().then(
-      resnew => {
+    // 数据库连接记录初始化
+    getConnRecordData();
+    getDataBaseConfigNew().then(resnew => {
       setCardLoading(false);
-        let res = resnew.data
-        if (resnew.code == 0) {
+      let res = resnew.data;
+      if (resnew.code === 0) {
         const { inUse } = res;
 
         let obj = {};
@@ -165,29 +103,54 @@ const InitDataBase = props => {
           setDefaultSqlDir(res.allSqlDir[0]);
         }
       }
-      }
-    )
+    });
     return () => {
       if (time) {
-        clearTimeout(time)
-        time = null
-      }
+        clearTimeout(time);
+        time = null;
       }
+    };
   }, []);
+  // 弹出模态框
+  const handleShowModal = (key, value) => {
+    setModalVisible({ ...modalVisible, [key]: value });
+  };
+  // 获取数据库连接记录
+  const getConnRecordData = () => {
+    setTableLoading(true);
+    getConnRecordNew()
+      .then(resnew => {
+        setTableLoading(false);
+        if (resnew.code === 0) {
+          let res = resnew.data;
+          let arr = res.map((item, index) => {
+            item.key = index;
+            return item;
+          });
+          setData(arr);
+        }
+      })
+      .catch(err => {
+        setTableLoading(false);
+        console.error(err);
+      });
+  };
   // 获取日志
   const doInitLog = () => {
-    setInitLoading(true)
+    setInitLoading(true);
     getInitDBLogNew()
       .then(res => {
-        if (res.code == 0) {
+        if (res.code === 0) {
           if (res.data.content) {
-            setInitLoading(false)
+            setInitLoading(false);
             let arr = [];
             arr.push(
-              res.data.content
-                .split(/(\r\n)|(\n)/)
-                .map((item, index) => <p key={index}>{item}</p>),
+              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;
           }
@@ -195,12 +158,11 @@ const InitDataBase = props => {
             time = setTimeout(() => {
               doInitLog();
             }, 600);
-          }
-          else {
-            setInitLoading(false)
+          } else {
+            setInitLoading(false);
             if (time) {
-              clearTimeout(time)
-              time = null
+              clearTimeout(time);
+              time = null;
             }
           }
         }
@@ -208,30 +170,6 @@ const InitDataBase = props => {
       .catch(err => {
         setFinish(true);
       });
-    // getInitDBLogNew().
-    // then(resnew => {
-    //   if (resnew.code == 0) {
-    //     let res = resnew.data
-    //     if (res.content) {
-    //       let arr = [];
-    //       arr.push(
-    //         res.content
-    //           .split(/(\r\n)|(\n)/)
-    //           .map((item, index) => <p key={index}>{item}</p>),
-    //       );
-    //       setInitContent(arr);
-    //       scroll.current.scrollTop = scroll.current.scrollHeight;
-    //     }
-    //     if (!res.finish) {
-    //       setTimeout(() => {
-    //         doInitLog();
-    //       }, 600);
-    //     }
-    //   }
-    // })
-    // .catch(err => {
-    //   setFinish(true);
-    // });
   };
   // 数据库初始化
   const initClick = () => {
@@ -240,30 +178,10 @@ const InitDataBase = props => {
     setInitVisible(true);
     let obj = form.getFieldsValue();
     doInitLog();
-    // initDBv4({
-    //   _version: 9999,
-    //   _dc: Date.now(),
-    //   ...obj,
-    // })
-    //   .then(res => {
-    //     setCardLoading(false);
-    //     if (res.GetMe) {
-    //       console.log(res);
-    //     } else {
-    //       notification.error({
-    //         message: '提示',
-    //         duration: 15,
-    //         description: res.Say.Message || '初始化失败',
-    //       });
-    //     }
-    //   })
-    //   .catch(err => {
-    //     setCardLoading(false);
-    //     console.log(err);
-    //   });
     initDBv4new({
-      ...obj
-    }).then(res => {
+      ...obj,
+    })
+      .then(res => {
         setCardLoading(false);
         if (res.code == 0) {
           console.log(res);
@@ -299,11 +217,12 @@ const InitDataBase = props => {
       dbName: obj.dbName,
       userName: obj.userName,
       password: obj.password,
-    }).then(
-      resnew => {
+    })
+      .then(resnew => {
         setCardLoading(false);
-        if (resnew.code == 0) {
-          setUpData(upData + 1);
+        if (resnew.code === 0) {
+          // setUpData(upData + 1);
+          getConnRecordData();
           notification.success({
             message: '提示',
             duration: 3,
@@ -316,40 +235,11 @@ const InitDataBase = props => {
             description: resnew.msg,
           });
         }
-      }
-    ).catch(err => {
+      })
+      .catch(err => {
         setCardLoading(false);
         console.log(err);
       });
-    // saveConnection({
-    //   _version: 9999,
-    //   _dc: new Date().getTime(),
-    //   ip: obj.ip,
-    //   dbName: obj.dbName,
-    //   userName: obj.userName,
-    //   password: obj.password,
-    // })
-    //   .then(res => {
-    //     setCardLoading(false);
-    //     if (res.GetMe === true) {
-    //       setUpData(upData + 1);
-    //       notification.success({
-    //         message: '提示',
-    //         duration: 3,
-    //         description: '保存成功',
-    //       });
-    //     } else {
-    //       notification.error({
-    //         message: '提示',
-    //         duration: 15,
-    //         description: res.Say.Message || '保存失败',
-    //       });
-    //     }
-    //   })
-    //   .catch(err => {
-    //     setCardLoading(false);
-    //     console.log(err);
-    //   });
   };
   // 测试连接
   const onCheck = e => {
@@ -431,7 +321,7 @@ const InitDataBase = props => {
       dirName: val,
     })
       .then(res => {
-        if (res.code == 0) {
+        if (res.code === 0) {
           notification.success({
             message: '提示',
             duration: 3,
@@ -452,7 +342,7 @@ const InitDataBase = props => {
   // 展示修改描述
   const changeDesc = val => {
     setDesc(val);
-    setModalVisible(true);
+    handleShowModal('describeVisible', true);
   };
   const descChange = e => {
     const { value } = e.target;
@@ -467,29 +357,12 @@ const InitDataBase = props => {
     //   _version: 9999,
     //   _dc: Date.now(),
     // });
-    deleteInitDBLogNew()
+    deleteInitDBLogNew();
   };
   // 弹窗确认回调
   const modalOkCallback = () => {
     const obj = form.getFieldsValue();
     // 更新描述
-    // updateConnDesc({
-    //   _version: 9999,
-    //   _dc: new Date().getTime(),
-    //   ip: obj.ip,
-    //   dbName: obj.dbName,
-    //   userName: obj.userName,
-    //   password: obj.password,
-    //   desc,
-    // })
-    //   .then(res => {
-    //     setModalVisible(false);
-    //     setUpData(upData + 1);
-    //   })
-    //   .catch(err => {
-    //     console.error(err);
-    //     setModalVisible(false);
-    //   });
     updateConnDescNew({
       ip: obj.ip,
       dbName: obj.dbName,
@@ -498,12 +371,13 @@ const InitDataBase = props => {
       desc,
     })
       .then(res => {
-        setModalVisible(false);
-        setUpData(upData + 1);
+        handleShowModal('describeVisible', false);
+        // setUpData(upData + 1);
+        getConnRecordData();
       })
       .catch(err => {
         console.error(err);
-        setModalVisible(false);
+        handleShowModal('describeVisible', false);
       });
   };
   // 删除数据库连接记录
@@ -516,7 +390,8 @@ const InitDataBase = props => {
       .then(res => {
         setTableLoading(false);
         if (res.code === 0) {
-          setUpData(upData + 1);
+          // setUpData(upData + 1);
+          getConnRecordData();
           notification.success({
             message: '提示',
             duration: 3,
@@ -534,25 +409,192 @@ const InitDataBase = props => {
         setTableLoading(false);
         console.error(err);
       });
-    // deleteConnNew({
-    //   rowIndex: key
-    // }).then(res => {
-    //   setTableLoading(false);
-    //   if (res.code == 0) {
-    //     setUpData(upData + 1);
-    //     notification.success({
-    //       message: '提示',
-    //       duration: 3,
-    //       description: '操作成功',
-    //     });
-    //   } else {
-    //     notification.error({
-    //       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);
+            });
+          });
+        });
+        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);
+            // 根据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(() => {
+        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 initDatabasePro = () => {
+    let productSetting = initList;
+    let obj = form.getFieldsValue();
+    // 数据库存在调用编辑接口否则调用新增接口
+    setInitLoading(true);
+    handleShowModal('initVisible', false);
+    setInitVisible(true);
+    doInitLog();
+    if (dbExists) {
+      InitEditDataBase({ ...obj, productSetting }).then(res => {
+        setInitLoading(false);
+        if (res.code === 0) {
+          notification.success({
+            message: '提示',
+            duration: 3,
+            description: '操作成功',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 15,
+            description: res.msg,
+          });
+        }
+      });
+      return;
+    }
+    InitAddDataBase({ ...obj, productSetting }).then(res => {
+      setInitLoading(false);
+      if (res.code === 0) {
+        notification.success({
+          message: '提示',
+          duration: 3,
+          description: '操作成功',
+        });
+      } else {
+        notification.error({
+          message: '提示',
+          duration: 15,
+          description: res.msg,
+        });
+      }
+    });
   };
   const columns = [
     {
@@ -694,38 +736,15 @@ const InitDataBase = props => {
                       </Button>
                     </Space>
                     <Space>
-                      <Popconfirm
-                        title="是否执行数据库初始化"
-                        okText="确认"
-                        cancelText="取消"
-                        onConfirm={() => {
-                          initClick();
-                        }}
-                      >
-                        <Button type="primary">数据库初始化</Button>
-                      </Popconfirm>
-                      {defaultSqlDir && (
-                        <Select
-                          placeholder="请选择解决方案"
-                          style={{ width: '200px' }}
-                          defaultValue={defaultSqlDir}
-                          onChange={e => {
-                            handleSelect(e);
+                      <Button
+                        type="primary"
+                        onClick={() => {
+                          getInitList();
+                          deleteInitDBLogNew();
                         }}
                       >
-                          {allSqlDir &&
-                            allSqlDir.map((item, index) => {
-                              if (item === '产品方案 (GCK平台)') {
-                                return null;
-                              }
-                              return (
-                                <Option value={item} key={index}>
-                                  {item}
-                                </Option>
-                              );
-                            })}
-                        </Select>
-                      )}
+                        数据库初始化
+                      </Button>
                     </Space>
                   </Space>
                 </div>
@@ -760,12 +779,12 @@ const InitDataBase = props => {
             //   _version: 9999,
             //   _dc: Date.now(),
             // });
-            deleteInitDBLogNew()
+            deleteInitDBLogNew();
           }}
           width={800}
           maskClosable={false}
           bodyStyle={{
-            height: '600px',
+            height: '500px',
             // overflowY: 'auto',
           }}
           footer={[
@@ -773,6 +792,7 @@ const InitDataBase = props => {
               onClick={() => {
                 handleClick();
               }}
+              key="back"
               type="primary"
             >
               关闭窗口
@@ -782,7 +802,7 @@ const InitDataBase = props => {
           <div
             ref={scroll}
             style={{
-              maxHeight: '570px',
+              maxHeight: '470px',
               overflowY: 'auto',
               marginRight: ' -24px',
             }}
@@ -799,9 +819,9 @@ const InitDataBase = props => {
 
         <Modal
           title="修改链接描述"
-          visible={modalVisible}
+          visible={modalVisible.describeVisible}
           onOk={() => modalOkCallback()}
-          onCancel={() => setModalVisible(false)}
+          onCancel={() => handleShowModal('describeVisible', false)}
           width="800px"
           bodyStyle={{
             minHeight: '100px',
@@ -827,6 +847,42 @@ const InitDataBase = props => {
             </Col>
           </Row>
         </Modal>
+        {/* 初始化选择产品弹窗 */}
+        <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.less

-.tableTitle{
+.tableTitle {
   font-size: 16px;
 }
-.mgTop20{
+.mgTop20 {
   margin-top: 20px !important;
 }
-.tCenter{
+.tCenter {
   text-align: center;
 }
-.decsBox{
+.decsBox {
   height: 32px;
   line-height: 32px;
 }
@@ -15,3 +15,30 @@
   display: flex !important;
   justify-content: space-between;
 }
+.ant-modal-header {
+  height: 70px;
+}
+
+.cardContainer {
+  margin-top: 10px;
+  border: 1px solid #ecf0fa;
+  border-top: none;
+  .ant-tabs-nav {
+    background-color: #f4f6fc;
+    .ant-tabs-tab {
+      background-color: transparent;
+      border: none;
+      border-top: 2px solid transparent;
+      box-sizing: content-box;
+    }
+    .ant-tabs-tab-active {
+      border: none;
+      background-color: #fff;
+      border-top: 2px solid #1685ff;
+    }
+  }
+  .tabContainer {
+    padding-left: 20px;
+    box-sizing: border-box;
+  }
+}

src/pages/database/ManagementDataBase.jsx

@@ -16,7 +16,7 @@ import {
   tableCheckNew,
   updateDateBase,
   databaseStandardGetLog,
-  databaseStandardGetLogNew
+  databaseStandardGetLogNew,
 } from '@/services/database/api';
 
 const ManagementDataBase = () => {
@@ -65,7 +65,7 @@ const ManagementDataBase = () => {
         setCheckLoading(false);
         console.log(resnew);
         if (resnew.code == 0) {
-          let res = resnew.data
+          let res = resnew.data;
           const { Autolist, ManualList } = res;
           // 自动检测列表
           let arr = Autolist.map((item, index) => {
@@ -112,7 +112,7 @@ const ManagementDataBase = () => {
       .then(resnew => {
         setLogLoading(false);
         if (resnew.code == 0) {
-          let res = resnew.data.list
+          let res = resnew.data.list;
           let arr = [];
           res.map((item, index) => {
             item.key = index;
@@ -138,7 +138,7 @@ const ManagementDataBase = () => {
         setCheckLoading(false);
         setCheckFlag(checkFlag + 1);
         setUpFlag(upFlag + 1);
-        if (res.code===0) {
+        if (res.code === 0) {
           notification.success({
             message: '通知',
             duration: 3,
@@ -166,7 +166,7 @@ const ManagementDataBase = () => {
     setModalVisible(true);
     // setContent(text);
     setContent(arr);
-  }
+  };
   const handleLog = (text, val) => {
     setModalTitle(val);
     let arr = [];
@@ -296,11 +296,11 @@ const ManagementDataBase = () => {
               onClick={() => {
                 handleLog(text, '详细信息');
               }}
-              style={{ backgroundColor: "red" }}
+              style={{ backgroundColor: 'red' }}
             >
               错误内容
             </Button>
-          )
+          );
         }
       },
     },
@@ -366,7 +366,6 @@ const ManagementDataBase = () => {
             size="small"
           />
         </Card>
-
       </PageContainer>
 
       <Modal
@@ -384,7 +383,11 @@ const ManagementDataBase = () => {
         }}
         style={{ top: '40px' }}
         footer={[
-          <Button type="primary" onClick={() => setModalVisible(false)}>
+          <Button
+            type="primary"
+            onClick={() => setModalVisible(false)}
+            key="back"
+          >
             关闭窗口
           </Button>,
         ]}

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

@@ -203,6 +203,7 @@ const SQLServerTable = props => {
           size="small"
           type="primary"
           onClick={() => handleCon(val, item)}
+          key="testLink"
         >
           测试连接
         </Button>,
@@ -213,12 +214,14 @@ const SQLServerTable = props => {
             color: '#faad14',
             borderColor: '#ffe58f',
           }}
+          key="bntEdit"
           size="small"
           onClick={() => handleEdit(val, item)}
         >
           编辑
         </Button>,
         <Popconfirm
+          key="btnDelete"
           title={`是否删除连接${item.name}`}
           cancelText="取消"
           okText="确认"
@@ -236,7 +239,7 @@ const SQLServerTable = props => {
     <>
       <ProTable
         headerTitle="SQL数据库"
-        rowKey="key"
+        rowKey="name"
         search={false}
         columns={columns}
         bordered

src/pages/mobileConfig/SiteConfig.jsx

@@ -50,7 +50,7 @@ const SiteConfig = props => {
         let obj = {};
         let arr = Object.keys(form.getFieldsValue());
         arr.map(k => {
-          obj[k] = res[k];
+          obj[k] = res.data[k];
         });
         form.setFieldsValue(obj);
       })
@@ -67,14 +67,10 @@ const SiteConfig = props => {
         setLoading(true);
         const obj = { ...form.getFieldsValue() };
         let params = { ...obj, mode: 'single', client: clientName };
-        editWebsite(params, {
-          headers: {
-            'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
-          },
-        })
+        editWebsite(params)
           .then(res => {
             setLoading(false);
-            if (res.success) {
+            if (res.code === 0) {
               submitCallback(obj.title);
               notification.success({
                 message: '提示',

src/pages/mobileConfig/addConfig.jsx

@@ -43,14 +43,10 @@ const AddConfig = props => {
         setLoading(true);
         const obj = { ...form.getFieldsValue() };
         let params = { ...obj, mode: 'single' };
-        addWebsite(params, {
-          headers: {
-            'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
-          },
-        })
+        addWebsite(params)
           .then(res => {
             setLoading(false);
-            if (res.code===0) {
+            if (res.code === 0) {
               addCallback(params.title);
               notification.success({
                 message: '提示',

src/pages/mobileConfig/index.js

@@ -141,7 +141,7 @@ const MobileConfigPage = props => {
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
+        if (res.code === 0) {
           setMiniTitle('');
           setTimeout(() => {
             setFlag(flag + 1);

src/pages/mobileConfig/menuconfig/miniMenu.jsx

@@ -303,7 +303,7 @@ const MiniMenu = props => {
     })
       .then(res => {
         setSubmitLoading(false);
-        if (res.success) {
+        if (res.code === 0) {
           setAddVisible(false);
           setAddTwoVisible(false);
           setFlag(flag + 1);

src/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal.jsx

@@ -34,8 +34,10 @@ const VisibleRoleModal = props => {
 
     useEffect(() => {
         let isUnmount = false
+        console.log('selectValue', selectValue);
         if (selectValue) {
             setSelectRole(selectValue)
+        }
         RoleGroupList().then(async res => {
             let tree = []
             let leafs = []
@@ -61,12 +63,12 @@ const VisibleRoleModal = props => {
             if (!isUnmount) {
                 setDataTree(tree)
                 setDataLeafs(leafs)
+                return () => isUnmount = true;
             }
 
         }
         )
-        }
-        return () => isUnmount = true;
+ 
     }, [selectValue])
 
 

src/pages/platformCenter/schemeConfig/projectMessage/AddModal.jsx

@@ -128,8 +128,6 @@ const AddModal = props => {
           pipeArr.push(item.ServiceName.split(".")[0])
         })
       }
-      console.log('pipeArr', pipeArr);
-      console.log('baseMap', baseMap);
       setPipeArr(pipeArr)
       setBaseMap(baseMap)
       form.setFieldsValue({

src/pages/platformCenter/schemeConfig/solutionConfig/solutionConfig.jsx

@@ -6,7 +6,7 @@ import {
     PlusOutlined
 } from '@ant-design/icons';
 import {
-    deleteConfig, setServiceType, SetServiceConfig,GetMaplayerByTerminalType
+    deleteConfig, setServiceType, SetServiceConfig, GetMaplayerByTerminalType
 } from '@/services/webConfig/api';
 import {
     UserAddOutlined
@@ -57,7 +57,7 @@ const VectorData = props => {
                 <Space>
                     <Space>
                         <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}>
-                            <VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} />
+                            <VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} />
                         </div>
                     </Space>
                 </Space>
@@ -117,7 +117,7 @@ const VectorData = props => {
             render: (text, record, index) => (
                 <Space>
                     <div onClick={() => pickRole(record)} style={{ cursor: 'pointer' }}>
-                        <VisibleRoleModal onSubmit={onPushSubmit} title={"关联角色"} initValues ={record.roles!=null?record.roles.split(","):[]} operate={<UserAddOutlined />} />
+                        <VisibleRoleModal onSubmit={onPushSubmit} selectValue={[]} title={"关联角色"} initValues={record.roles != null ? record.roles.split(",") : []} operate={<UserAddOutlined />} />
                     </div>
                 </Space>
             ),
@@ -168,7 +168,7 @@ const VectorData = props => {
                 else {
                     prompt('fail', '关联角色失败')
                 }
-            }).catch(err=>{
+            }).catch(err => {
                 prompt('fail', '网络请求失败')
             })
 
@@ -178,6 +178,7 @@ const VectorData = props => {
     }
     //获取角色
     const pickRole = (record) => {
+        console.log('recird', record);
         setRecord(record)
     }
     //设置web方案
@@ -420,8 +421,8 @@ const VectorData = props => {
             isBaseMap: false
         })
         Promise.all([schemeConfigQueryRequest, webSchemeQueryRequest]).then(res => {
-            console.log('res',res);
-            if (res[0].msg==="Ok" && res[0].data.phone) {
+            console.log('res', res);
+            if (res[0].msg === "Ok" && res[0].data.phone) {
                 let arr = []
                 res[0].data.phone.optionalLayer.layers.map((item, index) => {
                     if (item.isDefault) {
@@ -437,7 +438,7 @@ const VectorData = props => {
                 setHandStatus(arr)
 
             }
-            if (res[1].msg==="Ok" && res[1].data.web) {
+            if (res[1].msg === "Ok" && res[1].data.web) {
                 let arr = []
                 res[1].data.web.optionalLayer.layers.map((item, index) => {
                     if (item.type === "pipenet") {
@@ -452,7 +453,7 @@ const VectorData = props => {
                 setWebStatus(arr)
             }
             setCheckLoading(false)
-        }).catch(e=>{
+        }).catch(e => {
             setCheckLoading(false)
         })
 

src/pages/platformCenter/standingBook/standingBook.jsx

@@ -163,7 +163,8 @@ const standingBook = props => {
                 })
                 console.log(arr)
                 setAllData(arr);
-                setPickItem(newArr[0])
+                // 第一次进入展示第一页 不是第一次进入根据当前选择的来进行展示
+                flag === 0 ? setPickItem(newArr[0]) : setPickItem(pickItem);
                 console.log(newArr, 'newArr');
                 setTableData(newArr);
             }

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -25,7 +25,7 @@ import {
   FormOutlined,
   EditOutlined,
   DeleteOutlined,
-  UserAddOutlined
+  UserAddOutlined,
 } from '@ant-design/icons';
 import {
   setMenuToRole,
@@ -47,7 +47,7 @@ import EditModal from './EditModal';
 import EditGroup from './EditGroup';
 import userStyles from '@/pages/userCenter/userManage/UserManage.less';
 import iconStyles from '@/assets/font/omsfont/iconfont.css';
-import UserModal from './UserModal'
+import UserModal from './UserModal';
 import { data } from '@/pages/platformCenter/messageManage/projectManage/components/Mock';
 
 const { Search } = Input;
@@ -131,7 +131,9 @@ const SiteManage = () => {
   };
 
   useEffect(() => {
+    console.log('进入');
     if (!roleID) return;
+    console.log('选择后');
     setLoading(true);
     const defaultConfig = {
       optionsList: [],
@@ -146,8 +148,8 @@ const SiteManage = () => {
       .then(res => {
         const list = [];
         // eslint-disable-next-line no-unused-expressions
-        res.code===0 &&
-          res.root.forEach(item => {
+        res.code === 0 &&
+          res.data.root.forEach(item => {
             list.push({ ...defaultConfig, ...item });
           });
         const finalList = buildMap(list);
@@ -189,7 +191,6 @@ const SiteManage = () => {
   };
   // 树形数据转换;
   const transTree = val => {
-
     let arr = val;
     let newArr = [];
     // 提取child里面的数组
@@ -239,27 +240,44 @@ const SiteManage = () => {
                     {i.roleID && (
                       <>
                         <Tooltip title="编辑角色" className={styles.fs}>
-                          <FormOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e=>editorUser(e,i)} />
-                        </Tooltip><Tooltip title="删除角色" className={styles.fs}>
-                          <DeleteOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e=>deletesUser(e,i)} />
-                        </Tooltip><Tooltip title="关联用户" className={styles.fs}>
-                          <UserAddOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e=>relevancyUser(e,i)} />
-                        </Tooltip></>
+                          <FormOutlined
+                            style={{ fontSize: '16px', color: '#1890FF' }}
+                            onClick={e => editorUser(e, i)}
+                          />
+                        </Tooltip>
+                        <Tooltip title="删除角色" className={styles.fs}>
+                          <DeleteOutlined
+                            style={{ fontSize: '16px', color: '#1890FF' }}
+                            onClick={e => deletesUser(e, i)}
+                          />
+                        </Tooltip>
+                        <Tooltip title="关联用户" className={styles.fs}>
+                          <UserAddOutlined
+                            style={{ fontSize: '16px', color: '#1890FF' }}
+                            onClick={e => relevancyUser(e, i)}
+                          />
+                        </Tooltip>
+                      </>
                     )}
                     {!i.roleID && (
                       <Tooltip title="新增角色" className={styles.fs}>
-                        <PlusSquareOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e=>addsUser(e,i)} />
+                        <PlusSquareOutlined
+                          style={{ fontSize: '16px', color: '#1890FF' }}
+                          onClick={e => addsUser(e, i)}
+                        />
                       </Tooltip>
                     )}
                     {i.groupflag && (
                       <Tooltip title="编辑分组" className={styles.fs}>
-                        <EditOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e=>editorGroup(e,i)} />
+                        <EditOutlined
+                          style={{ fontSize: '16px', color: '#1890FF' }}
+                          onClick={e => editorGroup(e, i)}
+                        />
                       </Tooltip>
                     )}
-                  
                   </div>
                 </div>
-              )
+              );
               i.key = i.roleID;
               i.subSystemValue = item.visibleValue;
               i.group = itemRole.visibleTitle;
@@ -279,7 +297,6 @@ const SiteManage = () => {
               setItemObj(itemRole);
               // setCurrentSelectId(roleID);
             }
-
           }
           itemRole.title = (
             <div className={styles.title}>
@@ -288,27 +305,44 @@ const SiteManage = () => {
                 {itemRole.roleID && (
                   <>
                     <Tooltip title="编辑角色" className={styles.fs}>
-                      <FormOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>editorUser(e,itemRole)} />
-                    </Tooltip><Tooltip title="删除角色" className={styles.fs}>
-                      <DeleteOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>deletesUser(e,itemRole)} />
-                    </Tooltip><Tooltip title="关联用户" className={styles.fs}>
-                      <UserAddOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>relevancyUser(e,itemRole)} />
-                    </Tooltip></>
+                      <FormOutlined
+                        style={{ fontSize: '16px', color: '#1890FF' }}
+                        onClick={e => editorUser(e, itemRole)}
+                      />
+                    </Tooltip>
+                    <Tooltip title="删除角色" className={styles.fs}>
+                      <DeleteOutlined
+                        style={{ fontSize: '16px', color: '#1890FF' }}
+                        onClick={e => deletesUser(e, itemRole)}
+                      />
+                    </Tooltip>
+                    <Tooltip title="关联用户" className={styles.fs}>
+                      <UserAddOutlined
+                        style={{ fontSize: '16px', color: '#1890FF' }}
+                        onClick={e => relevancyUser(e, itemRole)}
+                      />
+                    </Tooltip>
+                  </>
                 )}
                 {!itemRole.roleID && (
                   <Tooltip title="新增角色" className={styles.fs}>
-                    <PlusSquareOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>addsUser(e,itemRole)} />
+                    <PlusSquareOutlined
+                      style={{ fontSize: '16px', color: '#1890FF' }}
+                      onClick={e => addsUser(e, itemRole)}
+                    />
                   </Tooltip>
                 )}
                 {itemRole.groupflag && (
                   <Tooltip title="编辑分组" className={styles.fs}>
-                    <EditOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>editorGroup(e,itemRole)} />
+                    <EditOutlined
+                      style={{ fontSize: '16px', color: '#1890FF' }}
+                      onClick={e => editorGroup(e, itemRole)}
+                    />
                   </Tooltip>
                 )}
-             
               </div>
             </div>
-          )
+          );
           return itemRole;
         });
       }
@@ -320,62 +354,80 @@ const SiteManage = () => {
             {item.roleID && (
               <>
                 <Tooltip title="编辑角色" className={styles.fs}>
-                  <FormOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>editorUser(e,item)} />
-                </Tooltip><Tooltip title="删除角色" className={styles.fs}>
-                  <DeleteOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>deletesUser(e,item)} />
-                </Tooltip><Tooltip title="关联用户" className={styles.fs}>
-                  <UserAddOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>relevancyUser(e,item)} />
-                </Tooltip></>
+                  <FormOutlined
+                    style={{ fontSize: '16px', color: '#1890FF' }}
+                    onClick={e => editorUser(e, item)}
+                  />
+                </Tooltip>
+                <Tooltip title="删除角色" className={styles.fs}>
+                  <DeleteOutlined
+                    style={{ fontSize: '16px', color: '#1890FF' }}
+                    onClick={e => deletesUser(e, item)}
+                  />
+                </Tooltip>
+                <Tooltip title="关联用户" className={styles.fs}>
+                  <UserAddOutlined
+                    style={{ fontSize: '16px', color: '#1890FF' }}
+                    onClick={e => relevancyUser(e, item)}
+                  />
+                </Tooltip>
+              </>
             )}
             {!item.roleID && (
               <Tooltip title="新增角色" className={styles.fs}>
-                <PlusSquareOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>addsUser(e,item)} />
+                <PlusSquareOutlined
+                  style={{ fontSize: '16px', color: '#1890FF' }}
+                  onClick={e => addsUser(e, item)}
+                />
               </Tooltip>
             )}
             {item.groupflag && (
               <Tooltip title="编辑分组" className={styles.fs}>
-                <EditOutlined style={{ fontSize: '16px', color: '#1890FF'  }} onClick={e=>editorGroup(e,item)} />
+                <EditOutlined
+                  style={{ fontSize: '16px', color: '#1890FF' }}
+                  onClick={e => editorGroup(e, item)}
+                />
               </Tooltip>
             )}
           </div>
         </div>
-      )
+      );
       return item;
     });
 
     return arr3;
   };
   //编辑角色
-  const editorUser = (e,record) => {
+  const editorUser = (e, record) => {
     e.stopPropagation();
     setItemObj(record);
     setEditVisible(true);
-  }
+  };
   //删除角色
-  const deletesUser = (e,record) => {
+  const deletesUser = (e, record) => {
     e.stopPropagation();
     setItemObj(record);
     setDelVisible(true);
-  }
+  };
   //关联用户
-  const relevancyUser = (e,record) => {
+  const relevancyUser = (e, record) => {
     e.stopPropagation();
     setItemObj(record);
-    setUserVisible(true)
-  }
+    setUserVisible(true);
+  };
   //编辑分组
-  const editorGroup = (e,record) => {
-    console.log(record,'1212')
+  const editorGroup = (e, record) => {
+    console.log(record, '1212');
     e.stopPropagation();
     setItemObj(record);
     setGroupVisible(true);
-  }
+  };
   //新增角色
-  const addsUser = (e,record) => {
+  const addsUser = (e, record) => {
     e.stopPropagation();
     setItemObj(record);
     setModalVisible(true);
-  }
+  };
   const handleChange = e => {
     const { value } = e.target;
     setSearchWord(value);
@@ -415,7 +467,7 @@ const SiteManage = () => {
     setFlag(flag + 1);
     setItemObj('');
     handleTreeSelect(saveCurId);
-  }
+  };
   const valueCallback = valueObj => {
     setSubList(valueObj);
   };
@@ -424,20 +476,13 @@ const SiteManage = () => {
   };
   const handleCommit = results => {
     setBtnLoading(true);
-    setMenuToRole(
-      qs.stringify({
-        roleID,
-        menuNameList: String(results.flat()),
-      }),
-      {
-        headers: {
-          'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
-        },
-      },
-    )
+    setMenuToRole({
+      roleID: Number(roleID),
+      menuIdList: String(results.flat()),
+    })
       .then(res => {
         setBtnLoading(false);
-        if (res.msg==='Ok') {
+        if (res.code === 0) {
           setValueList([...results.flat()]);
           notification.success({
             message: '提示',
@@ -457,8 +502,8 @@ const SiteManage = () => {
       });
   };
   const handleUserAttach = () => {
-    setUserVisible(true)
-  }
+    setUserVisible(true);
+  };
   return (
     <PageContainer>
       <div

src/pages/userCenter/siteManage/EditModal.jsx

@@ -18,7 +18,7 @@ const EditModal = props => {
         editStation({
           stationName: res.stationName,
           description: res.description,
-          stationID: stationObj,
+          stationID: stationObj.id,
         })
           .then(res => {
             setLoading(false);

src/pages/userCenter/siteManageV2/siteManage.jsx

@@ -70,6 +70,7 @@ const SiteManageV2 = () => {
     const [treeState, setTreeState] = useState(true); // 树第一次加载
     const [treeLoading, setTreeLoading] = useState(false);
     const [currentStation, setCurrentStation] = useState(''); // 当前选中站点
+    const [currentStationMsg, setCurrentStationMsg] = useState({}); //当前编辑节点信息
     const [currentStationOperate, setCurrentStationOperate] = useState(false)
     const [flag, setFlag] = useState(1);//操作标致触发界面刷新
     const [dataList, setdataList] = useState([]);//当前站点对应的分页用户列表
@@ -131,7 +132,10 @@ const SiteManageV2 = () => {
     //编辑当前站点
     const editorSite = (e, recode) => {
         e.stopPropagation();
-        setCurrentStation(recode.id);
+        // console.log(recode);
+        // 保存编辑回显信息
+        setCurrentStationMsg(recode);
+        // setCurrentStation(recode.id);
         handleShowModal('editVisible', true);
     }
     // 重新渲染树
@@ -422,15 +426,10 @@ const SiteManageV2 = () => {
                 description: '请至少选择选择一个用户！',
             });
         chooseUserToStation(
-            qs.stringify({
+            {
                 userList: String(result.flat()),
                 stationID: currentStation,
-            }),
-            {
-                headers: {
-                    'content-type': 'application/x-www-form-urlencggoded;charset=UTF-8',
-                },
-            },
+            }
         )
             .then(res => {
                 handleShowModal('btnLoading', false);
@@ -537,7 +536,7 @@ const SiteManageV2 = () => {
                     />
                     <EditModal
                         visible={visibleParams.editVisible}
-                        stationObj={currentStation}
+                        stationObj={currentStationMsg}
                         onCancel={() => handleShowModal('editVisible', false)}
                         confirmModal={editModal}
                     />

src/pages/webConfig/components/editForm.jsx

@@ -47,13 +47,13 @@ const EditForm = props => {
           <Item
             label="产品包名："
             name="PackageName"
-            rules={[
-              {
-                required: true,
-                pattern: new RegExp(/^[a-z0-9A-Z]+$/),
-                message: '产品包名必须是英文或者数字',
-              },
-            ]}
+            // rules={[
+            //   {
+            //     required: true,
+            //     pattern: new RegExp(/^[a-z0-9A-Z]+$/),
+            //     message: '产品包名必须是英文或者数字',
+            //   },
+            // ]}
           >
             <Input placeholder="请输入产品包名" allowClear disabled />
           </Item>
@@ -86,12 +86,12 @@ const EditForm = props => {
           <Item
             label="发布状态："
             name="PublishState"
-            rules={[
-              {
-                required: true,
-                message: '请选择发布状态',
-              },
-            ]}
+            // rules={[
+            //   {
+            //     required: true,
+            //     message: '请选择发布状态',
+            //   },
+            // ]}
           >
             <Select placeholder="请选择发布状态" disabled>
               {environmentList &&

src/pages/webConfig/components/webConfigForm.js

@@ -43,7 +43,7 @@ const WebConfigForm = props => {
 
   const onGetLoginPages = () => {
     if (loginPages.length === 0) {
-      getLoginPage().then(res => setLoginPages(res));
+      getLoginPage().then(res => setLoginPages(res.data));
     }
   };
 

src/pages/webConfig/index.js

@@ -44,7 +44,7 @@ const WebConfigPage = props => {
     setLoading(true);
     updateModuleTree(userMode || 'super', canceled);
     getAllConfigName().then(res => {
-      if (!canceled.cancel) setConfigFiles(res);
+      if (!canceled.cancel) setConfigFiles(res.data);
     });
     return () => {
       canceled.cancel = true;
@@ -105,7 +105,7 @@ const WebConfigPage = props => {
       .then(res => {
         setLoading(false);
         if (!canceled.cancel) {
-          setConfigObj(res);
+          setConfigObj(res.data);
           // setConfigObj(res.data);
           if (webTitle === curWeb.text) {
             setToEdit(res);

src/pages/webConfig/menuconfig/AddForm.jsx

@@ -96,6 +96,7 @@ const AddForm = props => {
             rules={[
               {
                 required: true,
+                // pattern: /^[^\s]*$/,
                 message: '请输入功能路径',
               },
             ]}

src/pages/webConfig/menuconfig/webMenu.jsx

@@ -167,8 +167,8 @@ const MiniMenu = props => {
     })
       .then(res => {
         setLoading(false);
-        if (res.success) {
-          setInfo({ ...res });
+        if (res.code === 0) {
+          setInfo({ ...res.data });
         } else {
           notification.error({
             message: '提示',
@@ -197,7 +197,7 @@ const MiniMenu = props => {
     })
       .then(res => {
         setModalLoading(false);
-        if (res.success) {
+        if (res.code === 0) {
           setDelVisible(false);
           setFlag(flag + 1);
           setNodeType('');
@@ -263,10 +263,11 @@ const MiniMenu = props => {
   };
   // 新增提交的回调
   const submitCallback = (prop, item) => {
+    console.log(subSystemValue, 'subSystemValue');
     setSubmitLoading(true);
     let baseUrl = handleGeturl(prop.imageUrl);
     let obj = { ...prop, baseUrl };
-    const parentID = item.menuID ? item.menuID : -1;
+    const parentID = item.menuID ? Number(item.menuID) : -1;
     addWebMenu({
       _dc: Date.now(),
       parentID,
@@ -275,7 +276,7 @@ const MiniMenu = props => {
     })
       .then(res => {
         setSubmitLoading(false);
-        if (res.success) {
+        if (res.code === 0) {
           setAddVisible(false);
           setAddTwoVisible(false);
           setFlag(flag + 1);
@@ -307,14 +308,14 @@ const MiniMenu = props => {
       obj.relatedRoleList = String(roleList) || '';
       editWebMenu({
         _dc: Date.now(),
-        menuID,
+        menuID: Number(menuID),
         // subSystemValue,
         ...obj,
       })
         .then(res => {
           setLoading(false);
 
-          if (res.success) {
+          if (res.code === 0) {
             setFlag(flag + 1);
             // updateMenuTree('edit');
             notification.success({
@@ -336,16 +337,20 @@ const MiniMenu = props => {
           setLoading(false);
         });
     } else {
-      pEditWebMenu({
+      // 新接口改为editWebMenu 原来为pEditWebMenu
+      editWebMenu({
         _dc: Date.now(),
-        menuID,
+        menuID: Number(menuID),
         // subSystemValue,
         ...obj,
+        product: null,
+        baseUrl: null,
+        hideInMenu: false,
       })
         .then(res => {
           setLoading(false);
 
-          if (res.success) {
+          if (res.code === 0) {
             setFlag(flag + 1);
             // updateMenuTree('edit');
             notification.success({
@@ -357,7 +362,7 @@ const MiniMenu = props => {
             notification.error({
               message: '提示',
               duration: 3,
-              description: res.message || '编辑失败',
+              description: res.msg || '编辑失败',
             });
           }
         })
@@ -435,7 +440,7 @@ const MiniMenu = props => {
       _version: 9999,
       _dc: Date.now(),
     }).then(res => {
-      if (res.success) {
+      if (res.code === 0) {
         // updateMenuTree();
         setFlag(flag + 1);
       } else {

src/services/database/api.js

@@ -16,7 +16,7 @@ import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';
  */
 // 测试数据库连接
 export const connectionTest = params =>
-  get(`${PUBLISH_SERVICE}/DBManager/ConnectionTest`, params);
+  post(`${PUBLISH_SERVICE}/DBManager/TestConnetions`, params);
 
 // 获取数据库配置信息
 export const getDataBaseConfigNew = params =>
@@ -203,3 +203,16 @@ export const AddUserAuthSetting = params =>
   get(`${PUBLISH_SERVICE}/WebSite/AddUserAuthSetting`, params);
 export const GetUserAuthSet = params =>
   get(`${PUBLISH_SERVICE}/WebSite/GetUserAuthSet`, params);
+
+// 获取产品列表
+export const GetProductList = params =>
+  get(`${PUBLISH_SERVICE}/DBManager/GetProductList`, params);
+// 获取产品方案配置
+export const GetDbProduct = params =>
+  post(`${PUBLISH_SERVICE}/DBManager/GetDbProduct`, params);
+// 数据库初始化
+export const InitAddDataBase = params =>
+  post(`${PUBLISH_SERVICE}/DBManager/InitAddDataBase`, params);
+// 二次初始化
+export const InitEditDataBase = params =>
+  post(`${PUBLISH_SERVICE}/DBManager/InitEditDataBase`, params);

src/services/intelligence/api.js

@@ -3,11 +3,11 @@ import { CITY_SERVICE, get, PUBLISH_SERVICE, post, postForm } from '../index';
 
 // 获取任务列表
 export const taskOptionsList = () =>
-  get(`/PandaCore/OMS/AIConfig/TaskOptionsList`);
+  get(`${PUBLISH_SERVICE}/AIConfig/TaskOptionsList`);
 
 // 获取设备类型
 export const getIotDeviceType = () =>
-  get(`/PandaCore/OMS/AIConfig/GetIotDeviceType`);
+  get(`${PUBLISH_SERVICE}/AIConfig/GetIotDeviceType`);
 
 // 获取场景列表
 export const algorithmList = () => get(`/PandaCore/OMS/AIConfig/AlgorithmList`);
@@ -42,7 +42,7 @@ export const deleteTaskOptions = params =>
 
 // 预测列表
 export const getPredictInfo = () =>
-  get(`/PandaCore/OMS/AIConfig/GetPredictInfo`);
+  get(`${PUBLISH_SERVICE}/AIConfig/GetPredictInfo`);
 
 // 预测新增
 export const addPredictOptions = params =>

src/services/mobileConfig/api.js

@@ -13,7 +13,7 @@ export const miniAppSiteTree = params =>
  * title:'名称'
  */
 export const getWebsite = params =>
-  get(`${CITY_SERVICE}/OMS.svc/MiniApp_GetWebsite`, params);
+  get(`${PUBLISH_SERVICE}/WebSite/MiniApp_GetWebsite`, params);
 /**
  *
  * @param {*} params
@@ -29,10 +29,10 @@ export const getWebsite = params =>
     "cloudLogin":false
 */
 export const editWebsite = (params, options) => {
-  let strParams = JSON.stringify(params);
-  let qsParams = qs.stringify({ config: strParams });
+  let strParams = params;
+  let qsParams = strParams;
   return post(
-    `${CITY_SERVICE}/OMS.svc/MiniApp_EditWebsite?_version=9999`,
+    `${PUBLISH_SERVICE}/WebSite/MiniApp_EditWebsite?_version=9999`,
     qsParams,
     options,
   );
@@ -65,7 +65,7 @@ export const getMiniAppModuleTree = params =>
   }
  */
 export const addMenu = params =>
-  get(`${CITY_SERVICE}/OMS.svc/MiniApp_AddMenu`, params);
+  post(`${PUBLISH_SERVICE}/WebSite/MiniApp_AddMenu`, params);
 
 // 获取菜单详情
 /**
@@ -90,14 +90,14 @@ export const getRoleListPlain = params =>
 
 // 删除小程序
 export const deleteWebsite = params =>
-  get(`${CITY_SERVICE}/OMS.svc/MiniApp_DeleteWebsite`, params);
+  get(`${PUBLISH_SERVICE}/WebSite/MiniApp_DeleteWebsite`, params);
 // 新增小程序
 export const addWebsite = (params, options) => {
-  let strParams = JSON.stringify(params);
-  let qsParams = qs.stringify({ config: strParams });
+  // let strParams = JSON.stringify(params);
+  // let qsParams = qs.stringify({ config: strParams });
   return post(
-    `${CITY_SERVICE}/OMS.svc/MiniApp_AddWebsite?_version=9999`,
-    qsParams,
+    `${PUBLISH_SERVICE}/WebSite/MiniApp_AddWebsite?_version=9999`,
+    params,
     options,
   );
 };

src/services/webConfig/api.js

@@ -22,7 +22,7 @@ export const getWebThemes = () =>
  * 获取登录模板下拉选项
  */
 export const getLoginPage = () =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_GetLoginPage`, { query: '' });
+  get(`${PUBLISH_SERVICE}/WebSite/GetLoginPage`, { query: '' });
 
 /**
  * 获取地图配置下拉选项
@@ -54,46 +54,44 @@ export const postEditWebConfig = (config, isAdd = false) => {
   });
   return post(
     `${PUBLISH_SERVICE}/WebSite/${
-      isAdd ? 'AddWebsite' : 'W4_EditWebsite'
+      isAdd ? 'AddWebsite' : 'EditWebsite'
     }?_version=9999`,
-    qs.stringify({ config: JSON.stringify(obj) }),
-    {
-      headers: {
-        'content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-      },
-    },
+    obj,
   );
 };
 
 export const postAddWebSite = config => postEditWebConfig(config, true);
 
 export const deleteWebsite = client =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_DeleteWebsite?_version=9999`, { client });
+  get(`${PUBLISH_SERVICE}/WebSite/DeleteWebsite?_version=9999`, { client });
 
 /**
  * 获取配置文件下拉选项
  */
 export const getAllConfigName = () =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_GetAllConfigName?_version=9999`);
+  get(`${PUBLISH_SERVICE}/WebSite/GetAllConfigName?_version=9999`);
 
 export const addWebMenu = param => {
   const defaultConfig = { pageUrl: '' };
   // eslint-disable-next-line no-return-assign
   Object.keys(param).forEach(k => (defaultConfig[k] = param[k]));
-  return get(`${CITY_SERVICE}/OMS.svc/W4_AddMenu?_version=9999`, defaultConfig);
+  return post(
+    `${PUBLISH_SERVICE}/WebSite/AddMenu?_version=9999`,
+    defaultConfig,
+  );
 };
 
 export const editWebMenu = param =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_EditMenu?_version=9999`, param);
+  post(`${PUBLISH_SERVICE}/WebSite/EditMenu?_version=9999`, param);
 
 export const pEditWebMenu = param =>
   get(`${CITY_SERVICE}/OMS.svc/P_EditMenu?_version=9999`, param);
 
 export const deleteWebMenu = param =>
-  get(`${CITY_SERVICE}/OMS.svc/W4_DeleteMenu?_version=9999`, param);
+  get(`${PUBLISH_SERVICE}/WebSite/DeleteMenu?_version=9999`, param);
 
 export const getWebMenuInfo = param =>
-  get(`${CITY_SERVICE}/OMS.svc/P_GetMenuInfo?_version=9999`, param);
+  get(`${PUBLISH_SERVICE}/PlatformCenter/GetMenuInfo?_version=9999`, param);
 
 export const saveConfigContent = (fileName, content) =>
   post(
@@ -113,7 +111,7 @@ export const getConfigContent = name =>
 
 // 菜单拖拽
 export const dragMenu = params =>
-  get(`${CITY_SERVICE}/OMS.svc/P_DragMenu`, params);
+  get(`${PUBLISH_SERVICE}/PlatformCenter/DragMenu`, params);
 
 // 获取产品列表
 export const getProductList = params =>