Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/log/loginLog/index.jsx

@@ -51,6 +51,12 @@ const LoginLog = () => {
       dataIndex: 'IP',
       key: 'IP',
     },
+    {
+      title: 'IP属地',
+      dataIndex: 'IPTerritory',
+      key: 'IPTerritory',
+      width: 250,
+    },
     {
       title: '用户名',
       dataIndex: 'ShowName',
@@ -61,11 +67,11 @@ const LoginLog = () => {
     },
     {
       title: '系统类型',
-      dataIndex: 'SystemType',
-      key: 'SystemType',
+      dataIndex: 'Ciient',
+      key: 'Ciient',
       width: 300,
       filters: SystemTypeFilters,
-      onFilter: (value, record) => record.SystemType === value,
+      onFilter: (value, record) => record.Ciient === value,
       filteredValue,
     },
     // {
@@ -102,8 +108,8 @@ const LoginLog = () => {
           let arr2 = res.data.map(item => item.ShowName);
           arr2 = arr2.filter((value, index) => arr2.indexOf(value) === index);
           setShowNameFilters(arr2.map(item => ({ text: item, value: item })));
-          // 过滤系统类型SystemType
-          let arr3 = res.data.map(item => item.SystemType);
+          // 过滤系统类型Ciient
+          let arr3 = res.data.map(item => item.Ciient);
           arr3 = arr3.filter((value, index) => arr3.indexOf(value) === index);
           setSystemTypeFilters(arr3.map(item => ({ text: item, value: item })));
         } else {
@@ -147,8 +153,8 @@ const LoginLog = () => {
     setFilteredValue([]);
   };
   const onChangeInput = filters => {
-    console.log('filters', filters);
-    setFilteredValue(filters.LoginName, filters.ShowName, filters.SystemType);
+    // console.log('filters', filters);
+    setFilteredValue(filters.LoginName, filters.ShowName, filters.Ciient);
   };
   return (
     <>