diff --git a/src/api/api/common.ts b/src/api/api/common.ts
index f1a2cf3..8fbc960 100644
--- a/src/api/api/common.ts
+++ b/src/api/api/common.ts
@@ -72,6 +72,16 @@ export async function getPageList(param, controller) {
 	return result;
 }
 
+// 获取日志分页
+export async function getLogPageList(param, controller) {
+	param = param || { FPageIndex: 1, FPageSize: 10 };
+	let result = {};
+	await http.post('/api/' + controller + '/GetPageListByParams', param).then((data) => {
+		result = data;
+	});
+	return result;
+}
+
 export async function GetFormulaPageList(param, controller) {
 	param = param || { FPageIndex: 1, FPageSize: 10 };
 	let result = {};
diff --git a/src/router/module/base-routes.ts b/src/router/module/base-routes.ts
index 6719401..664453d 100644
--- a/src/router/module/base-routes.ts
+++ b/src/router/module/base-routes.ts
@@ -55,7 +55,42 @@ export default [
 				meta: { title: '我参与的', icon: "" },
 			}
 		]
-	}, {
+	},
+	{
+		path: '/materia',
+		component: BaseLayout,
+		meta: { title: '物料路线' },
+		children: [
+			{
+				path: '/materia/all',
+				component: () => import('../../views/materia/all.vue'),
+				meta: { title: '物料记录', icon: "" },
+			},
+			{
+				path: '/materia/route',
+				component: () => import('../../views/materia/route.vue'),
+				meta: { title: '物料事项', icon: "" },
+			}
+		]
+	},
+	{
+		path: '/half',
+		component: BaseLayout,
+		meta: { title: '试验号变更' },
+		children: [
+			{
+				path: '/half/half',
+				component: () => import('../../views/half/half.vue'),
+				meta: { title: '试验号路线', icon: "" },
+			},
+			{
+				path: '/half/route',
+				component: () => import('../../views/half/route.vue'),
+				meta: { title: '试验号事项', icon: "" },
+			}
+		]
+	},
+	{
 		path: '/order',
 		component: BaseLayout,
 		meta: { title: '清单管理' },
@@ -114,40 +149,6 @@ export default [
 			}
 		]
 	},
-	{
-		path: '/materia',
-		component: BaseLayout,
-		meta: { title: '物料路线' },
-		children: [
-			{
-				path: '/materia/all',
-				component: () => import('../../views/materia/all.vue'),
-				meta: { title: '物料记录', icon: "" },
-			},
-			{
-				path: '/materia/route',
-				component: () => import('../../views/materia/route.vue'),
-				meta: { title: '物料事项', icon: "" },
-			}
-		]
-	},
-	{
-		path: '/half',
-		component: BaseLayout,
-		meta: { title: '半成品实验号变更' },
-		children: [
-			{
-				path: '/half/half',
-				component: () => import('../../views/half/half.vue'),
-				meta: { title: '配方变更', icon: "" },
-			},
-			{
-				path: '/half/route',
-				component: () => import('../../views/half/route.vue'),
-				meta: { title: '半成品变更事项', icon: "" },
-			}
-		]
-	},
 	{
 		path: '/log/log',
 		component: BaseLayout,
diff --git a/src/views/log/log.vue b/src/views/log/log.vue
index a740546..020ecf4 100644
--- a/src/views/log/log.vue
+++ b/src/views/log/log.vue
@@ -1,13 +1,12 @@
 <template>
-	<lay-container fluid="true"
-				   :style="'padding:10px;height:'+(dataInfoObj!=undefined?(dataInfoObj.FHeight+'px'):'auto')">
+	<lay-container fluid="true" :style="'padding:10px;height:'+(dataInfoObj!=undefined?(dataInfoObj.FHeight+'px'):'auto')">
 		<lay-row space="10">
 			<lay-col span="24">
 				<lay-card>
 					<lay-form :model="searchObj" class="search-box">
 						<lay-row class="search-items">
-							<lay-form-item label="物料号" prop="FSaleCode">
-								<lay-input v-model="searchObj.FSaleCode"></lay-input>
+							<lay-form-item label="用户" prop="FName">
+								<lay-input v-model="searchObj.FName"></lay-input>
 							</lay-form-item>
 							<lay-form-item label="类型" prop="FType">
 								<lay-select v-model="searchObj.FType">
@@ -15,9 +14,9 @@
 													   :label="tIdv.FName"></lay-select-option>
 								</lay-select>
 							</lay-form-item>
-							<lay-form-item v-if="postData.FState!=99" label="模块" prop="FState">
-								<lay-select v-model="searchObj.FState">
-									<lay-select-option v-for="(tv,tx) in stateList" :key="tx" :value="tv.id"
+							<lay-form-item v-if="postData.FState!=99" label="模块" prop="FModule">
+								<lay-select v-model="searchObj.FModule">
+									<lay-select-option v-for="(tv,tx) in moduleList" :key="tx" :value="tv.id"
 													   :label="tv.name"></lay-select-option>
 								</lay-select>
 							</lay-form-item>
@@ -32,19 +31,12 @@
 						</lay-form-item>
 					</lay-form>
 					<lay-table :columns="dataColumn" id="id" :dataSource="dataList"
-							   v-model:selectedKeys="selectedKeys" :checkbox="checkbox" :default-toolbar="defaultToolbar"
+							   v-model:selectedKeys="selectedKeys" :default-toolbar="defaultToolbar"
 							   :page="dataList.length>0?pageInfo:null" @change="changePage">
 						<template v-slot:toolbar>
 							<lay-button size="sm" @click="_getPageList(false,true)">刷新</lay-button>
 							<lay-button size="sm" type="normal" @click="showEditMaterial(1)">导出</lay-button>
 						</template>
-						<template v-slot:FStateName="{ data }">
-							<span v-if="data.FStateName=='已完成'" style="color:#5FB878">{{ data.FStateName }}</span>
-							<span v-else style="color:#1E9FFF">{{ data.FStateName }}</span>
-						</template>
-						<template v-if="dataInfoObj == undefined|| !dataInfoObj.FID" v-slot:operator="{ data }">
-							<lay-button size="xs" type="primary" @click="showEditMaterial(3)">视图</lay-button>
-						</template>
 					</lay-table>
 				</lay-card>
 			</lay-col>
@@ -67,7 +59,7 @@
 	} from "vue";
 	import {
 		getBasicList,
-		getPageList
+		getLogPageList
 	} from "/src/api/api/common";
 	import AddMateria from '../materia/components/AddMateria.vue';
 	import EditMateria from '../materia/components/EditMateria.vue';
@@ -82,53 +74,47 @@
 			EditView
 		},
 		setup() {
-			let dataColumn = [{
-			type: "checkbox"
-		},
-			{
-				title: "ID",
-				key: "F1",
-				width: "160px",
-				align: 'center',
-				hide: false
-			},{
-				title: "模块",
-				key: "F2",
-				width: "300px",
-				align: 'center',
-				hide: false
-			},
+			let dataColumn = [
+				{
+					title: "序号",
+					type: "number",
+				},
+				{
+					title: "模块",
+					key: "",
+					width: "120px",
+					align: 'center'
+				},
 				{
 					title: "功能",
-					key: "F3",
+					key: "",
 					width: "160px",
-					align: 'center',
-					hide: false
+					align: 'center'
 				},
 				{
 					title: "操作描述",
-					key: "F4",
-					width: "160px",
+					key: "FDesc",
+					width: "480px",
 					align: 'center',
-					hide: false
+        			ellipsisTooltip: true
 				},
 				{
 					title: "操作时间",
-					key: "F5",
+					key: "FAddDate",
 					width: "180px",
 					align: 'center'
 				},
 				{
 					title: "操作类型",
-					key: "F6",
-					width: "400px",
+					key: "FTypeName",
+					width: "160px",
 					align: 'center'
 				},
 				
 				{
 					title: "操作人",
-					key: "F7",
-					width: "178px",
+					key: "FName",
+					width: "160px",
 					align: 'center'
 				}
 			];
@@ -138,7 +124,8 @@
 			const pageInfo = ref({
 				total: 0,
 				limit: 10,
-				current: 1
+				current: 1,
+				showRefresh: true
 			});
 			const dataList = ref([]);
 			const typeList = ref([]);
@@ -149,12 +136,24 @@
 			const modelArea = ref(["70%", "70%", "70%", "86%", "70%", "70%", "70%", "70%", "700px", "70%", "70%","70%","70%"]);
 			const objInfoObj = ref({});
 			const editType = ref(1);
-			const stateList = ref([{
+			const moduleList = ref([{
 				id: 1,
-				name: "进行中"
+				name: "待办事项"
 			}, {
 				id: 2,
-				name: "已完成"
+				name: "协同路线"
+			}, {
+				id: 3,
+				name: "物料路线"
+			}, {
+				id: 4,
+				name: "试验号变更"
+			}, {
+				id: 5,
+				name: "清单管理"
+			}, {
+				id: 6,
+				name: "系统设置"
 			}]);
 			const hasLoaded = ref(false);
 			const dataItem=ref([]);
@@ -172,7 +171,7 @@
 				modelArea,
 				objInfoObj,
 				editType,
-				stateList,
+				moduleList,
 				hasLoaded,
 				MaterialModel,
 				dataItem
@@ -202,13 +201,17 @@
 		},
 		methods: {
 			changePage(obj) {
+				for (let key in this.searchObj) {
+					let val = this.searchObj[key];
+					if (val != null && val !== "") this.pageInfo[key] = val;
+				}
 				this.pageInfo.current = obj.current;
 				this.pageInfo.limit = obj.limit;
 				this._getPageList();
 			},
 			cancelClick(isRefresh, onlyRefresh) {
 				if (isRefresh) {
-					this._getPageList(true);
+					this._getPageList();
 				}
 				if (onlyRefresh) return false;
 				for (let i = 0; i < this.showEditBox.length; i++) {
@@ -219,14 +222,18 @@
 				this.typeList = await getBasicList(33) || [];
 			},
 			//分页列表
-			async _getPageList(isFirst, showOk) {
+			async _getPageList() {
+				let result= await getLogPageList(this.pageInfo, "OperateLog");
 
-				let result= await getPageList(this.pageInfo, "OperateLog");
-				debugger
-				this.dataList = [
-					{"F1":"1","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"新增协同","F5":"2022-10-24 11:00","F6":"新增","F7":"Kai"},
-					{"F1":"2","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"查看了物料视图","F5":"2022-10-24 11:00","F6":"查看","F7":"Kai"}
-				];
+				result.Data.List.map(item => {
+					const type = this.typeList.find(t => t.FCode == item.FType);
+					if (type) {
+						item["FTypeName"] = type.FName;
+					}
+				})
+
+				this.pageInfo.total = result.Data.Total;
+				this.dataList = result.Data.List;
 
 			},
 			//日期处理
@@ -285,9 +292,9 @@
 				this.postData = {};
 				for (let key in this.searchObj) {
 					let val = this.searchObj[key];
-					if (val != null && val !== "") this.postData[key] = val;
+					this.pageInfo[key] = val;
 				}
-				this._getPageList(true);
+				this._getPageList();
 			},
 			//检索-重置
 			_clickReset() {