48 changed files with 205 additions and 479 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,8 +1,8 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-03 11:22:19
- # @LastEditors: DY
+ # @LastEditTime: 2024-04-01 08:31:57
+ # @LastEditors: zhp
 # @Description:
 ###
 # 开发环境配置
--- a/src/mixins/lb/tableHeightMixin.js
+++ b/src/mixins/lb/tableHeightMixin.js
@ -5,7 +5,6 @@ export default {
 		};
 	},
 	created() {
-		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
 		window.addEventListener('resize', this._setTableHeight);
 	},
 	destroyed() {
@ -13,8 +12,7 @@ export default {
 	},
 	methods: {
 		_setTableHeight() {
-			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
-			// this.tableH = this.tableHeight(260);
+			this.tableH = this.tableHeight(260);
 		},
 	},
 };
--- a/src/views/base/coreAlarmLog/index.vue
+++ b/src/views/base/coreAlarmLog/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -34,49 +33,38 @@ 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,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'alarmSource',
-		label: '报警来源',
-		width: 200,
-		showOverflowtooltip: true
+		label: '报警来源'
 	},
 	{
 		prop: 'alarmType',
-		label: '报警类型',
-		width: 180,
-		showOverflowtooltip: true
+		label: '报警类型'
 	},
 	{
 		prop: 'alarmGrade',
 		label: '报警级别',
-		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL),
-		width: 120,
-		showOverflowtooltip: true
+		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
 	},
 	{
 		prop: 'alarmReason',
-		label: '报警原因',
-		showOverflowtooltip: true
+		label: '报警原因'
 	},
 	{
 		prop: 'alarmContent',
-		label: '报警详细',
-		showOverflowtooltip: true
+		label: '报警详细'
 	}
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@ -86,7 +74,7 @@ export default {
 			tableBtn: [].filter((v)=>v),
 			tableData: [],
 			listQuery: {
-        pageSize: 20,
+        pageSize: 10,
        pageNo: 1,
        total: 0,
 				alarmSource: undefined,
--- 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-04-02 16:46:17
+ * @LastEditTime: 2024-03-20 16:20:39
 * @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: "手机号不能为空" },
          {
--- a/src/views/base/coreCustomer/index.vue
+++ b/src/views/base/coreCustomer/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -46,56 +45,41 @@ import {
 	getCustomerPage,
 	deleteCustomer
 } from '@/api/base/coreCustomer';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'name',
-		label: '客户名称',
-		width: 150,
-		showOverflowtooltip: true
+		label: '客户名称'
 	},
 	{
 		prop: 'code',
-		label: '客户编码',
-		width: 150,
-		showOverflowtooltip: true
+		label: '客户编码'
 	},
 	{
 		prop: 'contact',
-		label: '联系人',
-		width: 120,
-		showOverflowtooltip: true
+		label: '联系人'
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
-		width: 150,
-		showOverflowtooltip: true
+		label: '联系电话'
 	},
 	{
 		prop: 'address',
-		label: '地址',
-		width: 150,
-		showOverflowtooltip: true
+		label: '地址'
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		minWidth: 150,
-		showOverflowtooltip: true
+		label: '备注'
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreDepartment/index.vue
+++ b/src/views/base/coreDepartment/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -46,7 +45,6 @@ import {
 	getCoreDepartmentPage,
 	deleteCoreDepartment
 } from '@/api/base/coreDepartment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
@ -73,7 +71,7 @@ const tableProps = [
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- 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>
--- a/src/views/base/coreEquipment/index.vue
+++ b/src/views/base/coreEquipment/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -79,7 +78,7 @@
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:core-equipment-attr:update')
@ -119,7 +118,6 @@ 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',
@ -127,7 +125,7 @@ export default {
 		Editor,
 		EquipmentDrawer,
 	},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name', 'code'],
@ -159,8 +157,8 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
-				{ width: 250, prop: 'code', label: '设备编码' },
+				{ prop: 'name', label: '设备名称' },
+				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
@ -486,7 +484,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				code: '',
 				name: '',
 				special: false
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -52,13 +51,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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			basePath: '/base/core-equipment-bind-section',
@ -82,13 +81,12 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 150,
-					showOverflowtooltip: true,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
-				{ prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'productionLineName', label: '产线名称' },
+				{ prop: 'workshopSectionName', label: '工段名称' },
+				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'sort', label: '工段中排序' },
 				{
 					prop: 'lineDataType',
@ -238,7 +236,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentName: null,
 				productionLineId: null,
 			},
--- a/src/views/base/coreEquipmentType/index.vue
+++ b/src/views/base/coreEquipmentType/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -51,7 +50,6 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 import {
 	createEquipmentType,
@ -67,7 +65,7 @@ import {
 export default {
 	name: 'EquipmentType',
 	components: {},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name'],
@ -173,7 +171,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				name: '',
 			},
 			// 表单参数
--- a/src/views/base/coreHotMaterial/index.vue
+++ b/src/views/base/coreHotMaterial/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -44,51 +43,38 @@ 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,
-		width: 180,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'name',
-		label: '原料名称',
-		minWidth: 250,
-		showOverflowtooltip: true
+		label: '原料名称'
 	},
 	{
 		prop: 'code',
-		label: '原料编码',
-		width: 250,
-		showOverflowtooltip: true
+		label: '原料编码'
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
-		width: 90,
-		showOverflowtooltip: true
+		filter: publicFormatter('unit_dict')
 	},
 	{
 		prop: 'dailyCost',
-		label: '每日消耗量',
-		width: 120,
-		showOverflowtooltip: true
+		label: '每日消耗量'
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		width: 120,
-		showOverflowtooltip: true
+		label: '备注'
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreMajor/index.vue
+++ b/src/views/base/coreMajor/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -46,7 +45,6 @@ import {
 	getCoreMajorPage,
 	deleteCoreMajor
 } from '@/api/base/coreMajor';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
@ -73,7 +71,7 @@ const tableProps = [
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/src/views/base/coreProduct/add-or-updata.vue
@ -2,17 +2,15 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-03-27 13:47:24
+ * @LastEditTime: 2024-03-13 13:54:01
 * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="isdetail"
 		class="drawer"
-		:before-close="beforeClose"
-		@closed="$emit('destroy')"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@ -264,15 +262,6 @@ 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)
--- a/src/views/base/coreProduct/index.vue
+++ b/src/views/base/coreProduct/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -27,8 +26,7 @@
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getDataList"
-			@destroy="addOrUpdateVisible = false" />
+			@refreshDataList="getDataList" />
 	</div>
 </template>

@ -41,58 +39,43 @@ import {
 	getCoreProductPage,
 	deleteCoreProduct
 } from '@/api/base/coreProduct';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'name',
-		label: '产品名称',
-		width: 150,
-		showOverflowtooltip: true
+		label: '产品名称'
 	},
 	{
 		prop: 'code',
-		label: '产品编码',
-		width: 190,
-		showOverflowtooltip: true
+		label: '产品编码'
 	},
 	{
 		prop: 'productType',
 		label: '产品类型',
-		filter: publicFormatter('product_type'),
-		width: 180,
-		showOverflowtooltip: true
+		filter: publicFormatter('product_type')
 	},
 	{
 		prop: 'specifications',
-		label: '规格',
-		width: 150,
-		showOverflowtooltip: true
+		label: '规格'
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
-		width: 90,
-		showOverflowtooltip: true
+		filter: publicFormatter('unit_dict')
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		width: 120,
-		showOverflowtooltip: true
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -49,47 +48,34 @@ 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,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'factoryName',
-		label: '工厂',
-		width: 150,
-		showOverflowtooltip: true
+		label: '工厂'
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
-		filter: publicFormatter('workshop'),
-		width: 120,
-		showOverflowtooltip: true
+		filter: publicFormatter('workshop')
 	},
 	{
 		prop: 'name',
-		label: '产线名称',
-		width: 120,
-		showOverflowtooltip: true
+		label: '产线名称'
 	},
 	{
 		prop: 'code',
-		label: '产线编码',
-		width: 150,
-		showOverflowtooltip: true
+		label: '产线编码'
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
-		filter: codeFilter('lineStatus'),
-		width: 120,
-		showOverflowtooltip: true
+		filter: codeFilter('lineStatus')
 	},
 	// {
 	// 	prop: 'tvalue',
@ -97,20 +83,16 @@ const tableProps = [
 	// },
 	{
 		prop: 'description',
-		label: '描述',
-		width: 120,
-		showOverflowtooltip: true
+		label: '描述'
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		width: 120,
-		showOverflowtooltip: true
+		label: '备注'
 	}
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- 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: 2024-04-02 16:46:49
+ * @LastEditTime: 2023-11-22 10:27:43
 * @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: "手机号不能为空" },
          {
--- a/src/views/base/coreSupplier/index.vue
+++ b/src/views/base/coreSupplier/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -46,56 +45,41 @@ import {
 	getCoreSupplierPage,
 	deleteCoreSupplier
 } from '@/api/base/coreSupplier';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'code',
-		label: '供应商编码',
-		width: 150,
-		showOverflowtooltip: true
+		label: '供应商编码'
 	},
 	{
 		prop: 'name',
-		label: '供应商名称',
-		width: 180,
-		showOverflowtooltip: true
+		label: '供应商名称'
 	},
 	{
 		prop: 'contact',
-		label: '联系人',
-		width: 180,
-		showOverflowtooltip: true
+		label: '联系人'
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
-		width: 150,
-		showOverflowtooltip: true
+		label: '联系电话'
 	},
 	{
 		prop: 'address',
-		label: '地址',
-		width: 180,
-		showOverflowtooltip: true
+		label: '地址'
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		minWidth: 90,
-		showOverflowtooltip: true
+		label: '备注'
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreWorker/index.vue
+++ b/src/views/base/coreWorker/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -47,27 +46,20 @@ import {
 	deleteCoreWorker
 } from '@/api/base/coreWorker';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
 	{
 		prop: 'name',
-		label: '姓名',
-		width: 120,
-		showOverflowtooltip: true
+		label: '姓名'
 	},
 	{
 		prop: 'code',
-		label: '员工号',
-		width: 150,
-		showOverflowtooltip: true
+		label: '员工号'
 	},
 	{
 		prop: 'sex',
@ -78,44 +70,32 @@ const tableProps = [
 		prop: 'entryTime',
 		label: '入职时间',
 		filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
-		width: 150,
-		showOverflowtooltip: true
+		label: '联系电话'
 	},
 	{
 		prop: 'status',
 		label: '状态',
-		filter: (val) => ['', '在职', '离职'][val],
-		width: 120,
-		showOverflowtooltip: true
+		filter: (val) => ['', '在职', '离职'][val]
 	},
 	{
 		prop: 'departmentName',
-		label: '部门',
-		width: 120,
-		showOverflowtooltip: true
+		label: '部门'
 	},
 	{
 		prop: 'majorName',
-		label: '专业',
-		width: 150,
-		showOverflowtooltip: true
+		label: '专业'
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		width: 150,
-		showOverflowtooltip: true
+		label: '备注'
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/coreWorkshopSection/index.vue
+++ b/src/views/base/coreWorkshopSection/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -46,14 +45,12 @@ import {
 	getCWSectionPage,
 	deleteCWSection
 } from '@/api/base/coreWorkshopSection';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
-
+		filter: parseTime
 	},
 	{
 		prop: 'code',
@ -73,13 +70,12 @@ const tableProps = [
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		showOverflowtooltip: true
+		label: '备注'
 	},
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/material/index.vue
+++ b/src/views/base/material/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -41,7 +40,6 @@ 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 = [
 	{
@ -77,7 +75,7 @@ const tableProps = [
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- a/src/views/base/materialProductBom/index.vue
+++ b/src/views/base/materialProductBom/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -39,7 +38,6 @@ import {
 	getMaterialPBPage,
 	deleteMaterialPB
 } from '@/api/base/materialProductBom';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	{
@ -57,7 +55,7 @@ const tableProps = [
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	components: {
 		AddOrUpdate,
 	},
--- a/src/views/core/analysis/balanceAnalysis/chart.vue
+++ b/src/views/core/analysis/balanceAnalysis/chart.vue
@ -106,10 +106,6 @@ export default {
 		activeIndex(val) {
 			this.initChart(val);
 		},
-		daterange(val) {
-			console.log('222', val)
-			this.templateOption.xAxis.data = val
-		},
 	},
 	methods: {
 		/**
@ -128,8 +124,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) => ({
@ -143,7 +139,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt,
-					}, true);
+					});
 					break;
 				case 1:
 					const eqTt = this.tableData.map((row) => ({
@ -157,7 +153,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
 						series: eqTt,
-					}, true);
+					});
 					break;
 				case 2:
 					const plCt = this.tableData.map((row) => ({
@ -171,7 +167,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
 						series: plCt,
-					}, true);
+					});
 					break;
 				case 3:
 					const plTt = this.tableData.map((row) => ({
@ -185,10 +181,9 @@ 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',
@ -200,7 +195,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt2,
-					}, true);
+					});
 			}
 		},
 	},
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@ -18,15 +18,13 @@
 						:page="1"
 						:limit="999"
 						:table-props="tableProps"
-						:table-data="tableData"
-						:max-height="tableH" />
+						:table-data="tableData" />
 					<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>
@ -49,14 +47,13 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			activeName: 'table',
@ -179,11 +176,6 @@ export default {
 			// const p = this.tableProps
 			// const d = this.tableData
 			// debugger;
-			if (this.activeName == 'graph') {
-				this.$nextTick(() => {
-					this.$refs['analysisChart'].initChart()
-				})
-			}
 			this.ready = true;
 		},

--- a/src/views/core/base/factory/index.vue
+++ b/src/views/core/base/factory/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -42,7 +41,6 @@
 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
@ -73,7 +71,7 @@ const tableProps = [
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
--- 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: 20,
+        pageSize: 10,
        pageNo: 1,
        total: 1,
      },
--- a/src/views/core/monitoring/data24/index.vue
+++ b/src/views/core/monitoring/data24/index.vue
@ -27,16 +27,13 @@
 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
 			},
@ -59,9 +56,9 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		// window.addEventListener('resize', () => {
-    //   this.tableH = this.tableHeight(240)
-    // })
+		window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(240)
+    })
 		this.getList();
 	},
 	methods: {
@ -118,7 +115,7 @@ export default {
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
 			// let sectionArr= []
-			let temp = list.datamap ? Object.values(list?.datamap) : []
+			let temp = Object.values(list.datamap)                             
 			console.log('111', temp)

 			temp.forEach(item => {
--- a/src/views/equipment/analysis/Statistics/index.vue
+++ b/src/views/equipment/analysis/Statistics/index.vue
@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -34,7 +33,6 @@ import {
 	getEqAnalysis,
 	exportEqAnalysisExcel,
 } from '@/api/equipment/analysis/statistics';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const tableProps = [
 	// {
@ -54,49 +52,35 @@ 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, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		const today = new Date();

@ -126,7 +110,7 @@ export default {
 			tableBtn: [].filter((v) => v),
 			tableData: [],
 			listQuery: {
-				pageSize: 20,
+				pageSize: 10,
 				pageNo: 1,
 				total: 1,
 				recordTime: [
--- a/src/views/equipment/analysis/efficiency/components/pieChart.vue
+++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue
@ -75,12 +75,6 @@ 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,
--- 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="tableH"
+			max-height="600"
 			@emitFun="handleEmitFun">
 			<!-- <method-btn
 				v-if="tableBtn.length"
@ -42,16 +42,14 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 export default {
 	name: 'ExceptionAnalysis',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: {},
 	props: {},
 	data() {
 		return {
-			heightNum: 220,
 			searchBarKeys: ['name', 'code'],
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:equipment-group:update')
--- a/src/views/equipment/analysis/quality/index.vue
+++ b/src/views/equipment/analysis/quality/index.vue
@ -48,11 +48,9 @@
 <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() {
@ -60,6 +58,7 @@ 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',
 			},
@ -255,9 +254,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: {
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -62,8 +61,6 @@ 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 = {
@ -92,7 +89,7 @@ const btn = {
 export default {
 	name: 'Record',
 	components: { AddOrUpdate },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			readOnly: false,
@ -119,17 +116,17 @@ export default {
 				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
-				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
-				{ prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'equipment', label: '设备名称' },
 				{
 					prop: 'alarmGrade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
-				{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
-				{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
+				{ prop: 'alarmCode', label: '设备报警码' },
+				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
 				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
 				// { prop: 'remark', label: '备注' },
@ -206,7 +203,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
 				recordTime: [],
--- a/src/views/equipment/base/config/AlarmGroup/index.vue
+++ b/src/views/equipment/base/config/AlarmGroup/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -71,7 +70,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('equipment:alarm-group:update')
@ -110,11 +109,10 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { BasicDrawer },
 	data() {
 		return {
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -73,7 +72,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:equipment-group:update')
@ -113,12 +112,11 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
@ -256,7 +254,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentName: null,
 				groupId: null,
 			},
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@ -19,8 +19,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -128,11 +127,10 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { BasicDrawer, AddOrUpdate },
 	data() {
 		return {
@ -158,14 +156,14 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ 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 },
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名' },
+				{ prop: 'equipmentCode', label: '设备编码' },
+				{ prop: 'plcCode', label: '关联表编码' },
+				{ prop: 'plcTableName', label: '关联表名' },
+				{ prop: 'plcName', label: '标识名称' },
+				{ prop: 'bindingParameters', label: '绑定参数数量' },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@ -271,7 +269,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				plcId: null,
 				equipmentId: null,
 			},
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@ -20,8 +20,7 @@
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			ref="pageTable"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -61,7 +60,6 @@ import {
 	exportEquipmentPlcExcel,
 } from '@/api/base/equipmentPlc';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 const switchBtn = {
 	name: 'SwitchBtn',
@ -101,7 +99,7 @@ const switchBtn = {

 export default {
 	name: 'EquipmentPlc',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: {},
 	data() {
 		return {
@ -129,16 +127,16 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ 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: 'code', label: '编码' },
+				{ prop: 'plcTableName', label: '关联表名' },
+				{ prop: 'name', label: '标识名称' },
+				{ prop: 'enName', label: '英文名称' },
 				{
 					prop: 'collection',
 					label: '是否采集',
 					subcomponent: switchBtn,
 				},
-				{ prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'description', label: '描述' },
 			],
 			searchBarFormConfig: [
 				{
@ -242,7 +240,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				plcTableName: null,
 				name: null,
 			},
--- a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
@ -15,7 +15,6 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
-		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@ -38,9 +37,8 @@
 		<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="部门" :show-overflow-tooltip="true" prop="planName">
+		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
 			<template slot-scope="scope">
 				{{ scope.row.department || '---' }}
 			</template>
@ -48,7 +46,6 @@
 		<el-table-column
 			v-if="selectedBox[2]"
 			label="巡检时间"
-			width="150"
 			prop="actualCheckTime">
 			<template slot-scope="scope">
 				{{ scope.row.actualCheckTime | timeFilter }}
@ -57,8 +54,6 @@
 		<el-table-column
 			v-if="selectedBox[3]"
 			label="班次"
-			width="180"
-			:show-overflow-tooltip="true"
 			prop="groupClass">
 			<template slot-scope="scope">
 				{{ scope.row.groupClass || '---' }}
@ -67,7 +62,6 @@
 		<el-table-column
 			v-if="selectedBox[4]"
 			label="确认截止时间"
-			width="150"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
 				{{ scope.row.confirmDueTime | timeFilter }}
@ -76,7 +70,6 @@
 		<el-table-column
 			v-if="selectedBox[5]"
 			width="150"
-			:show-overflow-tooltip="true"
 			label="备注"
 			prop="remark">
 			<template slot-scope="scope">
@ -179,7 +172,6 @@ export default {
 				true
 			],
 			selectedPlan: [],
-			tableH: this.tableHeight(260)
 		};
 	},
 	computed: {
@ -190,16 +182,6 @@ 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;
--- 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: 20,
+				pageSize: 10,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -66,7 +65,6 @@ 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');

@ -93,7 +91,7 @@ const btn = {
 export default {
 	name: 'EquipmentInspectionRecord',
 	components: { addRecord, AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@ -252,7 +250,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				name: null,
 				actualCheckTime: null,
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -54,14 +53,13 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@ -104,7 +102,7 @@ export default {
 				{
 					prop: 'code',
 					label: '巡检单编码',
-					minWidth: 170,
+					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
@ -227,7 +225,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentId: null,
 				name: null,
 				special: false,
--- a/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue
@ -7,13 +7,12 @@

 <template>
 	<el-drawer
-		:visible.sync="visible"
+		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
-		:before-close="beforeClose"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">编辑</SmallTitle>

@ -345,7 +344,6 @@ 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,
@ -445,15 +443,6 @@ export default {
 		this.getList('line');
 	},
 	methods: {
-		beforeClose(done) {
-			// if (!this.isdetail) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-			// }
-		},
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':
--- a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
@ -15,7 +15,6 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
-		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@ -37,9 +36,8 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[0]"
-			width="160"
+			width="128"
 			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">
@ -226,7 +224,6 @@ export default {
 				true,
 			],
 			selectedPlan: [],
-			tableH: this.tableHeight(260),
 		};
 	},
 	computed: {
@ -237,16 +234,6 @@ 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 (
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@ -335,7 +335,6 @@ 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,
--- 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: 20,
+				pageSize: 10,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -60,7 +59,6 @@ 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',
@ -118,7 +116,7 @@ const btn = {
 export default {
 	name: 'Monitor',
 	components: { AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addContent: false,
@ -131,7 +129,7 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -207,7 +205,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				equipmentName: null,
 				createTime: null,
--- a/src/views/equipment/base/maintain/PlanConfig/index.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@ -9,12 +9,11 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
-			:max-height="tableH">
+			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="150"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@ -54,7 +53,6 @@ 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 = [
 	// {
@ -64,64 +62,46 @@ const tableProps = [
 	// },
 	{
 		prop: 'name',
-		label: '保养计划名称',
-		width: 120,
-		showOverflowtooltip: true
+		label: '保养计划名称'
 	},
 	{
 		prop: 'departmentName',
-		label: '部门',
-		width: 120,
-		showOverflowtooltip: true
+		label: '部门'
 	},
  {
 		prop: 'lineName',
-		label: '产线名',
-		width: 120,
-		showOverflowtooltip: true
+		label: '产线名'
 	},
  {
 		prop: 'maintenancePeriod',
-		label: '保养频率(天/次)',
-		width: 150,
-		showOverflowtooltip: true
+		label: '保养频率(天/次)'
 	},
  {
 		prop: 'firstMaintenanceTime',
 		label: '首次保养时间',
-		filter: parseTime,
-		width: 150,
-		showOverflowtooltip: true
+		filter: parseTime
 	},
  {
 		prop: 'maintainDuration',
-		label: '保养时长',
-		width: 120,
-		showOverflowtooltip: true
+		label: '保养时长'
 	},
  {
 		prop: 'maintainer',
-		label: '计划保养人员',
-		width: 150,
-		showOverflowtooltip: true
+		label: '计划保养人员'
 	},
  {
 		prop: 'confirmTimeLimit',
 		label: '确认时限',
-		filter: toDay,
-		width: 130,
-		showOverflowtooltip: true
+		filter: toDay
 	},
 	{
 		prop: 'remark',
-		label: '备注',
-		width: 150,
-		showOverflowtooltip: true
+		label: '备注'
 	}
 ];

 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@ -131,7 +111,7 @@ export default {
 			tableProps,
 			addContent: false,
 			listQuery: {
-        pageSize: 20,
+        pageSize: 10,
        pageNo: 1,
        total: 0,
 				special: false,
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -66,7 +65,6 @@ 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');

@ -93,7 +91,7 @@ const btn = {
 export default {
 	name: 'EquipmentMaintainRecord',
 	components: { AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addContent: false,
@ -339,7 +337,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				maintainPlanId: null,
 				maintainPlanId: null,
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
-			:max-height="tableH">
+			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@ -59,13 +58,12 @@ 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, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@ -104,16 +102,16 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime,
 				// },
-				{ prop: 'repairOrderNumber', label: '维修单号', width: 180, showOverflowtooltip: true },
-				{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
-				{ prop: 'sectionName', label: '工段名', width: 120, showOverflowtooltip: true },
+				{ prop: 'repairOrderNumber', label: '维修单号' },
+				{ prop: 'lineName', label: '产线名' },
+				{ prop: 'sectionName', label: '工段名' },
 				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls, width: 180, showOverflowtooltip: true },
+				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls },
 				// { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'maintenanceStartTime',
 					label: '维修开始时间',
-					width: 150,
+					width: 150, 
 					filter: parseTime,
 				},
 				{
@ -195,7 +193,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				maintenanceResult: null,
 				createTime: null,
--- a/src/views/monitoring/equipmentProcessAmount/index.vue
+++ b/src/views/monitoring/equipmentProcessAmount/index.vue
@ -88,8 +88,7 @@
 									:page="1"
 									:limit="999"
 									:table-data="list"
-									@emitFun="handleEmitFun"
-									:max-height="tableH">
+									@emitFun="handleEmitFun">
 									<!-- <method-btn
 							v-if="tableBtn.length"
 						slot="handleBtn"
@ -120,11 +119,9 @@

 <script>
 import Graph from './graph.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 export default {
 	name: 'EquipmentProcessAmount',
-	mixins: [tableHeightMixin],
 	components: { Graph },
 	props: {},
 	data() {