Merge branch 'equipment-module-dev' into lb

.env.dev

@@ -5,9 +5,9 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48080'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 
 # 路由懒加载

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

@@ -53,7 +53,12 @@
 						:action="col.url"
 						:on-success="handleUploadSuccess"
 						v-bind="col.bind">
-						<el-button size="small" type="primary" :disabled="col.bind?.disabled || false">点击上传</el-button>
+						<el-button
+							size="small"
+							type="primary"
+							:disabled="col.bind?.disabled || false">
+							点击上传
+						</el-button>
 						<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
 							{{ col.uploadTips || '只能上传jpg/png文件，大小不超过2MB' }}
 						</div>
@@ -109,6 +114,7 @@ export default {
 			formLoading: true,
 			optionListOf: {},
 			uploadedFileList: [],
+			dataLoaded: false,
 		};
 	},
 	computed: {
@@ -120,6 +126,8 @@ export default {
 		},
 		form: {
 			get() {
+				// if (this.dataLoaded) return this.dataForm;
+				// else return {}
 				return this.dataForm;
 			},
 			set(val) {
@@ -157,7 +165,7 @@ export default {
 			return response.data;
 		},
 		async handleOptions(trigger = 'monuted') {
-			// console.log("[dialogForm:handleOptions]")
+			console.log('[dialogForm:handleOptions]');
 			const promiseList = [];
 			this.rows.forEach((cols) => {
 				cols.forEach((opt) => {
@@ -169,6 +177,36 @@ export default {
 					if (opt.options) {
 						this.$set(this.optionListOf, opt.prop, opt.options);
 					} else if (opt.url) {
+						// 如果有 depends，则暂时先不获取，注册一个watcher
+						if (opt.depends) {
+							console.log('[handleOptions] setting watch');
+							this.$watch(
+								() => this.form[opt.depends],
+								(id) => {
+									console.log('<', opt.depends, '>', 'changed', id);
+									if (id == null) return;
+									// 清空原有选项
+									this.form[opt.prop] = null;
+									// 获取新的选项
+									this.$axios({
+										url: `${opt.url}?id=${id}`,
+									}).then((res) => {
+										this.$set(
+											this.optionListOf,
+											opt.prop,
+											res.data.map((item) => ({
+												label: item[opt.labelKey ?? 'name'],
+												value: item[opt.valueKey ?? 'id'],
+											}))
+										);
+									});
+								},
+								{
+									immediate: true,
+								}
+							);
+							return;
+						}
 						// 如果是下拉框，或者新增模式下的输入框，才去请求
 						if (opt.select || (opt.input && !this.form?.id)) {
 							promiseList.push(async () => {
@@ -191,6 +229,7 @@ export default {
 										}))
 									);
 								} else if (opt.input) {
+									console.log('setting code: ', response.data)
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 								}
@@ -200,6 +239,8 @@ export default {
 				});
 			});
 
+			console.log('[dialogForm:handleOptions] done!');
+
 			// 如果是 watch 触发的，不需要执行进一步的请求
 			if (trigger == 'watch') {
 				this.formLoading = false;
@@ -208,6 +249,7 @@ export default {
 			try {
 				await Promise.all(promiseList.map((fn) => fn()));
 				this.formLoading = false;
+				this.dataLoaded = true;
 				// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
 			} catch (error) {
 				console.log('[dialogForm:handleOptions:error]', error);
@@ -219,7 +261,13 @@ export default {
 		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
-			console.log('[dialogForm:handleUploadSuccess]', response, file, fileList, this.form);
+			console.log(
+				'[dialogForm:handleUploadSuccess]',
+				response,
+				file,
+				fileList,
+				this.form
+			);
 			// 保存原始文件名
 			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
 			// 保存完整地址

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/equipmentBindSection/index.vue

@@ -1,129 +1,230 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<SearchBar
-      <el-form-item label="工段ID" prop="workshopSectionId">
+			:formConfigs="searchBarFormConfig"
-        <el-input v-model="queryParams.workshopSectionId" placeholder="请输入工段ID" clearable @keyup.enter.native="handleQuery"/>
+			ref="search-bar"
-      </el-form-item>
+			@headBtnClick="handleSearchBarBtnClick" />
-      <el-form-item label="设备ID" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-bind-section:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-bind-section:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
 		<!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+		<base-table
-      <el-table-column label="ID" align="center" prop="id" />
+			:table-props="tableProps"
-      <el-table-column label="工段ID" align="center" prop="workshopSectionId" />
+			:page="queryParams.pageNo"
-      <el-table-column label="设备ID" align="center" prop="equipmentId" />
+			:limit="queryParams.pageSize"
-      <el-table-column label="排序" align="center" prop="sort" />
+			:table-data="list"
-      <el-table-column label="产线数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="lineDataType">
+			@emitFun="handleEmitFun">
-        <template v-slot="scope">
+			<method-btn
-          <dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.lineDataType" />
+				v-if="tableBtn.length"
-        </template>
+				slot="handleBtn"
-      </el-table-column>
+				label="操作"
-      <el-table-column label="工段数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="sectionDataType">
+				:method-list="tableBtn"
-        <template v-slot="scope">
+				@clickBtn="handleTableBtnClick" />
-          <dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.sectionDataType" />
+		</base-table>
-        </template>
+
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-bind-section:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-bind-section:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 		<!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+		<base-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			:dialogTitle="title"
-        <el-form-item label="工段ID" prop="workshopSectionId">
+			:dialogVisible="open"
-          <el-input v-model="form.workshopSectionId" placeholder="请输入工段ID" />
+			width="700px"
-        </el-form-item>
+			@close="cancel"
-        <el-form-item label="设备ID" prop="equipmentId">
+			@cancel="cancel"
-          <el-input v-model="form.equipmentId" placeholder="请输入设备ID" />
+			@confirm="submitForm">
-        </el-form-item>
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-        <el-form-item label="排序" prop="sort">
+		</base-dialog>
-          <el-input v-model="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="产线数据类型 0.无类型 1.进口计数 2.出口计数" prop="lineDataType">
-          <el-select v-model="form.lineDataType" placeholder="请选择产线数据类型 0.无类型 1.进口计数 2.出口计数">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工段数据类型 0.无类型 1.进口计数 2.出口计数" prop="sectionDataType">
-          <el-select v-model="form.sectionDataType" placeholder="请选择工段数据类型 0.无类型 1.进口计数 2.出口计数">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
 	</div>
 </template>
 
 <script>
-import { createEquipmentBindSection, updateEquipmentBindSection, deleteEquipmentBindSection, getEquipmentBindSection, getEquipmentBindSectionPage, exportEquipmentBindSectionExcel } from "@/api/base/equipmentBindSection";
+import {
+	createEquipmentBindSection,
+	updateEquipmentBindSection,
+	deleteEquipmentBindSection,
+	getEquipmentBindSection,
+	getEquipmentBindSectionPage,
+	exportEquipmentBindSectionExcel,
+} from '@/api/base/equipmentBindSection';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 export default {
-  name: "EquipmentBindSection",
+	name: 'EquipmentBindSection',
-  components: {
+	components: {},
-  },
+	mixins: [basicPageMixin],
 	data() {
 		return {
-      // 遮罩层
+			searchBarKeys: ['workshopSectionId', 'equipmentName'],
-      loading: true,
+			tableBtn: [
-      // 导出遮罩层
+				this.$auth.hasPermi('base:equipment-bind-section:update')
-      exportLoading: false,
+					? {
-      // 显示搜索条件
+							type: 'edit',
-      showSearch: true,
+							btnName: '修改',
-      // 总条数
+					  }
-      total: 0,
+					: undefined,
-      // 工段设备绑定列表
+				this.$auth.hasPermi('base:equipment-bind-section:delete')
-      list: [],
+					? {
-      // 弹出层标题
+							type: 'delete',
-      title: "",
+							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: 'productionLine', label: '产线名称', align: 'center' },
+				{ prop: 'workshopSection', label: '工段名称', align: 'center' },
+				{ prop: 'equipment', label: '设备名称', align: 'center' },
+				{ prop: 'sort', label: '工段中排序', align: 'center' },
+				{
+					prop: 'lineDataType',
+					label: '产线数据类型',
+					align: 'center',
+					filter: (val) =>
+						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
+				},
+				{
+					prop: 'sectionDataType',
+					label: '工段数据类型',
+					align: 'center',
+					filter: (val) =>
+						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
+				},
+				// {
+				// 	action: '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.id,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看报警'
+				// 			);
+				// 		},
+				// 	},
+				// },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '工段',
+					placeholder: '请选择工段',
+					param: 'workshopSectionId',
+				},
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-bind-section: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/production-line/listAll',
+						// prop: '__product_line', // __开头代表不传递给服务器
+						prop: 'productionLineId', // 编辑接口返回的产线id，所以不能使用上面那种形式
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '工段',
+						url: '/base/workshop-section/listByParentId', // 根据产线获取
+            // depends: '__product_line', // 依赖产线获取数据
+            depends: 'productionLineId',
+						prop: 'workshopSectionId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备',
+						url: '/base/equipment/page?pageNo=1&pageSize=100',
+						prop: 'equipmentId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '工段排序',
+						prop: 'sort',
+						// url: '/base/equipment-group/getCode',
+					},
+				],
+				[
+					{
+						select: true,
+						label: '产线数据类型',
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
+						],
+						prop: 'lineDataType',
+					},
+					{
+						select: true,
+						label: '工段数据类型',
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
+						],
+						prop: 'sectionDataType',
+					},
+				],
+			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -135,11 +236,6 @@ export default {
 			},
 			// 表单参数
 			form: {},
-      // 表单校验
-      rules: {
-        workshopSectionId: [{ required: true, message: "工段ID不能为空", trigger: "blur" }],
-        equipmentId: [{ required: true, message: "设备ID不能为空", trigger: "blur" }],
-      }
 		};
 	},
 	created() {
@@ -150,7 +246,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-      getEquipmentBindSectionPage(this.queryParams).then(response => {
+			getEquipmentBindSectionPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
@@ -173,7 +269,7 @@ export default {
 				remark: undefined,
 				version: undefined,
 			};
-      this.resetForm("form");
+			this.resetForm('form');
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
@@ -182,43 +278,43 @@ export default {
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
-      this.resetForm("queryForm");
+			this.resetForm('queryForm');
 			this.handleQuery();
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
 			this.open = true;
-      this.title = "添加工段设备绑定";
+			this.title = '添加工段设备绑定';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
 			const id = row.id;
-      getEquipmentBindSection(id).then(response => {
+			getEquipmentBindSection(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-        this.title = "修改工段设备绑定";
+				this.title = '修改工段设备绑定';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-      this.$refs["form"].validate(valid => {
+			this.$refs['form'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-          updateEquipmentBindSection(this.form).then(response => {
+					updateEquipmentBindSection(this.form).then((response) => {
-            this.$modal.msgSuccess("修改成功");
+						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
 					});
 					return;
 				}
 				// 添加的提交
-        createEquipmentBindSection(this.form).then(response => {
+				createEquipmentBindSection(this.form).then((response) => {
-          this.$modal.msgSuccess("新增成功");
+					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
 				});
@@ -227,12 +323,16 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;
-      this.$modal.confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?')
+				.then(function () {
 					return deleteEquipmentBindSection(id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -240,14 +340,18 @@ export default {
 			let params = { ...this.queryParams };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有工段设备绑定数据项?').then(() => {
+			this.$modal
+				.confirm('是否确认导出所有工段设备绑定数据项?')
+				.then(() => {
 					this.exportLoading = true;
 					return exportEquipmentBindSectionExcel(params);
-        }).then(response => {
+				})
+				.then((response) => {
 					this.$download.excel(response, '工段设备绑定.xls');
 					this.exportLoading = false;
-        }).catch(() => {});
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

src/views/base/equipmentGroup/index.vue

@@ -39,7 +39,6 @@
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
-
 	</div>
 </template>
 
@@ -89,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: {
@@ -104,8 +103,9 @@ export default {
 										click: function () {
 											console.log('inejctdata', _this.injectData);
 											_this.$emit('emitData', {
-												action: _this.injectData.action,
+												action: _this.injectData._action,
-												value: _this.injectData.id,
+												// value: _this.injectData.id,
+												value: _this.injectData,
 											});
 										},
 									},
@@ -203,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,121 +1,176 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<SearchBar
-      <el-form-item label="设备分组ID，关联base_equipment_group" prop="equipmentGroupId">
+			:formConfigs="searchBarFormConfig"
-        <el-input v-model="queryParams.equipmentGroupId" placeholder="请输入设备分组ID，关联base_equipment_group" clearable @keyup.enter.native="handleQuery"/>
+			ref="search-bar"
-      </el-form-item>
+			@headBtnClick="handleSearchBarBtnClick" />
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-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="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-group-alarm:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-group-alarm:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
 		<!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+		<base-table
-      <el-table-column label="ID" align="center" prop="id" />
+			:table-props="tableProps"
-      <el-table-column label="设备分组ID，关联base_equipment_group" align="center" prop="equipmentGroupId" />
+			:page="queryParams.pageNo"
-      <el-table-column label="编码" align="center" prop="code" />
+			:limit="queryParams.pageSize"
-      <el-table-column label="报警类型:1.字符型，2.布尔型" align="center" prop="type" />
+			:table-data="list"
-      <el-table-column label="报警级别 字典表关联label_value" align="center" prop="grade">
+			@emitFun="handleEmitFun">
-        <template v-slot="scope">
+			<method-btn
-          <dict-tag :type="DICT_TYPE.EQU_ALARM_LEVEL" :value="scope.row.grade" />
+				v-if="tableBtn.length"
-        </template>
+				slot="handleBtn"
-      </el-table-column>
+				label="操作"
-      <el-table-column label="字符型用 对应到设备实际的报警编码 布尔型不用填写" align="center" prop="alarmCode" />
+				:method-list="tableBtn"
-      <el-table-column label="报警内容 该条报警具体的解释" align="center" prop="alarmContent" />
+				@clickBtn="handleTableBtnClick" />
-      <el-table-column label="关联编码，对应到plc_param_name的编码，用于链接数采" align="center" prop="plcParamName" />
+		</base-table>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-group-alarm:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-group-alarm:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 		<!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+		<base-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			:dialogTitle="title"
-        <el-form-item label="设备分组ID，关联base_equipment_group" prop="equipmentGroupId">
+			:dialogVisible="open"
-          <el-input v-model="form.equipmentGroupId" placeholder="请输入设备分组ID，关联base_equipment_group" />
+			width="736px"
-        </el-form-item>
+			@close="cancel"
-        <el-form-item label="编码" prop="code">
+			@cancel="cancel"
-          <el-input v-model="form.code" placeholder="请输入编码" />
+			@confirm="submitForm">
-        </el-form-item>
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-        <el-form-item label="报警类型:1.字符型，2.布尔型" prop="type">
+		</base-dialog>
-          <el-select v-model="form.type" placeholder="请选择报警类型:1.字符型，2.布尔型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="报警级别 字典表关联label_value" prop="grade">
-          <el-select v-model="form.grade" placeholder="请选择报警级别 字典表关联label_value">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="字符型用 对应到设备实际的报警编码 布尔型不用填写" prop="alarmCode">
-          <el-input v-model="form.alarmCode" placeholder="请输入字符型用 对应到设备实际的报警编码 布尔型不用填写" />
-        </el-form-item>
-        <el-form-item label="报警内容 该条报警具体的解释" prop="alarmContent">
-          <el-input v-model="form.alarmContent" placeholder="请输入报警内容 该条报警具体的解释" />
-        </el-form-item>
-        <el-form-item label="关联编码，对应到plc_param_name的编码，用于链接数采" prop="plcParamName">
-          <el-input v-model="form.plcParamName" placeholder="请输入关联编码，对应到plc_param_name的编码，用于链接数采" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
 	</div>
 </template>
 
 <script>
-import { createEquipmentGroupAlarm, updateEquipmentGroupAlarm, deleteEquipmentGroupAlarm, getEquipmentGroupAlarm, getEquipmentGroupAlarmPage, exportEquipmentGroupAlarmExcel } from "@/api/base/equipmentGroupAlarm";
+import {
+	createEquipmentGroupAlarm,
+	updateEquipmentGroupAlarm,
+	deleteEquipmentGroupAlarm,
+	getEquipmentGroupAlarm,
+	getEquipmentGroupAlarmPage,
+	exportEquipmentGroupAlarmExcel,
+} from '@/api/base/equipmentGroupAlarm';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import moment from 'moment';
+import { publicFormatter } from '@/utils/dict';
 
 export default {
-  name: "EquipmentGroupAlarm",
+	name: 'EquipmentGroupAlarm',
-  components: {
+	components: {},
-  },
+	mixins: [basicPageMixin],
 	data() {
 		return {
-      // 遮罩层
+			searchBarKeys: [''],
-      loading: true,
+			tableBtn: [
-      // 导出遮罩层
+				this.$auth.hasPermi('base:equipment-group-alarm:update')
-      exportLoading: false,
+					? {
-      // 显示搜索条件
+							type: 'edit',
-      showSearch: true,
+							btnName: '修改',
-      // 总条数
+					  }
-      total: 0,
+					: undefined,
-      // 设备分组报警明细列表
+				this.$auth.hasPermi('base:equipment-group-alarm:delete')
-      list: [],
+					? {
-      // 弹出层标题
+							type: 'delete',
-      title: "",
+							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: 'code', label: '报警编码', align: 'center' },
+				{ prop: 'type', 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' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备分组编码',
+					placeholder: '/',
+					param: 'equipmentGroupCode',
+					defaultSelect: null,
+					disabled: true,
+				},
+				{
+					type: 'input',
+					label: '设备分组名称',
+					placeholder: '/',
+					param: 'equipmentGroupName',
+					defaultSelect: null,
+					disabled: true,
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-group-alarm:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '报警编码', // 自动生成
+						prop: 'code',
+						url: '/base/equipment-group-alarm/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '报警类型', // 固定选项
+						prop: 'type',
+						options: [
+							{ label: '布尔型', value: 2 },
+							{ label: '字符型', value: 1 },
+						],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '报警级别', // 字典
+						prop: 'grade',
+						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
+					},
+					{
+						input: true,
+						label: '设备报警编码', // 对应到设备实际的报警编码
+						prop: 'alarmCode',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '参数列名', // 在实时数据库的列名
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -125,25 +180,62 @@ export default {
 				equipmentGroupId: null,
 			},
 			// 表单参数
-      form: {},
+			form: {
-      // 表单校验
+				id: undefined,
-      rules: {
+				equipmentGroupId: undefined,
-        equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
+				code: undefined,
-        type: [{ required: true, message: "报警类型:1.字符型，2.布尔型不能为空", trigger: "change" }],
+				type: undefined,
-        alarmContent: [{ required: true, message: "报警内容 该条报警具体的解释不能为空", trigger: "blur" }],
+				grade: undefined,
-        plcParamName: [{ required: true, message: "关联编码，对应到plc_param_name的编码，用于链接数采不能为空", trigger: "blur" }],
+				alarmCode: undefined,
-      }
+				alarmContent: undefined,
+				plcParamName: undefined,
+			},
+			// // 表单校验
+			// rules: {
+			//   equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
+			//   type: [{ required: true, message: "报警类型:1.字符型，2.布尔型不能为空", trigger: "change" }],
+			//   alarmContent: [{ required: true, message: "报警内容 该条报警具体的解释不能为空", trigger: "blur" }],
+			//   plcParamName: [{ required: true, message: "关联编码，对应到plc_param_name的编码，用于链接数采不能为空", trigger: "blur" }],
+			// }
 		};
 	},
-  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;
 			// 执行查询
-      getEquipmentGroupAlarmPage(this.queryParams).then(response => {
+			getEquipmentGroupAlarmPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
@@ -166,7 +258,7 @@ export default {
 				alarmContent: undefined,
 				plcParamName: undefined,
 			};
-      this.resetForm("form");
+			this.resetForm('form');
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
@@ -175,43 +267,51 @@ export default {
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
-      this.resetForm("queryForm");
+			this.resetForm('queryForm');
 			this.handleQuery();
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
+			if (this.queryParams.equipmentGroupId == null)
+				return this.$message.error('没有检测到设备分组信息');
 			this.reset();
 			this.open = true;
-      this.title = "添加设备分组报警明细";
+			this.title = '添加设备分组报警明细';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
 			const id = row.id;
-      getEquipmentGroupAlarm(id).then(response => {
+			getEquipmentGroupAlarm(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-        this.title = "修改设备分组报警明细";
+				this.title = '修改设备分组报警明细';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-      this.$refs["form"].validate(valid => {
+			this.$refs['form'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-          updateEquipmentGroupAlarm(this.form).then(response => {
+					updateEquipmentGroupAlarm({
-            this.$modal.msgSuccess("修改成功");
+						...this.form,
+						equipmentGroupId: this.queryParams.equipmentGroupId,
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
 					});
 					return;
 				}
 				// 添加的提交
-        createEquipmentGroupAlarm(this.form).then(response => {
+				createEquipmentGroupAlarm({
-          this.$modal.msgSuccess("新增成功");
+					...this.form,
+					equipmentGroupId: this.queryParams.equipmentGroupId,
+				}).then((response) => {
+					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
 				});
@@ -220,12 +320,16 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;
-      this.$modal.confirm('是否确认删除设备分组报警明细编号为"' + id + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除设备分组报警明细编号为"' + id + '"的数据项?')
+				.then(function () {
 					return deleteEquipmentGroupAlarm(id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -233,14 +337,18 @@ export default {
 			let params = { ...this.queryParams };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有设备分组报警明细数据项?').then(() => {
+			this.$modal
+				.confirm('是否确认导出所有设备分组报警明细数据项?')
+				.then(() => {
 					this.exportLoading = true;
 					return exportEquipmentGroupAlarmExcel(params);
-        }).then(response => {
+				})
+				.then((response) => {
 					this.$download.excel(response, '设备分组报警明细.xls');
 					this.exportLoading = false;
-        }).catch(() => {});
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>