Merge branch 'xinyan' into test

src/views/reportManage/dataCenter/combinedDisplay/components/tableData/mainData.vue

@@ -356,13 +356,13 @@ const cellStyleHandler = ({ column }) => {
   const dayDetailedFormat = /\d{4}-\d{2}-\d{2}/;
   const monthFormat = /\d{4}-\d{2}/;
   if (columnName.includes('~') || columnName.includes('截止') || columnName.includes('近90天平台退货率') || columnName.includes('余额')) {
-    return { fontSize: '12px', backgroundColor: '#b3ced7' };
+    return { fontSize: '12px', backgroundColor: '#e0f2fe' };
   }
   if (monthFormat.test(columnName) && !dayDetailedFormat.test(columnName)) {
-    return { fontSize: '12px', backgroundColor: '#8cbacc' };
+    return { fontSize: '12px', backgroundColor: 'rgba(186,230,253,0.9)' };
   }
   if (dayFormat.test(columnName)) {
-    return { fontSize: '12px', backgroundColor: '#d0dadf' };
+    return { fontSize: '12px', backgroundColor: '#f0f9ff' };
   }
   return { fontSize: '12px' };
 };

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

@@ -3,7 +3,12 @@ import { UserPageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions, Create
 
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
-		return await api.GetList(query);
+		const { search, ...otherParams } = query;
+		const newQueryParams = {
+			request_modular: search,
+			...otherParams
+		};
+		return await api.GetList(newQueryParams);
 	};
 	const editRequest = async ({ form, row }: EditReq) => {
 		form.id = row.id;
@@ -63,7 +68,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 				},
 				search: {
-					title: '关键词',
+					title: '请求模块搜索',
 					column: {
 						show: false,
 					},
@@ -73,7 +78,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							props: {
 								clearable: true,
 							},
-							placeholder: '请输入关键词',
+							placeholder: '请输入请求模块',
 						},
 					},
 					form: {