40 changed files with 272 additions and 316 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,3 +1,10 @@
+###
+ # @Author: Do not edit
+ # @Date: 2023-08-29 09:40:39
+ # @LastEditTime: 2024-04-10 16:58:06
+ # @LastEditors: zhp
+ # @Description:
+###
 # 开发环境配置
 ENV = 'development'

@ -5,18 +12,27 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统

 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# 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://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_APP_JIMU_API = 'http://10.70.2.22:8080'

 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.prod
+++ b/.env.prod
@ -1,4 +1,11 @@
-# 生产环境配置（许昌现场）
+###
+ # @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,12 +7,15 @@ 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/api/monitoring/statisticalData.js
+++ b/src/api/monitoring/statisticalData.js
@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2024-04-11 16:16:05
+ * @LastEditTime: 2024-04-09 09:17:02
 * @LastEditors: zhp
 * @Description:
 */
@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {

 export function getWorkOrderList(query) {
  return request({
-    url: 'base/core-work-order/listbyfilter',
+    url: 'base/quality-inspection-record/listbyfilter',
    method: 'get',
    params: query,
  })
 }
 export function getProductList(query) {
  return request({
-    url: 'base/core-product/listAll',
+    url: 'base/statistical-data/listAll',
    method: 'get',
    params: query,
  })
--- a/src/views/base/coreCustomer/index.vue
+++ b/src/views/base/coreCustomer/index.vue
@ -138,7 +138,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-customer:create') ? 'separate' : '',
+					type: '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: this.$auth.hasPermi('base:core-department:create') ? 'separate' : '',
+					type: '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,
-					minWidth: 180,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备名称', minWidth: 180, showOverflowtooltip: true },
-				{ minWidth: 250, prop: 'code', label: '设备编码' },
+				{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
+				{ width: 250, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
@ -211,7 +211,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: (this.$auth.hasPermi('base:core-equipment:export') || this.$auth.hasPermi('base:core-equipment:create')) ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-equipment:export')
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@ -126,8 +126,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
-						? 'separate' : '',
+					type: '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,
-					minWidth: 180,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{ prop: 'name', label: '类型名称' },
@ -111,8 +111,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment-type:create')
-						? 'separate' : '',
+					type: '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: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'separate' : '',
+					type: '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: this.$auth.hasPermi('base:core-major:create') ? 'separate' : '',
+					type: '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,
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
 		label: '产品名称',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
 		label: '产品编码',
-		minWidth: 190,
+		width: 190,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'productType',
 		label: '产品类型',
 		filter: publicFormatter('product_type'),
-		minWidth: 180,
+		width: 180,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'specifications',
 		label: '规格',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
 		filter: publicFormatter('unit_dict'),
-		minWidth: 90,
+		width: 90,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 ];
@ -141,7 +141,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-product:create') ? 'separate' : '',
+					type: '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"
-				:minWidth="120"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@ -30,7 +30,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			minWidth="50%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@ -56,39 +56,39 @@ const tableProps = [
 		prop: 'createTime',
 		label: '添加时间',
 		filter: parseTime,
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'factoryName',
 		label: '工厂',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
 		filter: publicFormatter('workshop'),
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
 		label: '产线名称',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
 		label: '产线编码',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
 		filter: codeFilter('lineStatus'),
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 	// {
@ -98,13 +98,13 @@ const tableProps = [
 	{
 		prop: 'description',
 		label: '描述',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	}
 ];
@ -147,7 +147,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '',
+					type: '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: this.$auth.hasPermi('base:core-supplier:create') ? 'separate' : '',
+					type: '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-10 16:16:31
+ * @LastEditTime: 2024-04-08 14:27:29
 * @Description:
 -->
 <template>
@ -201,7 +201,6 @@
 					@pagination="getList" /> -->
 			</div>

-			<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>
@ -221,7 +220,6 @@
 					:page-sizes="[5, 10, 15]"
 					@pagination="getList" /> -->
 			</div>
-			</div>

 			<!-- <div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
@ -463,7 +461,7 @@ export default {
 			});
 			// 获取预使用原料列表
 			console.log('111我看看', this.dataForm.materialMethod)
-			if (this.dataForm.id && this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])) {
+			if (this.dataForm.id) {
 				if (this.dataForm.materialMethod === 1) {
 					// 产品
 					getlistByProductId({
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@ -157,8 +157,7 @@ export default {
 				// 			showTip: '预使用原料信息'
 				// 	  }
 				// 	: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
+					{
 						type: 'active',
 						btnName: '激活',
 						showParam: {
@ -176,10 +175,8 @@ export default {
 								}
 							]
 						}
-						}
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
+					},
+					{
 						type: 'pause',
 						btnName: '暂停',
 						showParam: {
@ -192,10 +189,8 @@ export default {
 								}
 							]
 						}
-						}
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
+					},
+					{
 						type: 'nullify',
 						btnName: '作废',
 						showParam: {
@ -208,10 +203,8 @@ export default {
 								}
 							]
 						}
-						}
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
+					},
+					{
 						type: 'finish',
 						btnName: '完成',
 						showParam: {
@ -229,10 +222,8 @@ export default {
 								}
 							]
 						}
-						}
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
+					},
+					{
 						type: 'stop',
 						btnName: '终止',
 						showParam: {
@ -250,12 +241,8 @@ export default {
 								}
 							]
 						}
-						}
-					: undefined,
-					this.$auth.hasPermiAnd([
-						'base:core-work-order:query',
-						'base:order:query'
-					])
+					},
+					this.$auth.hasPermi(`base:core-work-order:detail`)
 					? {
 							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: this.$auth.hasPermi('base:core-worker:create') ? 'separate' : '',
+					type: '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,7 +52,8 @@ const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+
 	},
 	{
 		prop: 'code',
@ -115,7 +116,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'separate' : '',
+					type: '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-04-11 16:22:19
+ * @LastEditTime: 2024-03-21 15:21:32
 * @Description:
 -->
 <template>
@ -122,14 +122,14 @@
 				</el-form>
 			</div>
 			
-			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermi('base:material-attr:query')">
+			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					物料属性
 				</small-title>

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

-// 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 tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
 const tableProps = [
 	{
 		prop: 'createTime',
@ -220,23 +213,7 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			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,
-			],
+			tableBtn,
 			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: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
+					type: '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-04-11 16:44:41
+ * @LastEditTime: 2024-03-21 14:39:52
 * @Description:
 -->
 <template>
@ -56,14 +56,14 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
+			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					BOM明细
 				</small-title>

-				<div v-if="!isdetail && this.$auth.hasPermi('base:material-product-bom:create')" class="action_btn">
+				<div v-if="!isdetail" 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,24 +160,7 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			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,
-			],
+			tableBtn,
 			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: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
+					type: '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: this.$auth.hasPermi('base:core-factory:create') ? 'separate' : '',
+					type: '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,14 +57,10 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
-				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;
@ -101,7 +97,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,9 +266,8 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			console.log(row);
 			this.$modal
-				.confirm('是否确认删除第"' + row._pageIndex + '"条数据项?')
+				.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?')
 				.then(function () {
 					return deleteEnergyLimit(row.id);
 				})
--- a/src/views/equipment/base/config/AlarmGroup/index.vue
+++ b/src/views/equipment/base/config/AlarmGroup/index.vue
@ -244,8 +244,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:alarm-group:create')
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:alarm-group:create')
--- a/src/views/equipment/base/config/BindGroup/index.vue
+++ b/src/views/equipment/base/config/BindGroup/index.vue
@ -201,8 +201,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:bind-group:create')
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:bind-group:create')
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@ -158,14 +158,14 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ 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 },
+				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
+				{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@ -217,8 +217,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:collection-config:create')
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:collection-config:create')
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@ -160,12 +160,13 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-plc:create')
-						?  'separate' : '',
+					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-plc:create')
-						? 'button' : '',
+					// type: this.$auth.hasPermi('equipment:realtime-table-config:create')
+					// 	? 'button'
+					// 	: '',
+					type: 'button',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
@ -193,7 +194,7 @@ export default {
 						input: true,
 						label: '编码',
 						prop: 'code',
-						url: '/base/energy-plc/getCode',
+						url: '/base/equipment-group/getCode',
 						rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
 					},
 				],
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@ -101,10 +101,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: (this.$auth.hasPermi('equipment:inspection-confirm:create') ||
-								this.$auth.hasPermi('equipment:inspection-confirm:confirm') ||
-								this.$auth.hasPermi('equipment:inspection-confirm:export'))
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:inspection-confirm:create')
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@ -166,8 +166,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check-record:export')
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:check-record:export')
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -157,8 +157,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check-setting:create')
-						?  'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:check-setting:create')
--- 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]"
-			minWidth="160"
+			width="160"
 			label="设备保养单号"
 			:show-overflow-tooltip="true"
 			prop="maintainOrderNumber"></el-table-column>
-		<el-table-column v-if="selectedBox[1]" minWidth="128" label="保养计划名称" prop="planName">
+		<el-table-column v-if="selectedBox[1]" width="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]"
-			minWidth="150"
+			width="150"
 			label="计划结束时间"
 			prop="planEndTime">
 			<template slot-scope="scope">
@ -76,7 +76,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[6]"
-			minWidth="150"
+			width="150"
 			label="实际开始时间"
 			prop="startTime">
 			<template slot-scope="scope">
@ -85,7 +85,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[7]"
-			minWidth="150"
+			width="150"
 			label="实际结束时间"
 			prop="endTime">
 			<template slot-scope="scope">
@ -94,7 +94,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[8]"
-			minWidth="150"
+			width="150"
 			label="确认截止时间"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
@ -103,7 +103,7 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[9]"
-			minWidth="150"
+			width="150"
 			label="保养计划类型"
 			prop="relatePlan">
 			<template slot-scope="scope">
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@ -157,7 +157,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: (this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:confirm') || this.$auth.hasPermi('equipment:maintain-confirm:export')) ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-confirm:create')
--- 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: '保养计划单号', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
 				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@ -190,8 +190,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-monitor:export')
-						? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:maintain-monitor:export')
--- a/src/views/equipment/base/maintain/PlanConfig/index.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@ -65,57 +65,57 @@ const tableProps = [
 	{
 		prop: 'name',
 		label: '保养计划名称',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
 		label: '部门',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'lineName',
 		label: '产线名',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintenancePeriod',
 		label: '保养频率(天/次)',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'firstMaintenanceTime',
 		label: '首次保养时间',
 		filter: parseTime,
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintainDuration',
 		label: '保养时长',
-		minWidth: 120,
+		width: 120,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'maintainer',
 		label: '计划保养人员',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	},
  {
 		prop: 'confirmTimeLimit',
 		label: '确认时限',
 		filter: toDay,
-		minWidth: 130,
+		width: 130,
 		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		minWidth: 150,
+		width: 150,
 		showOverflowtooltip: true
 	}
 ];
@ -172,7 +172,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:create') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@ -131,21 +131,21 @@ export default {
 				// 	width: 180,
 				// 	filter: timeFilter,
 				// },
-				{ 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: '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: 'equipmentName', label: '设备名称' },
 				// { prop: 'maintainWorker', label: '保养人员' },
 				{
 					prop: 'relatePlan',
 					label: '保养计划类型',
 					filter: (v) => (v != null ? ['', '计划型', '非计划型'][v] : ''),
-					minWidth: 170,
+					width: 170,
 					showOverflowtooltip: true
 				},
 				{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
@ -198,8 +198,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
-						? 'separate' : '',
+					type: '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
@ -173,7 +173,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: (this.$auth.hasPermi('equipment:repair:export') || this.$auth.hasPermi('equipment:repair:create')) ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
--- a/src/views/quality/monitoring/deviceParameters/index.vue
+++ b/src/views/quality/monitoring/deviceParameters/index.vue
@ -219,7 +219,7 @@ export default {
        },
        {
            type: this.$auth.hasPermi(
-              'monitoring:equipment:query'
+              'monitoring:device-parameters:query'
            )
            ? 'button'
            : '',
--- a/src/views/quality/monitoring/equipmentTraceability/index.vue
+++ b/src/views/quality/monitoring/equipmentTraceability/index.vue
@ -261,7 +261,7 @@ export default {
 				// },
 				{
          type: this.$auth.hasPermi(
-            'analysis:equipment:query'
+            'monitoring:equipment-traceability:query'
          )
            ? 'button'
            : '',
@ -271,14 +271,14 @@ export default {
        },
        {
          type: this.$auth.hasPermi(
-            'analysis:equipment:export'
+            'monitoring:equipment-traceability:export'
          )
            ? 'separate'
            : '',
        },
        {
          type: this.$auth.hasPermi(
-            'analysis:equipment:export'
+            'monitoring:equipment-traceability:export'
          )
            ? 'button'
            : '',