fix: '日志管理界面'

src/pages/bsmanager/base/standingBook/BookConfigNew.jsx

@@ -846,6 +846,7 @@ const BookConfigNew = props => {
         onOk={viewSubmit}
         onCancel={() => {
           setAccountVisile(false);
+          callBackSubmit();
         }}
         centered
         bodyStyle={{ width: '100%', height: '800px', overflowY: 'scorll' }}

src/pages/bsmanager/base/standingBook/standingBook.jsx

@@ -98,6 +98,14 @@ const StandingBook = props => {
       width: 200,
       ellipsis: true,
     },
+    {
+      title: '父台账名称',
+      dataIndex: 'PreName',
+      key: 'PreName',
+      align: 'center',
+      width: 200,
+      ellipsis: true,
+    },
     {
       title: '台账字段',
       dataIndex: 'fields',

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx

@@ -1082,9 +1082,11 @@ const FlowChart = props => {
   const jsonData = val => {
     let listArr = [];
     val.map((item, index) => {
-      if(!item.Config){
+      console.log(item);
+      debugger;
+      if (!item.Config) {
         console.log(item);
-        debugger
+        debugger;
         let arr = [];
         arr.push({
           mapServer: item.schemeName,
@@ -1108,6 +1110,7 @@ const FlowChart = props => {
               fromData: {
                 tableName: item.TableName,
                 filed: item.Fields,
+                filedShape: item.tableShape,
               },
               toData: arr,
             },
@@ -1118,6 +1121,7 @@ const FlowChart = props => {
               fromData: {
                 tableName: item.TableName,
                 filed: item.Fields,
+                filedShape: item.tableShape,
               },
               toData: arr,
             },
@@ -1126,10 +1130,9 @@ const FlowChart = props => {
         let json = JSON.stringify(obj);
         let newObj = { Config: json, BackfillType: 'GIS', RuleName: item.RuleName };
         listArr.push(newObj);
-      }else{
+      } else {
         listArr.push(item);
       }
-      
     });
     return listArr;
   };

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/AddGIS.jsx

@@ -43,6 +43,7 @@ const AddModal = props => {
   const [tableType, setTableType] = useState();
   const [tableName, setTableName] = useState();
   const [ruleList, setRuleList] = useState([]);
+  const [tableShape, setTableShape] = useState();
 
   const [form] = Form.useForm();
   useEffect(() => {
@@ -54,7 +55,9 @@ const AddModal = props => {
       setRuleList(arr);
       getSchemeList();
       if (modalType === 'edit') {
+        console.log(msg);
         form.setFieldsValue(msg);
+        setTableShape(msg.tableShape);
         setTableType(msg.tableType);
         setTableName(msg.TableName);
       }
@@ -104,8 +107,6 @@ const AddModal = props => {
   const getLayerFields = (val, key, value, typeFields) => {
     let obj = form.getFieldsValue();
     let newValue = value ? value : schemeValue;
-    console.log(schemeValue);
-    debugger;
     let data = newValue.find(i => i.servicename === obj.schemeName);
     GetLayerFields({
       mapServer: data.servicename,
@@ -141,6 +142,7 @@ const AddModal = props => {
         arr.push(...item.TableFields);
       });
       let data = arr.find(i => i.FieldName === val[Object.keys(val)[0]]);
+      setTableShape(data.FiledShape);
       setTableType(data.type);
       setType(data.FiledType);
       setTableName(data.table);
@@ -178,7 +180,8 @@ const AddModal = props => {
         } else {
           obj = { ...validate, key: msg.ID || msg.key, ...arr };
         }
-        onSubumit(obj, modalType, tableType, tableName);
+        debugger
+        onSubumit(obj, modalType, tableType, tableName, tableShape);
       }
     });
   };

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigGIS.jsx

@@ -81,6 +81,8 @@ const ConfigGIS = (props, ref) => {
       let obj = {};
       if (item.Config) {
         let newConfig = JSON.parse(item.Config);
+        console.log(newConfig);
+        debugger
         if (newConfig.mapping) {
           let users = [];
           newConfig.mapping[0].toData.map((x, y) => {
@@ -90,6 +92,7 @@ const ConfigGIS = (props, ref) => {
           obj.ID = index;
           obj.RuleName = item.RuleName;
           obj.TableName = newConfig.mapping[0].fromData.tableName;
+          obj.tableShape = newConfig.mapping[0].fromData.filedShape;
           obj.key = index;
           obj.nodeName1 = newConfig.mapping[0].toData[0].tableName;
           obj.nodeValue1 = newConfig.mapping[0].toData[0].filed;
@@ -112,6 +115,7 @@ const ConfigGIS = (props, ref) => {
           obj.ID = index;
           obj.RuleName = item.RuleName;
           obj.TableName = newConfig.relationFormMapping[0].fromData.tableName;
+          obj.tableShape = newConfig.relationFormMapping[0].fromData.filedShape;
           obj.key = index;
           obj.nodeName1 = newConfig.relationFormMapping[0].toData[0].tableName;
           obj.nodeValue1 = newConfig.relationFormMapping[0].toData[0].filed;
@@ -176,20 +180,21 @@ const ConfigGIS = (props, ref) => {
     setviewMsg(val);
   };
   // GIS配置确定回调
-  const saveView = (val, type, tableType, TableName) => {
+  const saveView = (val, type, tableType, TableName, tableShape) => {
     let list = JSON.parse(JSON.stringify(tableData.current));
     // eslint-disable-next-line prefer-spread
     let newKey = list.length > 0 ? Math.max.apply(Math, list.map(item => item.key)) + 1 : 0;
 
     if (type === 'add') {
-      list.push({ ...val, key: newKey, tableType, TableName });
+      list.push({ ...val, key: newKey, tableType, TableName, tableShape });
     } else {
       let edtiIndex = list.findIndex(item => item.key === val.key);
 
-      list[edtiIndex] = { ...val, key: newKey, tableType, TableName };
+      list[edtiIndex] = { ...val, key: newKey, tableType, TableName, tableShape };
     }
     tableData.current = list;
     console.log(list);
+    debugger
     nodeChage('FlowNodeBackfillConfigs', tableData.current);
     setViewModal(false);
   };

src/pages/log/logCenter/index.less

+.omsLog {
+  .head {
+    padding: 10px;
+    background: white;
+    margin-bottom: 2px;
+    min-width: 1030px;
+  }
+  .chart {
+    padding: 16px;
+    background: white;
+  }
+  .table {
+    border-top: 1px solid #f0eded;
+    // overflow: auto;//不要这个，pagination否则无法固定底部
+    .ant-table-thead tr th {
+      font-weight: 600;
+      color: rgba(0, 0, 0, 0.85);
+      background-color: #f6f9fe;
+    }
+    .ant-table-body {
+      height: calc(100vh - 208px);
+      border-right: white;
+      overflow: auto !important;
+      // .ant-table-tbody{
+      //     overflow: scroll !important;
+      // }
+    }
+    .ant-table-cell {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .ant-pagination {
+      z-index: 999;
+      border-top: 1px solid #f0eded;
+    }
+    .ant-table.ant-table-small {
+      width: 99%;
+      margin: 10px auto;
+    }
+    .ant-table-pagination {
+      padding-right: 12px;
+      background: white;
+      margin: 1px 0;
+      padding: 8px;
+      padding-right: 20px;
+    }
+  }
+  .ant-spin-container {
+    background-color: white;
+  }
+  .icon {
+    margin-top: -5px !important;
+    vertical-align: text-bottom;
+  }
+}

src/routes/config.js

@@ -167,6 +167,7 @@ const MobileConfigPage = asyncComponent(() => import('@/pages/productCenter/mobi
 const ServiceLog = asyncComponent(() => import('@/pages/log/serviceLog'));
 const LoginLog = asyncComponent(() => import('@/pages/log/loginLog'));
 const OmsLog = asyncComponent(() => import('@/pages/log/omsLog'));
+const LogCenter = asyncComponent(() => import('@/pages/log/logCenter'));
 const superAuthority = [USER_MODE.SUPER];
 const adminAuthority = [...superAuthority, USER_MODE.ADMIN];
 const iconStyle = { verticalAlign: 'middle' };
@@ -529,6 +530,11 @@ export default {
               name: '运维痕迹',
               component: OmsLog,
             },
+            {
+              path: '/system/logCenter',
+              name: '日志管理',
+              component: LogCenter,
+            },
           ],
         },
       ],

src/services/logCenter/api.js

+/* eslint-disable camelcase */
+/*
+ * @Description:
+ * @Author: leizhe
+ * @Date: 2021-09-27 09:42:21
+ * @LastEditTime: 2022-04-19 14:56:50
+ * @LastEditors: leizhe
+ */
+import { get, PUBLISH_SERVICE, post, postForm } from '../index';
+
+// 获取错误日志、业务日志、第三方调用日志
+export const GetCallLogPages = data => post(`/PandaCore/GCK/Log/GetCallLogPages`, data);