Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

web/client/src/sections/install/containers/system.jsx

@@ -61,7 +61,6 @@ const Example = (props) => {
       dispatch(install.getProjectAppList(query)).then((res) => {//获取应用列表
          setAppList(res.payload.data)
       })
-      console.log('user', user);
    }, [])
    useEffect(() => {
       getProjectPomsList();
@@ -225,28 +224,37 @@ const Example = (props) => {
          }
       },
       {
-        title: '关联时间',
-        dataIndex: "createTime",
-        key: 'time',
-        render: (_, row) => {
-            return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss")||'无';
-        }
+         title: '映射类型',
+         dataIndex: "mappingClass",
+         key: 'mappingClass',
+         render: (_, row) => {
+            let data = { wisdom: '智慧类', monitor: '监测类', other: '其他' }
+            return data[row.mappingClass]
+         }
+      },
+      {
+         title: '关联时间',
+         dataIndex: "createTime",
+         key: 'time',
+         render: (_, row) => {
+            return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss") || '无';
+         }
       },
       {
-        title: '修改时间',
-        dataIndex: "updateTime",
-        key: 'updateTime',
-        render: (_, row) => {
-            return (row.updateTime?moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss"):moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"));
-        }
+         title: '修改时间',
+         dataIndex: "updateTime",
+         key: 'updateTime',
+         render: (_, row) => {
+            return (row.updateTime ? moment(row.updateTime).format("YYYY-MM-DD HH:mm:ss") : moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"));
+         }
       },
       {
-        title: '添加人员',
-        dataIndex: "pepUserName",
-        key: 'pepUserName',
-        render: (_, row) => {
-            return row.pepUserName||'无'
-        }
+         title: '添加人员',
+         dataIndex: "pepUserName",
+         key: 'pepUserName',
+         render: (_, row) => {
+            return row.pepUserName || '无'
+         }
       },
       {
          title: "管理",