2024-04-12 14:58:10 +08:00
39 changed files with 518 additions and 316 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,7 +1,7 @@
 ###
- # @Author: Do not edit
- # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-12 14:13:52
+ # @Author: zhp
+ # @Date: 2024-04-12 14:30:48
+ # @LastEditTime: 2024-04-12 14:31:16
 # @LastEditors: zhp
 # @Description:
 ###
@ -12,27 +12,18 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统

 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
-# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:9001'
-# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-# socket地址
-# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
-# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
-VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080'

 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
+VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+
+# socket地址(现场)
+# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+# socket地址(公司线上)
+VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+# socket dcs地址(只有现场)
+VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
+

 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.prod
+++ b/.env.prod
@ -1,11 +1,4 @@
-###
- # @Author: zhp
- # @Date: 2023-11-07 19:11:40
- # @LastEditTime: 2023-11-16 16:40:59
- # @LastEditors: zhp
- # @Description:
-###
-# 生产环境配置
+# 生产环境配置（许昌现场）
 ENV = 'production'

 # 页面标题
--- a/.env.stage
+++ b/.env.stage
@ -1,4 +1,4 @@
-# 生产环境配置
+# 公司线上环境（33服务器）
 ENV = 'production'

 # 页面标题
@ -7,15 +7,12 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

-# dcs地址
-VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
-# socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
-
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+# dcs地址（只有现场的）
+VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'


 # 根据服务器或域名修改
--- a/src/views/base/coreCustomer/index.vue
+++ b/src/views/base/coreCustomer/index.vue
@ -138,7 +138,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-customer:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',
--- a/src/views/base/coreDepartment/index.vue
+++ b/src/views/base/coreDepartment/index.vue
@ -110,7 +110,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-department:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',
--- a/src/views/base/coreEquipment/index.vue
+++ b/src/views/base/coreEquipment/index.vue
@ -156,11 +156,11 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					minWidth: 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: '设备名称', minWidth: 180, showOverflowtooltip: true },
+				{ minWidth: 250, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
@ -211,7 +211,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: (this.$auth.hasPermi('base:core-equipment:export') || this.$auth.hasPermi('base:core-equipment:create')) ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-equipment:export')
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@ -126,7 +126,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
+						? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
--- a/src/views/base/coreEquipmentType/index.vue
+++ b/src/views/base/coreEquipmentType/index.vue
@ -90,7 +90,7 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					minWidth: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{ prop: 'name', label: '类型名称' },
@ -111,7 +111,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-equipment-type:create')
+						? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-equipment-type:create')
--- a/src/views/base/coreHotMaterial/index.vue
+++ b/src/views/base/coreHotMaterial/index.vue
@ -137,7 +137,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'button' : '',
--- a/src/views/base/coreMajor/index.vue
+++ b/src/views/base/coreMajor/index.vue
@ -110,7 +110,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-major:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',
--- a/src/views/base/coreProduct/index.vue
+++ b/src/views/base/coreProduct/index.vue
@ -14,7 +14,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:Width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@ -48,45 +48,45 @@ const tableProps = [
 		prop: 'createTime',
 		label: '添加时间',
 		filter: parseTime,
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
 		label: '产品名称',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
 		label: '产品编码',
-		width: 190,
+		minWidth: 190,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'productType',
 		label: '产品类型',
 		filter: publicFormatter('product_type'),
-		width: 180,
+		minWidth: 180,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'specifications',
 		label: '规格',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
 		filter: publicFormatter('unit_dict'),
-		width: 90,
+		minWidth: 90,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 ];
@ -141,7 +141,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-product:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '',
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@ -14,7 +14,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:minWidth="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@ -30,7 +30,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			minWidth="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@ -56,39 +56,39 @@ const tableProps = [
 		prop: 'createTime',
 		label: '添加时间',
 		filter: parseTime,
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'factoryName',
 		label: '工厂',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
 		filter: publicFormatter('workshop'),
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
 		label: '产线名称',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
 		label: '产线编码',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
 		filter: codeFilter('lineStatus'),
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 	// {
@ -98,13 +98,13 @@ const tableProps = [
 	{
 		prop: 'description',
 		label: '描述',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	}
 ];
@ -147,7 +147,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '',
--- a/src/views/base/coreSupplier/index.vue
+++ b/src/views/base/coreSupplier/index.vue
@ -132,7 +132,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-supplier:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-04-08 14:27:29
+ * @LastEditTime: 2024-04-10 16:16:31
 * @Description:
 -->
 <template>
@ -201,24 +201,26 @@
 					@pagination="getList" /> -->
 			</div>

-			<div class="card" style="padding-bottom: 16px;">
-				<div class="boxTitle">
-					<span class="blueTitle"></span>
-					<span>预计用料信息</span>
+			<div v-if="this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
+				<div class="card" style="padding-bottom: 16px;">
+					<div class="boxTitle">
+						<span class="blueTitle"></span>
+						<span>预计用料信息</span>
+					</div>
+					<base-table
+						:table-props="tableProps1"
+						:page="listQuery1.pageNo"
+						:limit="listQuery1.pageSize"
+						:table-data="materialList"
+						:max-height="tableH" />
+					<!-- <pagination
+						v-show="listQuery1.total > 0"
+						:total="listQuery1.total"
+						:page.sync="listQuery1.pageNo"
+						:limit.sync="listQuery1.pageSize"
+						:page-sizes="[5, 10, 15]"
+						@pagination="getList" /> -->
 				</div>
-				<base-table
-					:table-props="tableProps1"
-					:page="listQuery1.pageNo"
-					:limit="listQuery1.pageSize"
-					:table-data="materialList"
-					:max-height="tableH" />
-				<!-- <pagination
-					v-show="listQuery1.total > 0"
-					:total="listQuery1.total"
-					:page.sync="listQuery1.pageNo"
-					:limit.sync="listQuery1.pageSize"
-					:page-sizes="[5, 10, 15]"
-					@pagination="getList" /> -->
 			</div>

 			<!-- <div class="drawer-body__footer">
@ -461,7 +463,7 @@ export default {
 			});
 			// 获取预使用原料列表
 			console.log('111我看看', this.dataForm.materialMethod)
-			if (this.dataForm.id) {
+			if (this.dataForm.id && this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])) {
 				if (this.dataForm.materialMethod === 1) {
 					// 产品
 					getlistByProductId({
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@ -157,92 +157,105 @@ export default {
 				// 			showTip: '预使用原料信息'
 				// 	  }
 				// 	: undefined,
-					{
-						type: 'active',
-						btnName: '激活',
-						showParam: {
-							type: '|',
-							data: [
-								{
-									name: 'status',
-									type: 'equal',
-									value: 1
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 3
-								}
-							]
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'active',
+							btnName: '激活',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									},
+									{
+										name: 'status',
+										type: 'equal',
+										value: 3
+									}
+								]
+							}
 						}
-					},
-					{
-						type: 'pause',
-						btnName: '暂停',
-						showParam: {
-							type: '|',
-							data: [
-								{
-									name: 'status',
-									type: 'equal',
-									value: 2
-								}
-							]
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'pause',
+							btnName: '暂停',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 2
+									}
+								]
+							}
 						}
-					},
-					{
-						type: 'nullify',
-						btnName: '作废',
-						showParam: {
-							type: '|',
-							data: [
-								{
-									name: 'status',
-									type: 'equal',
-									value: 1
-								}
-							]
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'nullify',
+							btnName: '作废',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
 						}
-					},
-					{
-						type: 'finish',
-						btnName: '完成',
-						showParam: {
-							type: '|',
-							data: [
-								{
-									name: 'status',
-									type: 'equal',
-									value: 2
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 3
-								}
-							]
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'finish',
+							btnName: '完成',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 2
+									},
+									{
+										name: 'status',
+										type: 'equal',
+										value: 3
+									}
+								]
+							}
 						}
-					},
-					{
-						type: 'stop',
-						btnName: '终止',
-						showParam: {
-							type: '|',
-							data: [
-								{
-									name: 'status',
-									type: 'equal',
-									value: 2
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 3
-								}
-							]
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'stop',
+							btnName: '终止',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 2
+									},
+									{
+										name: 'status',
+										type: 'equal',
+										value: 3
+									}
+								]
+							}
 						}
-					},
-					this.$auth.hasPermi(`base:core-work-order:detail`)
+					: undefined,
+					this.$auth.hasPermiAnd([
+						'base:core-work-order:query',
+						'base:order:query'
+					])
 					? {
 							type: 'detail',
 							btnName: '查看详情',
--- a/src/views/base/coreWorker/index.vue
+++ b/src/views/base/coreWorker/index.vue
@ -163,7 +163,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-worker:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '',
--- a/src/views/base/coreWorkshopSection/index.vue
+++ b/src/views/base/coreWorkshopSection/index.vue
@ -52,8 +52,7 @@ const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
-
+		filter: parseTime
 	},
 	{
 		prop: 'code',
@ -116,7 +115,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '',
--- a/src/views/base/material/add-or-updata.vue
+++ b/src/views/base/material/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-03-21 15:21:32
+ * @LastEditTime: 2024-04-11 16:22:19
 * @Description:
 -->
 <template>
@ -122,14 +122,14 @@
 				</el-form>
 			</div>

-			<div class="attr-list" v-if="idAttrShow">
+			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermi('base:material-attr:query')">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					物料属性
 				</small-title>

-				<div v-if="!isdetail" class="action_btn">
+				<div v-if="!isdetail && this.$auth.hasPermi('base:material-attr:create')" class="action_btn">
          <template>
            <span style="display: inline-block;">
              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
@ -182,16 +182,23 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 import { getDictDatas } from "@/utils/dict";

-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
+// const tableBtn = [
+// 		this.$auth.hasPermiAnd([
+// 			'base:material-attr:create',
+// 			'base:material-attr:update'
+// 		]) ?
+// 		{
+// 			type: 'edit',
+// 			btnName: '编辑',
+// 		}
+// 		: undefined,
+// 	this.$auth.hasPermi('base:material-attr:delete') ? 
+// 		{
+// 			type: 'delete',
+// 			btnName: '删除',
+// 		}
+// 	: undefined,
+// ];
 const tableProps = [
 	{
 		prop: 'createTime',
@ -213,7 +220,23 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn,
+			tableBtn: [
+				this.$auth.hasPermiAnd([
+					'base:material-attr:create',
+					'base:material-attr:update'
+				]) ?
+				{
+					type: 'edit',
+					btnName: '编辑',
+				}
+				: undefined,
+			this.$auth.hasPermi('base:material-attr:delete') ? 
+				{
+					type: 'delete',
+					btnName: '删除',
+				}
+			: undefined,
+			],
 			tableProps,
 			addOrUpdateVisible: false,
 			urlOptions: {
--- a/src/views/base/material/index.vue
+++ b/src/views/base/material/index.vue
@ -134,7 +134,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
--- a/src/views/base/materialProductBom/add-or-updata.vue
+++ b/src/views/base/materialProductBom/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-03-21 14:39:52
+ * @LastEditTime: 2024-04-11 16:44:41
 * @Description:
 -->
 <template>
@ -56,14 +56,14 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="attr-list" v-if="idAttrShow">
+			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					BOM明细
 				</small-title>

-				<div v-if="!isdetail" class="action_btn">
+				<div v-if="!isdetail && this.$auth.hasPermi('base:material-product-bom:create')" class="action_btn">
          <template>
            <span style="display: inline-block;">
              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
@ -116,16 +116,16 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 import { publicFormatter } from '@/utils/dict';

-const tableBtn = [
-	{
-		type: 'edit',
-		btnName: '编辑',
-	},
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
+// const tableBtn = [
+// 	{
+// 		type: 'edit',
+// 		btnName: '编辑',
+// 	},
+// 	{
+// 		type: 'delete',
+// 		btnName: '删除',
+// 	},
+// ];
 const tableProps = [
 	{
 		prop: 'createTime',
@ -160,7 +160,24 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn,
+			tableBtn: [
+				this.$auth.hasPermiAnd([
+					'base:material-product-bom:update',
+					'base:material-product-bom-det:create',
+					'base:material-product-bom-det:update'
+				]) ?
+				{
+					type: 'edit',
+					btnName: '编辑',
+				}
+				: undefined,
+				this.$auth.hasPermi('base:material-product-bom:delete') ? 
+					{
+						type: 'delete',
+						btnName: '删除',
+					}
+				: undefined,
+			],
 			tableProps,
 			addOrUpdateVisible: false,
 			urlOptions: {
--- a/src/views/base/materialProductBom/index.vue
+++ b/src/views/base/materialProductBom/index.vue
@ -110,7 +110,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
--- a/src/views/core/base/factory/index.vue
+++ b/src/views/core/base/factory/index.vue
@ -125,7 +125,7 @@ export default {
 				// 	name: 'reset',
 				// },
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:core-factory:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-factory:create') ? 'button' : '',
--- a/src/views/energy/analysis/trendAnalysis/index.vue
+++ b/src/views/energy/analysis/trendAnalysis/index.vue
@ -57,10 +57,14 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
-				let fName = arr[i].time.slice(0, 4);
-				let lName = arr[i].time.slice(4, 6);
+				if (this.timeDim === '3') {
+					let fName = arr[i].time.slice(0, 4);
+					let lName = arr[i].time.slice(4, 6);
+					obj.label = fName + ' 第 ' + lName + ' 周';
+				} else {
+					obj.label = arr[i].time;
+				}
 				obj.prop = arr[i].time;
-				obj.label = fName + ' 第 ' + lName + ' 周';
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;
@ -97,7 +101,7 @@ export default {
 	},
 };
 </script>
-<style lang='scss'>
+<style lang="scss">
 .trendAnalysisBox {
 	.trend-out-table {
 		margin-bottom: 15px;
--- a/src/views/energy/monitoring/energyLimit/index.vue
+++ b/src/views/energy/monitoring/energyLimit/index.vue
@ -266,8 +266,9 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
+			console.log(row);
 			this.$modal
-				.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?')
+				.confirm('是否确认删除第"' + row._pageIndex + '"条数据项?')
 				.then(function () {
 					return deleteEnergyLimit(row.id);
 				})
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@ -130,8 +130,20 @@ export default {
 				{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
 				{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
 				{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
-				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
+				this.$auth.hasPermiAnd([
+					'monitoring:equipment-alarm-log:query',
+					'base:equipment-alarm-hand:query'
+				]) ?
+				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn } : undefined,
+				this.$auth.hasPermiAnd([
+					'monitoring:equipment-alarm-log:query',
+					'base:equipment-alarm-hand:query',
+					'base:core-worker:query',
+					'base:equipment-alarm-hand:create',
+					'base:equipment-alarm-hand:update',
+					'monitoring:equipment-alarm-log:update'
+				]) ?
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn } : undefined,
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
--- a/src/views/equipment/base/config/AlarmGroup/index.vue
+++ b/src/views/equipment/base/config/AlarmGroup/index.vue
@ -122,19 +122,30 @@ export default {
 			editMode: '',
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:alarm-group:update')
-					? {
+				this.$auth.hasPermiAnd([
+					'base:equipment-group:query',
+					'base:equipment-group-alarm:query'
+				])
+				? {
 							type: 'detail',
 							btnName: '查看报警',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:alarm-group:update')
+				this.$auth.hasPermiAnd([
+					'base:equipment-group:update',
+					'base:equipment-group:query',
+					'base:equipment-group-alarm:create',
+					'base:equipment-group-alarm:delete',
+					'base:equipment-group-alarm:update',
+					'base:equipment-group-alarm:query',
+					'base:equipment-group-alarm:query'
+				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:alarm-group:delete')
+				this.$auth.hasPermi('base:equipment-group:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@ -244,10 +255,11 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:equipment-group:create')
+						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:alarm-group:create')
+					type: this.$auth.hasPermi('base:equipment-group:create')
 						? 'button'
 						: '',
 					btnName: '新增',
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@ -123,13 +123,23 @@ export default {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:bind-group:update')
+				this.$auth.hasPermiAnd([
+					'base:equipment-group-alarm:query',
+					'base:core-equipment:query'
+				])
 					? {
 							type: 'detail',
 							btnName: '查看报警',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:bind-group:update')
+				this.$auth.hasPermiAnd([
+					'equipment:bind-group:update',
+					'base:core-equipment:query',
+					'base:equipment-group-alarm:create',
+					'base:equipment-group-alarm:update',
+					'base:equipment-group-alarm:delete',
+					'base:equipment-group-alarm:query'
+				])
 					? {
 							type: 'edit',
 							btnName: '修改',
@ -201,11 +211,16 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermiAnd([
+							'equipment:bind-group:create',
+							'base:core-equipment:query'
+						]) ? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:bind-group:create')
-						? 'button'
+					type: this.$auth.hasPermiAnd([
+							'equipment:bind-group:create',
+							'base:core-equipment:query'
+						]) ? 'button'
 						: '',
 					btnName: '新增',
 					name: 'add',
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@ -140,17 +140,28 @@ export default {
 			// tableBtn: [
 			// ].filter((v) => v),
 			tableBtn: [
-				{
-					type: 'detail',
-					btnName: '参数绑定',
-				},
-				this.$auth.hasPermi('equipment:collection-config:update')
+				this.$auth.hasPermiAnd([
+					'base:equipment-plc-connect:query',
+					'base:equipment-plc-param:query'
+				])
+				? {
+						type: 'detail',
+						btnName: '参数绑定',
+					} : undefined,
+				this.$auth.hasPermiAnd([
+						'base:equipment-plc-connect:update',
+						'base:equipment-plc-connect:query',
+						'base:equipment-plc-param:create',
+						'base:equipment-plc-param:update',
+						'base:equipment-plc-param:delete',
+						'base:equipment-plc-param:query'
+					])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:collection-config:delete')
+				this.$auth.hasPermi('base:equipment-plc-connect:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@ -158,14 +169,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: '产线', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码', minWidth: 200, showOverflowtooltip: true },
+				{ prop: 'plcCode', label: '关联表编码', minWidth: 220, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'plcName', label: '标识名称', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'bindingParameters', label: '绑定参数数量', minWidth: 120, showOverflowtooltip: true },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@ -217,10 +228,11 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
+						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:collection-config:create')
+					type: this.$auth.hasPermi('base:equipment-plc-connect:create')
 						? 'button'
 						: '',
 					// type: 'button',
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@ -108,13 +108,16 @@ export default {
 			tableKey: Math.random(),
 			searchBarKeys: ['name', 'plcTableName'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:realtime-table-config:update')
+				this.$auth.hasPermiAnd([
+					'base:equipment-plc:update',
+					'base:equipment-plc:query'
+					])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:realtime-table-config:delete')
+				this.$auth.hasPermi('base:equipment-plc:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@ -160,13 +163,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:equipment-plc:create')
+						?  'separate' : '',
 				},
 				{
-					// type: this.$auth.hasPermi('equipment:realtime-table-config:create')
-					// 	? 'button'
-					// 	: '',
-					type: 'button',
+					type: this.$auth.hasPermi('base:equipment-plc:create')
+						? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
@ -194,7 +196,7 @@ export default {
 						input: true,
 						label: '编码',
 						prop: 'code',
-						url: '/base/equipment-group/getCode',
+						url: '/base/energy-plc/getCode',
 						rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
 					},
 				],
--- a/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/inspection/Confirm/WaitingListTable.vue
@ -91,7 +91,7 @@
 		<!-- btns  -->
 		<el-table-column width="188" label="操作">
 			<template slot-scope="scope">
-				<el-tooltip content="确认" placement="top">
+				<el-tooltip v-if="$auth.hasPermi('equipment:check:update')" content="确认" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
@ -101,8 +101,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="查看详情" placement="top">
+				<span v-if="$auth.hasPermi('equipment:check:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermi('equipment:check:query')" content="查看详情" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
@ -111,8 +111,26 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="编辑" placement="top">
+				<span v-if="$auth.hasPermiAnd([
+					'equipment:check:update',
+					'base:core-worker:query',
+					'base:group-classes:query',
+					'base:core-department:query',
+					'equipment:check:query',
+					'equipment:check:create',
+					'equipment:check:delete',
+					'base:core-equipment:query'
+				])" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermiAnd([
+					'equipment:check:update',
+					'base:core-worker:query',
+					'base:group-classes:query',
+					'base:core-department:query',
+					'equipment:check:query',
+					'equipment:check:create',
+					'equipment:check:delete',
+					'base:core-equipment:query'
+				])" content="编辑" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
@ -121,8 +139,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="删除" placement="top">
+				<span v-if="$auth.hasPermi('equipment:check:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermi('equipment:check:delete')" content="删除" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@ -101,10 +101,23 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: (this.$auth.hasPermiAnd([
+									'equipment:check:create',
+									'base:core-worker:query',
+									'base:group-classes:query',
+									'base:core-department:query'
+								]) ||
+								this.$auth.hasPermi('equipment:check:update') ||
+								this.$auth.hasPermi('equipment:check:export'))
+						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:create')
+					type: this.$auth.hasPermiAnd([
+							'equipment:check:create',
+							'base:core-worker:query',
+							'base:group-classes:query',
+							'base:core-department:query'
+						])
 						? 'button'
 						: '',
 					btnName: '新增',
@ -113,7 +126,7 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:confirm')
+					type: this.$auth.hasPermi('equipment:check:update')
 						? 'button'
 						: '',
 					btnName: '批量确认',
@ -122,7 +135,7 @@ export default {
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:export')
+					type: this.$auth.hasPermi('equipment:check:export')
 						? 'button'
 						: '',
 					btnName: '导出',
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@ -100,7 +100,7 @@ export default {
 			addContent: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check-record:detail')
+				this.$auth.hasPermi('equipment:check:query')
 					? {
 							type: 'detail',
 							btnName: '详情',
@ -166,10 +166,11 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('equipment:check:export')
+						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check-record:export')
+					type: this.$auth.hasPermi('equipment:check:export')
 						? 'button'
 						: '',
 					btnName: '导出',
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -68,14 +68,23 @@ export default {
 			addOrEditTitle: '',
 			searchBarKeys: ['equipmentId', 'name'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check-setting:addInsp')
+				this.$auth.hasPermiAnd([
+					'equipment:check:create',
+					'equipment:check:query',
+					'equipment:check:update',
+					'equipment:check:delete'
+				])
 					? {
 							type: 'add',
 							btnName: '添加',
 							showTip: '添加巡检',
 						}
 					: undefined,
-				this.$auth.hasPermi('equipment:check-setting:update')
+				this.$auth.hasPermiAnd([
+					'equipment:check:update',
+					'equipment:check:query',
+					'base:core-department:query'
+				])
 					? {
 							type: 'edit',
 							btnName: '修改',
@ -87,7 +96,7 @@ export default {
 				// 			btnName: '查看详情',
 				// 	  }
 				// 	: undefined,
-				this.$auth.hasPermi('equipment:check-setting:delete')
+				this.$auth.hasPermi('equipment:check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@ -157,10 +166,17 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermiAnd([
+						'equipment:check:create',
+						'base:core-department:query'
+					])
+						?  'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check-setting:create')
+					type: this.$auth.hasPermiAnd([
+						'equipment:check:create',
+						'base:core-department:query'
+					])
 						? 'button'
 						: '',
 					btnName: '新增',
--- a/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListTable.vue
@ -37,11 +37,11 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[0]"
-			width="160"
+			minWidth="160"
 			label="设备保养单号"
 			:show-overflow-tooltip="true"
 			prop="maintainOrderNumber"></el-table-column>
-		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
+		<el-table-column v-if="selectedBox[1]" minWidth="128" label="保养计划名称" prop="planName">
 			<template slot-scope="scope">
 				{{ scope.row.planName || '---' }}
 			</template>
@ -67,7 +67,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[5]"
-			width="150"
+			minWidth="150"
 			label="计划结束时间"
 			prop="planEndTime">
 			<template slot-scope="scope">
@ -76,7 +76,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[6]"
-			width="150"
+			minWidth="150"
 			label="实际开始时间"
 			prop="startTime">
 			<template slot-scope="scope">
@ -85,7 +85,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[7]"
-			width="150"
+			minWidth="150"
 			label="实际结束时间"
 			prop="endTime">
 			<template slot-scope="scope">
@ -94,7 +94,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[8]"
-			width="150"
+			minWidth="150"
 			label="确认截止时间"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
@ -103,7 +103,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[9]"
-			width="150"
+			minWidth="150"
 			label="保养计划类型"
 			prop="relatePlan">
 			<template slot-scope="scope">
@ -118,7 +118,7 @@
 		<!-- btns  -->
 		<el-table-column width="188" label="操作">
 			<template slot-scope="scope">
-				<el-tooltip content="确认" placement="top">
+				<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:update')" content="确认" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
@ -128,8 +128,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="查看详情" placement="top">
+				<span v-if="$auth.hasPermi('equipment:maintain-record:query')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:query')" content="查看详情" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
@ -138,18 +138,32 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="编辑" placement="top">
+				<!-- <span v-if="$auth.hasPermiAnd([
+						'equipment:maintain-record:update',
+						'base:core-production-line:query',
+						'base:core-department:query',
+						'equipment:maintain-record:create',
+						'equipment:maintain-record:query',
+						'equipment:maintain-record:delete'
+						])" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermiAnd([
+						'equipment:maintain-record:update',
+						'base:core-production-line:query',
+						'base:core-department:query',
+						'equipment:maintain-record:create',
+						'equipment:maintain-record:query',
+						'equipment:maintain-record:delete'
+						])" content="编辑" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
 						@click="$emit('edit', scope.row)">
 						<i class="iconfont icon-edit primary-color" />
 					</el-button>
-				</el-tooltip>
+				</el-tooltip> -->
 				<!-- line  -->
-				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
-				<el-tooltip content="删除" placement="top">
+				<span v-if="$auth.hasPermi('equipment:maintain-record:delete')" style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip v-if="$auth.hasPermi('equipment:maintain-record:delete')" content="删除" placement="top">
 					<el-button
 						type="text"
 						style="margin: 5px 0; padding: 0"
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@ -157,10 +157,20 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: (this.$auth.hasPermiAnd([
+						'equipment:maintain-record:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query'
+						]) || this.$auth.hasPermi('equipment:maintain-record:update') || this.$auth.hasPermi('equipment:maintain-record:export')) ? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:create')
+					type: this.$auth.hasPermiAnd([
+						'equipment:maintain-record:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query'
+						])
 						? 'button'
 						: '',
 					btnName: '新增',
@ -169,7 +179,7 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:confirm')
+					type: this.$auth.hasPermi('equipment:maintain-record:update')
 						? 'button'
 						: '',
 					btnName: '批量确认',
@ -178,7 +188,7 @@ export default {
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:export')
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
 						? 'button'
 						: '',
 					btnName: '导出',
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@ -131,7 +131,7 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '保养计划单号', minWidth: 150, showOverflowtooltip: true },
 				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -160,7 +160,8 @@ export default {
 				// 	filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				// },
 				// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 },
+				this.$auth.hasPermi('equipment:plan-config:query') ?
+				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 } : undefined,
 				{
 					prop: 'remainDays',
 					label: '距离下次保养剩余时间(天)',
@ -190,10 +191,11 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('equipment:plan-config:export')
+						? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-monitor:export')
+					type: this.$auth.hasPermi('equipment:plan-config:export')
 						? 'button'
 						: '',
 					btnName: '导出',
--- a/src/views/equipment/base/maintain/PlanConfig/index.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@ -14,7 +14,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="180"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@ -65,57 +65,57 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '保养计划名称',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
 		label: '部门',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'lineName',
 		label: '产线名',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintenancePeriod',
 		label: '保养频率(天/次)',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'firstMaintenanceTime',
 		label: '首次保养时间',
 		filter: parseTime,
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintainDuration',
 		label: '保养时长',
-		width: 120,
+		minWidth: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintainer',
 		label: '计划保养人员',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'confirmTimeLimit',
 		label: '确认时限',
 		filter: toDay,
-		width: 130,
+		minWidth: 130,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		width: 150,
+		minWidth: 150,
 		showOverflowtooltip: true
 	}
 ];
@ -138,13 +138,25 @@ export default {
 				planName: undefined
      },
 			tableBtn: [
-				this.$auth.hasPermi(`equipment:plan-config:add`)
+				this.$auth.hasPermiAnd([
+					'equipment:plan-config:query',
+					'equipment:plan-config:create',
+					'equipment:plan-config:update',
+					'equipment:plan-config:delete',
+					'base:core-equipment:query'
+					])
 					? {
 							type: 'add',
 							btnName: '添加内容',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`equipment:plan-config:update`)
+				this.$auth.hasPermiAnd([
+						'equipment:plan-config:update',
+						'equipment:plan-config:query',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query'
+					])
 					? {
 							type: 'edit',
 							btnName: '编辑',
@ -172,10 +184,20 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermiAnd([
+						'equipment:plan-config:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query'
+					]) ? 'separate' : '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+						'equipment:plan-config:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query'
+					]) ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@ -131,24 +131,25 @@ export default {
 				// 	width: 180,
 				// 	filter: timeFilter,
 				// },
-				{ prop: 'maintainOrderNumber', label: '设备保养单号', width: 170, showOverflowtooltip: true },
-				{ prop: 'planName', label: '保养计划名称', width: 150, showOverflowtooltip: true },
-				{ prop: 'departmentName', label: '部门', width: 120, showOverflowtooltip: true },
-				{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
-				{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
-				{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
-				{ prop: 'startTime', label: '实际开始时间', filter: parseTime, width: 150, showOverflowtooltip: true },
-				{ prop: 'endTime', label: '实际结束时间', filter: parseTime, width: 150, showOverflowtooltip: true },
+				{ prop: 'maintainOrderNumber', label: '设备保养单号', minWidth: 170, showOverflowtooltip: true },
+				{ prop: 'planName', label: '保养计划名称', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'departmentName', label: '部门', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名', minWidth: 120, showOverflowtooltip: true },
+				{ prop: 'planStartTime', label: '计划开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'planEndTime', label: '计划结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'startTime', label: '实际开始时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'endTime', label: '实际结束时间', filter: parseTime, minWidth: 150, showOverflowtooltip: true },
 				// { prop: 'equipmentName', label: '设备名称' },
 				// { prop: 'maintainWorker', label: '保养人员' },
 				{
 					prop: 'relatePlan',
 					label: '保养计划类型',
 					filter: (v) => (v != null ? ['', '计划型', '非计划型'][v] : ''),
-					width: 170,
+					minWidth: 170,
 					showOverflowtooltip: true
 				},
-				{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
+				this.$auth.hasPermi('equipment:maintain-record:query') ?
+				{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn } : undefined
 				// { prop: 'maintainDuration', label: '计划保养用时(h)' },
 				// { prop: 'timeUsed', label: '实际保养用时(h)' },
 				// { prop: 'remark', label: '备注' },
@ -198,7 +199,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-record:export')
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@ -71,7 +71,7 @@ export default {
 			addOrUpdateVisible: false,
 			searchBarKeys: ['maintenanceResult', 'createTime', 'equipmentId'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:repair:update')
+				this.$auth.hasPermi('equipment:repair:query')
 					? {
 							type: 'detail',
 							btnName: '详情',
@ -173,7 +173,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: (this.$auth.hasPermi('equipment:repair:export') || 
+						this.$auth.hasPermiAnd([
+							'equipment:repair:create',
+							'base:core-worker:query',
+							'system:user:list'
+						])) ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
@ -183,7 +188,11 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+								'equipment:repair:create',
+								'base:core-worker:query',
+								'system:user:list'
+							]) ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,