Merge branch 'test' into dy

src/views/base/dataBoard/index.vue

@@ -0,0 +1,74 @@
+<!-- 
+    filename: index.vue
+    author: liubin
+    date: 2023-10-11 09:32:04
+    description: 设备看板
+-->
+
+<template>
+	<div ref="dataBoard" class=""></div>
+</template>
+
+<script>
+export default {
+	name: 'DataBoard',
+	components: {},
+	props: {},
+	data() {
+		return {
+			appMain: null, // dom
+			parentStyle: {
+				margin: '8px 14px 0px 16px',
+				minHeight: 'calc(100vh - 120px - 8px)',
+			}, // object
+			mainFooter: null, // dom
+		};
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.modify();
+		});
+	},
+	activated() {
+		this.modify();
+	},
+	deactivated() {
+		this.recover();
+	},
+	beforeDestroy() {
+		this.recover();
+	},
+	methods: {
+		modify() {
+			// 在这个页面临时修改下父类的margin，结束时需还原
+			this.appMain = document.querySelector('.app-main');
+			// this.appMain.style.minHeight = 'calc(100vh - 90px)';
+			this.appMain.style.margin = 0;
+			// 在这个页面临时删除 main-footer 元素，结束时需还原
+			// this.mainFooter = document.querySelector('.main-footer').cloneNode(true);
+			// document.querySelector('.main-footer').remove();
+            this.$refs.dataBoard.classList.add('data-board');
+		},
+		recover() {
+            this.$refs.dataBoard.classList.remove('data-board');
+			this.$nextTick(() => {
+				this.appMain.style.margin = this.parentStyle.margin;
+				// this.appMain.style.minHeight = this.parentStyle.minHeight;
+				// this.appMain.insertAdjacentElement('afterend', this.mainFooter);
+			});
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.data-board {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: url('../../../assets/images/DataBoard.png') 100% 100% / contain
+		no-repeat;
+}
+</style>

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

@@ -0,0 +1,482 @@
+<!-- 
+    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 />
+						<BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="true"
+							: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="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</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"
+				:disabled="mode.includes('detail')"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm from '@/components/DialogForm';
+import DialogForm from './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, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentGroupId: '',
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			},
+			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: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			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',
+							disabled: true,
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		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;
+					} 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,
+				equipmentGroupId: this.dataId,
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			};
+			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(`确定删除该报警?`, '提示', {
+					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/equipmentBindGroup/components/dialogForm.vue

@@ -0,0 +1,186 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for equipmentBindSection only
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.code"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入工段排序" />
+				</el-form-item>
+				<!-- 				
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.code"
+						placeholder="请选择产线"
+						@change="handleProductlineChange">
+						<el-option
+							v-for="opt in productionLineList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.type"
+						placeholder="请选择报警类型"
+						@change="handleTypeChange">
+						<el-option
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					v-if="+dataForm.type == 1"
+					label="设备报警编码"
+					prop="alarmCode">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmCode"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入设备报警编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+		};
+	},
+	mounted() {
+		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.formLoading = false;
+			this.$emit('update', {
+				...this.dataForm,
+				code,
+			});
+		});
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleTypeChange(id) {
+			this.dataForm.alarmCode = '';
+			this.$emit('update', this.dataForm);
+		},
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

src/views/base/equipmentBindGroup/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"
+			:default-mode="editMode"
+			:data-id="alarmForm.id"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+					url: '/base/equipment-group/get',
+					urlUpdate: '/base/equipment-group/update',
+					urlCreate: '/base/equipment-group/create',
+					queryParams: { id: alarmForm.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: {
+						equipmentGroupId: alarmForm.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>
 
@@ -55,16 +106,24 @@ import {
 
 import { getEquipmentGroupPage } from '@/api/base/equipmentGroup';
 import moment from 'moment';
+import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import BasicDrawer from './components/BasicDrawer.vue';
 
 export default {
 	name: 'EquipmentBindGroup',
-	components: {},
+	components: { BasicDrawer },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
 			tableBtn: [
+				this.$auth.hasPermi('base:equipment-bind-group:update')
+					? {
+							type: 'detail',
+							btnName: '查看报警',
+					  }
+					: undefined,
 				this.$auth.hasPermi('base:equipment-bind-group:update')
 					? {
 							type: 'edit',
@@ -88,32 +147,32 @@ export default {
 				},
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'groupName', label: '分组' },
-				{
-					_action: 'equipment-bind-group-show-alert',
-					label: '分组报警',
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									props: { type: 'text' },
-									on: {
-										click: function () {
-											console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												value: _this.injectData,
-											});
-										},
-									},
-								},
-								'查看报警'
-							);
-						},
-					},
-				},
+				// {
+				// 	_action: 'equipment-bind-group-show-alert',
+				// 	label: '分组报警',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								value: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看报警'
+				// 			);
+				// 		},
+				// 	},
+				// },
 			],
 			searchBarFormConfig: [
 				{
@@ -196,6 +255,59 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {},
+			//
+			alarmForm: {
+				id: undefined,
+				equipmentGroupCode: undefined,
+				equipmentGroupName: undefined,
+			},
+			editVisible: false,
+			editMode: '',
+			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: '报警内容' },
+			],
 		};
 	},
 	created() {
@@ -229,7 +341,6 @@ export default {
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
-			_; // 执行查询
 			getEquipmentBindGroupPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@@ -299,6 +410,20 @@ export default {
 				});
 			});
 		},
+		// 查看报警
+		handleDetail(row) {
+			const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
+				row;
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.alarmForm.id = groupId;
+			this.alarmForm.equipmentGroupCode = groupCode;
+			this.alarmForm.equipmentGroupName = groupName;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;

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

@@ -0,0 +1,481 @@
+<!-- 
+    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 />
+						<BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="mode.includes('detail')"
+							: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="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</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"
+				:disabled="mode.includes('detail')"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm from '@/components/DialogForm';
+import DialogForm from './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, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentGroupId: '',
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			},
+			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: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			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',
+							disabled: true
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		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;
+					} 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,
+				equipmentGroupId: this.dataId,
+				code: '',
+				type: '',
+				grade: '',
+				alarmCode: '',
+				alarmContent: '',
+				plcParamName: '',
+			};
+			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;
+				}
+			});
+			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(`确定删除该报警?`, '提示', {
+					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/components/dialogForm.vue

@@ -0,0 +1,187 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for equipmentBindSection only
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.code"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入工段排序" />
+				</el-form-item>
+				<!-- 				
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.code"
+						placeholder="请选择产线"
+						@change="handleProductlineChange">
+						<el-option
+							v-for="opt in productionLineList"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.type"
+						placeholder="请选择报警类型"
+						@change="handleTypeChange">
+						<el-option
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					v-if="+dataForm.type == 1"
+					label="设备报警编码"
+					prop="alarmCode">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmCode"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入设备报警编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+		};
+	},
+	mounted() {
+		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.formLoading = false;
+			this.$emit('update', {
+				...this.dataForm,
+				code,
+			});
+		});
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleTypeChange(id) {
+			// debugger;
+			this.dataForm.alarmCode = '';
+			this.$emit('update', this.dataForm);
+		},
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</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"
+			:default-mode="editMode"
+			:data-id="alarmForm.id"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+					url: '/base/equipment-group/get',
+					urlUpdate: '/base/equipment-group/update',
+					urlCreate: '/base/equipment-group/create',
+					queryParams: { id: alarmForm.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: {
+						equipmentGroupId: alarmForm.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,34 +149,84 @@ export default {
 				{ prop: 'name', label: '设备分组名称' },
 				{ prop: 'code', label: '设备分组编码' },
 				{ prop: 'remark', label: '备注' },
-				{
-					_action: 'equipment-group-show-alert',
-					label: '报警',
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									props: { type: 'text' },
-									on: {
-										click: function () {
-											console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												// value: _this.injectData.id,
-												value: _this.injectData,
-											});
-										},
-									},
-								},
-								'查看报警'
-							);
-						},
-					},
-				},
+				// {
+				// 	_action: 'equipment-group-show-alert',
+				// 	label: '报警',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								// value: _this.injectData.id,
+				// 								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: '报警内容' },
+			],
+			alarmForm: {
+				id: undefined,
+				equipmentGroupCode: undefined,
+				equipmentGroupName: undefined,
+			},
 			searchBarFormConfig: [
 				{
 					type: 'input',
@@ -299,6 +410,20 @@ export default {
 				});
 			});
 		},
+		// 查看报警
+		handleDetail(row) {
+			// debugger;
+			const { id, code, name, createTime } = row;
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.alarmForm.id = id;
+			this.alarmForm.equipmentGroupCode = code;
+			this.alarmForm.equipmentGroupName = name;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;

src/views/base/equipmentGroupAlarm/dialogForm.vue

@@ -18,24 +18,25 @@
 					prop="code"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-input
+						:disabled="disabled"
 						v-model="dataForm.code"
 						@change="$emit('update', dataForm)"
 						placeholder="请输入工段排序" />
 				</el-form-item>
 				<!-- 				
-				<el-form-item
-					label="报警编码"
-					prop="code"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
+						<el-form-item
+						label="报警编码"
+						prop="code"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<el-select
 						v-model="dataForm.code"
 						placeholder="请选择产线"
 						@change="handleProductlineChange">
 						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
+						v-for="opt in productionLineList"
+						:key="opt.value"
+						:label="opt.label"
+						:value="opt.value" />
 					</el-select>
 				</el-form-item> -->
 			</el-col>
@@ -47,6 +48,7 @@
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
 						v-model="dataForm.type"
+						:disabled="disabled"
 						placeholder="请选择报警类型"
 						@change="$emit('update', dataForm)">
 						<el-option
@@ -68,6 +70,7 @@
 					prop="grade"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-select
+						:disabled="disabled"
 						v-model="dataForm.grade"
 						placeholder="请选择报警级别"
 						@change="$emit('update', dataForm)">
@@ -86,6 +89,7 @@
 					label="设备报警编码"
 					prop="alarmCode">
 					<el-input
+						:disabled="disabled"
 						v-model="dataForm.alarmCode"
 						@change="$emit('update', dataForm)"
 						placeholder="请输入设备报警编码" />
@@ -99,6 +103,7 @@
 					prop="plcParamName"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-input
+						:disabled="disabled"
 						v-model="dataForm.plcParamName"
 						placeholder="请输入参数列名"
 						@change="$emit('update', dataForm)"></el-input>
@@ -110,6 +115,7 @@
 					prop="alarmContent"
 					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
 					<el-input
+						:disabled="disabled"
 						v-model="dataForm.alarmContent"
 						placeholder="请输入报警内容"
 						@change="$emit('update', dataForm)"></el-input>
@@ -133,6 +139,10 @@ export default {
 			type: Object,
 			default: () => ({}),
 		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {

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

@@ -0,0 +1,531 @@
+<!-- 
+    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 />
+						<BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="mode.includes('detail')"
+							: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="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</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"
+				:disabled="mode.includes('detail')"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm 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: BaseInfoForm, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'infoData'],
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: '',
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '参数列名',
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '参数名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '单位',
+						prop: 'unit',
+						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						switch: true,
+						label: '是否采集',
+						prop: 'collection',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					},
+				],
+				[
+					{
+						input: true,
+						label: '最小值',
+						prop: 'minValue',
+						rules: [
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+					{
+						input: true,
+						label: '最大值',
+						prop: 'maxValue',
+						rules: [
+							{
+								required: false,
+							},
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '标准值',
+						prop: 'defaultValue',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '描述',
+						prop: 'description',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			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',
+							disabled: true,
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		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;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			} else if (section.key == 'base') {
+				this.form = this.infoData;
+				this.showForm = true;
+			}
+		}
+	},
+	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() {
+			this.attrForm = {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: '',
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+			};
+			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;
+				}
+			});
+			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,
+					connectId: this.infoData.id
+				},
+			});
+
+			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(`确定删除该报警?`, '提示', {
+					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/equipmentPlcConnect/index.vue

@@ -40,6 +40,53 @@
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
+
+		<!-- 抽屉 详情 -->
+		<BasicDrawer
+			v-if="editVisible"
+			ref="drawer"
+			:default-mode="editMode"
+			:info-data="alarmForm"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+				},
+				{
+					name: '属性列表',
+					key: 'attrs',
+					props: drawerListProps,
+					url: '/base/equipment-plc-param/page',
+					urlCreate: '/base/equipment-plc-param/create',
+					urlUpdate: '/base/equipment-plc-param/update',
+					urlDelete: '/base/equipment-plc-param/delete',
+					urlDetail: '/base/equipment-plc-param/get',
+					queryParams: {
+						connectId: alarmForm.id,
+						pageNo: 1,
+						pageSize: 10,
+					},
+					tableBtn: [
+						this.$auth.hasPermi('base:equipment-plc-param:update')
+							? {
+									type: 'edit',
+									btnName: '修改',
+							  }
+							: undefined,
+						this.$auth.hasPermi('base:equipment-plc-param:delete')
+							? {
+									type: 'delete',
+									btnName: '删除',
+							  }
+							: undefined,
+					].filter((v) => v),
+					allowAdd: true,
+				},
+			]"
+			@refreshDataList="getList"
+			@cancel="editVisible = false"
+			@destroy="editVisible = false" />
 	</div>
 </template>
 
@@ -55,11 +102,13 @@ import {
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import './http';
+import BasicDrawer from './components/BasicDrawer.vue';
+import { publicFormatter } from '@/utils/dict';
 
 export default {
 	name: 'EquipmentPlcConnect',
 	mixins: [basicPageMixin],
-	components: {},
+	components: { BasicDrawer },
 	data() {
 		return {
 			searchBarKeys: ['equipmentId', 'plcId'],
@@ -78,6 +127,10 @@ export default {
 			// 		: undefined,
 			// ].filter((v) => v),
 			tableBtn: [
+				{
+					type: 'detail',
+					btnName: '参数绑定',
+				},
 				{
 					type: 'edit',
 					btnName: '修改',
@@ -107,32 +160,32 @@ export default {
 				{ prop: 'plcTableName', label: '关联表名' },
 				{ prop: 'plcName', label: '标识名称' },
 				{ prop: 'bindingParameters', label: '绑定参数数量' },
-				{
-					_action: 'params-bind',
-					label: '查看绑定',
-					subcomponent: {
-						props: ['injectData'],
-						render: function (h) {
-							const _this = this;
-							return h(
-								'el-button',
-								{
-									props: { type: 'text' },
-									on: {
-										click: function () {
-											console.log('inejctdata', _this.injectData);
-											_this.$emit('emitData', {
-												action: _this.injectData._action,
-												payload: _this.injectData,
-											});
-										},
-									},
-								},
-								'查看绑定'
-							);
-						},
-					},
-				},
+				// {
+				// 	_action: 'params-bind',
+				// 	label: '查看绑定',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								payload: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看绑定'
+				// 			);
+				// 		},
+				// 	},
+				// },
 			],
 			searchBarFormConfig: [
 				{
@@ -185,8 +238,8 @@ export default {
 						url: '/base/equipment-plc/listAll',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						bind: {
-							filterable: true
-						}
+							filterable: true,
+						},
 					},
 				],
 				[
@@ -197,8 +250,8 @@ export default {
 						url: '/base/equipment/page?pageNo=1&pageSize=99',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						bind: {
-							filterable: true
-						}
+							filterable: true,
+						},
 					},
 				],
 			],
@@ -212,6 +265,52 @@ export default {
 			},
 			// 表单参数
 			form: {},
+			// 查看绑定配置
+			editVisible: false,
+			editMode: '',
+			drawerBaseInfoRows: [
+				[
+					{
+						input: true,
+						label: '设备名',
+						prop: 'equipmentName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '关联表名',
+						prop: 'plcTableName',
+						// url: '/base/equipment/getCode',
+					},
+				],
+			],
+			drawerListProps: [
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'name', label: '参数名称' },
+				{
+					prop: 'unit',
+					label: '单位',
+					filter: publicFormatter('unit_dict'),
+				},
+				{
+					prop: 'collection',
+					label: '是否采集',
+					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
+				},
+				{ prop: 'minValue', label: '最小值' },
+				{ prop: 'maxValue', label: '最大值' },
+				{ prop: 'defaultValue', label: '标准值' },
+				{ prop: 'description', label: '描述' },
+				{ prop: 'remark', label: '备注' },
+			],
+			alarmForm: {
+				id: undefined,
+				equipmentName: undefined,
+				plcTableName: undefined,
+			},
 		};
 	},
 	created() {
@@ -353,6 +452,34 @@ export default {
 				});
 			});
 		},
+
+		// 查看报警
+		handleDetail(row) {
+			// debugger;
+			const {
+				id,
+				bindingParameters,
+				equipmentCode,
+				equipmentId,
+				equipmentName,
+				plcCode,
+				plcId,
+				plcName,
+				plcTableName,
+				productionLine,
+				workshopSection,
+			} = row;
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.alarmForm.id = id;
+			this.alarmForm.plcTableName = plcTableName; // 关联表名
+			this.alarmForm.equipmentName = equipmentName;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;
@@ -367,6 +494,7 @@ export default {
 				})
 				.catch(() => {});
 		},
+
 		/** 导出按钮操作 */
 		handleExport() {
 			// 处理查询参数

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',
-					label: '详情',
-					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,
-											});
-										},
-									},
-								},
-								'查看详情'
-							);
-						},
-					},
-				},
+				// {
+				// 	action: 'show-detail',
+				// 	label: '详情',
+				// 	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: [
 				{
@@ -532,6 +538,10 @@ export default {
 				case 'delete':
 					this.handleDelete(data);
 					break;
+				case 'detail':
+					const { id } = data;
+					this.viewDetail(id);
+					break;
 			}
 		},
 	},

src/views/energy/analysis/contrastAnalysis/components/barChart.vue

@@ -97,6 +97,22 @@ export default {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
+          },
+          formatter: function(params) {
+            return (
+              params[0].axisValue + 
+              `<br>` +
+              params.map((item) => {
+                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
+                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
+						let value = item.value ? item.value : '-'
+						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
+						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
+									<span>${str}${seriesNameStr}</span>
+									<span>${valueStr}</span>
+								</span>`
+              }).join(``)
+            )
           }
         },
         grid: {
@@ -106,7 +122,11 @@ export default {
           containLabel: true
         },
         legend: {
-          data: legendData
+          data: legendData,
+          right: '1%',
+          icon: 'rect',
+          itemHeight: 8,
+          itemWidth: 8
         },
         xAxis: {
           type: 'category',

src/views/energy/analysis/contrastAnalysis/components/lineChart.vue

@@ -103,7 +103,8 @@ export default {
           containLabel: true
         },
         legend: {
-          data: legendData
+          data: legendData,
+          right: '1%'
         },
         xAxis: {
           type: 'category',

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -425,7 +425,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 时间整点 */
 .noneMinute .el-time-spinner__wrapper {
   width: 100%;
@@ -433,6 +433,16 @@ export default {
 .noneMinute .el-scrollbar:nth-of-type(2) {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
 <style lang="scss" scoped>
 .demo-form-inline {
@@ -446,8 +456,6 @@ export default {
     margin-top: 12px;
   }
 }
-</style>
-<style scoped>
 .searchBarBox .foldClass {
   position: absolute;
   top: 14px;

src/views/energy/analysis/qoqAnalysis/components/lineChart.vue

@@ -15,7 +15,7 @@ export default {
     return {
       chartDom: '',
       chart: '',
-      chartHeight: this.tableHeight(350)
+      chartHeight: this.tableHeight(370)
     }
   },
   props: {
@@ -34,7 +34,7 @@ export default {
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(350)
+      this.chartHeight = this.tableHeight(370)
     })
   },
   methods: {
@@ -86,17 +86,35 @@ export default {
         }
       }
       var option = {
-        // title: {
-        //   text: 'World Population'
-        // },
         color:['#288AFF','#8EF0AB'],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
+          },
+          formatter: function(params) {
+            return (
+              params[0].axisValue + 
+              `<br>` +
+              params.map((item) => {
+                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
+                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
+						let value = item.value ? item.value : '-'
+						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
+						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
+									<span>${str}${seriesNameStr}</span>
+									<span>${valueStr}</span>
+								</span>`
+              }).join(``)
+            )
           }
         },
-        legend: {},
+        legend: {
+          right: '1%',
+          icon: 'rect',
+          itemHeight: 8,
+          itemWidth: 8
+        },
         grid: {
           left: '1%',
           right: '1%',

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -194,13 +194,23 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 .separateStyle {
   display: inline-block;
   width: 1px;
@@ -208,8 +218,6 @@ export default {
   background: #E8E8E8;
   vertical-align: middle;
 }
-</style>
-<style lang="scss" scoped>
 .demo-form-inline {
   .blue-block {
     display: inline-block;

src/views/energy/analysis/qoqAnalysis/index.vue

@@ -9,7 +9,8 @@
         :table-data="list"
         class="qoq-out-table"
       />
-      <div style='width: 100%;height: 300px;padding-top: 30px;'>
+      <div class="chartTitle">环比分析图</div>
+      <div style='width: 100%'>
         <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </div>
     </div>
@@ -111,4 +112,21 @@ export default {
     }
   }
 }
-</script>
+</script>
+<style lang='scss' scoped>
+.chartTitle {
+  font-size: 16px;
+  color: #000;
+  margin-top: 20px;
+}
+.chartTitle::before {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+</style>

src/views/energy/analysis/trendAnalysis/components/barChart.vue

@@ -68,12 +68,6 @@ export default {
       }
       var option = {
         color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
         grid: {
           left: '4%',
           right: '1%',

src/views/energy/analysis/trendAnalysis/components/lineChart.vue

@@ -70,9 +70,9 @@ export default {
 
       var option = {
         color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis'
-        },
+        // tooltip: {
+        //   trigger: 'axis'
+        // },
         grid: {
           left: '4%',
           right: '1%',

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -385,7 +385,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
@@ -397,6 +397,16 @@ export default {
 .noneMinute .el-scrollbar:nth-of-type(2) {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
 <style lang="scss" scoped>
 .demo-form-inline {
@@ -410,8 +420,6 @@ export default {
     margin-top: 12px;
   }
 }
-</style>
-<style scoped>
 .searchBarBox .foldClass {
   position: absolute;
   top: 14px;

src/views/energy/analysis/yoyAnalysis/components/lineChart.vue

@@ -77,7 +77,8 @@ export default {
       var option = {
         color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
         legend: {
-          data: keys
+          data: keys,
+          right:'1%'
         },
         tooltip: {
           trigger: 'axis'

src/views/energy/analysis/yoyAnalysis/components/searchArea.vue

@@ -125,7 +125,31 @@ export default {
       this.$emit('submit', this.queryParams)
     },
     exportData() {
-      this.$emit('exportD')
+      let name
+      if (this.queryParams.objId) {
+        name = this.getObjName(this.objList, this.queryParams.objId)
+      } else {
+        this.$modal.msgWarning("对象不能为空")
+        return false
+      }
+      this.$emit('exportD', {name: name})
+    },
+    // 递归取对象name
+    getObjName(list, id) {
+      let _this = this
+      for (let i = 0; i < list.length; i++) {
+        let a = list[i]
+        if (a.id === id) {
+          return a.name
+        } else {
+          if (a.children && a.children.length > 0) {
+            let res = _this.getObjName(a.children, id)
+            if (res) {
+              return res
+            }
+          }
+        }
+      }
     },
     transformTime(timeStamp) {// 本月最后一天
       let year = moment(timeStamp).format('YYYY')
@@ -143,19 +167,20 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
 }
-</style>
-<style scoped>
-.separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
 }
 </style>
 <style lang="scss" scoped>
@@ -170,4 +195,11 @@ export default {
     margin-top: 10px;
   }
 }
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+}
 </style>

src/views/energy/analysis/yoyAnalysis/index.vue

@@ -3,6 +3,7 @@
     <!-- 搜索工作栏 -->
     <search-area @submit="getList" @exportD="exportData"/>
     <div v-show='chartData.length'>
+      <div class="chartTitle">同比分析图</div>
       <div style='width: 100%;height: 400px;'>
         <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </div>
@@ -33,12 +34,12 @@ export default {
       chartData: [],
       tableProps: [],
       list: [],
-      tableH: this.tableHeight(600)
+      tableH: this.tableHeight(640)
     }
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(600)
+      this.tableH = this.tableHeight(640)
     })
   },
   methods: {
@@ -99,9 +100,10 @@ export default {
       }
       this.chartData = this.list
     },
-    exportData() {
+    exportData(val) {
       if (this.list.length > 0) {
         var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
+        let fileName = val.name + "同比分析.xlsx"
         var wbout = XLSX.write(wb, {
             bookType: "xlsx",
             bookSST: true,
@@ -110,7 +112,7 @@ export default {
         try {
             FileSaver.saveAs(
             new Blob([wbout], { type: "application/octet-stream" }),
-            "同比分析.xlsx"
+            fileName
             )
         } catch (e) {
             if (typeof console !== "undefined") console.log(e, wbout);
@@ -122,4 +124,20 @@ export default {
     }
   }
 }
-</script>
+</script>
+<style lang='scss' scoped>
+.chartTitle {
+  font-size: 16px;
+  color: #000;
+}
+.chartTitle::before {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+</style>

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -130,7 +130,7 @@ export default {
       this.plcTableName = data.plcTableName
       this.objName = data.objName
       this.getList()
-      if (title === 'view') {
+      if (title === 'detail') {
         this.showBtn = false
         this.tableBtn = []
       } else {

src/views/energy/base/energyPlcConnect/index.vue

@@ -113,22 +113,22 @@ export default {
       ],
       tableProps,
       tableBtn: [
+        this.$auth.hasPermi('base:energy-plc-connect:bind')
+          ? {
+              type: 'connect',
+              btnName: '绑定'
+            }
+          : undefined,
+        {
+          type: 'detail',
+          btnName: '详情'
+        },
         this.$auth.hasPermi('base:energy-plc-connect:update')
           ? {
               type: 'edit',
               btnName: '编辑'
             }
           : undefined,
-        {
-          type: 'view',
-          btnName: '查看'
-        },
-        this.$auth.hasPermi('base:energy-plc-connect:bind')
-        ? {
-            type: 'connect',
-            btnName: '绑定'
-          }
-        : undefined,
         this.$auth.hasPermi('base:energy-plc-connect:delete')
           ? {
               type: 'delete',
@@ -205,10 +205,10 @@ export default {
         case 'delete':
           this.handleDelete(val.data)
           break
-        case 'view':
+        case 'detail':
           this.paramVisible = true
           this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'view')
+            this.$refs.plcParam.init(val.data, 'detail')
           })
           break
         default:

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -1,54 +1,72 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="110px" :model="form">
-    <el-form-item label="监控对象" prop="objectId">
-      <el-cascader
-        style='width: 100%;'
-        v-model="objIds"
-        :options="objList"
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        popper-class="cascaderParent"
-        @change="selectObj"
-        clearable></el-cascader>
-    </el-form-item>
-    <el-form-item label="能源类型" prop="energyTypeId">
-      <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
-        <el-option
-          v-for="item in this.energyTypeList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="监控模式" prop="type">
-      <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
-        <el-option label="合并" :value= "1" ></el-option>
-        <el-option label="详细" :value= "2" ></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
-      <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
-        <el-option
-          v-for="item in detailList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="指标类型" prop="limitType">
-      <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
-        <el-option
-          v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="消耗量阈值" prop="limitValue">
-      <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
-    </el-form-item>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="监控对象" prop="objectId">
+          <el-cascader
+            style='width: 100%;'
+            v-model="objIds"
+            :options="objList"
+            :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+            popper-class="cascaderParent"
+            @change="selectObj"
+            clearable></el-cascader>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
+            <el-option
+              v-for="item in this.energyTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="监控模式" prop="type">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
+            <el-option label="合并" :value= "1" ></el-option>
+            <el-option label="详细" :value= "2" ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
+          <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
+            <el-option
+              v-for="item in detailList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="指标类型" prop="limitType">
+          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="消耗量阈值" prop="limitValue">
+          <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -124,7 +124,7 @@ export default {
       this.energyType = data.energyType
       this.energyTypeId = data.energyTypeId
       this.getList()
-      if (title === 'view') {
+      if (title === 'detail') {
         this.showBtn = false
         this.tableBtn = []
       } else {

src/views/energy/monitoring/energyStatistics/index.vue

@@ -111,22 +111,22 @@ export default {
       ],
       tableProps,
       tableBtn: [
-        this.$auth.hasPermi('monitoring:energy-statistics:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        {
-          type: 'view',
-          btnName: '查看'
-        },
         this.$auth.hasPermi('monitoring:energy-statistics:bind')
         ? {
             type: 'connect',
             btnName: '绑定'
           }
         : undefined,
+        {
+          type: 'detail',
+          btnName: '详情'
+        },
+        this.$auth.hasPermi('monitoring:energy-statistics:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
         this.$auth.hasPermi('monitoring:energy-statistics:delete')
           ? {
               type: 'delete',
@@ -199,9 +199,9 @@ export default {
         case 'delete':
           this.handleDelete(val.data)
           break
-        case 'view':
+        case 'detail':
           this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'view')
+            this.$refs.plcParam.init(val.data, 'detail')
           })
           break
         default:

src/views/equipment/analysis/efficiency/components/pieChart.vue

@@ -6,10 +6,11 @@
 -->
 
 <template>
-	<div class="chart-grid-item" style="">
+	<div class="chart-grid-item" style="overflow: inherit">
 		<div
 			class="pie-chart"
 			ref="pieChart"
+			style="overflow: inherit;"
 			:data-eqname="value.equipmentName || 'Default'"></div>
 		<div class="data-view">
 			<div class="data-view__item">
@@ -93,7 +94,7 @@ export default {
 						name: '',
 						type: 'pie',
 						radius: ['75%', '90%'],
-						center: ['50%', '45%'],
+						center: ['50%', '48%'],
 						label: {
 							show: false,
 						},
@@ -108,7 +109,7 @@ export default {
 						// 内环
 						name: '',
 						type: 'pie',
-						center: ['50%', '45%'],
+						center: ['50%', '48%'],
 						radius: ['60%', '75%'],
 						itemStyle: {
 							borderRadius: 10,

src/views/equipment/analysis/efficiency/index.vue

@@ -6,7 +6,7 @@
 -->
 
 <template>
-	<div class="app-container">
+	<div class="app-container allow-overflow">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
@@ -29,11 +29,19 @@
 							:table-data="list"
 							@emitFun="handleEmitFun"></base-table>
 					</el-tab-pane>
-					<el-tab-pane :label="'\u3000可视化\u3000'" name="graph">
+					<el-tab-pane
+						:label="'\u3000可视化\u3000'"
+						name="graph"
+						style="overflow: inherit">
 						<div
 							v-if="activeName == 'graph'"
 							class="graph"
-							style="display: flex; flex-direction: column; position: relative">
+							style="
+								overflow: inherit;
+								display: flex;
+								flex-direction: column;
+								position: relative;
+							">
 							<div class="blue-title">各设备加工数量</div>
 							<div class="legend">
 								<div class="legend-item">
@@ -429,6 +437,10 @@ export default {
 		transform: translateY(-12px);
 	}
 
+	.el-tabs__content {
+		overflow: visible;
+	}
+
 	.el-tabs__item {
 		padding-left: 0 !important;
 		padding-right: 0 !important;
@@ -462,6 +474,7 @@ export default {
 	border-radius: 12px;
 	border: 1px solid #ccc;
 	// background: #0003;
+	overflow: inherit;
 }
 .bg-grid {
 	display: grid;
@@ -469,7 +482,7 @@ export default {
 	grid-template-columns: repeat(4, minmax(280px, 1fr));
 	grid-auto-columns: 280px;
 	grid-auto-rows: 290px;
-	overflow: hidden;
+	overflow: inherit;
 	position: relative;
 }
 

src/views/equipment/analysis/quality/components/lineChart.vue

@@ -66,7 +66,7 @@ export default {
 										(item, index) => `
 											<li style="list-style: none; display: flex; justify-content: space-between; align-items: center;">
 												<div>
-													<span style="display: inline-block; width: 10px; height: 10px; border-radius: 50%; background-color: ${item.color}; margin-right: 5px;"></span>
+													<span style="display: inline-block; width: 10px; height: 10px; border-radius: 2px; background-color: ${item.color}; margin-right: 5px;"></span>
 													${item.seriesName}
 												</div>
 												${item.value}
@@ -121,6 +121,7 @@ export default {
 				},
 				series: [
 					{
+						animation: false,
 						name: '合格数量',
 						type: 'bar',
 						barWidth: 20,
@@ -128,6 +129,7 @@ export default {
 						data: opt.map((item) => item[1]),
 					},
 					{
+						animation: false,
 						name: '不合格数量',
 						type: 'bar',
 						barWidth: 20,

src/views/equipment/analysis/quality/index.vue

@@ -302,7 +302,7 @@ export default {
 			});
 			this.list = data.map((item) => ({
 				...item,
-				products: item.products.join(','),
+				products: item.products?.join(','),
 			}));
 		},
 
@@ -312,7 +312,7 @@ export default {
 				case 'search':
 					this.queryParams.lineId = btn.lineId;
 					this.queryParams.productId = btn.productId;
-					this.queryParams.recordTime = btn.recordTime;
+					this.queryParams.recordTime = btn.recordTime ? btn.recordTime.map(time => moment(new Date(time)).format('YYYY-MM-DD HH:mm:ss')) : null;
 					this.$nextTick(() => {
 						this.getList();
 					});

src/views/equipment/timing-diagram/status/chart.js

@@ -0,0 +1,328 @@
+import * as echarts from 'echarts'
+
+function getStartTime(timestamp) {
+    return new Date(new Date(timestamp).toLocaleDateString()).getTime();
+}
+
+function renderItem(params, api) {
+    var categoryIndex = api.value(0);
+    var start = api.coord([api.value(1), categoryIndex]);
+    var end = api.coord([api.value(2), categoryIndex]);
+
+    var height = api.size([0, 1])[1] * 2;
+    var rectShape = echarts.graphic.clipRectByRect(
+        {
+            x: start[0],
+            y: start[1] - height / 2,
+            width: end[0] - start[0],
+            height: height,
+        },
+        {
+            x: params.coordSys.x,
+            y: params.coordSys.y - 16,
+            width: params.coordSys.width,
+            height: params.coordSys.height,
+        }
+    );
+
+    return (
+        rectShape && {
+            type: 'rect',
+            transition: ['shape'],
+            shape: rectShape,
+            style: api.style(),
+        }
+    );
+}
+
+// unused
+function getXaxisRange(startTime) {
+    return Array(24)
+        .fill(startTime)
+        .map((item, index) => {
+            return new Date(item + index * 3600 * 1000)
+                .toLocaleTimeString()
+                .split(':')
+                .slice(0, 2)
+                .join(':');
+        });
+}
+
+function getTodayStart(today) {
+    const [y, m, d] = [
+        today.getFullYear(),
+        today.getMonth(),
+        today.getDate(),
+    ];
+    // debugger;
+    return new Date(y, m, d).getTime();
+}
+
+
+/** 颜色配置 */
+const types = [
+    { name: '运行', color: '#288AFF' },
+    { name: '故障', color: '#FC9C91' },
+    { name: '计划停机', color: '#FFDC94' },
+    { name: '空白', color: '#F2F4F9' },
+];
+
+
+export default class GanttGraph {
+    // tooltip - 基本是固定的
+    tooltip = {
+        trigger: 'item',
+        axisPointer: {
+            type: 'none',
+        },
+        formatter: (params) => {
+            // debugger;
+            return `
+            <div style="display: flex; flex-direction: column;">
+                <span>${new Date(params.value[1]).toLocaleTimeString()} ~ ${new Date(params.value[2]).toLocaleTimeString()}</span>
+                <div style="display: flex; align-items: center; justify-content: space-between;">
+                    <div style="display: flex; align-items: center;">
+                        <span class="icon" style="width: 8px; height: 8px; border-radius: 2px; background: ${params.color}"></span>
+                        <span class="eq-name" style="margin-left: 4px;">${params.seriesName}</span>
+                    </div>
+                    <span class="run-status" style="margin-left: 8px; opacity: 0.6">${params.name}</span>
+            </div>            
+            `
+        }
+    }
+    grid = []
+    xAxis = []
+    yAxis = []
+    series = []
+
+    constructor(el, startTime) {
+        this.el = el;
+        this.gridIndex = -1;
+        this.currentGraphIndex = -2;
+        this.startTime = new Date(startTime);
+        // this.startTime = new Date(new Date('2023/10/8').toLocaleDateString());
+        // console.log('<> Gantt Created', this.startTime);
+    }
+
+    // 构造一个新的 grid
+    makeGrid() {
+        this.gridIndex++;
+        return {
+            id: 'GRID_' + this.gridIndex,
+            // top: 12 + 128 * this.gridIndex,
+            top: 12 + 104 * this.gridIndex,
+            right: 48,
+            left: 88,
+            height: 56
+        }
+    }
+
+    // 构造一个 xAxis
+    makeXaxis() {
+        const [id1, id2] = ['' + Math.random(), '' + Math.random()]
+        return [
+            {
+                id: id1,
+                gridIndex: this.gridIndex,
+                axisTick: {
+                    alignWithLabel: true,
+                    inside: true,
+                },
+                type: 'time',
+                min: getTodayStart(this.startTime),
+                max: getStartTime(this.startTime.getTime() + 3600 * 24 * 1000),
+                splitNumber: 10,
+                axisLabel: {
+                    margin: 12,
+                    formatter: function (val) {
+                        return new Date(val)
+                            .toLocaleTimeString()
+                            .split(':')
+                            .slice(0, 2)
+                            .join(':');
+                    },
+                },
+                axisLine: {
+                    lineStyle: {
+                        color: '#0005',
+                    },
+                },
+                boundaryGap: false,
+                // data: getXaxisRange(getTodayStart(new Date())),
+            },
+            {
+                id: id2,
+                gridIndex: this.gridIndex,
+                axisLabel: { show: false },
+                axisLine: { show: false },
+            },
+        ]
+    }
+
+
+    // 构造一个 yAxis
+    makeYaxis(equipmentName) {
+        const [id1, id2] = ['' + Math.random(), '' + Math.random()]
+        return [
+            // 主y轴
+            {
+                id: id1,
+                gridIndex: this.gridIndex,
+                type: 'value',
+                splitLine: { show: false },
+                name: equipmentName,
+                nameLocation: 'center',
+                nameGap: 14,
+                nameRotate: 0,
+                nameTextStyle: {
+                    fontSize: 16,
+                    color: '#000A'
+                },
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: '#0005',
+                    },
+                },
+                axisLabel: { show: false },
+                axisTick: { show: false },
+            },
+            // 辅y轴
+            {
+                id: id2,
+                gridIndex: this.gridIndex,
+                type: 'value',
+                splitLine: { show: false },
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: '#0005',
+                    },
+                },
+                axisLabel: { show: false },
+                axisTick: { show: false },
+            },
+        ]
+    }
+
+    // 构造一个 series
+    makeSeries({ equipmentName, arr }) {
+        this.currentGraphIndex += 2;
+        const bgStartTime = this.startTime.getTime();
+        const bgEndTime = bgStartTime + 3600 * 24 * 1000;
+        return [
+            // 沉默的背景
+            {
+                xAxisIndex: this.currentGraphIndex,
+                yAxisIndex: this.currentGraphIndex,
+                type: 'custom',
+                renderItem: renderItem,
+                silent: true,
+                itemStyle: {
+                    opacity: 0.8,
+                },
+                encode: {
+                    x: [1, 2],
+                    y: 0,
+                },
+                data: [
+                    {
+                        name: '无数据',
+                        value: [0, bgStartTime, bgEndTime, 0],
+                        tooltip: { show: false },
+                        itemStyle: {
+                            color: '#F2F4F9',
+                            opacity: 0.3,
+                        }
+                    },
+                ]
+            },
+            {
+                name: equipmentName,
+                xAxisIndex: this.currentGraphIndex,
+                yAxisIndex: this.currentGraphIndex,
+                type: 'custom',
+                renderItem: renderItem,
+                itemStyle: {
+                    opacity: 0.8,
+                },
+                encode: {
+                    x: [1, 2],
+                    y: 0,
+                },
+                data: arr.map(item => ({
+                    name: ['运行', '故障', '计划停机'][item.status],
+                    value: [0, item.startTime, item.startTime + item.duration * 60 * 1000, 0],
+                    itemStyle: {
+                        color: types[item.status].color,
+                    }
+                })),
+            },
+        ]
+    }
+
+    init(data) {
+        if (!this.el) throw new Error('没有可供echarts初始化的容器')
+        if (typeof this.el == 'string') {
+            this.el = document.querySelector(this.el);
+        }
+        this.chart = echarts.init(this.el);
+        this.handleProps(data);
+
+        setTimeout(() => {
+            // debugger;
+            this.chart.setOption(this.option);
+        }, 200);
+    }
+
+    update(data) {
+        this.clear();
+        this.init(data);
+    }
+
+    resize() {
+        this.chart.resize();
+    }
+
+    get option() {
+        return {
+            tooltip: this.tooltip,
+            grid: this.grid,
+            xAxis: this.xAxis,
+            yAxis: this.yAxis,
+            series: this.series,
+        }
+    }
+
+    // 每次 graphList 刷新都会重新渲染整个所有图表
+    // 可以改进的地方：添加一个 handleAdd() 方法，一次添加一个新的
+    handleProps(props) {
+        // props 是父组件的 graphList
+        console.log('props: ', props);
+        props.forEach(eqArr => {
+            this.grid.push(this.makeGrid());
+            this.xAxis.push(...this.makeXaxis());
+            this.yAxis.push(...this.makeYaxis(eqArr.key));
+            this.series.push(...this.makeSeries({ equipmentName: eqArr.key, arr: eqArr }))
+        });
+    }
+
+    // handleAdd
+    handleAdd() { }
+
+    clear() {
+        this.grid = [];
+        this.xAxis = [];
+        this.yAxis = [];
+        this.series = [];
+        this.currentGraphIndex = -2;
+        this.gridIndex = -1;
+        this.chart.dispose();
+    }
+
+    // print option
+    print() {
+        console.log(JSON.stringify(this.option, null, 2));
+    }
+
+}

src/views/equipment/timing-diagram/status/demo.html

@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Document</title>
-	</head>
-	<body>
-		<div
-			id="app"
-			style="width: 100vw; height: 80vh; background: #ccc3; margin: 24px"></div>
 
-		<script src="./echarts.js"></script>
-		<script>
-			function getStartTime(timestamp) {
-				return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-			}
+<head>
+	<meta charset="UTF-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>Document</title>
+</head>
 
-			function renderItem(params, api) {
-				var categoryIndex = api.value(0);
-				var start = api.coord([api.value(1), categoryIndex]);
-				var end = api.coord([api.value(2), categoryIndex]);
-				console.log(`
+<body>
+	<div id="app" style="width: 100vw; height: 80vh; background: #fff; margin: 24px"></div>
+
+	<script src="./echarts.js"></script>
+	<script>
+		function getStartTime(timestamp) {
+			return new Date(new Date(timestamp).toLocaleDateString()).getTime();
+		}
+
+		function renderItem(params, api) {
+			var categoryIndex = api.value(0);
+			var start = api.coord([api.value(1), categoryIndex]);
+			var end = api.coord([api.value(2), categoryIndex]);
+			console.log(`
                     categoryIndex: ${categoryIndex},
                     start: ${start},
                     end: ${end},
@@ -32,249 +32,466 @@
                     api.style(): ${JSON.stringify(api.style())}
                 `);
 
-				var height = api.size([0, 1])[1] * 2;
-				// 用一个矩形去截取另一个矩形
-				var rectShape = echarts.graphic.clipRectByRect(
-					// 被截取矩形
-					{
-						x: start[0],
-						y: start[1] - height / 2,
-						width: end[0] - start[0],
-						height: height,
-					},
-					// 截取矩形
-					{
-						// 截取掉grid以外的部分，实质是计算方块的偏移量
-						x: params.coordSys.x, // {number} grid rect 的 x
-						// y: params.coordSys.y, // {number} grid rect 的 y
-						y: params.coordSys.y - 16, // {number} grid rect 的 y，并多减掉 16 个单位
-						width: params.coordSys.width, // {number} grid rect 的 width
-						height: params.coordSys.height, // {number} grid rect 的 height
-					}
-				);
-                console.log(`------------- ${JSON.stringify(rectShape)} -------------- `)
-				return (
-					rectShape && {
-						type: 'rect',
-						transition: ['shape'],
-						shape: rectShape,
-						style: api.style(),
-					}
-				);
-			}
-
-			function getXaxisRange(startTime) {
-				return Array(24)
-					.fill(startTime)
-					.map((item, index) => {
-						return new Date(item + index * 3600 * 1000)
-							.toLocaleTimeString()
-							.split(':')
-							.slice(0, 2)
-							.join(':');
-					});
-			}
-
-			function getTodayStart(today) {
-				const [y, m, d] = [
-					today.getFullYear(),
-					today.getMonth(),
-					today.getDate(),
-				];
-				return new Date(y, m, d).getTime();
-			}
-
-			/** 颜色配置 */
-			const types = [
-				{ name: '运行', color: '#288AFF' },
-				{ name: '故障', color: '#FC9C91' },
-				{ name: '计划停机', color: '#FFDC94' },
-				{ name: '空白', color: '#F2F4F9' },
-			];
-
-			const option = {
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'none',
-						// label: {
-						// 	backgroundColor: '#6a7985',
-						// },
-					},
-                    formatter: (params) => {
-                        // console.log('formatter', params)
-                        // return `
-                        // <div>${new Date(params[0].value[1]).toLocaleString()} ~ ${new Date(params[0].value[2]).toLocaleString()}</div>
-                        // <div style="display: flex; justify-content: space-between; min-width: 128px; align-items: center;">
-                        //     <span>${params[0].seriesName}</span>
-                        //     <span>${params[0].name}</span>
-                        // </div>
-                        // `
-                        return `
-                        <h1 style="font-size: 18px; font-weight: 600; letter-spacing: 1px;">${params[0].name} <span style="display: inline-block; margin-left: 8px; width: 12px; height: 12px; border-radius: 50%; background: ${params[0].color} "></span></h1>
-                        <div>${new Date(params[0].value[1]).toLocaleString()} ~ ${new Date(params[0].value[2]).toLocaleString()}</div>
-                        `
-                    }
+			var height = api.size([0, 1])[1] * 2;
+			// 用一个矩形去截取另一个矩形
+			var rectShape = echarts.graphic.clipRectByRect(
+				// 被截取矩形
+				{
+					x: start[0],
+					y: start[1] - height / 2,
+					width: end[0] - start[0],
+					height: height,
 				},
-				grid: [
-					{
-						id: 0,
-						top: 10,
-                        left: 128,
-                        right: 64,
-						height: 56, 
-					},
-					// {
-					// 	id: 1,
-					// 	top: 80,
-					// 	height: 56,
+				// {x: 0, y: 0, width: 2000, height: 60 } // <== 也行...
+				// 截取矩形
+				{
+					// 截取掉grid以外的部分，实质是计算方块的偏移量
+					x: params.coordSys.x, // {number} grid rect 的 x
+					// y: params.coordSys.y, // {number} grid rect 的 y
+					y: params.coordSys.y - 16, // {number} grid rect 的 y，并多减掉 16 个单位
+					// width: end[0] - start[0],
+					width: params.coordSys.width, // {number} grid rect 的 width
+					height: params.coordSys.height, // {number} grid rect 的 height
+				}
+			);
+			console.log(`------------- ${JSON.stringify(rectShape)} -------------- `)
+			return (
+				rectShape && {
+					type: 'rect',
+					transition: ['shape'],
+					shape: rectShape,
+					style: api.style(),
+				}
+			);
+		}
+
+		function getXaxisRange(startTime) {
+			return Array(24)
+				.fill(startTime)
+				.map((item, index) => {
+					return new Date(item + index * 3600 * 1000)
+						.toLocaleTimeString()
+						.split(':')
+						.slice(0, 2)
+						.join(':');
+				});
+		}
+
+		function getTodayStart(today) {
+			const [y, m, d] = [
+				today.getFullYear(),
+				today.getMonth(),
+				today.getDate(),
+			];
+			return new Date(y, m, d).getTime();
+		}
+
+		/** 颜色配置 */
+		const types = [
+			{ name: '运行', color: '#288AFF' },
+			{ name: '故障', color: '#FC9C91' },
+			{ name: '计划停机', color: '#FFDC94' },
+			{ name: '空白', color: '#F2F4F9' },
+		];
+
+		const option = {
+			tooltip: {
+				trigger: 'item',
+				axisPointer: {
+					type: 'none',
+					// label: {
+					// 	backgroundColor: '#6a7985',
 					// },
-				],
-				xAxis: [
-					{
-						id: 0,
-						gridIndex: 0,
-						axisTick: {
-							alignWithLabel: true,
-							inside: true,
-						},
-						type: 'time',
-						min: getTodayStart(new Date()), // <===
-						max: getStartTime(new Date().getTime() + 3600 * 24 * 1000), // <===
-						splitNumber: 10,
-						axisLabel: {
-							margin: 12,
-							// rotate: -15,
-							formatter: function (val) {
-								return new Date(val)
-									.toLocaleTimeString()
-									.split(':')
-									.slice(0, 2)
-									.join(':');
-							},
-						},
-						boundaryGap: false,
-						// data: getXaxisRange(getTodayStart(new Date())),
+				},
+				formatter: (params) => {
+					// console.log('formatter', params)
+					// return `
+					// <div>${new Date(params[0].value[1]).toLocaleString()} ~ ${new Date(params[0].value[2]).toLocaleString()}</div>
+					// <div style="display: flex; justify-content: space-between; min-width: 128px; align-items: center;">
+					//     <span>${params[0].seriesName}</span>
+					//     <span>${params[0].name}</span>
+					// </div>
+					// `
+					return `
+						<div style="display: flex; align-items: center; justify-content: space-between">
+						<h1 style="font-size: 18px; font-weight: 600;">${params.seriesName}</h1>
+                        <h2 style="font-size: 18px; font-weight: 400; letter-spacing: 1px;">${params.name} <span style="display: inline-block; margin-left: 8px; width: 12px; height: 12px; border-radius: 50%; background: ${params.color} "></span></h2>
+                        </div>
+						<div>${new Date(params.value[1]).toLocaleString()} ~ ${new Date(params.value[2]).toLocaleString()}</div>
+                        `
+				}
+			},
+			grid: [
+				{
+					id: 0,
+					top: 10,
+					left: 128,
+					right: 64,
+					height: 56,
+				},
+				// {
+				// 	id: 1,
+				// 	top: 80,
+				// 	height: 56,
+				// },
+				// ***************** 添加第二个grid *****************
+				{
+					id: 1,
+					top: 180,
+					left: 128,
+					right: 64,
+					height: 56
+				}
+			],
+			xAxis: [
+				{
+					id: 'asdf',
+					gridIndex: 0,
+					axisTick: {
+						alignWithLabel: true,
+						inside: true,
 					},
-					{
-						id: 1,
-						gridIndex: 0,
-						axisLabel: { show: false },
-						axisLine: { show: false },
+					type: 'time',
+					min: getTodayStart(new Date()), // <===
+					max: getStartTime(new Date().getTime() + 3600 * 24 * 1000), // <===
+					splitNumber: 10,
+					axisLabel: {
+						margin: 12,
+						// rotate: -15,
+						formatter: function (val) {
+							return new Date(val)
+								.toLocaleTimeString()
+								.split(':')
+								.slice(0, 2)
+								.join(':');
+						},
 					},
-				],
-				yAxis: [
-					// 主y轴
-					{
-						id: 0,
-						gridIndex: 0,
-						type: 'value',
-						splitLine: { show: false },
-						name: '设备1',
-						nameLocation: 'center',
-						nameGap: 56,
-						nameRotate: 0,
-						nameTextStyle: {
-							fontSize: 18,
-						},
-						axisLine: {
-							show: true,
-							lineStyle: {},
-						},
-						axisLabel: { show: false },
-						axisTick: { show: false },
+					boundaryGap: false,
+					// data: getXaxisRange(getTodayStart(new Date())),
+				},
+				{
+					id: 'asdff',
+					gridIndex: 0,
+					axisLabel: { show: false },
+					axisLine: { show: false },
+				},
+				// ***************** 添加第二个 xAxis *****************
+				{
+					id: 'asdfjk',
+					gridIndex: 1,
+					axisTick: {
+						alignWithLabel: true,
+						inside: true,
 					},
-					// 辅y轴
-					{
-						id: 1,
-						gridIndex: 0,
-						type: 'value',
-						splitLine: { show: false },
-						axisLabel: { show: false },
-						axisTick: { show: false },
+					type: 'time',
+					min: getTodayStart(new Date()), // <===
+					max: getStartTime(new Date().getTime() + 3600 * 24 * 1000), // <===
+					splitNumber: 10,
+					axisLabel: {
+						margin: 12,
+						// rotate: -15,
+						formatter: function (val) {
+							return new Date(val)
+								.toLocaleTimeString()
+								.split(':')
+								.slice(0, 2)
+								.join(':');
+						},
 					},
-				],
-				series: [
-					{
-                        name: '设备1',
-						xAxisIndex: 0,
-						yAxisIndex: 0,
-						type: 'custom',
-						renderItem: renderItem,
-						itemStyle: {
-							opacity: 0.8,
-						},
-						encode: {
-							x: [1, 2],
-							y: 0,
-						},
-						//function getTimestamp(point) {
-						// const t = new Date();
-						// const [y,m,d] = [t.getFullYear(),t.getMonth(),t.getDate()]
-						// const [h,M] = point.split(':')
-						// return new Date(y,m,d,h,M,0,0).getTime()
-						//}
-						data: [
-							{
-								// 01:00 ~ 05:00
-								name: '运行',
-								value: [0, 1695747600000, 1695762000000, 0],
-								itemStyle: {
-									normal: {
-										color: types[0].color,
-									},
+					boundaryGap: false,
+					// data: getXaxisRange(getTodayStart(new Date())),
+				},
+				{
+					id: 'fjkd',
+					gridIndex: 1,
+					axisLabel: { show: false },
+					axisLine: { show: false },
+				},
+			],
+			yAxis: [
+				// 主y轴
+				{
+					id: 0,
+					gridIndex: 0,
+					type: 'value',
+					splitLine: { show: false },
+					name: '设备1',
+					nameLocation: 'center',
+					nameGap: 56,
+					nameRotate: 0,
+					nameTextStyle: {
+						fontSize: 18,
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {},
+					},
+					axisLabel: { show: false },
+					axisTick: { show: false },
+				},
+				// 辅y轴
+				{
+					id: 1,
+					gridIndex: 0,
+					type: 'value',
+					splitLine: { show: false },
+					axisLabel: { show: false },
+					axisTick: { show: false },
+				},
+				// ***************** 添加第二个 yAxis *****************
+				{
+					id: 2,
+					gridIndex: 1,
+					type: 'value',
+					splitLine: { show: false },
+					name: '设备1',
+					nameLocation: 'center',
+					nameGap: 56,
+					nameRotate: 0,
+					nameTextStyle: {
+						fontSize: 18,
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {},
+					},
+					axisLabel: { show: false },
+					axisTick: { show: false },
+				},
+				// 辅y轴
+				{
+					id: 3,
+					gridIndex: 1,
+					type: 'value',
+					splitLine: { show: false },
+					axisLabel: { show: false },
+					axisTick: { show: false },
+				},
+			],
+			series: [
+				{
+					// 沉默的背景
+					xAxisIndex: 0,
+					yAxisIndex: 0,
+					type: 'custom',
+					renderItem: renderItem,
+					silent: true,
+					itemStyle: {
+						opacity: 0.8,
+					},
+					encode: {
+						x: [1, 2],
+						y: 0,
+					},
+					data: [
+						{
+							name: '无数据',
+							value: [0, 1696694400000, 1696780800000, 0],
+							tooltip: { show: false },
+							// silent: true,
+							// animation: false,
+							// universalTransition: { enable: false },
+							// hoverAnimation: false,
+							// selectMode: true,
+							// select: { disabled: true },
+							// emphasis: { disabled: false, focus: 'none', itemStyle: { opacity: 0 } },
+							// z: 0,
+							// zlevel: 0,
+							// emphasis: { disabled: true },
+							itemStyle: {
+								color: '#ccc',
+								opacity: 0.3,
+							}
+						}
+					]
+				},
+				{
+					name: '设备1',
+					xAxisIndex: 0,
+					yAxisIndex: 0,
+					type: 'custom',
+					renderItem: renderItem,
+					itemStyle: {
+						opacity: 0.8,
+					},
+					encode: {
+						x: [1, 2],
+						y: 0,
+					},
+					data: [
+						{
+							name: '运行',
+							value: [0, 1696694400000, 1696699400000, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
 								},
 							},
-							{
-								// 5:00 ~ 8:00
-								name: '故障',
-								value: [0, 1695762000000, 1695772800000, 0],
-								itemStyle: {
-									normal: {
-										color: types[1].color,
-									},
+						},
+						{
+							name: '运行',
+							value: [0, 1696730000000, 1696734040450, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
 								},
 							},
-							{
-								// 8:00 ~ 8:39
-								name: '计划停机',
-								value: [0, 1695772800000, 1695775140000, 0],
-								itemStyle: {
-									normal: {
-										color: types[2].color,
-									},
+						},
+						{
+							name: '故障',
+							value: [0, 1696737040000, 1696754040450, 0],
+							itemStyle: {
+								normal: {
+									color: types[1].color,
 								},
 							},
-							{
-								// 08:39 ~ 18:00
-								name: '运行',
-								value: [0, 1695775140000, 1695808800000, 0],
-								itemStyle: {
-									normal: {
-										color: types[0].color,
-									},
+						},
+						{
+							name: '计划停机',
+							value: [0, 1696755000000, 1696759000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[2].color,
 								},
 							},
-							{
-								// 18:00 ~ 23:30
-								name: '计划停机',
-								value: [0, 1695808800000, 1695828600000, 0],
-								itemStyle: {
-									normal: {
-										color: types[2].color,
-									},
+						},
+						{
+							name: '运行',
+							value: [0, 1696759000000, 1696769000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
 								},
 							},
-						],
+						},
+						{
+							name: '计划停机',
+							value: [0, 1696769400000, 1696779000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[2].color,
+								},
+							},
+						},
+					],
+				},
+				// ***************** 添加第二个设备 *****************
+				{
+					// 沉默的背景
+					xAxisIndex: 2,
+					yAxisIndex: 2,
+					type: 'custom',
+					renderItem: renderItem,
+					silent: true,
+					itemStyle: {
+						opacity: 0.8,
 					},
-				],
-			};
+					encode: {
+						x: [1, 2],
+						y: 0,
+					},
+					data: [
+						{
+							name: '无数据',
+							value: [0, 1696694400000, 1696780800000, 0],
+							tooltip: { show: false },
+							// silent: true,
+							// animation: false,
+							// universalTransition: { enable: false },
+							// hoverAnimation: false,
+							// selectMode: true,
+							// select: { disabled: true },
+							// emphasis: { disabled: false, focus: 'none', itemStyle: { opacity: 0 } },
+							// z: 0,
+							// zlevel: 0,
+							// emphasis: { disabled: true },
+							itemStyle: {
+								color: '#ccc',
+								opacity: 0.3,
+							}
+						}
+					]
+				},
+				{
+					name: '设备2',
+					xAxisIndex: 2,
+					yAxisIndex: 2,
+					type: 'custom',
+					renderItem: renderItem,
+					itemStyle: {
+						opacity: 0.8,
+					},
+					encode: {
+						x: [1, 2],
+						y: 0,
+					},
+					data: [
+						{
+							name: '运行',
+							value: [0, 1696694400000, 1696699400000, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
+								},
+							},
+							// showBackground: true,
+						},
+						{
+							name: '运行',
+							value: [0, 1696730000000, 1696734040450, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
+								},
+							},
+						},
+						{
+							name: '故障',
+							value: [0, 1696737040000, 1696754040450, 0],
+							itemStyle: {
+								normal: {
+									color: types[1].color,
+								},
+							},
+						},
+						{
+							name: '计划停机',
+							value: [0, 1696755000000, 1696759000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[2].color,
+								},
+							},
+						},
+						{
+							name: '运行',
+							value: [0, 1696759000000, 1696769000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[0].color,
+								},
+							},
+						},
+						{
+							name: '计划停机',
+							value: [0, 1696769400000, 1696779000000, 0],
+							itemStyle: {
+								normal: {
+									color: types[2].color,
+								},
+							},
+						},
+					],
+				},
+			],
+		};
 
-			const el = document.getElementById('app');
-			const myChart = echarts.init(el);
+		const el = document.getElementById('app');
+		const myChart = echarts.init(el);
 
-			console.log('mychart', myChart);
-			myChart.setOption(option);
-		</script>
-	</body>
-</html>
+		console.log('mychart', myChart);
+		myChart.setOption(option);
+	</script>
+</body>
+
+</html>

src/views/equipment/timing-diagram/status/gantt.js

@@ -1,235 +0,0 @@
-import * as echarts from 'echarts';
-
-
-function renderItem(params, api) {
-    var categoryIndex = api.value(0);
-    var start = api.coord([api.value(1), categoryIndex]);
-    var end = api.coord([api.value(2), categoryIndex]);
-    var height = api.size([0, 1])[1] * 1;
-    // var height = api.size([0, 1])[1] * 0.8;
-    // var height = 56;
-    var rectShape = echarts.graphic.clipRectByRect(
-        {
-            x: start[0],
-            y: start[1] - height / 2,
-            width: end[0] - start[0],
-            height: height,
-        },
-        {
-            x: params.coordSys.x,
-            y: params.coordSys.y,
-            width: params.coordSys.width,
-            height: params.coordSys.height,
-        }
-    );
-    return (
-        rectShape && {
-            type: 'rect',
-            transition: ['shape'],
-            shape: rectShape,
-            style: api.style(),
-        }
-    );
-}
-
-
-
-/** 颜色配置 */
-const types = [
-    { name: '运行', color: '#5ad8a6' },
-    { name: '故障', color: '#fc9c91' },
-    { name: '计划停机', color: '#000' },
-];
-
-
-/** 从时间戳获取 startTime */
-function getStartTime(timestamp) {
-    return new Date(new Date(timestamp).toLocaleDateString()).getTime();
-}
-
-
-
-export default class GanttGraph {
-    constructor(el) {
-        this.chart = null;
-        this.el = el;
-        /** 默认配置 */
-        this.grid = {
-            top: 32,
-            left: 128,
-            right: 128,
-            bottom: 64,
-        }
-        this.tooltip = {
-            formatter: function (params) {
-                return (
-                    params.marker +
-                    params.name +
-                    ': ' +
-                    new Date(params.value[1]).toLocaleTimeString() +
-                    ' - ' +
-                    new Date(params.value[2]).toLocaleTimeString()
-                );
-            },
-        }
-        this.xAxis = {
-            type: 'time',
-            min: getStartTime(1691568181000), // <===
-            max: getStartTime(1691568181000 + 3600 * 24 * 1000), // <===
-            splitNumber: 10,
-            axisLabel: {
-                // rotate: -15,
-                formatter: function (val) {
-                    return new Date(val).toLocaleTimeString();
-                },
-            },
-            axisTick: {
-                show: true,
-            },
-            splitLine: {
-                show: false,
-            },
-        }
-        this.yAxis = [
-            {
-                interval: 40,
-                axisLine: {
-                    lineStyle: {
-                        color: '',
-                    },
-                },
-                axisLabel: {
-                    fontSize: 18,
-                },
-                axisTick: {
-                    show: false,
-                },
-                splitLine: {
-                    show: true,
-                },
-                // data: [], // <====
-                data: ['设备1', '设备2', '设备3', '设备4'],
-            },
-            {
-                axisLine: {
-                    lineStyle: {
-                        color: '',
-                    },
-                },
-                data: [],
-            },
-        ]
-        this.series = [
-            {
-                type: 'custom',
-                renderItem: renderItem,
-                itemStyle: {
-                    opacity: 0.8,
-                },
-                encode: {
-                    x: [1, 2],
-                    y: 0,
-                },
-                // data: [], // <===
-                data: [
-                    {
-                        name: '运行',
-                        value: [
-                            0,
-                            1691568181000,
-                            1691568181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '计划停机',
-                        value: [
-                            0,
-                            1691578581000,
-                            1691578581000 + 10 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[2].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '运行',
-                        value: [
-                            1,
-                            1691568181000,
-                            1691568181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '故障',
-                        value: [
-                            2,
-                            1691538181000,
-                            1691538181000 + 60 * 60 * 1000,
-                            60 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[1].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '运行',
-                        value: [
-                            2,
-                            1691578181000,
-                            1691578181000 + 90 * 60 * 1000,
-                            90 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[0].color,
-                            },
-                        },
-                    },
-                    {
-                        name: '计划停机',
-                        value: [
-                            3,
-                            1691528181000,
-                            1691528181000 + 240 * 60 * 1000,
-                            240 * 10 * 1000,
-                        ],
-                        itemStyle: {
-                            normal: {
-                                color: types[2].color,
-                            },
-                        },
-                    },
-                ],
-            },
-        ]
-    }
-
-    init() {
-        this.chart = echarts.init(this.el);
-        this.chart.setOption(this.getOption())
-    }
-
-    getOption() {
-        const { grid, xAxis, yAxis, series, tooltip } = this;
-        return {
-            grid, xAxis, yAxis, series, tooltip
-        }
-    }
-}

src/views/equipment/timing-diagram/status/index.vue

@@ -6,31 +6,19 @@
 -->
 
 <template>
-	<div
-		class="status-timegraph-container"
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
+	<div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
+		<el-row class="" style="
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 0;
 				border-radius: 8px;
 			">
 			<div class="blue-title">生产节拍时序图</div>
-			<!-- <h1>设备状态时序图</h1> -->
-			<!-- 搜索工作栏 -->
-			<SearchBar
-				:formConfigs="searchBarFormConfig"
-				ref="search-bar"
-				:remove-blue="true"
-				@select-changed="handleSearchBarSelectChange"
-				@headBtnClick="handleSearchBarBtnClick" />
+			<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true"
+				@select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" />
 		</el-row>
 
-		<el-row
-			class=""
-			style="
+		<el-row class="" style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
@@ -49,66 +37,34 @@
 						<div class="icon running"></div>
 						<div>运行中</div>
 					</div>
-					<!-- <div class="legend">
-					<div class="icon waiting"></div>
-					<div>待机</div>
-				</div> -->
 					<div class="legend">
 						<div class="icon fault"></div>
 						<div>故障</div>
 					</div>
-					<!-- <div class="legend">
-					<div class="icon lack"></div>
-					<div>缺料</div>
-				</div>
-				<div class="legend">
-					<div class="icon full"></div>
-					<div>满料</div>
-				</div> -->
 					<div class="legend">
 						<div class="icon stop"></div>
 						<div>计划停机</div>
 					</div>
 				</el-col>
 			</el-row>
-			<div
-				class="main-area"
-				style="flex: 1; display: flex; flex-direction: column">
-				<div
-					class="graphs"
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
+			<div class="main-area" style="flex: 1; display: flex; flex-direction: column">
+				<div class="graphs" v-show="graphList.length" id="status-chart" style="height: 1px; flex: 1"></div>
 				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
 			</div>
 		</el-row>
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			dialogTitle="添加设备"
-			:dialogVisible="open"
-			width="500px"
-			@close="open = false"
-			@cancel="open = false"
+		<base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
 			@confirm="submitForm">
-			<el-select
-				v-if="open"
-				style="width: 100%"
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
+			<el-select v-if="open" style="width: 100%" v-model="queryParams.equipmentId" placeholder="请选择一个设备">
+				<el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
 			</el-select>
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-// import * as echarts from 'echarts';
-import Gantt from './gantt';
+import Gantt from './chart';
 
 export default {
 	name: 'SGStatus',
@@ -169,6 +125,7 @@ export default {
 				recordTime: null,
 			},
 			graphList: [],
+			existingEquipments: [],
 			open: false,
 			eqList: [],
 			startTime: null,
@@ -202,15 +159,19 @@ export default {
 		this.initEquipment();
 		// this.getList();
 	},
-	mounted() {},
+	mounted() { },
 	watch: {
 		graphList: {
 			handler(val) {
 				if (val && val.length) {
 					this.$nextTick(() => {
-						if (!this.chart) this.initChart();
-						this.setInitialConfig();
-						this.handleGraphList();
+						if (!this.gantt) {
+							this.gantt = new Gantt('#status-chart', this.startTime);
+							this.gantt.init(val);
+							return;
+						}
+						this.gantt.update(val);
+
 					});
 				}
 				return;
@@ -220,43 +181,6 @@ export default {
 		},
 	},
 	methods: {
-		setInitialConfig() {
-			console.log('in setInitialConfig', this.chartOption);
-			this.chart.setOption(this.chartOption);
-		},
-
-		handleGraphList() {
-			console.log('in handleGraphList:', this.graphList);
-			return;
-			const min = this.queryParams.recordTime
-				? new Date(this.queryParams.recordTime).getTime()
-				: this.findMin();
-
-			console.log('min is', min);
-			this.chartOption.xAxis.min = getStartTime(min);
-			this.chartOption.xAxis.max = getStartTime(min + 3600 * 24 * 1000);
-			this.graphList.forEach((arr) => {
-				this.chartOption.yAxis[0].data.push(arr.key);
-				arr.forEach((item) => {
-					this.chartOption.series[0].data.push({
-						name: ['运行', '故障', '计划停机'][item.status],
-						value: [
-							0,
-							item.startTime,
-							item.startTime + item.duration * 60 * 1000,
-							item.duration * 60 * 1000,
-						],
-						itemStyle: {
-							normal: {
-								color: types[item.status].color,
-							},
-						},
-					});
-				});
-				console.log('chartOptions', this.chartOption);
-			});
-		},
-
 		findMin() {
 			let min = 0;
 			this.graphList.forEach((arr) => {
@@ -267,12 +191,6 @@ export default {
 			return min;
 		},
 
-		initChart() {
-			const el = document.getElementById('status-chart');
-			this.gantt = new Gantt(el);
-			this.gantt.init();
-		},
-
 		/** 重置查询条件 */
 		initQuery() {
 			this.queryParams.lineId = null;
@@ -297,8 +215,8 @@ export default {
 				params: this.queryParams,
 			});
 			if (code == 0) {
+				this.existingEquipments = Object.values(data).map((eq) => eq[0].equipmentId);
 				this.graphList = this.objectToArray(data);
-				console.log('graph list', this.graphList);
 			}
 		},
 
@@ -384,27 +302,26 @@ export default {
 						return;
 					}
 
-					this.startTime = new Date(payload.recordTime).getTime();
-
+					this.startTime = new Date(payload.recordTime)
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
 					this.queryParams.equipmentId = payload.equipmentId || null;
 					this.queryParams.recordTime = payload.recordTime
 						? [
-								payload.recordTime,
-								new Date(
-									new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
-								)
-									.toLocaleDateString()
-									.split('/')
-									.map((value, index) => {
-										if (index == 1 || index == 2) {
-											return value.padStart(2, '0');
-										}
-										return value;
-									})
-									.join('-') + ' 00:00:00',
-						  ]
+							payload.recordTime,
+							new Date(
+								new Date(payload.recordTime).getTime() + 24 * 3600 * 1000
+							)
+								.toLocaleDateString()
+								.split('/')
+								.map((value, index) => {
+									if (index == 1 || index == 2) {
+										return value.padStart(2, '0');
+									}
+									return value;
+								})
+								.join('-') + ' 00:00:00',
+						]
 						: null;
 					this.getList();
 					break;
@@ -415,6 +332,10 @@ export default {
 		},
 
 		async submitForm() {
+			if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
+				this.$message.error('该设备已存在');
+				return;
+			}
 			const { code, data } = await this.$axios({
 				url: '/analysis/equipment-analysis/status',
 				method: 'get',
@@ -523,7 +444,7 @@ export default {
 }
 
 .running {
-	background-color: #5ad8a6;
+	background-color: #288AFF;
 	// background-color: #84f04e;
 }
 
@@ -534,7 +455,7 @@ export default {
 
 .fault {
 	// background-color: #ea5b5b;
-	background-color: #fc9c91;
+	background-color: #FC9C91;
 }
 
 .full {
@@ -548,7 +469,7 @@ export default {
 }
 
 .stop {
-	background-color: #000;
+	background-color: #FFDC94;
 }
 
 .legend-row {
@@ -557,7 +478,7 @@ export default {
 	display: flex;
 	justify-content: flex-end;
 
-	> .legend:not(:last-child) {
+	>.legend:not(:last-child) {
 		margin-right: 12px;
 	}
 
@@ -600,7 +521,7 @@ export default {
 	background: #ccc;
 }
 
-.echarts__status-chart > div {
+.echarts__status-chart>div {
 	height: 100% !important;
 	width: 100% !important;
 }

src/views/group/base/groupClasses/index.vue

@@ -37,7 +37,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='70%'
+      width='50%'
     >
       <group-class-add ref="classList" @successSubmit="successSubmit" />
     </base-dialog>
@@ -108,12 +108,6 @@ export default {
       ],
       tableProps,
       tableBtn: [
-        this.$auth.hasPermi('base:group-classes:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
           {
             type: 'cancel',
             btnName: '作废',
@@ -128,6 +122,12 @@ export default {
               ]
             }
           },
+        this.$auth.hasPermi('base:group-classes:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
         this.$auth.hasPermi('base:group-classes:delete')
           ? {
               type: 'delete',

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -1,17 +1,29 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="80px" :model="form">
-    <el-form-item label="班组名称" prop="name">
-      <el-input v-model="form.name"></el-input>
-    </el-form-item>
-    <el-form-item label="班组编码" prop="code">
-      <el-input v-model="form.code" disabled></el-input>
-    </el-form-item>
-    <el-form-item label="班组人数" prop="num">
-      <el-input-number v-model="form.num" :min="1" :max="99999999" style="width: 100%;"></el-input-number>
-    </el-form-item>
-    <el-form-item label="班组组长" prop="leaderName">
-      <el-input v-model="form.leaderName"></el-input>
-    </el-form-item>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="班组名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="班组编码" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="班组人数" prop="num">
+          <el-input-number v-model="form.num" :min="1" :max="99999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="班组组长" prop="leaderName">
+          <el-input v-model="form.leaderName"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>

src/views/group/base/groupTeamScheduling/index.vue

@@ -308,6 +308,16 @@ export default {
   }
 </script>
 <style lang='scss'>
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 .groupTeamScheduling {
   background-color: #F2F4F9;
   .operationArea {

src/views/monitoring/equipmentFullParams/index.vue

@@ -35,8 +35,7 @@
 					" />
 			</div>
 		</div>
-		<div v-else style="margin-top: 20px; color: #c7c7c7; text-align: center">
-			暂无数据
+		<div v-else class="no-data-bg">
 		</div>
 	</div>
 </template>

src/views/monitoring/equipmentProcessAmount/graph.vue

@@ -45,7 +45,7 @@ export default {
 					axisLine: {
 						show: true,
 						lineStyle: {
-							color: '#ccc',
+							color: '#777',
 						},
 					},
 					axisTick: {
@@ -63,7 +63,7 @@ export default {
 					axisLine: {
 						show: true,
 						lineStyle: {
-							color: '#ccc',
+							color: '#777',
 						},
 					},
 					name: '数量',

src/views/monitoring/equipmentProcessAmount/index.vue

@@ -33,7 +33,13 @@
 							:data-value="fc.id"
 							class="factory-list__item"
 							:class="{ 'is-current': fc.id == currentFactory?.id }">
-							{{ fc.label }}
+							<span>
+								{{ fc.label }}
+							</span>
+							<svg-icon
+								v-if="fc.id == currentFactory?.id"
+								icon-class="Confirm"
+								style="height: 14px; width: 14px" />
 						</li>
 					</ul>
 					<div v-else style="color: #0008; width: 128px; text-align: center">
@@ -93,15 +99,7 @@
 										v-if="list.length"
 										:equipment-list="list"
 										:render="renderKey" />
-									<div
-										v-if="list.length == 0"
-										style="
-											color: #c7c7c7;
-											text-align: center;
-											margin-top: 20px;
-										">
-										没有设备
-									</div>
+									<div v-if="list.length == 0" class="no-data-bg"></div>
 								</div>
 							</el-tab-pane>
 						</el-tabs>
@@ -507,9 +505,12 @@ li {
 .factory-list__item {
 	font-size: 16px;
 	line-height: 1;
-	padding: 8px 64px 8px 16px;
-	/* min-width: 64px; */
+	padding: 8px 16px 8px 16px;
+	min-width: 128px;
 	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
 }
 
 .factory-list__item:hover,
@@ -518,13 +519,13 @@ li {
 	color: #0b58ff;
 }
 
-.factory-list__item.is-current::after {
+/* .factory-list__item.is-current::after {
 	content: '√';
 	position: absolute;
 	top: 8px;
 	right: 16px;
 	font-weight: bold;
-}
+} */
 
 .custom-tree-class >>> .el-tree-node__content {
 	width: 100%;
@@ -551,8 +552,8 @@ li {
 .custom-icon-class {
 	margin-right: 8px;
 	width: 20px;
-	height: 24px;
-	background: url('../../../assets/images/tree-icon-1.png') 100% / contain
+	height: 20px;
+	background: url('../../../assets/images/Qian.png') center center / contain
 		no-repeat;
 }
 

src/views/monitoring/equipmentStatusAndParams/index.vue

@@ -116,7 +116,7 @@ export default {
 				},
 				{
 					_action: 'params-monitor',
-					label: '参数监控',
+					label: '操作',
 					subcomponent: {
 						props: ['injectData'],
 						render: function (h) {
@@ -136,7 +136,7 @@ export default {
 										},
 									},
 								},
-								'查看监控'
+								'查看详情'
 							);
 						},
 					},

src/views/print/design.vue

@@ -0,0 +1,271 @@
+<!-- 
+    filename: design.vue
+    author: liubin
+    date: 2023-10-07 13:14:40
+    description: 设计打印模板
+-->
+
+<template>
+	<div class="print-design">
+		<section id="menu">
+			<NavMenu @action="handleAction" :menu="menu" />
+		</section>
+		<section id="main-panel">
+			<section id="left-panel" v-drag="'right'">
+				<h2>组件</h2>
+				<div id="components"></div>
+			</section>
+			<section id="edit-panel"></section>
+			<section id="right-panel">
+				<h2>设置</h2>
+				<div id="settings"></div>
+			</section>
+		</section>
+	</div>
+</template>
+
+<script>
+import vDrag from './drag'
+import { hiprint, defaultElementTypeProvider } from "vue-plugin-hiprint";
+hiprint.init({
+	providers: [defaultElementTypeProvider()],
+});
+
+const NavSelector = {
+	name: 'NavSelector',
+	props: ['name', 'options'],
+	data() {
+		return {
+			open: false,
+		};
+	},
+	methods: {
+		handleOpen() {
+			// this.$emit('closeOtherMenu', this)
+			// this.$emit('hover', this)
+			this.open = !this.open;
+		},
+		handleClickItem(e) {
+			this.$emit('click', e.target.innerText)
+		},
+		// 暴露一个close方法，供父组件调用
+		closeSubMenu() {
+			this.open = false;
+		},
+	},
+	render: function (h) {
+		return (
+			<li class={'nav-selector__item'} onMouseenter={this.handleOpen} onMouseleave={this.handleOpen}>
+				<span class={'nav-selector__name'}>{this.name}</span>
+				<ul class={`${this.open ? '' : 'hidden'} nav-selector__submenu-items`}>
+					{this.options.map((item) => {
+						return <li onClick={this.handleClickItem}>{item}</li>;
+					})}
+				</ul>
+			</li>
+		);
+	},
+};
+
+const NavMenu = {
+	name: 'NavMenu',
+	props: ['menu'],
+	components: { NavSelector },
+	data() {
+		return {}
+	},
+	methods: {
+		handleCloseOtherMenu(vueInstance) {
+			this.$children.forEach(vm => {
+				if (vm != vueInstance) {
+					vm.closeSubMenu()
+				}
+			})
+		},
+		handleItemClicked(e) {
+			this.$emit('action', e);
+		}
+	},
+	render: function (h) {
+		return (
+			<ul class={'nav-menu'}>
+				{this.menu.map((item) => {
+					return <NavSelector onClick={this.handleItemClicked} onCloseOtherMenu={this.handleCloseOtherMenu} name={item.name} options={item.options} />;
+				})}
+			</ul>
+		);
+	},
+};
+
+export default {
+	name: 'PrintDesignPage',
+	components: { NavMenu },
+	props: {},
+	directives: { drag: vDrag },
+	data() {
+		return {
+			hiprintTemplate: null,
+			menu: [
+				{
+					name: '菜单',
+					options: ['新建', '打开', '保存', '另存为', '导出', '打印', '退出'],
+				},
+				{
+					name: '视图',
+					options: ['编辑', '布局'],
+				},
+			],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.loadSideBar();
+		this.loadDesigner();
+	},
+	methods: {
+		loadDesigner() {
+			$("#edit-panel").empty();
+			this.hiprintTemplate = new hiprint.PrintTemplate({
+				settingContainer: "#settings",
+			});
+			this.hiprintTemplate.design("#edit-panel");
+		},
+		loadSideBar() {
+			this.loadProviders();
+			this.loadSettings();
+		},
+		loadProviders() { },
+		loadSettings() { },
+		handleAction(name) {
+			console.log('name', name)
+		}
+	},
+};
+</script>
+
+<style scoped lang="scss">
+::-webkit-scrollbar {
+	width: 0;
+}
+
+::-webkit-scrollbar-button {
+	// background: red;
+}
+
+
+.print-design {
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+}
+
+#main-panel {
+	height: 1px;
+	flex: 1;
+	display: grid;
+	grid-template-columns: 1fr 3fr 1fr;
+	grid-auto-rows: 1fr;
+	grid-template-areas: 'left main right';
+}
+
+#menu {
+	// background: black;
+	// color: white;
+	background: #fff;
+	border-bottom: 1px solid #ccc;
+
+	>ul {
+		// background: #32aa32;
+		padding: 0;
+		list-style: none;
+		margin: 0;
+		margin-left: 10px;
+		display: flex;
+	}
+}
+
+#left-panel {
+	overflow: auto;
+	grid-area: left;
+	background: #fff;
+
+	h2 {
+		margin: 0;
+		font-weight: 400;
+		padding: 4px 20px;
+		border-bottom: 1px solid #ccc;
+		background: #ccc;
+	}
+}
+
+#edit-panel {
+	padding: 20px;
+	overflow: auto;
+	grid-area: main;
+	justify-items: center;
+	background: #fff;
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
+
+}
+
+#right-panel {
+	overflow: auto;
+	grid-area: right;
+	background: #fff;
+
+	h2 {
+		margin: 0;
+		font-weight: 400;
+		padding: 4px 12px;
+		border-bottom: 1px solid #ccc;
+		background: #ccc;
+	}
+}
+</style>
+
+<style lang="scss">
+// 子组件的样式
+.nav-selector__item {
+	font-size: 18px;
+	letter-spacing: 1px;
+	// font-weight: 600;
+	padding: 6px 12px;
+	line-height: 1.25;
+	position: relative;
+	cursor: pointer;
+
+	&:hover {
+		background: #f1f1f1;
+	}
+
+	ul {
+		list-style: none;
+		margin: 0;
+		padding: 0;
+		position: absolute;
+		top: 100%;
+		min-width: 128px;
+		left: 0px;
+		background: #fff;
+		border: 1px solid #ccc;
+		// border-radius: 4px;
+		margin: 0;
+		box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
+		z-index: 100;
+
+		li {
+			padding: 6px 12px;
+			cursor: pointer;
+
+			&:hover {
+				background: #f1f1f1;
+			}
+		}
+	}
+
+	.hidden {
+		display: none;
+	}
+}
+</style>

src/views/print/drag.css

@@ -0,0 +1,41 @@
+.v-drag-border-left {
+    border-left: 1px solid #ccc;
+}
+
+.v-drag-border-left > div.pseudo-border { 
+    position: absolute;
+    top: 0;
+    right: -2px;
+    width: 4px;
+    height: 100%;
+    background: transparent;
+    z-index: 1;
+    transition: all linear 0.3s; 
+    cursor: col-resize;
+}
+
+.v-drag-border-left > div.pseudo-border:hover {
+    background: #ccc;
+}
+
+.v-drag-border-right {
+    /* border-right: 1px solid #ccc; */
+    position: relative;
+    transition: width linear 0.3s;
+}
+
+.v-drag-border-right > div.pseudo-border { 
+    position: absolute;
+    top: 0;
+    right: -2px;
+    width: 4px;
+    height: 100%;
+    background: transparent;
+    z-index: 1;
+    transition: all linear 0.3s; 
+    cursor: col-resize;
+}
+
+.v-drag-border-right > div.pseudo-border:hover {
+    background: #ccc;
+}

src/views/print/drag.js

@@ -0,0 +1,96 @@
+import './drag.css';
+
+export default {
+    bind(el, { name, value }, vnode) {
+        switch (name) {
+            case 'drag': {
+                if (['left', 'right', 'top', 'bottom'].indexOf(value) == -1) return;
+                // 创建边框子元素
+                const border = document.createElement('div');
+                border.classList.add("pseudo-border");
+                el.appendChild(border);
+                // 添加拖拽样式
+                addDragStyle(el, value);
+                // 添加拖拽事件
+                addDragEvent(el, border);
+                break;
+            }
+        }
+    },
+    // inserted()
+    // update()
+    // componentUpdated()
+    // unbind()
+}
+
+function addDragEvent(el, border, direction) {
+    // border.setAttribute('draggable', true)
+    const onMouseMove = function (e) {
+        console.log('move', e);
+    }
+    const onMouseUp = function (e) {
+        console.log('up')
+        border.removeEventListener('mousemove', onMouseMove);
+    }
+    
+    border.addEventListener('mousedown', function (e) {
+        console.log('down');
+        document.body.removeEventListener('mouseup', onMouseUp)
+        document.body.addEventListener('mouseup', onMouseUp)
+        border.addEventListener('mousemove', onMouseMove);
+    });
+
+    // TODO: 有点bug
+
+    // el.addEventListener('mousedown', function (e) {
+    //     console.log('mousedown', e);
+    //     const { clientX, clientY } = e;
+    //     const { left, top, width, height } = el.getBoundingClientRect();
+    //     const { offsetLeft, offsetTop } = el;
+    //     const startX = clientX;
+    //     const startY = clientY;
+    //     const startLeft = left;
+    //     const startTop = top;
+    //     const startWidth = width;
+    //     const startHeight = height;
+    //     const startOffsetLeft = offsetLeft;
+    //     const startOffsetTop = offsetTop;
+    //     const move = function (e) {
+    //         console.log('mousemove', e);
+    //         const { clientX, clientY } = e;
+    //         const offsetX = clientX - startX;
+    //         const offsetY = clientY - startY;
+    //         switch (direction) {
+    //             case 'left': {
+    //                 el.style.left = startLeft + offsetX + 'px';
+    //                 el.style.width = startWidth - offsetX + 'px';
+    //                 break;
+    //             }
+    //             case 'right': {
+    //                 el.style.width = startWidth + offsetX + 'px';
+    //                 break;
+    //             }
+    //             case 'top': {
+    //                 el.style.top = startTop + offsetY + 'px';
+    //                 el.style.height = startHeight - offsetY + 'px';
+    //                 break;
+    //             }
+    //             case 'bottom': {
+    //                 el.style.height = startHeight + offsetY + 'px';
+    //                 break;
+    //             }
+    //         }
+    //     }
+    //     const up = function (e) {
+    //         console.log('mouseup', e);
+    //         document.removeEventListener('mousemove', move);
+    //         document.removeEventListener('mouseup', up);
+    //     }
+    //     document.addEventListener('mousemove', move);
+    //     document.addEventListener('mouseup', up);
+    // });
+}
+
+function addDragStyle(el, direction) {
+    el.classList.add('v-drag-border-' + direction)
+}

src/views/quality/base/qualityInspectionBoxBtn/dialogForm.vue

@@ -9,10 +9,10 @@
 	<el-form
 		ref="form"
 		:model="dataForm"
-		label-width="100px"
+		label-width="120px"
 		v-loading="formLoading">
 		<el-row :gutter="20">
-			<el-col>
+			<el-col :span="12">
 				<el-form-item
 					label="产线"
 					prop="productionId"
@@ -30,7 +30,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col>
+			<el-col :span="12">
 				<el-form-item
 					label="工段"
 					prop="sectionId"
@@ -49,7 +49,7 @@
 				</el-form-item>
 			</el-col>
 
-			<el-col>
+			<el-col :span="12">
 				<el-form-item
 					label="按钮盒识别码"
 					prop="buttonId"
@@ -85,7 +85,7 @@
 				</el-form-item> -->
 			</el-col>
 
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="按钮盒模式" prop="model">
 					<el-input
 						v-model="dataForm.model"
@@ -94,7 +94,7 @@
 				</el-form-item>
 			</el-col>
 
-			<el-col>
+			<el-col :span="12">
 				<el-form-item
 					label="按钮值"
 					prop="keyValue"
@@ -121,7 +121,7 @@
 				</el-form-item>
 			</el-col>
 
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="检测内容" prop="inspectionDetContent">
 					<el-input
 						type="textarea"

src/views/quality/base/qualityInspectionBoxBtn/index.vue

@@ -75,8 +75,6 @@ export default {
 							filterable: true,
 						},
 					},
-				],
-				[
 					{
 						select: true,
 						label: '工段',
@@ -103,8 +101,8 @@ export default {
 							},
 						],
 					},
+					{ input: true, label: '按钮盒模式', prop: 'model' },
 				],
-				[{ input: true, label: '按钮盒模式', prop: 'model' }],
 				[
 					{
 						input: true,
@@ -121,8 +119,6 @@ export default {
 						],
 						bind: { type: 'number', min: 0, max: 100 },
 					},
-				],
-				[
 					{
 						textarea: true,
 						label: '检测内容',

src/views/quality/monitoring/qualityStatistics/graphPage.vue

@@ -15,7 +15,8 @@
 		</DetailGraph> -->
 		<!-- <DetailGraph id="dg3" key="dg3" ref="dg3" />
 			<DetailGraph id="dg4" key="dg4" ref="dg4" /> -->
-		<div v-if="!series || series.length == 0" style="color: #777; font-size: 16px; letter-spacing: 1px; text-align: center; padding-top: 56px; text-decoration: underline;">暂无数据</div>
+		<!-- <div v-if="!series || series.length == 0" style="color: #777; font-size: 16px; letter-spacing: 1px; text-align: center; padding-top: 56px; text-decoration: underline;">暂无数据</div> -->
+		<div v-if="!series || series.length == 0" class="no-data-bg" />
 		<LineGraph
 			v-else
 			:x-props="lineData.xProps"

src/views/quality/monitoring/qualityStatistics/index.vue

@@ -6,7 +6,7 @@
 -->
 
 <template>
-	<div class="quality-container" style="background: #f2f4f9; flex: 1">
+	<div class="quality-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column;">
 		<el-row
 			class=""
 			style="
@@ -43,6 +43,7 @@
 				background: #fff;
 				padding: 12px 16px 16px;
 				border-radius: 8px;
+				flex: 1;
 			">
 			<el-row style="display: flex; align-items: center">
 				<div class="blue-title">产线检测详细</div>
@@ -64,12 +65,13 @@
 			<transition mode="out-in" name="fade-down">
 				<template v-if="mode == 'table'">
 					<base-table
-						v-if="mode == 'table'"
+						v-if="mode == 'table' && list.length"
 						:table-props="tableProps"
 						:page="queryParams.pageNo"
 						:limit="queryParams.pageSize"
 						:table-data="list"
 						@emitFun="handleEmitFun"></base-table>
+					<div v-else class="no-data-bg"></div>
 				</template>
 
 				<GraphPage
@@ -302,8 +304,8 @@ export default {
 				},
 				{
 					// width: 128,
-					prop: 'ratio',
-					label: '比例',
+					prop: 'scrapRatio',
+					label: '比例(%)',
 					// subcomponent: {
 					// 	name: 'TextOnly',
 					// 	props: {
@@ -445,6 +447,7 @@ export default {
 					inspectionContent: item.inspectionContent,
 					...keyValuePairs,
 					sumInput: item.sumInput,
+					scrapRatio: item.scrapRatio,
 				};
 			});
 		},