Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

src/packages/pc/views/system/login_failed/index.vue

@@ -26,6 +26,7 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { queryError } from '@/services/api/system'
 import { useOperation } from '@/hooks/operation'
+import { formatDate } from '@/filters'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
@@ -49,11 +50,11 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryE
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userName', label: '登录账号' },
-    { field: 'memberUserName', label: '登录时间' },
-    { field: 'areaName', label: '客户端类型' },
-    { field: 'openMode', label: '登录ip' },
-    { field: 'userState', label: '失败原因' }
+    { field: 'loginaccount', label: '登录账号' },
+    { field: 'operatetime', label: '登录时间', formatValue: (val) => formatDate(val) },
+    { field: 'lienttype', label: '客户端类型' },
+    { field: 'loginip', label: '登录ip' },
+    { field: 'description', label: '失败原因' }
 ])
 
 filterOptons.inputList = [

src/packages/pc/views/system/operation_log/index.vue

@@ -23,6 +23,7 @@ import { useDataFilter } from '@/hooks/datatable'
 import { queryLog } from '@/services/api/system'
 import { useOperation } from '@/hooks/operation'
 import { useUserStore } from '@/stores'
+import { formatDate } from '@/filters'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
@@ -53,7 +54,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'username', label: '操作人' },
     { field: 'areaname', label: '所属机构' },
     { field: 'content', label: '操作内容' },
-    { field: 'operatetime', label: '操作时间' }
+    { field: 'operatetime', label: '操作时间', formatValue: (val) => formatDate(val) }
 ])
 
 filterOptons.inputList = [