diff --git a/src/views/syslog/alarm/index.vue b/src/views/syslog/alarm/index.vue
new file mode 100644
index 0000000..292f775
--- /dev/null
+++ b/src/views/syslog/alarm/index.vue
@@ -0,0 +1,284 @@
+<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">
+					<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="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>
+					</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>
+				</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>
+				</el-form-item>
+				<el-form-item label="状态" prop="isDeal">
+					<el-select clearable v-model="queryParams.isDeal" placeholder="请选择状态" @change="dataChange">
+						<el-option v-for="item in isDeals" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
+			<el-row :gutter="10" class="mb8">
+				<el-button type="primary" plain icon="Check" :disabled="multiple" @click="handleConfirm">确认</el-button>
+				<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+			</el-row>
+		</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 type="selection" width="55" :align="alignment" />
+				<el-table-column type="index" width="50" :align="alignment" label="序号" />
+				<el-table-column label="站点名称" :align="alignment" prop="stnm" />
+				<el-table-column label="时间" :align="alignment" prop="tm" width="180">
+					<template #default="{row}">
+						<span>{{ parseTime(row.tm) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="异常内容" width="330" :align="alignment" prop="comment" />
+				<el-table-column label="数值" :align="alignment" prop="value" />
+				<el-table-column label="修正值" :align="alignment" prop="correctionValue" />
+				<el-table-column prop="isDeal" label="状态" width="80">
+					<template #default="scope">
+						<span v-if="scope.row.isDeal == 'n'" class="red">待确认</span>
+						<span v-if="scope.row.isDeal == 'y'" class="green">已确认</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width" width="250">
+					<template #default="scope">
+						<el-button type="text" icon="View" @click="handleShow(scope.row)">查看</el-button>
+						<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+						<el-button v-if="scope.row.isDeal == 'n'" type="text" icon="Check" @click="handleQR(scope.row)">确认</el-button>
+						<el-button type="text" icon="RefreshRight" @click="handleZB(scope.row)">整编</el-button>
+					</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" />
+		</div>
+		<el-dialog class="custom-dialog" :title="title" v-model="open" width="500px" append-to-body>
+			<el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
+				<el-form-item label="修正值" prop="correctionValue">
+					<el-input v-model="form.correctionValue" placeholder="请输入修正值" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button type="primary" @click="submitForm(formRef)" v-loading='btnLoading'>确 定</el-button>
+					<el-button @click="cancel">取 消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<script setup>
+	import ESelectSingle from '@/components/ESelectSingle/index.vue'
+
+	import {
+		ref,
+		reactive,
+		onMounted,
+	} from 'vue'
+	import dayjs from 'dayjs'
+
+	const {
+		proxy
+	} = getCurrentInstance()
+	const {
+		mainTypes
+	} = proxy.useDict('mainTypes')
+	const alignment = 'center'
+	const showSearch = ref(true)
+	const isDeals = [{
+		label: "待确认",
+		value: "n"
+	},
+	{
+		label: "已确认",
+		value: "y"
+	}
+	]
+	const queryParams = reactive({
+		page: 1,
+		limit: 10,
+		stnmId: "",
+		pType: "",
+		startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+		endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+		isDeal: "",
+	})
+	const loading = ref(false)
+	const total = ref(0)
+	const dataList = ref([])
+	const getList = async () => {
+		loading.value = true;
+		try {
+			const res = await proxy.axiosGet('/abnormal/data/list', queryParams)
+			if (res.code == 0) {
+				dataList.value = res.data
+				total.value = res.count
+			}
+			loading.value = false
+		} catch (error) {
+			loading.value = false
+		}
+	}
+	/** 搜索按钮操作 */
+	const handleQuery = () => {
+		queryParams.pageNum = 1
+		getList()
+	}
+	const resetQuery = () => {
+		proxy.resetForm("queryForm");
+		handleQuery();
+	}
+
+	// 多选框选中数据
+	let ids = ref([])
+	let names = ref([])
+	let single = ref(true)
+	let multiple = ref(true)
+	const handleSelectionChange = (selection) => {
+		ids.value = selection.map(item => item.id)
+		console.log(ids.value, '===')
+		names.value = selection.map(item => item.stnm)
+		single.value = selection.length !== 1
+		multiple.value = !selection.length
+	}
+	/** 新增按钮操作 */
+	const open = ref(false)
+	const title = ref("")
+	const handleAdd = () => {
+		reset();
+		open.value = true;
+		title.value = "添加警戒水位信息";
+	}
+	/** 修改按钮操作 */
+	const form = reactive({})
+	const rules = reactive({
+		correctionValue: [{
+			required: true,
+			message: '请输入修正值',
+			trigger: 'blur'
+		},]
+	})
+	const handleUpdate = async (row) => {
+		reset();
+		open.value = true;
+		title.value = "修改数据异常值";
+		form.stnmId = row.stnmId
+		form.tm = row.tm
+
+	}
+	/** 整编按钮操作 */
+	const handleZB = (row) => {
+		let stnms = row.stnm
+		const stnmIds = row.stnmId;
+		proxy.$modal.confirm('是否确认整编站点名称为"' + stnms + '"的数据项？').then(async function () {
+			let res = await proxy.axiosPost('/abnormal/data/zhengbian', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("整编成功");
+				getList();
+			}
+		})
+	}
+	/** 导出按钮操作 */
+	const handleExport = async () => {
+		var p = {
+			pageNum: 1,
+			pageSize: 9999,
+			stnm: queryParams.stnm
+		}
+		var res = await proxy.axiosGet('/basic/warnlevel/list', p);
+		if (res.code === 200) {
+			var table = [];
+			table.push({
+				A: "站点编码",
+				B: "站点名称",
+				C: "开始日期",
+				D: "结束日期",
+				E: "警戒水位值"
+			});
+			res.rows.forEach(d => {
+				var row = {
+					A: d.staid,
+					B: d.stnm,
+					C: d.startTime,
+					D: d.endTime,
+					E: d.value
+				};
+				table.push(row);
+			});
+			var header = ["A", "B", "C", "D", "E"];
+			var fileName = "警戒水位列表";
+			proxy.exportExcel(header, table, fileName);
+		}
+	}
+	/*************************************************************  弹窗  ***************************************/
+	let formRef = ref(null)
+	let biaoshi = ref(
+		[{
+			flag: '水库水位',
+			value: '1'
+		}, {
+			flag: '河道水位',
+			value: '2'
+		}]
+	)
+	const stationList = ref([])
+	const getStnmandStnmId = async () => {
+		let res = await proxy.axiosGet('/basic/warnlevel/queryStnmandStnmId');
+		if (res.code === 200) {
+			stationList.value = res.data
+		}
+	}
+	// 取消按钮
+	const cancel = () => {
+		open.value = false;
+		reset();
+	}
+	const reset = () => {
+		Object.assign(form, {
+			correctionValue: null,
+		});
+		proxy.resetForm("formRef");
+	}
+	/** 提交按钮 */
+	const submitForm = async (formEl) => {
+		if (!formEl) return
+		await formEl.validate((valid, fields) => {
+			if (valid) {
+				editMethod();
+			}
+		})
+	}
+	const btnLoading = ref(false)
+	// 数据异常监控修改方法
+	const editMethod = async () => {
+		btnLoading.value = true
+		try {
+			let res = await proxy.axiosPut('/abnormal/data/edit', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("修改成功");
+				open.value = false;
+				getList();
+				btnLoading.value = false
+			}
+		} catch (error) {
+			btnLoading.value = false
+		}
+	}
+	onMounted(() => {
+		getList()
+		getStnmandStnmId()
+	})
+</script>
\ No newline at end of file
diff --git a/src/views/syslog/updatelog/index.vue b/src/views/syslog/updatelog/index.vue
new file mode 100644
index 0000000..0ad527a
--- /dev/null
+++ b/src/views/syslog/updatelog/index.vue
@@ -0,0 +1,287 @@
+<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="stnm">
+					<el-input v-model="queryParams.stnm" placeholder="请输入站点名称" clearable filterable @keyup.enter.native="handleQuery" />
+				</el-form-item>
+				<el-form-item label="开始时间" prop="startTime">
+					<el-date-picker v-model="queryParams.startTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss" class="w200">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="结束时间" prop="endTime">
+					<el-date-picker v-model="queryParams.endTime" type="datetime" placeholder="选择结束时间" value-format="yyyy-MM-dd HH:mm:ss" class="w200">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="是否删除" prop="isDeleted">
+					<el-select v-model="queryParams.isDeleted" placeholder="请选择" @change="dataChange">
+						<el-option v-for="dict in isDeleteds" :key="dict.value" :label="dict.label" :value="dict.value" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</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" border>
+				<el-table-column type="index" width="50" :align="alignment" label="序号" />
+				<el-table-column label="站点名称" :align="alignment" prop="stnm" />
+				<el-table-column label="时间" :align="alignment">
+					<template #default="scope">
+						<span>{{ parseTime(scope.row.tm) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="数据类型" :align="alignment" prop="dataType" />
+				<el-table-column label="分类" :align="alignment" prop="type">
+					<template #default="{row}">
+						<div>{{row.type===0?'预处理':'摘录'}}</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="状态" :align="alignment" prop="isDeleted">
+					<template #default="scope">
+						<span v-if="scope.row.status == '0'" class="red">可恢复</span>
+						<span v-if="scope.row.status == '1'" class="green">已恢复</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width">
+					<template #default="scope">
+						<el-button type="text" icon="View" @click="handleShow(scope.row)">查看</el-button>
+						<el-button type="text" icon="RefreshRight" @click="handleUpdate(scope.row)">恢复</el-button>
+						<el-button text type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+					</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" />
+		</div>
+		<el-dialog class="custom-dialog" :title="title" v-model="open" width="500px" 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" prop="value"> </el-table-column>
+				<el-table-column label="历史值" :align="alignment" prop="exValue" />
+			</el-table>
+		</el-dialog>
+	</div>
+</template>
+<script setup>
+	import {
+		ref,
+		reactive,
+		onMounted,
+	} from 'vue'
+	import dayjs from 'dayjs'
+	const {
+		proxy
+	} = getCurrentInstance()
+	const {
+		mainTypes
+	} = proxy.useDict('mainTypes')
+	const alignment = 'center'
+	const showSearch = ref(true)
+	const queryParams = reactive({
+		page: 1,
+		limit: 10,
+		stnm: "",
+		startTime: '',
+		endTime: '',
+		isDeleted: "n",
+	})
+	const loading = ref(false)
+	const total = ref(0)
+	const dataList = ref([])
+	const getList = async () => {
+		loading.value = true;
+		try {
+			const res = await proxy.axiosGet('/yczbupdatelog/list', queryParams)
+			if (res.code == 0) {
+				dataList.value = res.data
+				total.value = res.count
+			}
+			loading.value = false
+		} catch (error) {
+			loading.value = false
+		}
+	}
+	/** 搜索按钮操作 */
+	const handleQuery = () => {
+		queryParams.pageNum = 1
+		getList()
+	}
+	const resetQuery = () => {
+		proxy.resetForm("queryForm");
+		handleQuery();
+	}
+
+
+	const open = ref(false)
+	const title = ref("")
+	const detailList = ref([])
+	const dialogLoading = ref(false)
+	// 查看按钮操作
+	const handleShow = async (row) => {
+		let id = row.id
+		dialogLoading.value = true;
+		try {
+			let res = await proxy.axiosGet('/yczbupdatelog/detail/' + id);
+			if (res.code === 0) {
+				open.value = true;
+				title.value = row.stnm + '详情';
+				detailList.value = res.data;
+				dialogLoading.value = false;
+			}
+		} catch (error) {
+			dialogLoading.value = false;
+		}
+	}
+
+	/** 修改按钮操作 */
+	const form = reactive({})
+	const rules = reactive({})
+	const handleUpdate = async (row) => {
+		let stnms = row.stnm
+		const stnmIds = row.id
+		proxy.$modal.confirm('是否确认恢复站点名称为"' + stnms + '"的数据项？').then(async function () {
+			let res = await proxy.axiosDelete('/yczbupdatelog/recovery/' + stnmIds);
+			if (res.code === 0) {
+				proxy.$modal.msgSuccess("恢复成功");
+				getList();
+			}
+		})
+	}
+	/** 删除按钮操作 */
+	const handleDelete = (row) => {
+		let stnms = row.stnm
+		const stnmIds = row.id
+		proxy.$modal.confirm('此操作将永久删除数据,是否确认删除站点名称为"' + stnms + '"的数据项？').then(async function () {
+			let res = await proxy.axiosDelete('/yczbupdatelog/remove/' + stnmIds);
+			if (res.code === 0) {
+				proxy.$modal.msgSuccess("删除成功");
+				getList();
+			}
+		})
+	}
+	/** 导出按钮操作 */
+	const handleExport = async () => {
+		var p = {
+			pageNum: 1,
+			pageSize: 9999,
+			stnm: queryParams.stnm
+		}
+		var res = await proxy.axiosGet('/basic/warnlevel/list', p);
+		if (res.code === 200) {
+			var table = [];
+			table.push({
+				A: "站点编码",
+				B: "站点名称",
+				C: "开始日期",
+				D: "结束日期",
+				E: "警戒水位值"
+			});
+			res.rows.forEach(d => {
+				var row = {
+					A: d.staid,
+					B: d.stnm,
+					C: d.startTime,
+					D: d.endTime,
+					E: d.value
+				};
+				table.push(row);
+			});
+			var header = ["A", "B", "C", "D", "E"];
+			var fileName = "警戒水位列表";
+			proxy.exportExcel(header, table, fileName);
+		}
+	}
+	/*************************************************************  弹窗  ***************************************/
+	let formRef = ref(null)
+	let biaoshi = ref(
+		[{
+			flag: '水库水位',
+			value: '1'
+		}, {
+			flag: '河道水位',
+			value: '2'
+		}]
+	)
+	const stationList = ref([])
+	const getStnmandStnmId = async () => {
+		let res = await proxy.axiosGet('/basic/warnlevel/queryStnmandStnmId');
+		if (res.code === 200) {
+			stationList.value = res.data
+		}
+	}
+	// 取消按钮
+	const cancel = () => {
+		open.value = false;
+		reset();
+	}
+	const reset = () => {
+		Object.assign(form, {
+			tm: null,
+			stnmId: null,
+			correctionValue: null,
+		});
+		proxy.resetForm("formRef");
+	}
+	/** 提交按钮 */
+	const submitForm = async (formEl) => {
+		if (!formEl) return
+		await formEl.validate((valid, fields) => {
+			if (valid) {
+				if (form.id != null) {
+					editMethod();
+				} else {
+					addMethod();
+				}
+			}
+		})
+	}
+	const btnLoading = ref(false)
+	// 警戒水位新增方法
+	const addMethod = async () => {
+		btnLoading.value = true
+		try {
+			let res = await proxy.axiosPost('/basic/warnlevel', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("新增成功");
+				open.value = false;
+				getList();
+				btnLoading.value = false
+			}
+		} catch (error) {
+			btnLoading.value = false
+		}
+	}
+	// 警戒水位修改方法
+	const editMethod = async () => {
+		btnLoading.value = true
+		try {
+			let res = await proxy.axiosPut('/basic/warnlevel', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("修改成功");
+				open.value = false;
+				getList();
+				btnLoading.value = false
+			}
+		} catch (error) {
+			btnLoading.value = false
+		}
+	}
+	onMounted(() => {
+		getList()
+		getStnmandStnmId()
+	})
+	const isDeleteds = ref(
+		[
+			{
+				value: "n",
+				label: "未删除"
+			},
+			{
+				value: "y",
+				label: "已删除"
+			}
+		]
+	)
+</script>
\ No newline at end of file
diff --git a/src/views/syslog/zbmessage/index.vue b/src/views/syslog/zbmessage/index.vue
new file mode 100644
index 0000000..c408dd1
--- /dev/null
+++ b/src/views/syslog/zbmessage/index.vue
@@ -0,0 +1,317 @@
+<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-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>
+				</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>
+				</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>
+				</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>
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</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-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>
+				<el-table-column label="未处理" :align="alignment" prop="dealValue" />
+				<el-table-column label="已处理" :align="alignment" prop="unDealValue" />
+				<el-table-column label="数据插补" :align="alignment" prop="errOneValue" />
+				<el-table-column label="副站数据填充" :align="alignment" prop="errTwoValue" />
+				<el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width">
+					<template #default="scope">
+						<el-button type="text" icon="View" @click="handleShow(scope.row)">详情</el-button>
+					</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" />
+		</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">
+				<el-table-column min-width="50" :align="alignment" label="序号"> </el-table-column>
+				<el-table-column label="站点名称" :align="alignment" prop="stnm" />
+				<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="整编信息" width="200" :align="alignment" prop="comment" />
+				<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>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="数值" :align="alignment" prop="value" />
+				<el-table-column label="状态" :align="alignment" prop="isDeal">
+					<template #default="scope">
+						<span v-if="scope.row.isDeal != 'y'" class="red">待确认</span>
+						<span v-if="scope.row.isDeal == 'y'" class="green">已确认</span>
+					</template>
+				</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>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-dialog>
+	</div>
+</template>
+<script setup>
+	import {
+		ref,
+		reactive,
+		onMounted,
+	} from 'vue'
+
+	const {
+		proxy
+	} = getCurrentInstance()
+	const {
+
+	} = proxy.useDict('')
+	const alignment = 'center'
+	const showSearch = ref(true)
+	const queryParams = reactive({
+		page: 1,
+		limit: 10,
+		stnmId: "",
+		pType: "",
+		startTime: "",
+		endTime: "",
+		isDeal: "",
+	})
+	const loading = ref(false)
+	const total = ref(0)
+	const dataList = ref([])
+	const getList = async () => {
+		loading.value = true;
+		try {
+			const res = await proxy.axiosGet('/abnormal/data/list', queryParams)
+			if (res.code == 200) {
+				dataList.value = res.data
+				total.value = res.count
+			}
+			loading.value = false
+		} catch (error) {
+			loading.value = false
+		}
+	}
+	/** 搜索按钮操作 */
+	const handleQuery = () => {
+		queryParams.pageNum = 1
+		getList()
+	}
+	const resetQuery = () => {
+		proxy.resetForm("queryForm");
+		handleQuery();
+	}
+
+	// 多选框选中数据
+	let ids = ref([])
+	let names = ref([])
+	let single = ref(true)
+	let multiple = ref(true)
+	const handleSelectionChange = (selection) => {
+		ids.value = selection.map(item => item.id)
+		console.log(ids.value, '===')
+		names.value = selection.map(item => item.stnm)
+		single.value = selection.length !== 1
+		multiple.value = !selection.length
+	}
+	/** 新增按钮操作 */
+	const open = ref(false)
+	const title = ref("")
+	const handleAdd = () => {
+		reset();
+		open.value = true;
+		title.value = "添加警戒水位信息";
+	}
+	/** 修改按钮操作 */
+	const form = reactive({})
+	const rules = reactive({})
+	const handleUpdate = async (row) => {
+		reset();
+		let id = row.id || ids.value
+		try {
+			let res = await proxy.axiosGet('/basic/warnlevel/' + id);
+			if (res.code === 200) {
+				Object.assign(form, res.data);
+				open.value = true;
+				title.value = "修改警戒水位信息";
+			}
+		} catch (error) {
+			console.log(error)
+		}
+	}
+	/** 删除按钮操作 */
+	const handleDelete = (row) => {
+		let stnms = row.stnm || names.value
+		const stnmIds = row.id || ids.value;
+		proxy.$modal.confirm('是否确认删除站点名称为"' + stnms + '"的数据项？').then(async function() {
+			let res = await proxy.axiosDelete('/basic/warnlevel/' + stnmIds);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("删除成功");
+				getList();
+			}
+		})
+	}
+	/** 导出按钮操作 */
+	const handleExport = async () => {
+		var p = {
+			pageNum: 1,
+			pageSize: 9999,
+			stnm: queryParams.stnm
+		}
+		var res = await proxy.axiosGet('/basic/warnlevel/list', p);
+		if (res.code === 200) {
+			var table = [];
+			table.push({
+				A: "站点编码",
+				B: "站点名称",
+				C: "开始日期",
+				D: "结束日期",
+				E: "警戒水位值"
+			});
+			res.rows.forEach(d => {
+				var row = {
+					A: d.staid,
+					B: d.stnm,
+					C: d.startTime,
+					D: d.endTime,
+					E: d.value
+				};
+				table.push(row);
+			});
+			var header = ["A", "B", "C", "D", "E"];
+			var fileName = "警戒水位列表";
+			proxy.exportExcel(header, table, fileName);
+		}
+	}
+	/*************************************************************  弹窗  ***************************************/
+	let formRef = ref(null)
+	let biaoshi = ref(
+		[{
+			flag: '水库水位',
+			value: '1'
+		}, {
+			flag: '河道水位',
+			value: '2'
+		}]
+	)
+	const stationList = ref([])
+	const getStnmandStnmId = async () => {
+		let res = await proxy.axiosGet('/basic/warnlevel/queryStnmandStnmId');
+		if (res.code === 200) {
+			stationList.value = res.data
+		}
+	}
+	// 取消按钮
+	const cancel = () => {
+		open.value = false;
+		reset();
+	}
+	const reset = () => {
+		Object.assign(form, {
+			tm: null,
+			stnmId: null,
+			correctionValue: null,
+		});
+		proxy.resetForm("formRef");
+	}
+	/** 提交按钮 */
+	const submitForm = async (formEl) => {
+		if (!formEl) return
+		await formEl.validate((valid, fields) => {
+			if (valid) {
+				if (form.id != null) {
+					editMethod();
+				} else {
+					addMethod();
+				}
+			}
+		})
+	}
+	const btnLoading = ref(false)
+	// 警戒水位新增方法
+	const addMethod = async () => {
+		btnLoading.value = true
+		try {
+			let res = await proxy.axiosPost('/basic/warnlevel', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("新增成功");
+				open.value = false;
+				getList();
+				btnLoading.value = false
+			}
+		} catch (error) {
+			btnLoading.value = false
+		}
+	}
+	// 警戒水位修改方法
+	const editMethod = async () => {
+		btnLoading.value = true
+		try {
+			let res = await proxy.axiosPut('/basic/warnlevel', form);
+			if (res.code === 200) {
+				proxy.$modal.msgSuccess("修改成功");
+				open.value = false;
+				getList();
+				btnLoading.value = false
+			}
+		} catch (error) {
+			btnLoading.value = false
+		}
+	}
+
+
+	// 获取归属地区下拉框数据
+	const stcdAreaOption = ref([])
+	const getDivision = async () => {
+		try {
+			const res = await proxy.axiosGet('/basic/info/getDivision')
+			stcdAreaOption.value = res.data;
+		} catch (error) {
+
+		}
+	}
+	onMounted(() => {
+		getList()
+		getStnmandStnmId()
+		// getDivision()
+	})
+</script>
\ No newline at end of file
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f62b800..f415f58 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -204,7 +204,8 @@
 
 <script setup name="User">
    import { getToken } from "@/utils/auth";
-   import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
+   import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
+   import { treeselect } from "@/api/system/dept";
 
    const router = useRouter();
    const { proxy } = getCurrentInstance();
@@ -283,7 +284,7 @@
    });
    /** 查询部门下拉树结构 */
    function getDeptTree() {
-      deptTreeSelect().then(response => {
+      treeselect().then(response => {
          deptOptions.value = response.data;
       });
    };
diff --git a/src/views/system/user/serveUser.vue b/src/views/system/user/serveUser.vue
new file mode 100644
index 0000000..0990d4e
--- /dev/null
+++ b/src/views/system/user/serveUser.vue
@@ -0,0 +1,342 @@
+<template>
+  <div class="app-container app-container-bg">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24" style="background:#fff">
+        <div class="head-container pt10">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container">
+          <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <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="userName">
+              <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable filterable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable filterable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 240px" @change="handleQuery">
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间" style="width: 300px;">
+              <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="info" plain icon="Upload2" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          </el-row>
+        </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="userList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="50" :align="alignment" />
+            <el-table-column label="用户名称" :align="alignment" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="用户昵称" :align="alignment" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="部门" :align="alignment" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="手机号码" :align="alignment" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+            <el-table-column label="状态" :align="alignment" key="status" v-if="columns[5].visible">
+              <template #default="scope">
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间" :align="alignment" prop="createTime" v-if="columns[6].visible" width="160">
+              <template #default="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" :align="alignment" class-name="small-padding fixed-width">
+              <template #default="scope">
+                <el-button type="text" icon="View" @click="handleShow(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </div>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+<script setup>
+  import {
+    ref,
+    reactive,
+    onMounted,
+  } from 'vue'
+  import { treeselect } from "@/api/system/dept";
+  const {
+    proxy
+  } = getCurrentInstance()
+  const {
+    sys_normal_disable
+  } = proxy.useDict('sys_normal_disable')
+  const alignment = 'center'
+  const showSearch = ref(true)
+  const dateRange = ref([])
+  const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    userName: "",
+    phonenumber: "",
+    status: "",
+    deptId: "",
+    serveType: 1,
+  })
+  const deptName = ref("");
+  const deptOptions = ref(undefined);
+  const loading = ref(false)
+  const total = ref(0)
+  const userList = ref([])
+  const getList = async () => {
+    loading.value = true;
+    try {
+      const res = await proxy.axiosGet('/system/user/list', proxy.addDateRange(queryParams, dateRange.value))
+      if (res.code == 200) {
+        userList.value = res.rows
+        total.value = res.total
+      }
+      loading.value = false
+    } catch (error) {
+      loading.value = false
+    }
+  }
+  /** 通过条件过滤节点  */
+  const filterNode = (value, data) => {
+    if (!value) return true;
+    return data.label.indexOf(value) !== -1;
+  };
+  /** 根据名称筛选部门树 */
+  watch(deptName, val => {
+    proxy.$refs["deptTreeRef"].filter(val);
+  });
+  /** 查询部门下拉树结构 */
+  function getDeptTree() {
+    treeselect().then(response => {
+      deptOptions.value = response.data;
+    });
+  };
+   /** 节点单击事件 */
+   function handleNodeClick(data) {
+      queryParams.deptId = data.id;
+      handleQuery();
+   };
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.pageNum = 1
+    getList()
+  }
+  const resetQuery = () => {
+    dateRange.value = []
+    proxy.resetForm("queryForm");
+    handleQuery();
+  }
+
+  // 多选框选中数据
+  let ids = ref([])
+  let names = ref([])
+  let single = ref(true)
+  let multiple = ref(true)
+  const handleSelectionChange = (selection) => {
+    ids.value = selection.map(item => item.id)
+    console.log(ids.value, '===')
+    names.value = selection.map(item => item.stnm)
+    single.value = selection.length !== 1
+    multiple.value = !selection.length
+  }
+  /** 新增按钮操作 */
+  const open = ref(false)
+  const title = ref("")
+  const handleAdd = () => {
+    reset();
+    open.value = true;
+    title.value = "添加警戒水位信息";
+  }
+  /** 修改按钮操作 */
+  const form = reactive({})
+  const rules = reactive({})
+  const handleUpdate = async (row) => {
+    reset();
+    let id = row.id || ids.value
+    try {
+      let res = await proxy.axiosGet('/basic/warnlevel/' + id);
+      if (res.code === 200) {
+        Object.assign(form, res.data);
+        open.value = true;
+        title.value = "修改警戒水位信息";
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  }
+  /** 删除按钮操作 */
+  const handleDelete = (row) => {
+    let stnms = row.stnm || names.value
+    const stnmIds = row.id || ids.value;
+    proxy.$modal.confirm('是否确认删除站点名称为"' + stnms + '"的数据项？').then(async function () {
+      let res = await proxy.axiosDelete('/basic/warnlevel/' + stnmIds);
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess("删除成功");
+        getList();
+      }
+    })
+  }
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    var p = {
+      pageNum: 1,
+      pageSize: 9999,
+      stnm: queryParams.stnm
+    }
+    var res = await proxy.axiosGet('/basic/warnlevel/list', p);
+    if (res.code === 200) {
+      var table = [];
+      table.push({
+        A: "站点编码",
+        B: "站点名称",
+        C: "开始日期",
+        D: "结束日期",
+        E: "警戒水位值"
+      });
+      res.rows.forEach(d => {
+        var row = {
+          A: d.staid,
+          B: d.stnm,
+          C: d.startTime,
+          D: d.endTime,
+          E: d.value
+        };
+        table.push(row);
+      });
+      var header = ["A", "B", "C", "D", "E"];
+      var fileName = "警戒水位列表";
+      proxy.exportExcel(header, table, fileName);
+    }
+  }
+  /*************************************************************  弹窗  ***************************************/
+  let formRef = ref(null)
+  let biaoshi = ref(
+    [{
+      flag: '水库水位',
+      value: '1'
+    }, {
+      flag: '河道水位',
+      value: '2'
+    }]
+  )
+  const stationList = ref([])
+  const getStnmandStnmId = async () => {
+    let res = await proxy.axiosGet('/basic/warnlevel/queryStnmandStnmId');
+    if (res.code === 200) {
+      stationList.value = res.data
+    }
+  }
+  // 取消按钮
+  const cancel = () => {
+    open.value = false;
+    reset();
+  }
+  const reset = () => {
+    Object.assign(form, {
+      tm: null,
+      stnmId: null,
+      correctionValue: null,
+    });
+    proxy.resetForm("formRef");
+  }
+  /** 提交按钮 */
+  const submitForm = async (formEl) => {
+    if (!formEl) return
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        if (form.id != null) {
+          editMethod();
+        } else {
+          addMethod();
+        }
+      }
+    })
+  }
+  const btnLoading = ref(false)
+  // 警戒水位新增方法
+  const addMethod = async () => {
+    btnLoading.value = true
+    try {
+      let res = await proxy.axiosPost('/basic/warnlevel', form);
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess("新增成功");
+        open.value = false;
+        getList();
+        btnLoading.value = false
+      }
+    } catch (error) {
+      btnLoading.value = false
+    }
+  }
+  // 警戒水位修改方法
+  const editMethod = async () => {
+    btnLoading.value = true
+    try {
+      let res = await proxy.axiosPut('/basic/warnlevel', form);
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess("修改成功");
+        open.value = false;
+        getList();
+        btnLoading.value = false
+      }
+    } catch (error) {
+      btnLoading.value = false
+    }
+  }
+
+
+  // 获取归属地区下拉框数据
+  const stcdAreaOption = ref([])
+  const getDivision = async () => {
+    try {
+      const res = await proxy.axiosGet('/basic/info/getDivision')
+      stcdAreaOption.value = res.data;
+    } catch (error) {
+
+    }
+  }
+  onMounted(() => {
+    getList()
+    getStnmandStnmId()
+    getDeptTree()
+    // getDivision()
+  })
+  const columns = ref([
+    { key: 0, label: `用户编号`, visible: true },
+    { key: 1, label: `用户名称`, visible: true },
+    { key: 2, label: `用户昵称`, visible: true },
+    { key: 3, label: `部门`, visible: true },
+    { key: 4, label: `手机号码`, visible: true },
+    { key: 5, label: `状态`, visible: true },
+    { key: 6, label: `创建时间`, visible: true }
+  ])
+</script>
\ No newline at end of file