新接口全部替换

src/pages/dataCenter/dictionary/WebDic.js

@@ -326,13 +326,11 @@ const WebDic = () => {
   };
   // 提交-删除
   const submitDelete = () => {
-    get(`${CITY_SERVICE}/OMS.svc/D_DeleteDataDictionary`, {
-      _version: 9999,
-      _dc: new Date().getTime(),
+    DeleteDataDictionary({
       nodeID: select.nodeID,
     })
       .then(res => {
-        if (res.success) {
+        if (res.code===0) {
           getData(select.parentID);
           if (select.parentID === '-1') {
             setSubData([]);

src/pages/database/InitDataBase.jsx

@@ -335,16 +335,18 @@ const InitDataBase = props => {
     setCardLoading(true);
     const obj = form.getFieldsValue();
     getConnectionTest({
-      _version: 9999,
-      _dc: new Date().getTime(),
-      ip: obj.ip,
-      dbName: obj.dbName,
-      userName: obj.userName,
-      password: obj.password,
+      // _version: 9999,
+      // _dc: new Date().getTime(),
+      // ip: obj.ip,
+      // dbName: obj.dbName,
+      // userName: obj.userName,
+      // password: obj.password,
+      Type:"SQLServer",
+      name:obj.dbName,
     })
       .then(res => {
         setCardLoading(false);
-        if (res.GetMe === true) {
+        if (res.code === 0) {
           notification.success({
             message: '提示',
             duration: 3,

src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx

@@ -68,8 +68,6 @@ const ProjectManage = () => {
         },
         {
             title: '操作',
-            dataIndex: 'action',
-            key: 'action',
             width: 250,
             ellipsis: true,
             render: (text, record) => (
@@ -127,6 +125,7 @@ const ProjectManage = () => {
         handleShowModal("editVisible", true)
     }
     const TestDesc = (record) => {
+        console.log(record)
         if(record.ThemeName)
         TestPush({
             theme:record.ThemeName,
@@ -249,6 +248,7 @@ const ProjectManage = () => {
                             item: item
                         })
                     })
+                    console.log('mesList',mesList);
                     setDataList(mesList)
                 }
             }
@@ -297,7 +297,7 @@ const ProjectManage = () => {
 
             </div>
             <div className={styles.list_view}>
-                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} />
+                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} rowKey='ID'/>
             </div>
             <EditModal
                 visible={visibleParams.editVisible}

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

@@ -69,12 +69,14 @@ const EditModal = props => {
     useEffect(() => {
 
         if (template.ThemeName) {
+            console.log(template);
             form.setFieldsValue({
                 name: template.MsgType,
                 isStart: template.IsStarted === "0" ? "关闭" : "开启",
                 to_person: template.PushGroup,
                 push_plan: template.MsgType,
-                push_mode: template.PushMode.split(","),
+                push_mode: template.PushMode === null ? '' : template.PushMode.split(","),
+
                 app_template: template.AppTemplateID,
                 app_path: template.AppFunctionPath,
                 wx_template: parseInt(template.PublicTemplateID),
@@ -85,10 +87,10 @@ const EditModal = props => {
                 message_template: template.MsgTemplateID,
             })
             setCurrentTrench({
-                isAPPShow: template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
-                isWXShow: template.PushMode.split(",").indexOf("公众号推送") > -1 ? true : false,
-                isWEBShow: template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
-                isMessageShow: template.PushMode.split(",").indexOf("短信推送") > -1 ? true : false,
+                isAPPShow: template.PushMode && template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
+                isWXShow: template.PushMode && template.PushMode.split(",").indexOf("公众号推送") > -1 ? true : false,
+                isWEBShow: template.PushMode &&template.PushMode.split(",").indexOf("平台弹框") > -1 ? true : false,
+                isMessageShow: template.PushMode &&template.PushMode.split(",").indexOf("短信推送") > -1 ? true : false,
             })
         }
 
@@ -270,7 +272,7 @@ const EditModal = props => {
                         <VisibleRoleModal
                             onSubmit={onPushSubmit}
                             title={"推送人员"}
-        
+
                         />
                     </Item>
                     <Item

src/pages/userCenter/roleManage/EditGroup.jsx

@@ -16,6 +16,7 @@ const EditGroup = props => {
   }, [itemObj]);
   const onSubmit = props => {
     setLoading(true);
+    console.log(itemObj)
     setRoleGroupName({
       subSystemValue: itemObj.visibleValue || itemObj.subSystemValue,
       oldName: itemObj.groupflag,
@@ -23,7 +24,7 @@ const EditGroup = props => {
     })
       .then(res => {
         setLoading(false);
-        if (res.msg==='') {
+        if (res.code===0) {
           form.resetFields();
           notification.success({
             message: '提示',

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -146,7 +146,7 @@ const SiteManage = () => {
       .then(res => {
         const list = [];
         // eslint-disable-next-line no-unused-expressions
-        res.success &&
+        res.code===0 &&
           res.root.forEach(item => {
             list.push({ ...defaultConfig, ...item });
           });
@@ -365,6 +365,7 @@ const SiteManage = () => {
   }
   //编辑分组
   const editorGroup = (e,record) => {
+    console.log(record,'1212')
     e.stopPropagation();
     setItemObj(record);
     setGroupVisible(true);

src/pages/userCenter/roleManage/UserModal.jsx

@@ -97,7 +97,7 @@ const UserModal = props => {
             res => {
                 let list = []
                 if (res.data && res.data.length > 0) {
-
+                    console.log(res.data)
                     res.data.map((item, index) => {
                         list.push({
                             GroupId: +item.OUID,
@@ -109,6 +109,7 @@ const UserModal = props => {
 
                 }
                 setSelectList(lodash.cloneDeep(list));
+                console.log(lodash.cloneDeep(list));
                 setUpdatePageUser(updatePageUser + 1)
             }
         )
@@ -149,7 +150,7 @@ const UserModal = props => {
             .then(res => {
 
 
-                if (res.msg==='') {
+                if (res.code===0) {
                     setSelectList([]);
                     setUpdateCheck(updateCheck + 1);
                     confirmModal(itemObj.roleID)

src/pages/userCenter/siteManage/SiteManage.jsx

@@ -348,7 +348,7 @@ const SiteManage = props => {
       .then(res => {
         handleShowModal('btnLoading', false);
 
-        if (res.msg==='') {
+        if (res.code===0) {
           setSelectList([]);
           setUpdate1(update1 + 1);
           notification.success({

src/pages/userCenter/siteManageV2/siteManage.jsx

@@ -435,7 +435,7 @@ const SiteManageV2 = () => {
             .then(res => {
                 handleShowModal('btnLoading', false);
 
-                if (res.msg==='') {
+                if (res.code===0) {
                     setSelectList([]);
                     setUpdateCheck(updateCheck + 1);
                     notification.success({

src/pages/userCenter/userManage/AuthModal.jsx

@@ -24,7 +24,7 @@ const AuthModal = props => {
             UserId: currentUser.userID
         }).then(
             res => {
-                if(res.code == 0){
+                if(res.code === 0){
                     setSelctValue(res.data)
                 }
             }
@@ -36,7 +36,7 @@ const AuthModal = props => {
     const onSubmit = () => {
         AddUserAuthSetting({userId:currentUser.userID}).then(
             res =>{
-                if(res.code == 0){
+                if(res.code === 0){
                     message.info("提交成功")
                 }
             }

src/pages/userCenter/userManage/UserManage.js

@@ -87,7 +87,7 @@ const UserManage = () => {
 
   const [form] = Form.useForm();
   const { Item } = Form;
-  const [selectValue,setSelctValue] = useState(1)//用户鉴权
+  const [selectValue,setSelctValue] = useState(0)//用户鉴权
 
   const [width, setWidth] = useState(50);
   const [treeLoading, setTreeLoading] = useState(false);
@@ -361,6 +361,7 @@ const UserManage = () => {
               onConfirm={() => authUser(record)}
             >
             <LockOutlined
+              onClick={() => jianquan(record)}
               style={{ fontSize: '16px', color: '#1890ff' }}
             />
             </Popconfirm>
@@ -534,7 +535,6 @@ const UserManage = () => {
     // 树节点变化（即props不为空）时才请求，避免重复请求
     if (props[0]) {
       // eslint-disable-next-line no-console
-      console.log(props[0]);
       getOneOUUserListNew(props[0] || currentSelectOrg)
         .then(res => {
           setCurrentOrgOperate(false); // 重置禁用当前机构操作为false
@@ -740,20 +740,33 @@ const UserManage = () => {
   };
 
   // 用户鉴权
-  useEffect(() => {
-    currentUser.userID 
-    GetUserAuthSet({
-        UserId: currentUser.userID
-    }).then(
-        res => {
-            if(res.code == 0){
-                setSelctValue(res.data)
-                console.log(selectValue);
-                console.log(res.data);
-            }
+//   useEffect(() => {
+//     currentUser.userID 
+//     GetUserAuthSet({
+//         UserId: currentUser.userID
+//     }).then(
+//         res => {
+//             if(res.code == 0){
+//                 setSelctValue(res.data)
+//                 console.log(selectValue);
+//                 console.log(res.data);
+//             }
+//         }
+//     )
+// }, [currentUser])
+const jianquan = record=>{
+  GetUserAuthSet({
+    UserId: record.userID
+}).then(
+    res => {
+        if(res.code == 0){
+            setSelctValue(res.data)
+            console.log(selectValue);
+            console.log(res.data);
         }
-    )
-}, [currentUser])
+    }
+)
+}
 const onTypeChange = (value) => {
     console.log(value);
     setSelctValue(value)

src/pages/userCenter/userManage/UserManage.less

@@ -132,6 +132,9 @@
         display: flex;
         width: 100%;
         position: relative;
+        .ant-table.ant-table-bordered > .ant-table-container {
+            min-width: calc(100vw - 582px);
+        }
         .orgContainer{
             height: calc(100vh - 74px);
             width: 340px;

src/services/dataCenter/api.jsx

@@ -9,6 +9,7 @@ export const DeleteDataDictionary = params =>
 export const EditDataDictionary = params =>
     get(`${PUBLISH_SERVICE}/DataManger/EditDataDictionary`, params);
 
+//获取数据字典
 export const GetKeyValue = params =>
     get(`${PUBLISH_SERVICE}/DataManger/GetKeyValue`, params);
 export const AddKeyValue = params =>

src/services/database/api.js

@@ -27,9 +27,10 @@ export const getConnRecordNew = params =>
   get(`${PUBLISH_SERVICE}/DBManager/GetConnRecord`, params);
 
 // 测试连接
-export const getConnectionTest = params =>
-  get(`${CITY_SERVICE}/OMS.svc/S_GetConnectionTest`, params);
-
+// export const getConnectionTest = params =>
+//   get(`${CITY_SERVICE}/OMS.svc/S_GetConnectionTest`, params);
+  export const getConnectionTest = params =>
+  get(`${PUBLISH_SERVICE}/DBManager/GetConnectionTest`, params);
 // 保存数据库连接
 // export const saveConnection = params =>
 //   get(`${CITY_SERVICE}/OMS.svc/S_SaveConnection`, params);

src/services/userCenter/RoleManage/api.js

@@ -2,7 +2,7 @@
  * @Description: 
  * @Author: leizhe
  * @Date: 2021-05-27 16:31:05
- * @LastEditTime: 2021-07-07 17:50:49
+ * @LastEditTime: 2021-07-12 17:04:25
  * @LastEditors: leizhe
  */
 import { get, post, PUBLISH_SERVICE, CITY_SERVICE } from '@/services/index';

src/utils/request/index.js

@@ -35,7 +35,7 @@ axios.interceptors.request.use( function (request){
     request.headers.Authorization = 'Bearer ' + token
   }
   if(pandaPublish){
-    if(request.url!='/PandaOMS/OMS/OMSLogin'&&request.url!='/Publish/OMS/FileCenter/SaveMobileApk'&&request.url!='/Publish/OMS/GateWayConfig')
+    if(request.url!='/PandaOMS/OMS/OMSLogin'&&request.url!='/Publish/OMS/FileCenter/SaveMobileApk'&&request.url!='/Publish/GCK/Basis/GateWayConfig')
     request.url=getWay+request.url
   }
   return request