src/api/base/equipmentBindGroup.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建设备与分组绑定
+export function createEquipmentBindGroup(data) {
+  return request({
+    url: '/base/equipment-bind-group/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备与分组绑定
+export function updateEquipmentBindGroup(data) {
+  return request({
+    url: '/base/equipment-bind-group/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备与分组绑定
+export function deleteEquipmentBindGroup(id) {
+  return request({
+    url: '/base/equipment-bind-group/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得设备与分组绑定
+export function getEquipmentBindGroup(id) {
+  return request({
+    url: '/base/equipment-bind-group/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备与分组绑定分页
+export function getEquipmentBindGroupPage(query) {
+  return request({
+    url: '/base/equipment-bind-group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出设备与分组绑定 Excel
+export function exportEquipmentBindGroupExcel(query) {
+  return request({
+    url: '/base/equipment-bind-group/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/components/DialogForm/index.vue

@@ -126,8 +126,9 @@ export default {
 		},
 		form: {
 			get() {
-				if (this.dataLoaded) return this.dataForm;
-				else return {}
+				// if (this.dataLoaded) return this.dataForm;
+				// else return {}
+				return this.dataForm;
 			},
 			set(val) {
 				console.log('set form', val);
@@ -228,6 +229,7 @@ export default {
 										}))
 									);
 								} else if (opt.input) {
+									console.log('setting code: ', response.data)
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 								}

src/utils/dict.js

@@ -88,7 +88,10 @@ export const DICT_TYPE = {
   PRODUCT_TYPE: 'product_type',
 
   // ============== ENERGY - 能源模块 =============
-  ENERGY_UNIT: 'energy_unit'
+  ENERGY_UNIT: 'energy_unit',
+  
+  // ============== ENERGY - 能源模块 =============
+  EQU_ALARM_LEVEL: 'equ_alarm_level'
 }
 
 /**

src/views/base/equipmentBindGroup/index.vue

@@ -0,0 +1,330 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<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="700px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import {
+	createEquipmentBindGroup,
+	updateEquipmentBindGroup,
+	deleteEquipmentBindGroup,
+	getEquipmentBindGroup,
+	getEquipmentBindGroupPage,
+	exportEquipmentBindGroupExcel,
+} from '@/api/base/equipmentBindGroup';
+
+import { getEquipmentGroupPage } from '@/api/base/equipmentGroup';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+export default {
+	name: 'EquipmentBindGroup',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['groupId', 'equipmentName'],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-bind-group:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-bind-group:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'equipmentName', label: '设备', align: 'center' },
+				{ prop: 'groupName', label: '分组', align: 'center' },
+				{
+					_action: 'equipment-bind-group-show-alert',
+					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,
+											});
+										},
+									},
+								},
+								'查看报警'
+							);
+						},
+					},
+				},
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '分组',
+					placeholder: '请选择分组',
+					param: 'groupId',
+					filterable: true,
+					selectOptions: [],
+				},
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-bind-group:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '设备',
+						url: '/base/equipment/page?pageNo=1&pageSize=100',
+						prop: 'equipmentId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '报警分组',
+						url: '/base/equipment-group/listAll', // 根据产线获取
+						// depends: '__product_line', // 依赖产线获取数据
+						// depends: 'productionLineId',
+						prop: 'groupId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentName: null,
+				groupId: null,
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {},
+		};
+	},
+	created() {
+		this.getList();
+		getEquipmentGroupPage({ pageNo: 1, pageSize: 100 }).then((res) => {
+			this.searchBarFormConfig[0].selectOptions = res.data.list;
+		});
+	},
+	methods: {
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, value }) {
+			const {
+				groupId: equipmentGroupId,
+				groupName: equipmentGroupName,
+				groupCode: equipmentGroupCode,
+			} = value;
+			switch (action) {
+				case 'equipment-bind-group-show-alert':
+					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
+					this.$router.push({
+						name: 'EquipmentGroupAlarm',
+						params: {
+							equipmentGroupId,
+							equipmentGroupCode,
+							equipmentGroupName,
+						},
+					});
+					break;
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			_// 执行查询
+			getEquipmentBindGroupPage(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,
+				equipmentId: undefined,
+				groupId: 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;
+			getEquipmentBindGroup(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) {
+					updateEquipmentBindGroup(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentBindGroup(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 deleteEquipmentBindGroup(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 exportEquipmentBindGroupExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备与分组绑定.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/base/equipmentGroup/index.vue

@@ -88,7 +88,7 @@ export default {
 				{ prop: 'code', label: '检测分组编码', align: 'center' },
 				{ prop: 'remark', label: '备注', align: 'center' },
 				{
-					action: 'show-alert',
+					_action: 'equipment-group-show-alert',
 					label: '报警',
 					align: 'center',
 					subcomponent: {
@@ -103,8 +103,9 @@ export default {
 										click: function () {
 											console.log('inejctdata', _this.injectData);
 											_this.$emit('emitData', {
-												action: _this.injectData.action,
-												value: _this.injectData.id,
+												action: _this.injectData._action,
+												// value: _this.injectData.id,
+												value: _this.injectData,
 											});
 										},
 									},
@@ -202,6 +203,27 @@ export default {
 		this.getList();
 	},
 	methods: {
+		/** 覆盖 handleEmitFun 的默认实现 */
+		handleEmitFun({ action, value }) {
+			const {
+				id: equipmentGroupId,
+				name: equipmentGroupName,
+				code: equipmentGroupCode,
+			} = value;
+			switch (action) {
+				case 'equipment-group-show-alert':
+					// this.$router.push({ path: '/equipment/base/equipment-group-alarm' });
+					this.$router.push({
+						name: 'EquipmentGroupAlarm',
+						params: {
+							equipmentGroupId,
+							equipmentGroupCode,
+							equipmentGroupName,
+						},
+					});
+					break;
+			}
+		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;

src/views/base/equipmentGroupAlarm/index.vue

@@ -1,8 +1,10 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-		<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
-		<!-- @headBtnClick="handleSearchBarBtnClick" /> -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
 		<base-table
@@ -31,7 +33,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="500px"
+			width="736px"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -51,6 +53,7 @@ import {
 } from '@/api/base/equipmentGroupAlarm';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import moment from 'moment';
+import { publicFormatter } from '@/utils/dict';
 
 export default {
 	name: 'EquipmentGroupAlarm',
@@ -83,7 +86,12 @@ export default {
 				},
 				{ prop: 'code', label: '报警编码', align: 'center' },
 				{ prop: 'type', label: '报警类型', align: 'center' },
-				{ prop: 'grade', label: '报警级别', align: 'center' },
+				{
+					prop: 'grade',
+					label: '报警级别',
+					align: 'center',
+					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				},
 				{ prop: 'alarmCode', label: '设备报警编码', align: 'center' },
 				{ prop: 'plcParamName', label: '参数列名', align: 'center' },
 				{ prop: 'alarmContent', label: '报警内容', align: 'center' },
@@ -94,14 +102,25 @@ export default {
 					label: '设备分组编码',
 					placeholder: '/',
 					param: 'equipmentGroupCode',
-					defaultSelect: '1',
+					defaultSelect: null,
+					disabled: true,
 				},
 				{
 					type: 'input',
 					label: '设备分组名称',
 					placeholder: '/',
 					param: 'equipmentGroupName',
-					defaultSelect: '2',
+					defaultSelect: null,
+					disabled: true,
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-group-alarm:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
 				},
 			],
 			rows: [
@@ -110,18 +129,18 @@ export default {
 						input: true,
 						label: '报警编码', // 自动生成
 						prop: 'code',
-						url: '',
+						url: '/base/equipment-group-alarm/getCode',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 					{
-            select: true,
+						select: true,
 						label: '报警类型', // 固定选项
 						prop: 'type',
 						options: [
-              { label: '布尔型', value: 2 },
+							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-            rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 					},
 				],
 				[
@@ -161,7 +180,16 @@ export default {
 				equipmentGroupId: null,
 			},
 			// 表单参数
-			form: {},
+			form: {
+				id: undefined,
+				equipmentGroupId: undefined,
+				code: undefined,
+				type: undefined,
+				grade: undefined,
+				alarmCode: undefined,
+				alarmContent: undefined,
+				plcParamName: undefined,
+			},
 			// // 表单校验
 			// rules: {
 			//   equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
@@ -171,10 +199,38 @@ export default {
 			// }
 		};
 	},
-	created() {
+	// watch: {
+	//   $route(value) {
+	//     console.log('new route info', value)
+	//   }
+	// },
+	// created() {
+	// 	this.getList();
+	// },
+	activated() {
+		// 设置顶部搜索栏信息
+		const { equipmentGroupName, equipmentGroupCode, equipmentGroupId } =
+			this.$route.params;
+		this.setSearchBarFormValue('equipmentGroupName', equipmentGroupName);
+		this.setSearchBarFormValue('equipmentGroupCode', equipmentGroupCode);
+		this.queryParams.equipmentGroupId = equipmentGroupId;
+		// if (!equipmentGroupId) this.getList(); // 拦截
 		this.getList();
 	},
+	deactivated() {
+		this.setSearchBarFormValue('equipmentGroupName', null);
+		this.setSearchBarFormValue('equipmentGroupCode', null);
+		this.queryParams.equipmentGroupId = null;
+	},
 	methods: {
+		/** 设置 searchBarForm 的默认值 - 用得比较少 */
+		setSearchBarFormValue(param, value) {
+			this.searchBarFormConfig.forEach((config) => {
+				if (config.param == param) {
+					config.defaultSelect = value;
+				}
+			});
+		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -216,6 +272,8 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
+			if (this.queryParams.equipmentGroupId == null)
+				return this.$message.error('没有检测到设备分组信息');
 			this.reset();
 			this.open = true;
 			this.title = '添加设备分组报警明细';
@@ -238,7 +296,10 @@ export default {
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-					updateEquipmentGroupAlarm(this.form).then((response) => {
+					updateEquipmentGroupAlarm({
+						...this.form,
+						equipmentGroupId: this.queryParams.equipmentGroupId,
+					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -246,7 +307,10 @@ export default {
 					return;
 				}
 				// 添加的提交
-				createEquipmentGroupAlarm(this.form).then((response) => {
+				createEquipmentGroupAlarm({
+					...this.form,
+					equipmentGroupId: this.queryParams.equipmentGroupId,
+				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();