diff --git a/src/views/wpm_gx/chaoxi.vue b/src/views/wpm_gx/chaoxi.vue
index 1c2d1429..25f9dc35 100644
--- a/src/views/wpm_gx/chaoxi.vue
+++ b/src/views/wpm_gx/chaoxi.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/chaoxi2.vue b/src/views/wpm_gx/chaoxi2.vue
index 9a9f64ab..160ad744 100644
--- a/src/views/wpm_gx/chaoxi2.vue
+++ b/src/views/wpm_gx/chaoxi2.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/chaoxi3.vue b/src/views/wpm_gx/chaoxi3.vue
index 03a62136..fb1f8ddf 100644
--- a/src/views/wpm_gx/chaoxi3.vue
+++ b/src/views/wpm_gx/chaoxi3.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/daojiao.vue b/src/views/wpm_gx/daojiao.vue
index 2fba2562..73a95b50 100644
--- a/src/views/wpm_gx/daojiao.vue
+++ b/src/views/wpm_gx/daojiao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 10a1f622..02ca8232 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -82,6 +82,7 @@
 							type="primary"
 							>交送</el-text
 						>
+						<span style="width: 4px;"></span>
 						<el-text
 							v-if="scope.row.recive_mgroup == mgroupId"
 							type="success"
diff --git a/src/views/wpm_gx/heihua.vue b/src/views/wpm_gx/heihua.vue
index a3863d3a..1a708034 100644
--- a/src/views/wpm_gx/heihua.vue
+++ b/src/views/wpm_gx/heihua.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/jianbo.vue b/src/views/wpm_gx/jianbo.vue
index cf785ed7..dcb2e739 100644
--- a/src/views/wpm_gx/jianbo.vue
+++ b/src/views/wpm_gx/jianbo.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/jingdiao.vue b/src/views/wpm_gx/jingdiao.vue
index dbd2c523..24e2297a 100644
--- a/src/views/wpm_gx/jingdiao.vue
+++ b/src/views/wpm_gx/jingdiao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 59faf69e..940ab98a 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -41,17 +41,13 @@
 				<el-table-column
 					label="生产路线"
 					prop="material_out_name"
-					min-width="100"
+					min-width="130"
 				>
 				</el-table-column>
 				<el-table-column
 					label="预计工时"
 					prop="hour_work"
-				></el-table-column>
-				<el-table-column
-					label="工段名称"
-					prop="mgroup_name"
-					min-width="100"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="生产设备"
@@ -59,12 +55,17 @@
 					min-width="150"
 				></el-table-column>
 				<el-table-column
-					label="所属部门"
+					label="部门/工段"
 					prop="belong_dept_name"
-				></el-table-column>
+				>
+				<template #default="scope">
+					{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
+				</template>
+				</el-table-column>
 				<el-table-column
 					label="处理人"
 					prop="handle_user_name"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="开始时间"
@@ -74,10 +75,10 @@
 					label="结束时间"
 					prop="work_end_time"
 				></el-table-column>
-				<el-table-column
+				<!-- <el-table-column
 					label="创建时间"
 					prop="create_time"
-				></el-table-column>
+				></el-table-column> -->
 				<el-table-column
 					label="操作"
 					fixed="right"
diff --git a/src/views/wpm_gx/mopao.vue b/src/views/wpm_gx/mopao.vue
index 718254df..e983c6ef 100644
--- a/src/views/wpm_gx/mopao.vue
+++ b/src/views/wpm_gx/mopao.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue
index 1a50da76..3951f11f 100644
--- a/src/views/wpm_gx/mtask.vue
+++ b/src/views/wpm_gx/mtask.vue
@@ -1,8 +1,5 @@
 <template>
 	<el-container>
-		<el-header>
-			<h2>任务列表</h2>
-		</el-header>
 		<el-main>
 			<scTable
 				ref="table"
@@ -12,25 +9,16 @@
 				:params="params"
 			>
 				<el-table-column
-					label="#"
+					label="任务列表"
 					type="index"
-					width="50"
+					width="80"
 				></el-table-column>
 				<el-table-column
-					label="产品名称"
+					label="产品名"
 					prop="material_out_name"
 					show-overflow-tooltip
 				>
 				</el-table-column>
-				<el-table-column label="型号规格">
-					<template #default="scope">
-						<span v-if="scope.row.material_out_"
-							>{{ scope.row.material_out_.specification }}|{{
-								scope.row.material_out_.model
-							}}</span
-						>
-					</template>
-				</el-table-column>
 				<el-table-column
 					label="任务编号"
 					prop="number"
diff --git a/src/views/wpm_gx/qiepian.vue b/src/views/wpm_gx/qiepian.vue
index 4dd98842..1c1d319a 100644
--- a/src/views/wpm_gx/qiepian.vue
+++ b/src/views/wpm_gx/qiepian.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue
index e2529f39..00a225f5 100644
--- a/src/views/wpm_gx/saobian.vue
+++ b/src/views/wpm_gx/saobian.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover
diff --git a/src/views/wpm_gx/shaojie.vue b/src/views/wpm_gx/shaojie.vue
index d2a0419a..1939edab 100644
--- a/src/views/wpm_gx/shaojie.vue
+++ b/src/views/wpm_gx/shaojie.vue
@@ -12,12 +12,12 @@
 			<mlogs
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 60%"
 			></mlogs>
 			<mtask
 				v-if="values == '日志'"
 				:mgroupName="mgroupName"
-				style="height: 50%"
+				style="height: 40%"
 			></mtask>
 			<!-- 交接记录 -->
 			<handover