From 7e2a6f2f0b430eb30f38fe2d51657aa1956bb13b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 16 Jul 2024 13:48:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=81=9C=E6=9C=BA=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=A5=E5=8F=8Astlog=E8=A1=A8=E6=A0=BCtabl?=
 =?UTF-8?q?e=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_rm/logDetail.vue | 45 ++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index b4fee9d3..070ee9f7 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-container>
-		<el-main class="nopadding">
-			<el-card style="margin: 6px; position: relative">
+		<el-main id="elMain" class="nopadding">
+			<el-card id="logDetail" style="margin: 6px; position: relative">
 				<el-descriptions title="日志信息" :column="3">
 					<el-descriptions-item label="所属工段:">
 						<span>{{ form.mgroup_name }}</span>
@@ -31,6 +31,7 @@
 					>新增异常</el-button
 				>
 				<el-tabs
+					ref="infoTabd"
 					v-model="activeName"
 					class="demo-tabs"
 					@tab-click="handleClick"
@@ -129,7 +130,7 @@
 									row-key="id"
 									stripe
 									hideSetting
-									:height="300"
+									:height="heightTable"
 									highlightCurrentRow
 								>
 									<el-table-column type="index" width="50" />
@@ -392,7 +393,19 @@
 					<el-tab-pane label="异常" name="fourth">
 						<el-row :gutter="20">
 							<el-col :span="14">
-								<el-table
+								<scTable
+									ref="stlogTable"
+									:apiObj="apiObjStlog"
+									:query="querystlog"
+									:params="querystlog"
+									row-key="id"
+									stripe
+									hideSetting
+									:height="heightTable"
+									@row-click="stlogRowClick"
+									highlightCurrentRow
+								>
+									<!-- <el-table
 									ref="stlogTable"
 									:data="stlogList"
 									row-key="id"
@@ -400,7 +413,7 @@
 									@row-click="stlogRowClick"
 									:height="300"
 									highlightCurrentRow
-								>
+								> -->
 									<el-table-column type="index" width="50" />
 									<el-table-column
 										label="异常类别"
@@ -467,15 +480,16 @@
 											>
 										</template>
 									</el-table-column>
-								</el-table>
+								</scTable>
 							</el-col>
 							<el-col :span="10">
-								<el-table
+								<scTable
 									ref="expTable"
 									:data="sflogexpList"
 									row-key="id"
 									stripe
-									:height="300"
+									:height="heightTable"
+									hidePagination
 									highlightCurrentRow
 								>
 									<el-table-column type="index" width="50" />
@@ -529,7 +543,7 @@
 											>
 										</template>
 									</el-table-column>
-								</el-table>
+								</scTable>
 							</el-col>
 						</el-row>
 						<!-- <el-row :gutter="20" v-if="sflogExpVisiable"> -->
@@ -745,6 +759,7 @@ export default {
 				mpoint__type: 30,
 				has_create_by: 1,
 			},
+			querystlog: { mgroup: "" },
 			sflogExpVisiable: false,
 			checkList: [],
 			stlogList: [],
@@ -753,22 +768,32 @@ export default {
 			sflogexpList: [],
 			mpointOptions: [],
 			apiObj: null,
+			apiObjStlog: null,
+			heightTable: null,
 		};
 	},
 	mounted() {
 		this.deptId = this.$route.query.deptId;
 		this.mgroupId = this.$route.query.mgroupId;
 		this.querymplogX.mgroup = this.mgroupId;
+		this.querystlog.mgroup = this.mgroupId;
 		this.apiObj = this.$API.enm.mpoint.stat;
+		this.apiObjStlog = this.$API.wpm.stlog.list;
 		let form = this.$TOOL.data.get("sflogItem");
 		this.form = JSON.parse(form);
 		if (this.form.mgroup_name == "石灰石破碎") {
 			this.getMpoint();
 			this.getMpointStat();
 		}
-		console.log(this.form);
 		this.getTeam();
 		this.getStlog();
+		let height = document.getElementById("elMain").clientHeight;
+		let heightdetail = document.getElementById("logDetail").clientHeight;
+		let heightTabs = height - heightdetail - 40;
+		this.heightTable = heightTabs - 45 + "px";
+		this.$nextTick(() => {
+			this.$refs.infoTabd.$el.style.height = heightTabs + "px";
+		});
 	},
 	methods: {
 		handleClick(e) {