diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue
index dd6f739a..2cacd5b6 100644
--- a/src/views/monitoring/equipmentStatusAndParams/index.vue
+++ b/src/views/monitoring/equipmentStatusAndParams/index.vue
@@ -84,9 +84,28 @@ export default {
 				},
 				{ width: 128, prop: 'inQuantity', label: '投入数', align: 'center' },
 				{ width: 128, prop: 'outQuantity', label: '产出数', align: 'center' },
-				{ width: 128, prop: 'run', label: '是否运行', align: 'center' },
-				{ width: 128, prop: 'status', label: '状态', align: 'center' },
-				{ width: 128, prop: 'error', label: '是否故障', align: 'center' },
+				{
+					width: 128,
+					prop: 'run',
+					label: '是否运行',
+					align: 'center',
+					filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
+				},
+				{
+					width: 128,
+					prop: 'status',
+					label: '状态',
+					align: 'center',
+					filter: (val) =>
+						val != null ? ['正常', '计划停机', '故障'][val] : '-',
+				},
+				{
+					width: 128,
+					prop: 'error',
+					label: '是否故障',
+					align: 'center',
+					filter: (val) => (val != null ? (val ? '是' : '否') : '-'),
+				},
 				{
 					prop: 'quantityRecordTime',
 					label: '生产量记录时间',
@@ -174,6 +193,7 @@ export default {
 				productionLineId: null,
 				equipmentId: null,
 			},
+			total: 0,
 			// 表单参数
 			form: {},
 			// 表单校验
@@ -210,6 +230,11 @@ export default {
 		/** 监听 search bar 的产线下拉框改变 */
 		async handleSearchBarItemChange({ param, value: id }) {
 			if (param == 'productionLineId') {
+				if (id == '') {
+					// 清除设备选框里的选项
+					this.searchBarFormConfig[1].selectOptions = [];
+					return;
+				}
 				const list = await this.getEquipmentList(id);
 				this.searchBarFormConfig[1].selectOptions = list.map((eq) => ({
 					name: eq.name,
@@ -218,119 +243,40 @@ export default {
 			}
 		},
 
-		/** 重写 basicPageMixin 里的 handleSearchBarBtnClick */
 		handleSearchBarBtnClick(btn) {
-			// 仅查询一种情况
-			this.queryParams.createTime = btn.createTime;
-			this.handleQuery();
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			// getEquipmentAlarmLogPage(this.queryParams).then((response) => {
-			// 	this.list = response.data.list;
-			// 	this.total = response.data.total;
-			// 	this.loading = false;
-			// });
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				alarmId: undefined,
-				alarmContent: undefined,
-				alarmValue: undefined,
-				alarmEquipmentId: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
+			const { equipmentId, productionLineId } = btn;
+			if (equipmentId) this.queryParams.equipmentId = equipmentId;
+			else this.queryParams.equipmentId = null;
+			if (productionLineId)
+				this.queryParams.productionLineId = productionLineId;
+			else this.queryParams.productionLineId = null;
 			this.getList();
 		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备报警日志';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentAlarmLog(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备报警日志';
+
+		/** 查询列表 */
+		async getList() {
+			this.loading = true;
+			const { data } = await this.$axios({
+				url: '/monitoring/equipment-monitor/realtime-page',
+				method: 'get',
+				params: this.queryParams,
 			});
+			this.list = data.list;
+			this.total = data.total;
 		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentAlarmLog(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentAlarmLog(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
+
+		handleEmitFun({ action, value }) {
+			if (action == 'params-monitor') {
+				const { equipmentId, equipmentName, equipmentCode } = value;
+				this.$router.push({
+					name: 'equipmentFullParams',
+					params: {
+						equipmentId,
+						equipmentCode,
+						equipmentName,
+					},
 				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备报警日志编号为"' + id + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentAlarmLog(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备报警日志数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentAlarmLogExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备报警日志.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
+			}
 		},
 	},
 };