diff --git a/.env.dev b/.env.dev
index e54a5c3c..03228f8a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-01 08:31:57
- # @LastEditors: zhp
+ # @LastEditTime: 2024-04-03 11:22:19
+ # @LastEditors: DY
  # @Description:
 ###
 # 开发环境配置
diff --git a/src/mixins/lb/tableHeightMixin.js b/src/mixins/lb/tableHeightMixin.js
index f8495e1b..ad23d16e 100644
--- a/src/mixins/lb/tableHeightMixin.js
+++ b/src/mixins/lb/tableHeightMixin.js
@@ -5,6 +5,7 @@ export default {
 		};
 	},
 	created() {
+		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
 		window.addEventListener('resize', this._setTableHeight);
 	},
 	destroyed() {
@@ -12,7 +13,8 @@ export default {
 	},
 	methods: {
 		_setTableHeight() {
-			this.tableH = this.tableHeight(260);
+			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			// this.tableH = this.tableHeight(260);
 		},
 	},
 };
diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/base/coreAlarmLog/index.vue
index 23b46378..c55c7d62 100644
--- a/src/views/base/coreAlarmLog/index.vue
+++ b/src/views/base/coreAlarmLog/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -33,38 +34,49 @@ import {
 	getcoreAlarmLogPage
 } from '@/api/base/coreAlarmLog';
 import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'alarmTime',
 		label: '报警时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmSource',
-		label: '报警来源'
+		label: '报警来源',
+		width: 200,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmType',
-		label: '报警类型'
+		label: '报警类型',
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmGrade',
 		label: '报警级别',
-		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
+		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL),
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmReason',
-		label: '报警原因'
+		label: '报警原因',
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmContent',
-		label: '报警详细'
+		label: '报警详细',
+		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -74,7 +86,7 @@ export default {
 			tableBtn: [].filter((v)=>v),
 			tableData: [],
 			listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 0,
 				alarmSource: undefined,
diff --git a/src/views/base/coreCustomer/add-or-updata.vue b/src/views/base/coreCustomer/add-or-updata.vue
index 156fd061..caf12ba9 100644
--- a/src/views/base/coreCustomer/add-or-updata.vue
+++ b/src/views/base/coreCustomer/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-20 16:20:39
+ * @LastEditTime: 2024-04-02 16:46:17
  * @Description:
 -->
 <template>
@@ -96,7 +96,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }],
         name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
-				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				// contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
           {
diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue
index dc1dbeff..3b120cda 100644
--- a/src/views/base/coreCustomer/index.vue
+++ b/src/views/base/coreCustomer/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -45,41 +46,56 @@ import {
 	getCustomerPage,
 	deleteCustomer
 } from '@/api/base/coreCustomer';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '客户名称'
+		label: '客户名称',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '客户编码'
+		label: '客户编码',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'contact',
-		label: '联系人'
+		label: '联系人',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话'
+		label: '联系电话',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'address',
-		label: '地址'
+		label: '地址',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue
index abdcccf3..fbff8627 100644
--- a/src/views/base/coreDepartment/index.vue
+++ b/src/views/base/coreDepartment/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -45,6 +46,7 @@ import {
 	getCoreDepartmentPage,
 	deleteCoreDepartment
 } from '@/api/base/coreDepartment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +73,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreEquipment/components/EquipmentInfoForm.vue b/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
index 926c850a..96a1bf9b 100644
--- a/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
+++ b/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
@@ -64,8 +64,8 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
-					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进场日期"
+				<el-form-item label="进厂日期" prop="enterTime" :rules="[]">
+					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进厂日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
diff --git a/src/views/base/coreEquipment/index.vue b/src/views/base/coreEquipment/index.vue
index bcb777b9..4f551b58 100644
--- a/src/views/base/coreEquipment/index.vue
+++ b/src/views/base/coreEquipment/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -78,7 +79,7 @@
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:core-equipment-attr:update')
@@ -118,6 +119,7 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from './components/AssetsUpload.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'Equipment',
@@ -125,7 +127,7 @@ export default {
 		Editor,
 		EquipmentDrawer,
 	},
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			searchBarKeys: ['name', 'code'],
@@ -157,8 +159,8 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备名称' },
-				{ width: 256, prop: 'code', label: '设备编码' },
+				{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
+				{ width: 250, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
@@ -484,7 +486,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				code: '',
 				name: '',
 				special: false
diff --git a/src/views/base/coreEquipmentLineBind/index.vue b/src/views/base/coreEquipmentLineBind/index.vue
index 1e2811f5..326b108b 100644
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -51,13 +52,13 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogForm from './dialogForm.vue';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import { getAccessToken } from '@/utils/auth';
 
 export default {
 	name: 'EquipmentLineBind',
 	components: { DialogForm },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			basePath: '/base/core-equipment-bind-section',
@@ -81,12 +82,13 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 150,
+					showOverflowtooltip: true,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'productionLineName', label: '产线名称' },
-				{ prop: 'workshopSectionName', label: '工段名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
 				{ prop: 'sort', label: '工段中排序' },
 				{
 					prop: 'lineDataType',
@@ -236,7 +238,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				equipmentName: null,
 				productionLineId: null,
 			},
diff --git a/src/views/base/coreEquipmentType/index.vue b/src/views/base/coreEquipmentType/index.vue
index 33814944..8c8ce086 100644
--- a/src/views/base/coreEquipmentType/index.vue
+++ b/src/views/base/coreEquipmentType/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -50,6 +51,7 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 import {
 	createEquipmentType,
@@ -65,7 +67,7 @@ import {
 export default {
 	name: 'EquipmentType',
 	components: {},
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			searchBarKeys: ['name'],
@@ -171,7 +173,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				name: '',
 			},
 			// 表单参数
diff --git a/src/views/base/coreHotMaterial/index.vue b/src/views/base/coreHotMaterial/index.vue
index d661316e..c0cee5d5 100644
--- a/src/views/base/coreHotMaterial/index.vue
+++ b/src/views/base/coreHotMaterial/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -43,38 +44,51 @@ import basicPage from '../../core/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
 import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from "@/utils/dict";
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '原料名称'
+		label: '原料名称',
+		minWidth: 250,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '原料编码'
+		label: '原料编码',
+		width: 250,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict')
+		filter: publicFormatter('unit_dict'),
+		width: 90,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'dailyCost',
-		label: '每日消耗量'
+		label: '每日消耗量',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		width: 120,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreMajor/index.vue b/src/views/base/coreMajor/index.vue
index 145efb94..5597106c 100644
--- a/src/views/base/coreMajor/index.vue
+++ b/src/views/base/coreMajor/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -45,6 +46,7 @@ import {
 	getCoreMajorPage,
 	deleteCoreMajor
 } from '@/api/base/coreMajor';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +73,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue
index 0ec802ba..43df9f16 100644
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/src/views/base/coreProduct/add-or-updata.vue
@@ -2,15 +2,17 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-13 13:54:01
+ * @LastEditTime: 2024-03-27 13:47:24
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="isdetail"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
+		@closed="$emit('destroy')"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@@ -262,6 +264,15 @@ export default {
 	},
 	mounted() {},
 	methods: {
+		beforeClose(done) {
+			if (!this.isdetail) {
+				this.$confirm('确认关闭？')
+					.then(_ => {
+						done();
+					})
+					.catch(_ => {});
+			}
+		},
 		clearArea() {
 			this.$set(this.dataForm, 'area', 0)
 			this.$set(this.dataForm, 'weight', 0)
diff --git a/src/views/base/coreProduct/index.vue b/src/views/base/coreProduct/index.vue
index 087cde3d..48876d0a 100644
--- a/src/views/base/coreProduct/index.vue
+++ b/src/views/base/coreProduct/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -26,7 +27,8 @@
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
+			@refreshDataList="getDataList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -39,43 +41,58 @@ import {
 	getCoreProductPage,
 	deleteCoreProduct
 } from '@/api/base/coreProduct';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '产品名称'
+		label: '产品名称',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '产品编码'
+		label: '产品编码',
+		width: 190,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'productType',
 		label: '产品类型',
-		filter: publicFormatter('product_type')
+		filter: publicFormatter('product_type'),
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'specifications',
-		label: '规格'
+		label: '规格',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict')
+		filter: publicFormatter('unit_dict'),
+		width: 90,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		width: 120,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue
index 886fd9c1..6e6fd194 100644
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -48,34 +49,47 @@ import {
 import { getStatus } from '@/api/core/base/productionLine';
 import codeFilter from '../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'factoryName',
-		label: '工厂'
+		label: '工厂',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
-		filter: publicFormatter('workshop')
+		filter: publicFormatter('workshop'),
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '产线名称'
+		label: '产线名称',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '产线编码'
+		label: '产线编码',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
-		filter: codeFilter('lineStatus')
+		filter: codeFilter('lineStatus'),
+		width: 120,
+		showOverflowtooltip: true
 	},
 	// {
 	// 	prop: 'tvalue',
@@ -83,16 +97,20 @@ const tableProps = [
 	// },
 	{
 		prop: 'description',
-		label: '描述'
+		label: '描述',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		width: 120,
+		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreSupplier/add-or-updata.vue b/src/views/base/coreSupplier/add-or-updata.vue
index bcdfb8a3..e8dfa0be 100644
--- a/src/views/base/coreSupplier/add-or-updata.vue
+++ b/src/views/base/coreSupplier/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:27:43
+ * @LastEditTime: 2024-04-02 16:46:49
  * @Description:
 -->
 <template>
@@ -79,7 +79,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }],
         name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
-				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				// contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
           {
diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue
index 6be77494..1fb01338 100644
--- a/src/views/base/coreSupplier/index.vue
+++ b/src/views/base/coreSupplier/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -45,41 +46,56 @@ import {
 	getCoreSupplierPage,
 	deleteCoreSupplier
 } from '@/api/base/coreSupplier';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '供应商编码'
+		label: '供应商编码',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '供应商名称'
+		label: '供应商名称',
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'contact',
-		label: '联系人'
+		label: '联系人',
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话'
+		label: '联系电话',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'address',
-		label: '地址'
+		label: '地址',
+		width: 180,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		minWidth: 90,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreWorker/index.vue b/src/views/base/coreWorker/index.vue
index c5a6ccdf..9d5f4a67 100644
--- a/src/views/base/coreWorker/index.vue
+++ b/src/views/base/coreWorker/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,20 +47,27 @@ import {
 	deleteCoreWorker
 } from '@/api/base/coreWorker';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '姓名'
+		label: '姓名',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '员工号'
+		label: '员工号',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'sex',
@@ -70,32 +78,44 @@ const tableProps = [
 		prop: 'entryTime',
 		label: '入职时间',
 		filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话'
+		label: '联系电话',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'status',
 		label: '状态',
-		filter: (val) => ['', '在职', '离职'][val]
+		filter: (val) => ['', '在职', '离职'][val],
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
-		label: '部门'
+		label: '部门',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'majorName',
-		label: '专业'
+		label: '专业',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		width: 150,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/base/coreWorkshopSection/index.vue
index 11b6f4a7..3a73e5e9 100644
--- a/src/views/base/coreWorkshopSection/index.vue
+++ b/src/views/base/coreWorkshopSection/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -45,12 +46,14 @@ import {
 	getCWSectionPage,
 	deleteCWSection
 } from '@/api/base/coreWorkshopSection';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+
 	},
 	{
 		prop: 'code',
@@ -70,12 +73,13 @@ const tableProps = [
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue
index 6f35f2fe..8a4236eb 100644
--- a/src/views/base/material/index.vue
+++ b/src/views/base/material/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -40,6 +41,7 @@ import {
 } from '@/api/base/material';
 import { listData } from "@/api/system/dict/data";
 import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -75,7 +77,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/base/materialProductBom/index.vue b/src/views/base/materialProductBom/index.vue
index 05733596..412ce542 100644
--- a/src/views/base/materialProductBom/index.vue
+++ b/src/views/base/materialProductBom/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -38,6 +39,7 @@ import {
 	getMaterialPBPage,
 	deleteMaterialPB
 } from '@/api/base/materialProductBom';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -55,7 +57,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	components: {
 		AddOrUpdate,
 	},
diff --git a/src/views/core/analysis/balanceAnalysis/chart.vue b/src/views/core/analysis/balanceAnalysis/chart.vue
index 3df9d162..afc101cc 100644
--- a/src/views/core/analysis/balanceAnalysis/chart.vue
+++ b/src/views/core/analysis/balanceAnalysis/chart.vue
@@ -106,6 +106,10 @@ export default {
 		activeIndex(val) {
 			this.initChart(val);
 		},
+		daterange(val) {
+			console.log('222', val)
+			this.templateOption.xAxis.data = val
+		},
 	},
 	methods: {
 		/**
@@ -124,8 +128,8 @@ export default {
 		},
 		/** 初始化/设置 图表 */
 		initChart(val) {
-			console.log('tableData', this.tableData);
 			if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
+			this.chart.clear();
 			switch (val) {
 				case 0:
 					const eqCt = this.tableData.map((row) => ({
@@ -139,7 +143,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt,
-					});
+					}, true);
 					break;
 				case 1:
 					const eqTt = this.tableData.map((row) => ({
@@ -153,7 +157,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
 						series: eqTt,
-					});
+					}, true);
 					break;
 				case 2:
 					const plCt = this.tableData.map((row) => ({
@@ -167,7 +171,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
 						series: plCt,
-					});
+					}, true);
 					break;
 				case 3:
 					const plTt = this.tableData.map((row) => ({
@@ -181,9 +185,10 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
 						series: plTt,
-					});
+					}, true);
 					break;
 				default:
+					this.activeIndex = 0
 					const eqCt2 = this.tableData.map((row) => ({
 						name: row.equName,
 						type: 'line',
@@ -195,7 +200,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt2,
-					});
+					}, true);
 			}
 		},
 	},
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index 095553e0..c60c5f45 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -18,13 +18,15 @@
 						:page="1"
 						:limit="999"
 						:table-props="tableProps"
-						:table-data="tableData" />
+						:table-data="tableData"
+						:max-height="tableH" />
 					<div v-if="tableData.length == 0" class="no-data-bg"></div>
 				</el-tab-pane>
 				<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
 					<div class="graph" style="height: 800px">
 						<!-- graph  -->
 						<AnalysisChart
+							ref="analysisChart"
 							v-if="activeName == 'graph'"
 							:table-data="tableData"
 							:daterange="dateArr"></AnalysisChart>
@@ -47,13 +49,14 @@ import BalanceChart from '../balanceChart';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import AnalysisChart from './chart.vue';
 import { parseTime } from '@/utils/ruoyi'
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	components: {
 		BalanceChart,
 		AnalysisChart,
 	},
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			activeName: 'table',
@@ -176,6 +179,11 @@ export default {
 			// const p = this.tableProps
 			// const d = this.tableData
 			// debugger;
+			if (this.activeName == 'graph') {
+				this.$nextTick(() => {
+					this.$refs['analysisChart'].initChart()
+				})
+			}
 			this.ready = true;
 		},
 
diff --git a/src/views/core/base/factory/index.vue b/src/views/core/base/factory/index.vue
index ba0ea31e..d8867ac6 100644
--- a/src/views/core/base/factory/index.vue
+++ b/src/views/core/base/factory/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -41,6 +42,7 @@
 import AddOrUpdate from './add-or-updata';
 import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
 	deleteFactory,
 	getFactoryPage
@@ -71,7 +73,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
diff --git a/src/views/core/mixins/basic-page.js b/src/views/core/mixins/basic-page.js
index 348fcdb2..894044d2 100644
--- a/src/views/core/mixins/basic-page.js
+++ b/src/views/core/mixins/basic-page.js
@@ -17,7 +17,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
diff --git a/src/views/core/monitoring/data24/index.vue b/src/views/core/monitoring/data24/index.vue
index 2d0d0623..2ea5451f 100644
--- a/src/views/core/monitoring/data24/index.vue
+++ b/src/views/core/monitoring/data24/index.vue
@@ -27,13 +27,16 @@
 import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
 import { parseTime } from '../../mixins/code-filter';
 import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction'
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'productionLineData24',
+	mixins: [tableHeightMixin],
 	components: {},
 	props: {},
 	data() {
 		return {
+			heightNum: 240,
       urlOptions: {
 				getDataListURL: getPdlDataOneDay
 			},
@@ -56,9 +59,9 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(240)
-    })
+		// window.addEventListener('resize', () => {
+    //   this.tableH = this.tableHeight(240)
+    // })
 		this.getList();
 	},
 	methods: {
@@ -115,7 +118,7 @@ export default {
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
 			// let sectionArr= []
-			let temp = Object.values(list.datamap)                             
+			let temp = list.datamap ? Object.values(list?.datamap) : []
 			console.log('111', temp)
 
 			temp.forEach(item => {
diff --git a/src/views/equipment/analysis/Statistics/index.vue b/src/views/equipment/analysis/Statistics/index.vue
index 353685da..fd2049cb 100644
--- a/src/views/equipment/analysis/Statistics/index.vue
+++ b/src/views/equipment/analysis/Statistics/index.vue
@@ -9,7 +9,8 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -33,6 +34,7 @@ import {
 	getEqAnalysis,
 	exportEqAnalysisExcel,
 } from '@/api/equipment/analysis/statistics';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	// {
@@ -52,35 +54,49 @@ const tableProps = [
 	{
 		prop: 'lineName',
 		label: '产线',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'sectionName',
 		label: '工段',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'equipmentName',
 		label: '设备名称',
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'equipmentType',
 		label: '设备类型',
+		width: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'workTime',
 		label: '工作时间累积(h)',
+		width: 160,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'repairCount',
 		label: '维修次数',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'maintainCount',
 		label: '保养次数',
+		width: 120,
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		const today = new Date();
 
@@ -110,7 +126,7 @@ export default {
 			tableBtn: [].filter((v) => v),
 			tableData: [],
 			listQuery: {
-				pageSize: 10,
+				pageSize: 20,
 				pageNo: 1,
 				total: 1,
 				recordTime: [
diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue
index a79fae2a..9e13b150 100644
--- a/src/views/equipment/analysis/efficiency/components/pieChart.vue
+++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue
@@ -75,6 +75,12 @@ export default {
 				},
 				tooltip: {
 					trigger: 'item',
+					formatter: (v) => {
+						const num = String(v.value)?.split('.').length === 2 ? v.value?.toFixed(2) : v.value
+						return `<div>
+						<span>${v.name}: ${num}</span>
+						</div>`
+					}
 				},
 				legend: {
 					show: false,
diff --git a/src/views/equipment/analysis/exception/index.vue b/src/views/equipment/analysis/exception/index.vue
index 783ace7f..1a44c76f 100644
--- a/src/views/equipment/analysis/exception/index.vue
+++ b/src/views/equipment/analysis/exception/index.vue
@@ -19,7 +19,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			max-height="600"
+			:max-height="tableH"
 			@emitFun="handleEmitFun">
 			<!-- <method-btn
 				v-if="tableBtn.length"
@@ -42,14 +42,16 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'ExceptionAnalysis',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	components: {},
 	props: {},
 	data() {
 		return {
+			heightNum: 220,
 			searchBarKeys: ['name', 'code'],
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:equipment-group:update')
diff --git a/src/views/equipment/analysis/quality/index.vue b/src/views/equipment/analysis/quality/index.vue
index 9eba29f3..e01e8f2c 100644
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@@ -48,9 +48,11 @@
 <script>
 import moment from 'moment';
 import LineChart from './components/lineChart.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'QualityAnalysis',
+	mixins: [tableHeightMixin],
 	components: { LineChart },
 	props: {},
 	data() {
@@ -58,7 +60,6 @@ export default {
 		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
 		return {
 			dialogVisible: false,
-			tableH: this.tableHeight(260),
 			urls: {
 				page: '/analysis/equipment-analysis/quality',
 			},
@@ -254,9 +255,9 @@ export default {
 		this.fillProductOptions();
 	},
 	mounted() {
-		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
+		// window.addEventListener('resize', () => {
+    //   this.tableH = this.tableHeight(260)
+    // })
 		this.$refs['search-bar'].headBtnClick('search');
 	},
 	methods: {
diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue
index a9b41c91..9c154511 100644
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -61,6 +62,8 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
 import AddOrUpdate from './AddOrUpdate.vue';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 const btn = {
@@ -89,7 +92,7 @@ const btn = {
 export default {
 	name: 'Record',
 	components: { AddOrUpdate },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			readOnly: false,
@@ -116,17 +119,17 @@ export default {
 				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipment', label: '设备名称' },
+				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true },
 				{
 					prop: 'alarmGrade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
-				{ prop: 'alarmCode', label: '设备报警码' },
-				{ prop: 'alarmContent', label: '报警内容' },
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
+				{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
+				{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
 				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
 				// { prop: 'remark', label: '备注' },
@@ -203,7 +206,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				lineId: null,
 				equipmentId: null,
 				recordTime: [],
diff --git a/src/views/equipment/base/config/AlarmGroup/index.vue b/src/views/equipment/base/config/AlarmGroup/index.vue
index 61cc4027..92ad250b 100644
--- a/src/views/equipment/base/config/AlarmGroup/index.vue
+++ b/src/views/equipment/base/config/AlarmGroup/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -70,7 +71,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('equipment:alarm-group:update')
@@ -109,10 +110,11 @@ import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import { getAccessToken } from '@/utils/auth';
 import BasicDrawer from './components/BasicDrawer.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentGroup',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	components: { BasicDrawer },
 	data() {
 		return {
diff --git a/src/views/equipment/base/config/BindGroup/index.vue b/src/views/equipment/base/config/BindGroup/index.vue
index af742be9..11120e61 100644
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -72,7 +73,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:equipment-group:update')
@@ -112,11 +113,12 @@ import moment from 'moment';
 import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import BasicDrawer from './components/BasicDrawer.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentBindGroup',
 	components: { BasicDrawer },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
@@ -254,7 +256,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				equipmentName: null,
 				groupId: null,
 			},
diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
index 53a98db0..e28bd072 100644
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@@ -19,7 +19,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -127,10 +128,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import BasicDrawer from './components/BasicDrawer.vue';
 import { publicFormatter } from '@/utils/dict';
 import AddOrUpdate from './add-or-updata';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentPlcConnect',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	components: { BasicDrawer, AddOrUpdate },
 	data() {
 		return {
@@ -156,14 +158,14 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名' },
-				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'plcCode', label: '关联表编码' },
-				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'plcName', label: '标识名称' },
-				{ prop: 'bindingParameters', label: '绑定参数数量' },
+				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
+				{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@@ -269,7 +271,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				plcId: null,
 				equipmentId: null,
 			},
diff --git a/src/views/equipment/base/config/DataCollection/TableConfig.vue b/src/views/equipment/base/config/DataCollection/TableConfig.vue
index 2b08eada..54f9dd7d 100644
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@@ -20,7 +20,8 @@
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			ref="pageTable"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -60,6 +61,7 @@ import {
 	exportEquipmentPlcExcel,
 } from '@/api/base/equipmentPlc';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const switchBtn = {
 	name: 'SwitchBtn',
@@ -99,7 +101,7 @@ const switchBtn = {
 
 export default {
 	name: 'EquipmentPlc',
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	components: {},
 	data() {
 		return {
@@ -127,16 +129,16 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'code', label: '编码' },
-				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'name', label: '标识名称' },
-				{ prop: 'enName', label: '英文名称' },
+				{ prop: 'code', label: '编码', width: 180, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
 				{
 					prop: 'collection',
 					label: '是否采集',
 					subcomponent: switchBtn,
 				},
-				{ prop: 'description', label: '描述' },
+				{ prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -240,7 +242,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				plcTableName: null,
 				name: null,
 			},
diff --git a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
index 7319f32c..2d3387dd 100644
--- a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
@@ -15,6 +15,7 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
+		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@@ -37,8 +38,9 @@
 		<el-table-column
 			v-if="selectedBox[0]"
 			label="巡检单名称"
+			:show-overflow-tooltip="true"
 			prop="name"></el-table-column>
-		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
+		<el-table-column v-if="selectedBox[1]" label="部门" :show-overflow-tooltip="true" prop="planName">
 			<template slot-scope="scope">
 				{{ scope.row.department || '---' }}
 			</template>
@@ -46,6 +48,7 @@
 		<el-table-column
 			v-if="selectedBox[2]"
 			label="巡检时间"
+			width="150"
 			prop="actualCheckTime">
 			<template slot-scope="scope">
 				{{ scope.row.actualCheckTime | timeFilter }}
@@ -54,6 +57,8 @@
 		<el-table-column
 			v-if="selectedBox[3]"
 			label="班次"
+			width="180"
+			:show-overflow-tooltip="true"
 			prop="groupClass">
 			<template slot-scope="scope">
 				{{ scope.row.groupClass || '---' }}
@@ -62,6 +67,7 @@
 		<el-table-column
 			v-if="selectedBox[4]"
 			label="确认截止时间"
+			width="150"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
 				{{ scope.row.confirmDueTime | timeFilter }}
@@ -70,6 +76,7 @@
 		<el-table-column
 			v-if="selectedBox[5]"
 			width="150"
+			:show-overflow-tooltip="true"
 			label="备注"
 			prop="remark">
 			<template slot-scope="scope">
@@ -172,6 +179,7 @@ export default {
 				true
 			],
 			selectedPlan: [],
+			tableH: this.tableHeight(260)
 		};
 	},
 	computed: {
@@ -182,6 +190,16 @@ export default {
 			}));
 		},
 	},
+	created() {
+		window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+	},
+	destroyed() {
+		window.removeEventListener('resize', () => {
+			this.tableH = this.tableHeight(260)
+		});
+	},
 	methods: {
 		checkSelectable(row, index) {
 			return true;
diff --git a/src/views/equipment/base/inspection/Confirm/index.vue b/src/views/equipment/base/inspection/Confirm/index.vue
index ae3abcf6..8eee64c1 100644
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@@ -139,7 +139,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 62e36af8..18901579 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -65,6 +66,7 @@ import addRecord from './addRecord.vue';
 import AddContent from './addContent.vue';
 import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
 import { parseTime } from '../../../../core/mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -91,7 +93,7 @@ const btn = {
 export default {
 	name: 'EquipmentInspectionRecord',
 	components: { addRecord, AddContent },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -250,7 +252,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				special: false,
 				name: null,
 				actualCheckTime: null,
diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue
index 6a13b1d2..f051c0c7 100644
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -53,13 +54,14 @@ import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
 import { groupClassesListAll } from '@/api/monitoring/teamProduction';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
 	components: { addOrUpdata, add },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -102,7 +104,7 @@ export default {
 				{
 					prop: 'code',
 					label: '巡检单编码',
-					minWidth: 150,
+					minWidth: 170,
 					showOverflowtooltip: true,
 				},
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
@@ -225,7 +227,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				equipmentId: null,
 				name: null,
 				special: false,
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue b/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
index 47ca18bd..a1e4f2a8 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
@@ -7,12 +7,13 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
+		:before-close="beforeClose"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">编辑</SmallTitle>
 
@@ -344,6 +345,7 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
+						bind: { clearable: true, filterable: true },
 						// method: 'post',
 						// queryParams: {
 						// 	pageNo: 1,
@@ -443,6 +445,15 @@ export default {
 		this.getList('line');
 	},
 	methods: {
+		beforeClose(done) {
+			// if (!this.isdetail) {
+			this.$confirm('确认关闭？')
+				.then(_ => {
+					done();
+				})
+				.catch(_ => {});
+			// }
+		},
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
index 697fbd8e..77745cee 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
@@ -15,6 +15,7 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
+		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@@ -36,8 +37,9 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[0]"
-			width="128"
+			width="160"
 			label="设备保养单号"
+			:show-overflow-tooltip="true"
 			prop="maintainOrderNumber"></el-table-column>
 		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
 			<template slot-scope="scope">
@@ -224,6 +226,7 @@ export default {
 				true,
 			],
 			selectedPlan: [],
+			tableH: this.tableHeight(260),
 		};
 	},
 	computed: {
@@ -234,6 +237,16 @@ export default {
 			}));
 		},
 	},
+	created() {
+		window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+	},
+	destroyed() {
+		window.removeEventListener('resize', () => {
+			this.tableH = this.tableHeight(260)
+		});
+	},
 	methods: {
 		checkSelectable(row, index) {
 			return (
diff --git a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
index 773cc0b2..caaa4197 100644
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@@ -335,6 +335,7 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
+						bind: { clearable: true, filterable: true },
 						// method: 'post',
 						// queryParams: {
 						// 	pageNo: 1,
diff --git a/src/views/equipment/base/maintain/Confirm/index.vue b/src/views/equipment/base/maintain/Confirm/index.vue
index 28c9db73..385f50bc 100644
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@@ -197,7 +197,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,
diff --git a/src/views/equipment/base/maintain/Monitor/index.vue b/src/views/equipment/base/maintain/Monitor/index.vue
index 2c40215f..bff11225 100644
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -59,6 +60,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 import { parseTime } from '@/utils/ruoyi'
 import AddContent from '../PlanConfig/addContent.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const remainBox = {
 	name: 'RemainBox',
@@ -116,7 +118,7 @@ const btn = {
 export default {
 	name: 'Monitor',
 	components: { AddContent },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			addContent: false,
@@ -129,7 +131,7 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
+				{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
 				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@@ -205,7 +207,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				special: false,
 				equipmentName: null,
 				createTime: null,
diff --git a/src/views/equipment/base/maintain/PlanConfig/index.vue b/src/views/equipment/base/maintain/PlanConfig/index.vue
index 8feb94fe..bcd1bf0b 100644
--- a/src/views/equipment/base/maintain/PlanConfig/index.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@@ -9,11 +9,12 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData">
+			:table-data="tableData"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="150"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -53,6 +54,7 @@ import { parseTime, toDay } from '../../../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
 import { getPlanPage } from '@/api/equipment/base/maintain/planconfig';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	// {
@@ -62,46 +64,64 @@ const tableProps = [
 	// },
 	{
 		prop: 'name',
-		label: '保养计划名称'
+		label: '保养计划名称',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
-		label: '部门'
+		label: '部门',
+		width: 120,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'lineName',
-		label: '产线名'
+		label: '产线名',
+		width: 120,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'maintenancePeriod',
-		label: '保养频率(天/次)'
+		label: '保养频率(天/次)',
+		width: 150,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'firstMaintenanceTime',
 		label: '首次保养时间',
-		filter: parseTime
+		filter: parseTime,
+		width: 150,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'maintainDuration',
-		label: '保养时长'
+		label: '保养时长',
+		width: 120,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'maintainer',
-		label: '计划保养人员'
+		label: '计划保养人员',
+		width: 150,
+		showOverflowtooltip: true
 	},
   {
 		prop: 'confirmTimeLimit',
 		label: '确认时限',
-		filter: toDay
+		filter: toDay,
+		width: 130,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		width: 150,
+		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -111,7 +131,7 @@ export default {
 			tableProps,
 			addContent: false,
 			listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 0,
 				special: false,
diff --git a/src/views/equipment/base/maintain/Record/index.vue b/src/views/equipment/base/maintain/Record/index.vue
index ee6ea625..718ffca9 100644
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -65,6 +66,7 @@ import Editor from '@/components/Editor';
 import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 import AddContent from './addContent.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -91,7 +93,7 @@ const btn = {
 export default {
 	name: 'EquipmentMaintainRecord',
 	components: { AddContent },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			addContent: false,
@@ -337,7 +339,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				special: false,
 				maintainPlanId: null,
 				maintainPlanId: null,
diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue
index 51ce72a1..905a89fa 100644
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@@ -12,7 +12,8 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun">
+			@emitFun="handleEmitFun"
+			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -58,12 +59,13 @@ import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
 import { parseTime } from '@/utils/ruoyi'
 import htmls from './htmls.vue'
 import DialogForm from './Repair--add.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
 	components: { CustomDialogForm, DialogForm },
-	mixins: [basicPageMixin],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -102,16 +104,16 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime,
 				// },
-				{ prop: 'repairOrderNumber', label: '维修单号' },
-				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'sectionName', label: '工段名' },
+				{ prop: 'repairOrderNumber', label: '维修单号', width: 180, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
+				{ prop: 'sectionName', label: '工段名', width: 120, showOverflowtooltip: true },
 				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls },
+				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls, width: 180, showOverflowtooltip: true },
 				// { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'maintenanceStartTime',
 					label: '维修开始时间',
-					width: 150, 
+					width: 150,
 					filter: parseTime,
 				},
 				{
@@ -193,7 +195,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				special: false,
 				maintenanceResult: null,
 				createTime: null,
diff --git a/src/views/monitoring/equipmentProcessAmount/index.vue b/src/views/monitoring/equipmentProcessAmount/index.vue
index d1cd534e..2032fc5d 100644
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ b/src/views/monitoring/equipmentProcessAmount/index.vue
@@ -88,7 +88,8 @@
 									:page="1"
 									:limit="999"
 									:table-data="list"
-									@emitFun="handleEmitFun">
+									@emitFun="handleEmitFun"
+									:max-height="tableH">
 									<!-- <method-btn
 							v-if="tableBtn.length"
 						slot="handleBtn"
@@ -119,9 +120,11 @@
 
 <script>
 import Graph from './graph.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentProcessAmount',
+	mixins: [tableHeightMixin],
 	components: { Graph },
 	props: {},
 	data() {