From 1f5d248e95cd8cdfdd4b1a0dad199c56c894e58c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Apr 2025 16:50:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/chatTest.vue         | 312 +++++++++++++++-------------
 src/views/wpm_bx/mlog_detail.vue    |  12 ++
 src/views/wpm_bx/monitor_detail.vue |   2 +-
 3 files changed, 178 insertions(+), 148 deletions(-)

diff --git a/src/views/home/chatTest.vue b/src/views/home/chatTest.vue
index f5441472..6ad5001b 100644
--- a/src/views/home/chatTest.vue
+++ b/src/views/home/chatTest.vue
@@ -1,21 +1,17 @@
 <template>
-	<div style="padding:0;width: 99%;height: 99%;border-radius: 0.375rem;margin: 0.5vh auto 0;box-shadow: 0 4px 6px -1px rgba(0, 0, 0 ,.1), 0 2px 4px -2px rgba(0, 0, 0 ,.1);">
-		<div style="width: 100%;height: 100%;position: relative;    background: #fff;border-radius: 6px;">
-			<div style=" max-width: 260px;width: 260px;border-right: 1px solid rgb(229, 231, 235);box-sizing: border-box;height: 100%;position: absolute;left: 0;top: 0;">
-				<main style="display: flex;flex-direction: column;min-height: 0;flex:1 1 0%">
-					<el-button type="line"  style="margin: 1rem;">新建聊天</el-button>
-					<div style="padding-bottom: 1rem;overflow: hidden;flex: 1 1 0%;min-height: 0px;">
-						<div style="overflow: hidden; position: relative;z-index: auto;height: 100%;width: 100%;padding: 0 1rem;"></div>
+	<div class="pageCantainer">
+		<div class="pageContent">
+			<div class="chatSide">
+				<div class="sideContent">
+					<div plain="true" class="addBtn">新建聊天</div>
+					<div class="chatList">
+						<div class="listItem" v-for="item in listData" :key="item.id">
+							<div>{{ item.title }}</div>
+						</div>
 					</div>
-				</main>
-				<footer style="padding: 1rem;border-top: 1px solid rgb(229, 231, 235);">
-					<div style="align-items: center;display: flex;">
-						<img style="width: 2.5rem;height: 2.5rem;border-radius: 50%;flex-shrink: 0;" src="img/icon_nbyg.png" alt="">
-						<div style="font-weight: 700;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;flex: 1 1 0%;min-width: 0px;margin-left: 0.5rem;"> {{ userName }}</div>
-					</div>
-				</footer>
+				</div>
 			</div>
-			<div style="padding-left: 260px;height: 100%;box-sizing: border-box;position: relative;z-index: auto;">
+			<div class="mainChat" style="">
 				<el-container>
 					<el-main>
 						<div>
@@ -42,67 +38,17 @@
 				</el-container>
 			</div>
 		</div>
-		
-		<!-- <el-container>
-			<el-side style=" max-width: 260px;width: 260px;border-right: 1px solid #ddd;box-sizing: border-box;">
-				<div class="common-layout">
-					<el-container>
-					<el-header style="padding:0 6px 0 0;"></el-header>
-					<el-main style="padding:0 6px 0 0;">
-						<div style="display: flex;flex-direction: column;height: 100%;">
-							<el-button type="line"  style="margin: 1rem;">新建聊天</el-button>
-							<div class="chat_list">
-								<div class="chat_list_item" v-for="(item,index) in 10" :key="index">
-									<div class="chat_list_item_icon" style="border:1px solid rgb(75, 158, 95);border-radius:20% 20% 0 20%;color:rgb(75,158,95);">...</div>
-									<div class="chat_list_item_text" style="flex:8;color:rgb(75,158,95);">前端有哪些性能优化？</div>
-								</div>
-							</div>
-						</div>
-					</el-main>
-					<el-footer>
-						<div style="align-items: center;display: flex;">
-							<img style="width: 2.5rem;height: 2.5rem;border-radius: 50%;margin-right: 1rem;" src="img/icon_nbyg.png" alt="">
-							<div style="font-weight: 700;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;"> {{ userName }}</div>
-						</div>
-					</el-footer>
-				</el-container>
-				</div>
-			</el-side>
-			<el-main>
-				<el-container>
-					<el-main>
-						<div class="right_layout_son">
-							<div class="right_layout_myselfChat">
-								<div id="datatime" style="flex:2;font-size:13px;color:lightgray"></div>
-								<div style="flex:1">
-									<div class="user_icons" style="width:40px;height:40px;"></div>
-								</div>
-							</div>
-							<div class="myself_chat">
-								前端有哪些性能优化？
-							</div>
-							
-						</div>
-					</el-main>
-					<el-footer>
-						<div class="right_layout_son_ipt">
-							<input class="ipt" type="text" placeholder="来说点什么吧...">
-							<button class="btn">发送</button>
-						</div>
-					</el-footer>
-				</el-container>
-			</el-main>
-		</el-container> -->
 	</div>
 </template>
 <script>
-// import xSelects from "@/components/xtSelect/index2.vue";
 export default {
 	name: "testx",
 	components: {},
 	data() {
 		return {
 			userName: "",
+			listData:[{id:1,title:'第一次聊天'}],
+			chatData: [{chat_text:'前端有哪些性能优化？',chat_time:'2022-08-18 10:00:00',chat_type:'myself'}],
 		};
 	},
 	mounted() {
@@ -115,88 +61,160 @@ export default {
 };
 </script>
 <style scoped>
+.pageCantainer{
+	padding:0;
+	width: 99%;
+	height: 99%;
+	border-radius: 0.375rem;
+	margin: 0.5vh auto 0;
+	box-shadow: 0 4px 6px -1px rgba(0, 0, 0 ,.1), 0 2px 4px -2px rgba(0, 0, 0 ,.1);
+}
+.pageContent{
+	width: 100%;
+	height: 100%;
+	position: relative;
+	background: #fff;
+	border-radius: 6px;
+}
+.chatSide{
+	max-width: 260px;
+	width: 260px;
+	border-right: 1px solid rgb(229, 231, 235);
+	box-sizing: border-box;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 10;
+}
+.sideContent{
+	display: flex;
+	flex-direction: column;
+	min-height: 0;
+	flex:1 1 0%;
+}
+.addBtn{
+	margin: 1rem;
+    border: 1px dotted #dddddd;
+    height: 35px;
+    line-height: 35px;
+    text-align: center;
+	cursor: pointer;
+}
+.addBtn:hover{
+	color: #18a058;
+	border: 1px dotted #18a058;
+}
+.chatList{
+	padding: 1rem;
+	overflow: hidden;
+	flex: 1 1 0%;
+	min-height: 0px;
+	box-sizing: border-box;
+}
+.listItem{
+	overflow: hidden; 
+	position: relative;
+	z-index: auto;
+	height: 45px;
+	line-height: 45px;
+	
+	width: 100%;
+	display :flex;
+	padding: 0 1rem;
+	border-radius: 6px;
+	box-sizing: border-box;
+	color :rgb(51, 54, 57);
+	border :1px solid rgb(229, 231, 235);
+}
+.listItem.active{
+	background-color :rgb(245, 245, 245)
+}
+.mainChat{
+	padding-left: 260px;height: 100%;box-sizing: border-box;position: relative;z-index: auto;
+}
 
-			.right_layout {
-				flex: 6;
-			}
+	.right_layout {
+		flex: 6;
+	}
 
-			.icons {
-				background-color: white;
-				z-index: 99;
-				position: absolute;
-				font-size: 20px;
-				border-radius: 50%;
-				border: 1px solid lightgray;
-				padding: 0px 5px;
-				box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
-				color: gray;
-			}
+	.icons {
+		background-color: white;
+		z-index: 99;
+		position: absolute;
+		font-size: 20px;
+		border-radius: 50%;
+		border: 1px solid lightgray;
+		padding: 0px 5px;
+		box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
+		color: gray;
+	}
 
-			.icons_display {
-				top: 48vh;
-				right: -15px;
-			}
+	.icons_display {
+		top: 48vh;
+		right: -15px;
+	}
 
-			.icons_hideen {
-				top: 48vh;
-				left: 10px;
-				display: none;
-			}
-			.new_chat_text {
-				border: 1px solid #4b9e5f;
-				display: flex;
-			}
+	.icons_hideen {
+		top: 48vh;
+		left: 10px;
+		display: none;
+	}
+	.new_chat_text {
+		border: 1px solid #4b9e5f;
+		display: flex;
+	}
 
-			.user_icons {
-				width: 50px;
-				height: 50px;
-				background: linear-gradient(-135deg, #0000cc, #009dff);
-				border: 1px solid lightblue;
-				border-radius: 50%;
-			}
-		
-			.right_layout_flex{
-				display:flex;
-				justify-content: center;
-				align-items: center;
-			}
-			.right_layout_son{
-				margin:0 auto 0 auto;
-				width:100vh;
-				height:98vh;
-				/* border:1px solid gray; */
-				position: relative;
-			}
-			.right_layout_son_ipt{
-				position: absolute;
-				bottom:0;
-			}
-			.btn{
-				border:none;
-				padding:10px 15px;
-				background-color: #18a058;
-				border-radius: 1px;
-				color:white;
-			}
-			.search_input{
-				width: 100%;
-				padding:0.5rem 1rem;
-				/* border:1px solid lightgray; */
-			}
-			.right_layout_myselfChat{
-				width:200px;
-				position: absolute;
-				top:5px;
-				right:0;
-				display:flex;
-			}
-			.myself_chat{
-				position: absolute;
-				top:30px;
-				right:80px;
-				padding:10px 20px;
-				border-radius: 10px;
-				background-color: #7ae1b6;
-				opacity: 0.8;
-			}
-			</style>
\ No newline at end of file
+	.user_icons {
+		width: 50px;
+		height: 50px;
+		background: linear-gradient(-135deg, #0000cc, #009dff);
+		border: 1px solid lightblue;
+		border-radius: 50%;
+	}
+
+	.right_layout_flex{
+		display:flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.right_layout_son{
+		margin:0 auto 0 auto;
+		width:100vh;
+		height:98vh;
+		/* border:1px solid gray; */
+		position: relative;
+	}
+	.right_layout_son_ipt{
+		position: absolute;
+		bottom:0;
+	}
+	.btn{
+		border:none;
+		padding:10px 15px;
+		background-color: #18a058;
+		border-radius: 1px;
+		color:white;
+	}
+	.search_input{
+		width: 100%;
+		padding:0.5rem 1rem;
+		/* border:1px solid lightgray; */
+	}
+	.right_layout_myselfChat{
+		width:200px;
+		position: absolute;
+		top:5px;
+		right:0;
+		display:flex;
+	}
+	.myself_chat{
+		position: absolute;
+		top:30px;
+		right:80px;
+		padding:10px 20px;
+		border-radius: 10px;
+		background-color: #7ae1b6;
+		opacity: 0.8;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index d8a53e22..cb88e5b0 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -211,6 +211,7 @@
 					@click="table_add"
 					style="position: absolute; left: 100px; top: 5px"
 				>新增</el-button>
+				<span class="warningText" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'">注：请扫码录入单个棒！一个棒对应一个日志，方便于采集数据对应</span>
 				<scTable
 					ref="tableIn"
 					:apiObj="apiObj"
@@ -556,6 +557,7 @@ export default {
 			handle_date:'',
 			handle_user:'',
 			wm:'',
+			route_code:'',
 			materialOut:'',
 			batchContains:'',
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
@@ -575,6 +577,7 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		this.route_code = this.$route.path.split("/")[2];
 		this.paramsIn.mlog = this.mlogId;
 		this.paramsOut.mlog = this.mlogId;
 		this.apiObj = this.$API.wpm.mlogb.list;
@@ -850,4 +853,13 @@ export default {
 	background: rgb(255,255,255);
 	z-index: 999;
 }
+.warningText{
+	position: absolute; 
+	left: 200px; 
+	top: 5px;
+	font-size: 16px; 
+	line-height:35px;
+	color: red;
+	font-weight: 600;
+}
 </style>
diff --git a/src/views/wpm_bx/monitor_detail.vue b/src/views/wpm_bx/monitor_detail.vue
index c28445c6..d5c32236 100644
--- a/src/views/wpm_bx/monitor_detail.vue
+++ b/src/views/wpm_bx/monitor_detail.vue
@@ -16,7 +16,7 @@
 						row-key="id"
 						stripe
 						:height="tableHeight"
-						:params="{'mpoint':item.id, 'timex_gte':startTime, 'timex_lte':endTime}"   
+						:params="{'mpoint':item.id, 'timex__gte':startTime, 'timex__lte':endTime}"   
 						hideDo                                            
 					>
 						<el-table-column label="时间" prop="timex">