From ffb70953058feb9020d618516016c256149c77b0 Mon Sep 17 00:00:00 2001
From: waibao2 <1@qq.com>
Date: Thu, 30 Oct 2025 14:32:26 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=95=B4=E7=BC=96=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/syslog/alarm/index.vue     |  3 +-
 src/views/syslog/updatelog/index.vue | 10 ++--
 src/views/syslog/zbmessage/index.vue | 78 +++++++++++++++++-----------
 3 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/src/views/syslog/alarm/index.vue b/src/views/syslog/alarm/index.vue
index 0c645ba..f30c936 100644
--- a/src/views/syslog/alarm/index.vue
+++ b/src/views/syslog/alarm/index.vue
@@ -5,7 +5,8 @@
 				<el-form-item label="站点" prop="stnmId">
 					<el-select clearable filterable v-model="queryParams.stnmId" placeholder="请选择站点" @change="dataChange">
 						<el-option v-for="dict in stationList" :key="dict.stnmId" :label="dict.stnm" :value="dict.stnmId"></el-option>
-					</el-select> </el-form-item>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="测站类型" prop="sTypename">
 					<el-select v-model="queryParams.pType" placeholder="请选择测站类型" clearable @change="dataChange">
 						<el-option v-for="dict in mainTypes" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
diff --git a/src/views/syslog/updatelog/index.vue b/src/views/syslog/updatelog/index.vue
index 0ad527a..a637077 100644
--- a/src/views/syslog/updatelog/index.vue
+++ b/src/views/syslog/updatelog/index.vue
@@ -26,7 +26,7 @@
 		</el-card>
 		<div class="el-card-p card-shadow carder-border mt10 pad10 ">
 			<el-table class="table-box" v-table-height v-loading="loading" :data="dataList" border>
-				<el-table-column type="index" width="50" :align="alignment" label="序号" />
+				<el-table-column type="index" width="60" :align="alignment" label="序号" />
 				<el-table-column label="站点名称" :align="alignment" prop="stnm" />
 				<el-table-column label="时间" :align="alignment">
 					<template #default="scope">
@@ -55,9 +55,13 @@
 			</el-table>
 			<pagination v-show="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.limit" @pagination="getList" />
 		</div>
-		<el-dialog class="custom-dialog" :title="title" v-model="open" width="500px" append-to-body>
+		<el-dialog class="custom-dialog" :title="title" v-model="open" width="700px" append-to-body>
 			<el-table v-loading="dialogLoading" :data="detailList" height="500">
-				<el-table-column prop="tm" label="操作时间" :align="alignment" width="180"> </el-table-column>
+				<el-table-column  label="操作时间" :align="alignment" width="180"> 
+					<template #default="scope">
+						<span>{{ parseTime(scope.row.tm) }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="当前值" :align="alignment" prop="value"> </el-table-column>
 				<el-table-column label="历史值" :align="alignment" prop="exValue" />
 			</el-table>
diff --git a/src/views/syslog/zbmessage/index.vue b/src/views/syslog/zbmessage/index.vue
index c408dd1..aab13ac 100644
--- a/src/views/syslog/zbmessage/index.vue
+++ b/src/views/syslog/zbmessage/index.vue
@@ -1,31 +1,29 @@
 <template>
 	<div class="app-container app-container-bg">
 		<el-card class="first-card" ref='firstCard' shadow="always">
-			<el-form :model="queryParams" ref="queryForm" :inline="true"  @submit.native.prevent>
-				<!-- <el-form-item label="站点" prop="stnmId">
-                    <singleStationSelect ref="station" type="ALL" @submitForm="getList" />
-                </el-form-item> -->
+			<el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
+				<el-form-item label="站点" prop="stnmId">
+					<el-select clearable filterable v-model="queryParams.stnmId" placeholder="请选择站点" @change="dataChange">
+						<el-option v-for="dict in stationList" :key="dict.stnmId" :label="dict.stnm" :value="dict.stnmId"></el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="归属地区" prop="code">
-					<el-select class="menu-panel-select-item" v-model="queryParams.code" filterable placeholder="请选择"
-						style="width: 200px" :popper-append-to-body="false">
-						<el-option v-for="item in stcdAreaOption" :label="item.fullName" :value="item.code"
-							:key="item.code"></el-option>
+					<el-select class="menu-panel-select-item" v-model="queryParams.code" filterable placeholder="请选择" style="width: 200px" :popper-append-to-body="false">
+						<el-option v-for="item in stcdAreaOption" :label="item.fullName" :value="item.code" :key="item.code"></el-option>
 					</el-select>
 				</el-form-item>
 
 				<el-form-item label="开始时间">
-					<el-date-picker v-model="queryParams.startTime" type="datetime" placeholder="选择开始时间"
-						value-format="yyyy-MM-dd HH:mm:ss" class="w200">
+					<el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择开始时间" value-format="YYYY-MM-DD" class="w200">
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束时间">
-					<el-date-picker v-model="queryParams.endTime" type="datetime" placeholder="选择结束时间"
-						value-format="yyyy-MM-dd HH:mm:ss" class="w200">
+					<el-date-picker v-model="queryParams.endTime" type="date" placeholder="选择结束时间" value-format="YYYY-MM-DD" class="w200">
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="数据类型" prop="type">
 					<el-select v-model="queryParams.type" placeholder="请选择状态" @change="dataChange">
-						<el-option v-for="item in types" :key="item.value" :label="item.name" :value="item.value">
+						<el-option v-for="item in types" :key="item.value" :label="item.label" :value="item.value">
 						</el-option>
 					</el-select>
 				</el-form-item>
@@ -36,9 +34,8 @@
 			</el-form>
 		</el-card>
 		<div class="el-card-p card-shadow carder-border mt10 pad10 ">
-			<el-table class="table-box" v-table-height v-loading="loading" :data="dataList"
-				@selection-change="handleSelectionChange">
-				<el-table-column width="50" :align="alignment" label="序号" />
+			<el-table class="table-box" v-table-height v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+				<el-table-column type="index" width="60" :align="alignment" label="序号" />
 				<el-table-column label="站点名称" :align="alignment" prop="stnm" />
 				<el-table-column label="时间" :align="alignment" prop="startTime" />
 				<el-table-column label="数据类型" :align="alignment" prop="type"> </el-table-column>
@@ -52,8 +49,7 @@
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination v-show="total > 0" :total="total" v-model:page="queryParams.page"
-				v-model:limit="queryParams.limit" @pagination="getList" />
+			<pagination v-show="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.limit" @pagination="getList" />
 		</div>
 		<el-dialog class="custom-dialog" :title="title" v-model="open" width="500px" append-to-body>
 			<el-table v-loading="loadingDetail" border :data="dataListDetail" height="500">
@@ -68,7 +64,7 @@
 				<el-table-column label="数据类型" :align="alignment" prop="type">
 					<template #default="scope">
 						<div v-for="item in types">
-							<span v-if="item.value === scope.row.type">{{item.name}}</span>
+							<span v-if="item.value === scope.row.type">{{item.label}}</span>
 						</div>
 					</template>
 				</el-table-column>
@@ -81,10 +77,8 @@
 				</el-table-column>
 				<el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width" width="120">
 					<template #default="scope">
-						<el-button  type="text" icon="View"
-							@click="handleShow(scope.row)">详情</el-button>
-						<el-button v-if="scope.row.isDeal !== 'y'"  type="text" icon="Check"
-							@click="handleUpdate(scope.row)">确认</el-button>
+						<el-button type="text" icon="View" @click="handleShow(scope.row)">详情</el-button>
+						<el-button v-if="scope.row.isDeal !== 'y'" type="text" icon="Check" @click="handleUpdate(scope.row)">确认</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -92,6 +86,7 @@
 	</div>
 </template>
 <script setup>
+	import dayjs from 'dayjs'
 	import {
 		ref,
 		reactive,
@@ -101,9 +96,7 @@
 	const {
 		proxy
 	} = getCurrentInstance()
-	const {
-
-	} = proxy.useDict('')
+	// const { } = proxy.useDict('')
 	const alignment = 'center'
 	const showSearch = ref(true)
 	const queryParams = reactive({
@@ -111,9 +104,10 @@
 		limit: 10,
 		stnmId: "",
 		pType: "",
-		startTime: "",
-		endTime: "",
-		isDeal: "",
+		startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD'),
+		endTime: dayjs().format('YYYY-MM-DD'),
+		isDeal: 'n',
+		type: 'yc_pd_rain',
 	})
 	const loading = ref(false)
 	const total = ref(0)
@@ -121,7 +115,7 @@
 	const getList = async () => {
 		loading.value = true;
 		try {
-			const res = await proxy.axiosGet('/abnormal/data/list', queryParams)
+			const res = await proxy.axiosGet('/zb/message/infoList', queryParams)
 			if (res.code == 200) {
 				dataList.value = res.data
 				total.value = res.count
@@ -182,7 +176,7 @@
 	const handleDelete = (row) => {
 		let stnms = row.stnm || names.value
 		const stnmIds = row.id || ids.value;
-		proxy.$modal.confirm('是否确认删除站点名称为"' + stnms + '"的数据项？').then(async function() {
+		proxy.$modal.confirm('是否确认删除站点名称为"' + stnms + '"的数据项？').then(async function () {
 			let res = await proxy.axiosDelete('/basic/warnlevel/' + stnmIds);
 			if (res.code === 200) {
 				proxy.$modal.msgSuccess("删除成功");
@@ -314,4 +308,26 @@
 		getStnmandStnmId()
 		// getDivision()
 	})
+	const types = ref([
+		{
+			value: "yc_pd_rain",
+			label: "雨情"
+		},
+		{
+			value: "yc_pd_rsvr",
+			label: "水库"
+		},
+		{
+			value: "yc_pd_river",
+			label: "河道"
+		},
+		{
+			value: "yc_pd_q_qflow",
+			label: "流量"
+		},
+		{
+			value: "yc_pd_tide",
+			label: "潮位"
+		},
+	])
 </script>
\ No newline at end of file