src/components/DialogForm/index.vue

@@ -89,6 +89,8 @@ function findMaxLabelWidth(rows) {
 	let max = 0;
 	rows.forEach((row) => {
 		row.forEach((opt) => {
+			// debugger;
+			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
 			}

src/mixins/lb/basicPageMixin.js

@@ -53,6 +53,9 @@ export default {
 				case 'delete':
 					this.handleDelete(data);
 					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
 			}
 		},
 		// 处理搜索栏按钮

src/views/base/equipmentGroup/components/BasicDrawer.vue

@@ -0,0 +1,476 @@
+<!-- 
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div class="form-part" v-if="section.key == 'base'">
+						<el-skeleton v-if="!showForm" animated />
+						<DialogForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:dataForm="form"
+							:rows="formRows" />
+					</div>
+
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery.params.pageNo || 1"
+							:limit="attrQuery.params.pageSize || 10"
+							:table-data="list"
+							:add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr"
+							@emitFun="handleEmitFun">
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="margin-right: 10px" @click="handleCancel">
+					返回
+				</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<span v-else>
+					<el-button type="primary" @click="handleSave">保存</el-button>
+					<!-- sections的第二项必须是 属性列表  -->
+					<el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button>
+				</span>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="45%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:dataForm="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						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' }],
+					},
+				],
+			],
+			attrQuery: null, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					return {
+						...col,
+						bind: {
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				// debugger;
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+						console.log('setting form: ', this.form, data);
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.mode = 'edit';
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.error('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		async submitAttrForm() {
+			this.$refs['attrForm'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+			});
+			console.log('this.attrform', this.attrForm);
+			const isEdit = this.attrForm.id != null;
+			this.attrFormSubmitting = true;
+			const res = await this.$axios({
+				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+				method: isEdit ? 'put' : 'post',
+				data: this.attrForm,
+			});
+
+			if (res.code == 0) {
+				this.closeAttrForm();
+				this.$message({
+					message: `${isEdit ? '更新' : '创建'}成功`,
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.getAttrList();
+					},
+				});
+			}
+			this.attrFormSubmitting = false;
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/base/equipmentGroup/index.vue

@@ -40,6 +40,57 @@
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
+
+		<!-- 抽屉 详情 -->
+		<BasicDrawer
+			v-if="editVisible"
+			ref="drawer"
+			:mode="editMode"
+			:data-id="form.id"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+					url: '/base/equipment-group/get',
+					urlUpdate: '/base/equipment-group/update',
+					urlCreate: '/base/equipment-group/create',
+					queryParams: { id: form.id },
+				},
+				{
+					name: '属性列表',
+					key: 'attrs',
+					props: drawerListProps,
+					url: '/base/equipment-group-alarm/page',
+					urlCreate: '/base/equipment-group-alarm/create',
+					urlUpdate: '/base/equipment-group-alarm/update',
+					urlDelete: '/base/equipment-group-alarm/delete',
+					urlDetail: '/base/equipment-group-alarm/get',
+					queryParams: {
+						id: form.id,
+						pageNo: 1,
+						pageSize: 10,
+					},
+					tableBtn: [
+						this.$auth.hasPermi('base:equipment-group:update')
+							? {
+									type: 'edit',
+									btnName: '修改',
+							  }
+							: undefined,
+						this.$auth.hasPermi('base:equipment-group:delete')
+							? {
+									type: 'delete',
+									btnName: '删除',
+							  }
+							: undefined,
+					].filter((v) => v),
+					allowAdd: true,
+				},
+			]"
+			@refreshDataList="getList"
+			@cancel="editVisible = false"
+			@destroy="editVisible = false" />
 	</div>
 </template>
 
@@ -53,17 +104,27 @@ import {
 	exportEquipmentGroupExcel,
 } from '@/api/base/equipmentGroup';
 import moment from 'moment';
+import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { getAccessToken } from '@/utils/auth';
+// import { getAccessToken } from '@/utils/auth';
+import BasicDrawer from './components/BasicDrawer.vue';
 
 export default {
 	name: 'EquipmentGroup',
 	mixins: [basicPageMixin],
-	components: {},
+	components: { BasicDrawer },
 	data() {
 		return {
+			editVisible: false,
+			editMode: '',
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
+				this.$auth.hasPermi('base:equipment-group:update')
+					? {
+							type: 'detail',
+							btnName: '查看报警',
+					  }
+					: undefined,
 				this.$auth.hasPermi('base:equipment-group:update')
 					? {
 							type: 'edit',
@@ -88,33 +149,78 @@ export default {
 				{ prop: 'name', label: '设备分组名称' },
 				{ prop: 'code', label: '设备分组编码' },
 				{ prop: 'remark', label: '备注' },
-				{
+				// {
-					_action: 'equipment-group-show-alert',
+				// 	_action: 'equipment-group-show-alert',
-					label: '报警',
+				// 	label: '报警',
-					subcomponent: {
+				// 	subcomponent: {
-						props: ['injectData'],
+				// 		props: ['injectData'],
-						render: function (h) {
+				// 		render: function (h) {
-							const _this = this;
+				// 			const _this = this;
-							return h(
+				// 			return h(
-								'el-button',
+				// 				'el-button',
-								{
+				// 				{
-									props: { type: 'text' },
+				// 					props: { type: 'text' },
-									on: {
+				// 					on: {
-										click: function () {
+				// 						click: function () {
-											console.log('inejctdata', _this.injectData);
+				// 							console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
+				// 							_this.$emit('emitData', {
-												action: _this.injectData._action,
+				// 								action: _this.injectData._action,
-												// value: _this.injectData.id,
+				// 								// value: _this.injectData.id,
-												value: _this.injectData,
+				// 								value: _this.injectData,
-											});
+				// 							});
-										},
+				// 						},
-									},
+				// 					},
-								},
+				// 				},
-								'查看报警'
+				// 				'查看报警'
-							);
+				// 			);
-						},
+				// 		},
+				// 	},
+				// },
+			],
+			drawerBaseInfoRows: [
+				[
+					{
+						input: true,
+						label: '设备分组名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
+						// }
 					},
+					{
+						input: true,
+						label: '设备分组编码',
+						prop: 'code',
+						// url: '/base/equipment/getCode',
+					}
+				]
+			],
+			drawerListProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
+				{ width: 240, prop: 'code', label: '报警编码' },
+				{
+					width: 100,
+					prop: 'type',
+					label: '报警类型',
+					filter: (val) =>
+						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
+				},
+				{
+					width: 90,
+					prop: 'grade',
+					label: '报警级别',
+					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				},
+				{ width: 180, prop: 'alarmCode', label: '设备报警编码' },
+				{ width: 128, prop: 'plcParamName', label: '参数列名' },
+				{ width: 128, prop: 'alarmContent', label: '报警内容' },
 			],
 			searchBarFormConfig: [
 				{
@@ -299,6 +405,17 @@ export default {
 				});
 			});
 		},
+		handleDetail(row) {
+			const { id, code, name, createTime } = row;
+
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.form.id = id;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;

src/views/core/base/equipment/index.vue

@@ -139,6 +139,12 @@ export default {
 							btnName: '删除',
 					  }
 					: undefined,
+				this.$auth.hasPermi(`base:equipment:update`)
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableProps: [
 				{
@@ -153,32 +159,32 @@ export default {
 				{ prop: 'equipmentType', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
-				{
+				// {
-					action: 'show-detail',
+				// 	action: 'show-detail',
-					label: '详情',
+				// 	label: '详情',
-					subcomponent: {
+				// 	subcomponent: {
-						props: ['injectData'],
+				// 		props: ['injectData'],
-						render: function (h) {
+				// 		render: function (h) {
-							const _this = this;
+				// 			const _this = this;
-							return h(
+				// 			return h(
-								'el-button',
+				// 				'el-button',
-								{
+				// 				{
-									props: { type: 'text', size: 'mini' },
+				// 					props: { type: 'text', size: 'mini' },
-									on: {
+				// 					on: {
-										click: function () {
+				// 						click: function () {
-											console.log('inejctdata', _this.injectData);
+				// 							console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
+				// 							_this.$emit('emitData', {
-												action: _this.injectData.action,
+				// 								action: _this.injectData.action,
-												value: _this.injectData.id,
+				// 								value: _this.injectData.id,
-											});
+				// 							});
-										},
+				// 						},
-									},
+				// 					},
-								},
+				// 				},
-								'查看详情'
+				// 				'查看详情'
-							);
+				// 			);
-						},
+				// 		},
-					},
+				// 	},
-				},
+				// },
 			],
 			searchBarFormConfig: [
 				{
@@ -532,6 +538,10 @@ export default {
 				case 'delete':
 					this.handleDelete(data);
 					break;
+				case 'detail':
+					const { id } = data;
+					this.viewDetail(id);
+					break;
 			}
 		},
 	},