Merge branch 'wang' into test

src/views/searchTerm/analysisPage/QuerySummary.vue

@@ -5,15 +5,24 @@
  * @Author: Cheney
  */
 
-import { inject, nextTick, Ref, ref } from 'vue'
+import { inject, nextTick, onBeforeUnmount, Ref, ref } from 'vue'
 import * as api from './api';
 import { usePagination } from '/@/utils/usePagination';
+import emitter from '/@/utils/emitter'
 
 const { tableData, total, currentPage, pageSize, handlePageChange } = usePagination(fetchTableData);
 const filter = inject<Ref>('filter');
 const loading = ref(false);
 const typeSelect = ref('positive');
 
+onBeforeUnmount(() => {
+  emitter.all.clear();
+});
+
+emitter.on('QueryCondition-sendRequest', () => {
+  fetchTableData();
+});
+
 async function fetchTableData() {
   loading.value = true;
   const query = {

src/views/system/log/loginLog/crud.tsx

@@ -23,6 +23,19 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				editRequest,
 				delRequest,
 			},
+			table: {
+				border: true,
+				bordered: true,
+				height: "100%",
+				// rowKey: "id",
+				// size: "small",
+				stripe: true,
+			},
+			toolbar: {
+				style: {
+					margin: '8px 0 8px 0',
+				}
+			},
 			actionbar: {
 				buttons: {
 					add: {
@@ -117,6 +130,12 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						},
 					},
 				},
+				create_datetime: {
+					title: '登录时间',
+					column: {
+						minWidth: 100,
+					},
+				},
 				isp: {
 					title: '运营商',
 					search: {