diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
new file mode 100644
index 00000000..38324b7a
--- /dev/null
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -0,0 +1,118 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-08-31 09:14:19
+    description: 设备全参数查询
+-->
+
+<template>
+	<div class="app-container">
+		<el-row>设备全参数查询</el-row>
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<div class="tables">
+			<div class="table-wrapper" v-for="table in tableList" :key="table.key">
+				<div class="table-title">PLC 1</div>
+				<base-table
+					:key="table.key + '__basetable'"
+					:table-props="table.tableProps"
+					:page="1"
+					:limit="999"
+					:table-data="table.data"
+					@emitFun="(val) => handleEmitFun(table, val)">
+					<!-- <method-btn
+                    v-if="tableBtn.length"
+                    slot="handleBtn"
+                    label="操作"
+                :method-list="tableBtn"
+                @clickBtn="handleTableBtnClick" /> -->
+				</base-table>
+
+				<!-- 分页组件 -->
+				<pagination
+					v-show="table.total > 0"
+					:total="table.total"
+					:page.sync="table.queryParams.pageNo"
+					:limit.sync="table.queryParams.pageSize"
+					@pagination="(val) => getListFor(table, val)" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'EquipmentFullParams',
+	components: {},
+	props: {},
+	data() {
+		return {
+			tableList: [],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备名称',
+					placeholder: '请输入设备名称',
+					param: 'name',
+				},
+				{
+					type: 'input',
+					label: '设备编码',
+					placeholder: '请输入设备编码',
+					param: 'codes',
+				},
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'timeVal',
+					width: 350,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	mounted() {},
+	methods: {
+		/** 查询 */
+        handleQuery() {},
+
+        handleSearchBarBtnClick() {},
+
+		handleEmitFun(table, val) {
+			console.log('table val', table, val);
+		},
+
+		/** 构造 props */
+		buildProps() {
+			this.tableList.forEach((table) => {
+				this.buildTableProp(table);
+			});
+		},
+
+		/** 构造一个 tableProps - 根据动态结构 */
+		buildTableProp(table) {},
+
+		/** 为某个 table 获取 list 数据 */
+		getListFor(table, val) {
+			console.log('get list for', table, val);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/monitoring/equipmentProcessAmount/graph.vue b/src/views/monitoring/equipmentProcessAmount/graph.vue
new file mode 100644
index 00000000..c75926b5
--- /dev/null
+++ b/src/views/monitoring/equipmentProcessAmount/graph.vue
@@ -0,0 +1,69 @@
+<!-- 
+    filename: graph.vue
+    author: liubin
+    date: 2023-08-31 14:00:02
+    description: 
+-->
+
+<template>
+	<div class="chart-wrapper">
+		<h4>line graph</h4>
+		<div class="chart" ref="chart"></div>
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+
+export default {
+	name: 'LineChartInEquipmentProcessAmount',
+	components: {},
+	props: {},
+	data() {
+		return {
+			chart: null,
+			option: {
+				xAxis: {
+					type: 'category',
+					data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+				},
+				yAxis: {
+					type: 'value',
+				},
+				series: [
+					{
+						data: [120, 200, 150, 80, 70, 110, 130],
+						type: 'bar',
+						showBackground: true,
+						backgroundStyle: {
+							color: 'rgba(180, 180, 180, 0.2)',
+						},
+					},
+				],
+			},
+		};
+	},
+	mounted() {
+		if (!this.chart) this.chart = echarts.init(this.$refs.chart);
+		this.chart.setOption(this.option);
+	},
+	beforeDestroy() {
+		this.chart.dispose();
+	},
+	methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.chart-wrapper {
+	height: 100%;
+	flex: 1;
+	background: #f1f1f1;
+	padding: 12px;
+}
+
+.chart {
+	height: 100%;
+	width: 100%;
+}
+</style>
diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue
index 1d308799..ccbe715e 100644
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ b/src/views/monitoring/equipmentProcessAmount/index.vue
@@ -24,41 +24,44 @@
 			class="app-container equipment-process-amount"
 			style="flex: 1; border-radius: 8px; background: #fff">
 			<!-- main area  -->
-			<div class="main-content">
+			<div class="main-content" style="display: flex; flex-direction: column">
 				<SearchBar
 					:formConfigs="searchBarFormConfig"
 					ref="search-bar"
 					@headBtnClick="handleSearchBarBtnClick" />
 
-				<!-- tabs  -->
-				<div class="table" v-if="mode == 'table'">
+				<transition appear name="vvv" mode="out-in">
 					<base-table
+						v-if="mode == 'table'"
 						:table-props="tableProps"
 						:page="1"
 						:limit="999"
 						:table-data="list"
 						@emitFun="handleEmitFun">
 						<!-- <method-btn
-						v-if="tableBtn.length"
+							v-if="tableBtn.length"
 						slot="handleBtn"
 						label="操作"
 						:method-list="tableBtn"
 						@clickBtn="handleTableBtnClick" /> -->
 					</base-table>
-				</div>
 
-				<div class="graph" v-else>
-					<!-- graph  -->
-				</div>
+					<div class="graph" style="height: 56vh;" v-else>
+						<!-- graph  -->
+						<Graph />
+					</div>
+				</transition>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
+import Graph from './graph.vue';
+
 export default {
 	name: 'EquipmentProcessAmount',
-	components: {},
+	components: { Graph },
 	props: {},
 	data() {
 		return {
@@ -127,7 +130,6 @@ export default {
 				// 				},
 				// 			],
 				// 		},
-
 				// 		{
 				// 			name: '产线2',
 				// 			id: 'pl2',
@@ -317,4 +319,22 @@ export default {
 	color: #111;
 	background: #f2f4f7;
 }
+
+.vvv-enter,
+.vvv-leave-to {
+	/* transform: translateY(24px) scaleY(0); */
+	transform: translateY(24px);
+	opacity: 0;
+}
+
+.vvv-enter-active,
+.vvv-leave-active {
+	transition: all 0.3s ease-out;
+}
+
+.vvv-enter-to,
+.vvv-leave {
+	/* transform: translateY(0) scaleY(1); */
+	transform: translateY(0);
+}
 </style>
diff --git a/src/views/monitoring/equipmentStatusAndParams/index.vue b/src/views/monitoring/equipmentStatusAndParams/index.vue
new file mode 100644
index 00000000..dd6f739a
--- /dev/null
+++ b/src/views/monitoring/equipmentStatusAndParams/index.vue
@@ -0,0 +1,337 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick"
+			@select-changed="handleSearchBarItemChange" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<!-- <base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="500px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+		</base-dialog> -->
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { publicFormatter } from '@/utils/dict';
+
+export default {
+	name: 'EquipmentStatusAndParams',
+
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['equipmentId', 'productionLineId'],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-alarm-log:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-alarm-log:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					width: 128,
+					prop: 'equipmentName',
+					label: '设备名称',
+					align: 'center',
+				},
+				{
+					width: 128,
+					prop: 'equipmentCode',
+					label: '设备编码',
+					align: 'center',
+				},
+				{ 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' },
+				{
+					prop: 'quantityRecordTime',
+					label: '生产量记录时间',
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{
+					prop: 'statusRecordTime',
+					label: '状态量记录时间',
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{
+					_action: 'params-monitor',
+					label: '参数监控',
+					align: 'center',
+					subcomponent: {
+						props: ['injectData'],
+						render: function (h) {
+							const _this = this;
+							return h(
+								'el-button',
+								{
+									props: { type: 'text', size: 'mini' },
+									on: {
+										click: function () {
+											console.log('inejctdata', _this.injectData);
+											_this.$emit('emitData', {
+												action: _this.injectData._action,
+												// value: _this.injectData.id,
+												value: _this.injectData,
+											});
+										},
+									},
+								},
+								'查看监控'
+							);
+						},
+					},
+				},
+			],
+			searchBarFormConfig: [
+				// {
+				// 	type: 'datePicker',
+				// 	label: '时间段',
+				// 	dateType: 'daterange', // datetimerange
+				// 	// format: 'yyyy-MM-dd HH:mm:ss',
+				// 	format: 'yyyy-MM-dd',
+				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				// 	rangeSeparator: '-',
+				// 	startPlaceholder: '开始日期',
+				// 	endPlaceholder: '结束日期',
+				// 	defaultTime: ['00:00:00', '23:59:59'],
+				// 	param: 'createTime',
+				// 	// width: 350,
+				// },
+				{
+					type: 'select',
+					label: '产线',
+					onchange: true,
+					placeholder: '请选择产线',
+					selectOptions: [],
+					param: 'productionLineId',
+				},
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					selectOptions: [],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				productionLineId: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {},
+		};
+	},
+	created() {
+		this.getLineList();
+		this.getList();
+	},
+	methods: {
+		/** 获取产线 */
+		async getLineList() {
+			const { data } = await this.$axios({
+				url: '/base/production-line/listAll',
+				method: 'get',
+			});
+			this.searchBarFormConfig[0].selectOptions = data.map((line) => ({
+				name: line.name,
+				id: line.id,
+			}));
+		},
+
+		/** 根据产线获取设备 */
+		async getEquipmentList(id) {
+			const { data } = await this.$axios({
+				url: '/base/equipment/listByLine',
+				method: 'get',
+				query: { id },
+			});
+			return data;
+		},
+
+		/** 监听 search bar 的产线下拉框改变 */
+		async handleSearchBarItemChange({ param, value: id }) {
+			if (param == 'productionLineId') {
+				const list = await this.getEquipmentList(id);
+				this.searchBarFormConfig[1].selectOptions = list.map((eq) => ({
+					name: eq.name,
+					id: eq.id,
+				}));
+			}
+		},
+
+		/** 重写 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;
+			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 = '修改设备报警日志';
+			});
+		},
+		/** 提交按钮 */
+		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();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		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(() => {});
+		},
+	},
+};
+</script>