update table

.prettierrc

@@ -4,7 +4,7 @@
 	"bracketSameLine": true,
 	"jsxBracketSameLine": true,
 	"embeddedLanguageFormatting": "auto",
-	"printWidth": 80,
+	"printWidth": 180,
 	"quoteProps": "consistent",
 	"trailingComma": "none",
 	"semi": false,

src/views/modules/monitoring/equipmentAlarmLog.vue

@@ -54,7 +54,7 @@ import AddOrUpdate from './equipmentAlarmLog-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'id', name: 'ID' },
 	{ prop: 'alarmId', name: '报警信息ID，关联T_equipment_group_alarm表' },

src/views/modules/monitoring/equipmentFile.vue

@@ -57,7 +57,7 @@ import AddOrUpdate from './equipmentFile-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'id', name: '' },
 	{ prop: 'equipmentId', name: '设备ID' },

src/views/modules/monitoring/equipmentGroup.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './equipmentGroup-add-or-update'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/equipmentGroupAlarm.vue

@@ -64,6 +64,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
@@ -203,7 +204,7 @@ export default {
 			switch (type) {
 				case 'edit':
 					return this.addOrUpdateHandle(id)
-				case 'delete': 
+				case 'delete':
 					return this.deleteHandle(id)
 			}
 		},

src/views/modules/monitoring/equipmentPlc.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './equipmentPlc-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
@@ -118,7 +119,7 @@ export default {
 		//handleOperations
 		handleOperations({ type, data: id }) {
 			switch (type) {
-				case 'edit': 
+				case 'edit':
 					return this.addOrUpdateHandle(id)
 				case 'delete':
 					return this.deleteHandle(id)

src/views/modules/monitoring/equipmentPlcConnect.vue

@@ -28,6 +28,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './equipmentPlcConnect-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/equipmentPlcParam.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './equipmentPlcParam-add-or-update'
 import BaseTable from '@/components/base-table'
 // import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/equipmentQuantity.vue

@@ -7,37 +7,10 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:equipmenquantity:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部编码"> </el-table-column>
-			<el-table-column prop="equipmentName" header-align="center" align="center" label="设备名称"> </el-table-column>
-			<el-table-column prop="inQuantity" header-align="center" align="center" label="进入设备的数量"> </el-table-column>
-			<el-table-column prop="outQuantity" header-align="center" align="center" label="离开设备的数量，若plc只记录一个生产数量，也写入该字段"> </el-table-column>
-			<el-table-column prop="okQuantity" header-align="center" align="center" label=""> </el-table-column>
-			<el-table-column prop="nokQuantity" header-align="center" align="center" label="设备上报的报废数量"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label=""> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="recordTime" header-align="center" align="center" label="生产数量的记录时间"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -54,39 +27,41 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './equipmentQuantity-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "id" },
-  { "prop": "externalCode", "name": "设备外部编码" },
-  { "prop": "equipmentName", "name": "设备名称" },
-  { "prop": "inQuantity", "name": "进入设备的数量" },
-  {
-    "prop": "outQuantity",
-    "name": "离开设备的数量，若plc只记录一个生产数量，也写入该字段"
-  },
-  { "prop": "okQuantity", "name": "" },
-  { "prop": "nokQuantity", "name": "设备上报的报废数量" },
-  { "prop": "description", "name": "" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },
-  { "prop": "recordTime", "name": "生产数量的记录时间" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: 'id' },
+	{ prop: 'externalCode', name: '设备外部编码' },
+	{ prop: 'equipmentName', name: '设备名称' },
+	{ prop: 'inQuantity', name: '进入设备的数量' },
+	{
+		prop: 'outQuantity',
+		name: '离开设备的数量，若plc只记录一个生产数量，也写入该字段'
+	},
+	{ prop: 'okQuantity', name: '' },
+	{ prop: 'nokQuantity', name: '设备上报的报废数量' },
+	{ prop: 'description', name: '' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'recordTime', name: '生产数量的记录时间' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -100,7 +75,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()

src/views/modules/monitoring/equipmentStatusLog.vue

@@ -9,33 +9,8 @@
 				<el-button v-if="$hasPermission('monitoring:equipmenstatuslog:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="设备外部代码"> </el-table-column>
-			<el-table-column prop="plcId" header-align="center" align="center" label="plc id"> </el-table-column>
-			<el-table-column prop="plc" header-align="center" align="center" label="plc"> </el-table-column>
-			<el-table-column prop="equipmentId" header-align="center" align="center" label="设备id"> </el-table-column>
-			<el-table-column prop="equipmentName" header-align="center" align="center" label="设备名称"> </el-table-column>
-			<el-table-column prop="status" header-align="center" align="center" label="状态，0正常 1计划停机 2故障"> </el-table-column>
-			<el-table-column prop="logTime" header-align="center" align="center" label="记录时间"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -52,35 +27,37 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './equipmentStatusLog-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "id" },
-  { "prop": "externalCode", "name": "设备外部代码" },
-  { "prop": "plcId", "name": "plc id" },
-  { "prop": "plc", "name": "plc" },
-  { "prop": "equipmentId", "name": "设备id" },
-  { "prop": "equipmentName", "name": "设备名称" },
-  { "prop": "status", "name": "状态，0正常 1计划停机 2故障" },
-  { "prop": "logTime", "name": "记录时间" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: 'id' },
+	{ prop: 'externalCode', name: '设备外部代码' },
+	{ prop: 'plcId', name: 'plc id' },
+	{ prop: 'plc', name: 'plc' },
+	{ prop: 'equipmentId', name: '设备id' },
+	{ prop: 'equipmentName', name: '设备名称' },
+	{ prop: 'status', name: '状态，0正常 1计划停机 2故障' },
+	{ prop: 'logTime', name: '记录时间' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -94,7 +71,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()

src/views/modules/monitoring/equipmentType.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './equipmentType-add-or-update'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/equipmentTypeFile.vue

@@ -7,36 +7,10 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:equipmentypefile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="equipmentTypeId" header-align="center" align="center" label="设备类型ID"> </el-table-column>
-			<el-table-column prop="fileId" header-align="center" align="center" label="文件ID"> </el-table-column>
-			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编码"> </el-table-column>
-			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
-			<el-table-column prop="fileUrl" header-align="center" align="center" label="下载地址"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -53,35 +27,37 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './equipmentTypeFile-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "ID" },
-  { "prop": "equipmentTypeId", "name": "设备类型ID" },
-  { "prop": "fileId", "name": "文件ID" },
-  { "prop": "typeCode", "name": "文件类型编码" },
-  { "prop": "fileName", "name": "文件名称" },
-  { "prop": "fileUrl", "name": "下载地址" },
-  { "prop": "description", "name": "描述" },
-  { "prop": "enabled", "name": "启用状态:0 、停用，1、启用" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: 'ID' },
+	{ prop: 'equipmentTypeId', name: '设备类型ID' },
+	{ prop: 'fileId', name: '文件ID' },
+	{ prop: 'typeCode', name: '文件类型编码' },
+	{ prop: 'fileName', name: '文件名称' },
+	{ prop: 'fileUrl', name: '下载地址' },
+	{ prop: 'description', name: '描述' },
+	{ prop: 'enabled', name: '启用状态:0 、停用，1、启用' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -95,7 +71,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()

src/views/modules/monitoring/equipmentattr.vue

@@ -1,13 +1,25 @@
 <template>
 	<div class="mod-config">
-		<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+		<el-form
+			:inline="true"
+			:model="dataForm"
+			@keyup.enter.native="getDataList()"
+		>
 			<el-form-item>
-				<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+				<el-input
+					v-model="dataForm.key"
+					placeholder="参数名"
+					clearable
+				></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
-				<el-button v-if="$hasPermission('monitoring:equipmenattr:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
+				<el-button
+					v-if="$hasPermission('monitoring:equipmenattr:save')"
+					type="primary"
+					@click="addOrUpdateHandle()"
+					>新增</el-button
+				>
 			</el-form-item>
 		</el-form>
 		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
@@ -32,7 +44,11 @@
 				</template>
 			</el-table-column>
 		</el-table> -->
-		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+		<base-table
+			:data="dataList"
+			:table-head-configs="tableConfigs"
+			:max-height="500"
+		/>
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -44,11 +60,16 @@
 		>
 		</el-pagination>
 		<!-- 弹窗, 新增 / 修改 -->
-		<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList"
+		></add-or-update>
 	</div>
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './equipmentAttr-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
@@ -68,7 +89,14 @@ const tableConfigs = [
 	// { "prop": "updaterName", "name": "更新人姓名" },
 	// { "prop": "updateTime", "name": "更新时间" },
 	// { prop: 'version', name: '版本号' },
-	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{
+		prop: 'operations',
+		name: '操作',
+		fixed: 'right',
+		width: 180,
+		subcomponent: TableOperateComponent,
+		options: ['edit', 'delete']
+	}
 ]
 
 export default {
@@ -146,11 +174,15 @@ export default {
 				: this.dataListSelections.map(item => {
 						return item.id
 				  })
-			this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
+			this.$confirm(
+				`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`,
+				'提示',
+				{
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}
+			).then(() => {
 				this.$http({
 					url: this.$http.adornUrl('/monitoring/equipmentAttr'),
 					method: 'delete',

src/views/modules/monitoring/factory.vue

@@ -9,31 +9,7 @@
 				<el-button v-if="$hasPermission('monitoring:factory:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="id"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="工厂编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="工厂名称"> </el-table-column>
-			<el-table-column prop="address" header-align="center" align="center" label="地址"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部系统编码"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
+
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -51,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './factory-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/product.vue

@@ -11,35 +11,6 @@
 				<el-button v-if="$hasPermission('monitoring:product:save')" type="primary" @click="addOrEdit()">新增</el-button>
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"></el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"></el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"></el-table-column>
-			<el-table-column prop="externalCode" header-align="center" align="center" label="外部编码，用于对照外部系统的编码"></el-table-column>
-			<el-table-column prop="specifications" header-align="center" align="center" label="规格"></el-table-column>
-			<el-table-column prop="unitDictValue" header-align="center" align="center" label="单位value，对应到数据字典label_value"></el-table-column>
-			<el-table-column prop="area" header-align="center" align="center" label="一单位的面积（平方米）"></el-table-column>
-			<el-table-column prop="processTime" header-align="center" align="center" label="加工一单位产品需要的时间"></el-table-column>
-			<el-table-column prop="typeDictValue" header-align="center" align="center" label="产品类型value，对应到数据字典label_value"></el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"></el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"></el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"></el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"></el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"></el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"></el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"></el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"></el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"></el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
 
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" @operate-event="handleOperations" @refreshDataList="getDataList" />
 
@@ -60,6 +31,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './product-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/productArrt.vue

@@ -52,6 +52,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './productArrt-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/productionLine.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/productionLineRecSch.vue

@@ -43,6 +43,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './productionLineRecSch-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/qualityInspectionCurrent.vue

@@ -60,6 +60,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import moment from 'moment'
 import BaseTable from '@/components/base-table'
 import SmallTitle from '@/components/small-title'

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './qualityInspectionDet-add-or-update'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/qualityInspectionRecord.vue

@@ -36,6 +36,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 // import AddOrUpdate from './qualityInspectionRecord-add-or-update'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/qualityInspectionType.vue

@@ -32,7 +32,7 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'name', name: '检测类型名称' },

src/views/modules/monitoring/realtimeEquipment.vue

@@ -18,7 +18,7 @@
 import BaseTable from '@/components/base-table'
 import SmallTitle from '@/components/small-title'
 import moment from 'moment'
-
+import { calcMaxHeight } from '@/utils'
 export default {
 	name: 'RealtimeDataOfEquipment',
 	components: { BaseTable, SmallTitle },

src/views/modules/monitoring/realtimeProductLine.vue

@@ -18,7 +18,7 @@
 import BaseTable from '@/components/base-table'
 import SmallTitle from '@/components/small-title'
 import moment from 'moment'
-
+import { calcMaxHeight } from '@/utils'
 export default {
 	name: 'RealtimeDataOfLine',
 	components: { BaseTable, SmallTitle },

src/views/modules/monitoring/realtimeQualityInspection.vue

@@ -1,10 +1,3 @@
-<!--
- * @Author: lb
- * @Date: 2022-06-22 14:00:17
- * @LastEditors: lb
- * @LastEditTime: 2022-06-22 14:00:17
- * @Description: 质量检查实时数据
--->
 <template>
 	<div>
 		<div class="app-container">
@@ -15,10 +8,14 @@
 </template>
 
 <script>
+	// @ts-nocheck
+	/* eslint-disable */
 import BaseTable from '@/components/base-table'
 import SmallTitle from '@/components/small-title'
 import moment from 'moment'
+import { calcMaxHeight } from '@/utils'
 
+// tslint: disable
 export default {
 	name: 'RealtimeDataOfTeam',
 	components: { BaseTable, SmallTitle },

src/views/modules/monitoring/reportCategory.vue

@@ -33,7 +33,7 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 // import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'name', name: '分类名称' },
@@ -47,7 +47,7 @@ const addOrUpdateConfigs = {
 	type: 'dialog',
 	infoUrl: '/monitoring/reportSheetCategory',
 	fields: [
-		{ name: 'name', label: '分类名称', required: true, span: 24 },
+		{ name: 'name', label: '分类名称', required: true, span: 24 }
 		// { name: 'code', label: '分类编码', required: true },
 		// { name: 'description', label: '描述' },
 		// { name: 'remark', label: '备注' }

src/views/modules/monitoring/reportDetail.vue

@@ -29,6 +29,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from './equipmentPlcConnect-add-or-update'
 import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/reportSheet.vue

@@ -7,36 +7,9 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:reporsheet:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="ID"> </el-table-column>
-			<el-table-column prop="category" header-align="center" align="center" label="分类：关联report_sheet_category"> </el-table-column>
-			<el-table-column prop="code" header-align="center" align="center" label="编码"> </el-table-column>
-			<el-table-column prop="name" header-align="center" align="center" label="名称"> </el-table-column>
-			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
-			<el-table-column prop="url" header-align="center" align="center" label="链接地址"> </el-table-column>
-			<el-table-column prop="description" header-align="center" align="center" label="描述"> </el-table-column>
-			<el-table-column prop="enabled" header-align="center" align="center" label="启用状态:0 、停用，1、启用"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column prop="content" header-align="center" align="center" label="报表内容"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
+
 		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
@@ -54,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './reportSheet-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/reportSheetCategory.vue

@@ -50,6 +50,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './reportSheetCategory-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'

src/views/modules/monitoring/sysfile.vue

@@ -7,33 +7,10 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:sysfile:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
-			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
-			<el-table-column prop="fileCode" header-align="center" align="center" label="文件编号"> </el-table-column>
-			<el-table-column prop="fileName" header-align="center" align="center" label="文件名称"> </el-table-column>
-			<el-table-column prop="fileUrl" header-align="center" align="center" label="文件路径URL"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -50,31 +27,34 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 import AddOrUpdate from './sysFile-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
 
 const tableConfigs = [
-  { "prop": "id", "name": "主键，自增" },
-  { "prop": "typeCode", "name": "文件类型编号" },
-  { "prop": "fileCode", "name": "文件编号" },
-  { "prop": "fileName", "name": "文件名称" },
-  { "prop": "fileUrl", "name": "文件路径URL" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: '主键，自增' },
+	{ prop: 'typeCode', name: '文件类型编号' },
+	{ prop: 'fileCode', name: '文件编号' },
+	{ prop: 'fileName', name: '文件名称' },
+	{ prop: 'fileUrl', name: '文件路径URL' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -88,7 +68,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()
@@ -152,7 +133,7 @@ export default {
 			}).then(() => {
 				this.$http({
 					url: this.$http.adornUrl('/monitoring/sysFile'),
-					
+
 					data: this.$http.adornData(ids, false)
 				}).then(({ data }) => {
 					if (data && data.code === 0) {

src/views/modules/monitoring/sysfileType.vue

@@ -7,31 +7,10 @@
 			<el-form-item>
 				<el-button @click="getDataList()">查询</el-button>
 				<el-button v-if="$hasPermission('monitoring:sysfiletype:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-				
 			</el-form-item>
 		</el-form>
-		<!-- <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
-			<el-table-column type="selection" header-align="center" align="center" width="50"> </el-table-column>
-			<el-table-column prop="id" header-align="center" align="center" label="主键，自增"> </el-table-column>
-			<el-table-column prop="typeCode" header-align="center" align="center" label="文件类型编号"> </el-table-column>
-			<el-table-column prop="typeName" header-align="center" align="center" label="文件类型名称"> </el-table-column>
-			<el-table-column prop="remark" header-align="center" align="center" label="备注"> </el-table-column>
-			<el-table-column prop="valid" header-align="center" align="center" label="删除标志，是否有效:1 可用 0不可用"> </el-table-column>
-			<el-table-column prop="creatorId" header-align="center" align="center" label="创建人"> </el-table-column>
-			<el-table-column prop="creatorName" header-align="center" align="center" label="创建人姓名"> </el-table-column>
-			<el-table-column prop="createTime" header-align="center" align="center" label="创建时间"> </el-table-column>
-			<el-table-column prop="updaterId" header-align="center" align="center" label="更新人"> </el-table-column>
-			<el-table-column prop="updaterName" header-align="center" align="center" label="更新人姓名"> </el-table-column>
-			<el-table-column prop="updateTime" header-align="center" align="center" label="更新时间"> </el-table-column>
-			<el-table-column prop="version" header-align="center" align="center" label="版本号"> </el-table-column>
-			<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
-				<template slot-scope="scope">
-					<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-					<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table> -->
-			<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
+
+		<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
 		<el-pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
@@ -52,26 +31,27 @@ import AddOrUpdate from './sysFileType-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
-  { "prop": "id", "name": "主键，自增" },
-  { "prop": "typeCode", "name": "文件类型编号" },
-  { "prop": "typeName", "name": "文件类型名称" },
-  { "prop": "remark", "name": "备注" },
-  { "prop": "valid", "name": "删除标志，是否有效:1 可用 0不可用" },
-  { "prop": "creatorId", "name": "创建人" },
-  { "prop": "creatorName", "name": "创建人姓名" },
-  { "prop": "createTime", "name": "添加时间" },
-  { "prop": "updaterId", "name": "更新人" },
-  { "prop": "updaterName", "name": "更新人姓名" },
-  { "prop": "updateTime", "name": "更新时间" },
-  { "prop": "version", "name": "版本号" },		{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
+	{ prop: 'id', name: '主键，自增' },
+	{ prop: 'typeCode', name: '文件类型编号' },
+	{ prop: 'typeName', name: '文件类型名称' },
+	{ prop: 'remark', name: '备注' },
+	{ prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' },
+	{ prop: 'creatorId', name: '创建人' },
+	{ prop: 'creatorName', name: '创建人姓名' },
+	{ prop: 'createTime', name: '添加时间' },
+	{ prop: 'updaterId', name: '更新人' },
+	{ prop: 'updaterName', name: '更新人姓名' },
+	{ prop: 'updateTime', name: '更新时间' },
+	{ prop: 'version', name: '版本号' },
+	{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
 ]
 
-
 export default {
 	data() {
-		return {tableConfigs,
+		return {
+			tableConfigs,
 			dataForm: {
 				key: ''
 			},
@@ -85,7 +65,8 @@ export default {
 		}
 	},
 	components: {
-		AddOrUpdate,BaseTable
+		AddOrUpdate,
+		BaseTable
 	},
 	activated() {
 		this.getDataList()

src/views/modules/monitoring/workShopSection.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { calcMaxHeight } from '@/utils'
 // import AddOrUpdate from '@/components/base-dialog/addOrUpdate'
 import AddOrUpdate from './workshopSectionDialog.vue'
 import BaseTable from '@/components/base-table'

src/views/modules/monitoring/workShopSectionEquipment.vue

@@ -52,7 +52,7 @@ import AddOrUpdate from './workshopSectionEquipment-add-or-update'
 import BaseTable from '@/components/base-table'
 import TableOperateComponent from '@/components/base-table/components/operationComponent'
 import TableTextComponent from '@/components/base-table/components/detailComponent'
-
+import { calcMaxHeight } from '@/utils'
 const tableConfigs = [
 	{ prop: 'createTime', name: '添加时间' },
 	{ prop: 'workshopSectionId', name: '工段ID' },