From f4354c5a98c6a3bdb4f355b107e2421848f1426b Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 13 十一月 2024 17:31:52 +0800
Subject: [PATCH] Merge branches 'test' and 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test

---
 src/views/project/yw/systemManage/chatLog/ChatLog.vue |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/views/project/yw/systemManage/chatLog/ChatLog.vue b/src/views/project/yw/systemManage/chatLog/ChatLog.vue
index f686efb..971a131 100644
--- a/src/views/project/yw/systemManage/chatLog/ChatLog.vue
+++ b/src/views/project/yw/systemManage/chatLog/ChatLog.vue
@@ -27,6 +27,19 @@
 						@input="debounceQueryTable"
 					/>
 				</el-form-item>
+
+				<el-form-item label="缁撴灉" prop="state">
+					<el-select
+						
+						v-model="queryParams.state"
+						style="width: 226.4px"
+						placeholder="缁撴灉"
+						clearable
+						@change="handleQueryTable"
+					>
+						<el-option v-for="item in resultList" :key="item" :value="item" :label="item"></el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="鎿嶄綔浜哄憳" prop="user">
 					<el-input v-model="queryParams.user" style="width: 226.4px" placeholder="鎿嶄綔浜哄憳" clearable @input="debounceQueryTable" />
 				</el-form-item>
@@ -47,7 +60,13 @@
 					<el-table-column prop="time" label="鏃堕棿" width="185" show-overflow-tooltip> </el-table-column>
 					<el-table-column label="涓氬姟鍦烘櫙" width="120" prop="group_type" show-overflow-tooltip> </el-table-column>
 					<el-table-column label="闂鍐呭" prop="question" show-overflow-tooltip> </el-table-column>
-					<el-table-column label="缁撴灉" width="80" prop="state" show-overflow-tooltip> </el-table-column>
+					<el-table-column label="缁撴灉" width="80" prop="state" show-overflow-tooltip>
+						<template #default="scope">
+							<span :class="{ 'text-red-500': scope.row.state === 'NG', 'font-bold': scope.row.state === 'NG' }">
+								{{ scope.row.state }}
+							</span>
+						</template>
+					</el-table-column>
 					<el-table-column width="120" label="鑺辫垂鏃堕棿(绉�)" prop="run_ms" show-overflow-tooltip> </el-table-column>
 					<el-table-column label="鎿嶄綔" width="180" fixed="right" show-overflow-tooltip>
 						<template #default="scope">
@@ -95,8 +114,10 @@
 	group_type: [],
 	user: '',
 	question: '',
+	state: '',
 });
 
+const resultList = ['OK', 'NG'];
 // groupType 鍒楄〃
 const groupTypeList = computed(() => Array.from(new Set(sceneGroupList.value.map((item) => item.group_type))));
 const sceneGroupList = ref([]);
@@ -115,6 +136,7 @@
 		group_type: queryParams.value.group_type.join(','),
 		user: queryParams.value.user,
 		question: queryParams.value.question,
+		state:queryParams.value.state
 	});
 
 	tableData.value = (res?.values ?? []).map((item) => {

--
Gitblit v1.9.3