.env.dev

@@ -1,10 +1,3 @@
-###
- # @Author: zhp
- # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-12 14:31:16
- # @LastEditors: zhp
- # @Description:
-###
 # 开发环境配置
 ENV = 'development'
 

src/views/base/coreWorkOrder/detail.vue

@@ -201,7 +201,7 @@
 					@pagination="getList" /> -->
 			</div>
 
-			<div v-if="$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
+			<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>

src/views/base/materialProductBom/add-or-updata.vue

@@ -56,14 +56,14 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="attr-list" v-if="idAttrShow && $auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
+			<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 && $auth.hasPermi('base:material-product-bom:create')" 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>

src/views/energy/monitoring/energyStatistics/index.vue

@@ -103,7 +103,6 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-
 				{
 					type: this.$auth.hasPermi('monitoring:energy-statistics:create')
 						? 'separate'

src/views/extend/processEquMaterialBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-12 14:26:22
+ * @LastEditTime: 2024-04-11 13:35:46
  * @Description:
 -->
 <template>
@@ -100,6 +100,20 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 // import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import { publicFormatter } from '@/utils/dict';
+const tableBtn = [
+	{
+    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:update')
+      ? 'edit'
+      : '',
+		btnName: '编辑',
+	},
+	{
+    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
+      ? 'delete'
+      : '',
+		btnName: '删除',
+	},
+];
 const tableProps = [
 	{
     prop: 'materialName',
@@ -123,36 +137,22 @@ const tableProps = [
     label: '备注',
   },
 ];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
 export default {
 	mixins: [basicAdd],
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-      tableBtn:[
+			tableBtn,
-        {
-          type: this.$auth.hasPermi(
-            'extend:process-equ-material-bom-det:query'
-          )
-            ? 'edit'
-            : '',
-          btnName: '编辑',
-        },
-        {
-          type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
-            ? 'delete'
-            : '',
-          btnName: '删除',
-        },
-      ],
 			tableProps,
-      topBtnConfig:[
+			topBtnConfig,
-        {
-          type: this.$auth.hasPermi('extend:process-equ-material-bom-det:add')
-            ? 'add'
-            : '',
-          btnName: 'btn.add'
-        }
-      ],
 			addOrUpdateVisible: false,
 			urlOptions: {
 			  isGetCode: false,

src/views/extend/processEquValueBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-12 14:28:44
+ * @LastEditTime: 2024-04-11 13:35:42
  * @Description:
 -->
 <template>
@@ -110,6 +110,20 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 // import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 
+const tableBtn = [
+	{
+    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
+      ? 'edit'
+      : '',
+		btnName: '编辑',
+	},
+	{
+    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
+      ? 'delete'
+      : '',
+		btnName: '删除',
+	},
+];
 const tableProps = [
 	{
     prop: 'valueName',
@@ -143,35 +157,25 @@ const tableProps = [
     prop: 'remark',
     label: '备注',
   },
-]
+];
-export default {
+
-	mixins: [basicAdd],
+const topBtnConfig = [
-	components: { SmallTitle, attrAdd },
-	data() {
-		return {
-      tableBtn:[
-        {
-          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
-            ? 'edit'
-            : '',
-          btnName: '编辑',
-        },
-        {
-          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
-            ? 'delete'
-            : '',
-          btnName: '删除',
-        },
-      ],
-			tableProps,
-      topBtnConfig:[
   {
     type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
       ? 'add'
       : '',
     btnName: 'btn.add'
   }
-      ],
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
       addOrUpdateVisible: false,
       enableList: [
         {

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-12 14:12:55
+ * @LastEditTime: 2024-04-10 16:31:48
  * @Description:
 -->
 <template>
@@ -131,7 +131,7 @@ export default {
           width: 250
         },
         {
-          type: this.$auth.hasPermi('base:material-use-log:query') ? 'button' : '',
+          type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',
@@ -163,13 +163,13 @@ export default {
         // },
         {
           type: this.$auth.hasPermi(
-            'base:material-use-log:export'
+            'monitoring:materiel-date-from:export'
           )
             ? 'separate'
             : '',
         },
         {
-          type: this.$auth.hasPermi('base:material-use-log:export') ? 'button' : '',
+          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
         	btnName: '导出',
         	name: 'export',
           color: 'primary',

src/views/quality/monitoring/processTraceability/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-12 14:16:03
+ * @LastEditTime: 2024-04-07 16:26:56
  * @Description:
 -->
 <template>
@@ -97,13 +97,10 @@ export default {
         //   }
         //   : undefined,
           {
-        	 type: this.$auth.hasPermi(
+            type: 'processDetail',
-             'extend:process-retrospect:query'
-           )
-            ? 'button'
-            : '',
             btnName: '查看工艺详情',
           },
+
       ].filter((v) => v),
       list: [],
       listQuery: {
@@ -140,7 +137,7 @@ export default {
         {
 
        	 type: this.$auth.hasPermi(
-             'extend:process-retrospect:query'
+            'monitoring:process-traceability:query'
           )
             ? 'button'
             : '',

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-04-12 15:13:43
+ * @LastEditTime: 2024-04-08 11:47:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -184,8 +184,8 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.startTimeStamp = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.endTimeStamp  = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.startTimeStamp  = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         // console.log(this.listQuery.reportTime);
         this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000

src/views/report/glass/inputTable.vue

@@ -1,15 +1,14 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-04-12 14:21:34
+ * @LastEditTime: 2024-03-29 09:43:52
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
+      <el-button v-if="!edit" :disabled="noData" size="small" @click="edit = true">编辑</el-button>
-        size="small" @click="edit = true">编辑</el-button>
       <el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
       <el-button v-if="edit" size="small" @click="updateData">保存</el-button>
     </el-row>

src/views/report/glass/year.vue

@@ -160,8 +160,8 @@ export default {
 		changeTime(val) {
 			if(val) {
 					// let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
-        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(),11, 31, 7, 0, 0).getTime()); //开始时间
+        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //开始时间
-        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //结束时间
+        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间
         this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
 			} else {

src/views/report/productionDayReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 15:15:39
+ * @LastEditTime: 2024-03-29 09:48:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -13,12 +13,11 @@
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -486,8 +485,8 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         this.timeTips = this.listQuery.reportTime[0] + ' - ' + this.listQuery.reportTime[1]
         // console.log(this.listQuery.reportTime);
       } else {

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:46
+ * @LastEditTime: 2024-04-08 11:45:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -12,15 +12,13 @@
         <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>

src/views/report/productionWeekReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:51
+ * @LastEditTime: 2024-03-29 09:48:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,15 +14,13 @@
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:54
+ * @LastEditTime: 2024-04-08 11:46:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,17 +14,15 @@
           style="width: 350px" placeholder="选择年">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
       <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>

src/views/specialEquipment/basic/FireFighthing.vue

@@ -91,13 +91,13 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						this.$auth.hasPermi('base:core-equipment-attr:update')
+						this.$auth.hasPermi('base:core-equipment-attr:update') // ('se:firefight-attr:update') // TODO 此处需用firefight-attr权限还是core-equipment-attr 权限？
 							? {
 									type: 'edit',
 									btnName: '修改',
 							  }
 							: undefined,
-						this.$auth.hasPermi('base:core-equipment-attr:delete')
+						this.$auth.hasPermi('base:core-equipment-attr:delete') // ('se:firefight-attr:delete')
 							? {
 									type: 'delete',
 									btnName: '删除',
@@ -142,29 +142,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:firefight:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:firefight:update')
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:firefight:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -215,32 +205,17 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:firefight:export') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
-				//
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:firefight:create') ? 'button' : '',
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/basic/Manage.vue

@@ -142,29 +142,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:manage:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:manage:update')
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:manage:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -214,17 +204,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:manage:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -233,10 +216,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:manage:create')
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',

src/views/specialEquipment/basic/Safety.vue

@@ -141,30 +141,19 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi(`se:safety:update`)
-					'base:core-equipment:query',
-					'base:core-equipment-attr:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				//
+				this.$auth.hasPermi('se:safety:update')
-				this.$auth.hasPermiAnd([
-					'base:core-equipment:update',
-					'base:core-worker:query',
-					'base:core-equipment:query',
-					'base:core-equipment-attr:create',
-					'base:core-equipment-attr:query',
-					'base:core-equipment-attr:delete',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:core-equipment:delete')
+				this.$auth.hasPermi('se:safety:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -214,17 +203,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('base:core-equipment:export') ||
-						this.$auth.hasPermiAnd([
-							'base:core-equipment:create',
-							'base:core-worker:query',
-						])
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export')
+					type: this.$auth.hasPermi('se:safety:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -233,10 +215,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:safety:create')
-						'base:core-equipment:create',
-						'base:core-worker:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',

src/views/specialEquipment/check/CheckOrderListTable.vue

@@ -103,7 +103,6 @@
 			label="操作">
 			<template slot-scope="scope">
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:check:update')"
 					content="确认"
 					placement="top">
 					<el-button
@@ -115,13 +114,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</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
@@ -132,35 +126,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</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
@@ -171,13 +138,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</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

src/views/specialEquipment/check/Config.vue

@@ -26,7 +26,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="128"
+				:width="180"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -78,29 +78,20 @@ export default {
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:check:add-item')
-					'equipment:check:create',
-					'equipment:check:query',
-					'equipment:check:update',
-					'equipment:check:delete',
-				])
 					? {
 							type: 'add',
 							btnName: '添加',
 							showTip: '添加巡检',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:check:update')
-					'equipment:check:update',
-					'equipment:check:query',
-					'base:core-department:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check:delete')
+				this.$auth.hasPermi('se:check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -173,20 +164,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: 'separate',
-						'equipment:check:create',
-						'base:core-department:query',
-					])
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:check:create') ? 'button' : '',
-						'equipment:check:create',
-						'base:core-department:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/check/Content.vue

@@ -155,25 +155,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermiAnd([
-							'equipment:check:create',
-							'base:core-worker:query',
-							'base:group-classes:query',
-							'base:core-department:query',
-						]) ||
-						this.$auth.hasPermi('equipment:check:export') ||
-						this.$auth.hasPermi('equipment:check:update')
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:check-unconfirm:create')
-						'equipment:check:create',
-						'base:core-worker:query',
-						'base:group-classes:query',
-						'base:core-department:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -182,14 +167,18 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-unconfirm:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'warning',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:update') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-unconfirm:confirm-all')
+						? 'button'
+						: '',
 					btnName: '批量确认',
 					name: 'batch-confirm',
 					plain: true,

src/views/specialEquipment/check/Record.vue

@@ -71,7 +71,7 @@ export default {
 			addOrUpdateVisible: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check:query')
+				this.$auth.hasPermi('se:check-record:detail')
 					? {
 							type: 'detail',
 							btnName: '详情',
@@ -147,10 +147,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:export') ? 'button' : '',
+					type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,

src/views/specialEquipment/maintain/Monitor.vue

@@ -122,22 +122,20 @@ export default {
 					minWidth: 158,
 					showOverflowtooltip: true,
 				},
-				this.$auth.hasPermi('equipment:plan-config:query')
+				{
-					? {
 					prop: 'opt2',
 					label: '保养内容',
 					entryText: '详情',
 					subcomponent: TableBtn,
 					width: 100,
-					  }
+				},
-					: undefined,
 				{
 					prop: 'remainDays',
 					label: '距离下次保养剩余时间(天)',
 					subcomponent: RemainBox,
 					minWidth: 210,
 				},
-			].filter(v => v),
+			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
@@ -153,12 +151,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:export')
+					type: 'separate',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:export')
+					type: this.$auth.hasPermi('se:maintain-plan:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/PlanConfig.vue

@@ -83,31 +83,19 @@ export default {
 		return {
 			searchBarKeys: ['planName'],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:maintain:update')
-					'equipment:plan-config:query',
-					'equipment:plan-config:create',
-					'equipment:plan-config:update',
-					'equipment:plan-config:delete',
-					'base:core-equipment:query',
-				])
 					? {
 							type: 'addContent',
 							btnName: '添加内容',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('se:maintain:update')
-					'equipment:plan-config:update',
-					'equipment:plan-config:query',
-					'base:core-worker:query',
-					'base:core-production-line:query',
-					'base:core-department:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:plan-config:delete')
+				this.$auth.hasPermi('se:maintain:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -178,24 +166,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: 'separate',
-						'equipment:plan-config:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:maintain:create') ? 'button' : '',
-						'equipment:plan-config:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/maintain/Record--detail.vue

@@ -212,7 +212,7 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		// this.loadEquipments();
+		this.loadEquipments();
 	},
 	methods: {
 		/** 确认是否关闭 */

src/views/specialEquipment/maintain/Record.vue

@@ -100,26 +100,26 @@ export default {
 		return {
 			recordDetailVisible: false,
 			searchBarKeys: ['maintainPlanId', 'startTime', 'special'],
-			// tableBtn: [
+			tableBtn: [
-			// 	this.$auth.hasPermi('se:maintain-record:update')
+				this.$auth.hasPermi('se:maintain-record:update')
-			// 		? {
+					? {
-			// 				type: 'detail',
+							type: 'detail',
-			// 				btnName: '详情',
+							btnName: '详情',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// 	this.$auth.hasPermi('se:maintain-record:update')
+				this.$auth.hasPermi('se:maintain-record:update')
-			// 		? {
+					? {
-			// 				type: 'edit',
+							type: 'edit',
-			// 				btnName: '修改',
+							btnName: '修改',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// 	this.$auth.hasPermi('se:maintain-record:delete')
+				this.$auth.hasPermi('se:maintain-record:delete')
-			// 		? {
+					? {
-			// 				type: 'delete',
+							type: 'delete',
-			// 				btnName: '删除',
+							btnName: '删除',
-			// 		  }
+					  }
-			// 		: undefined,
+					: undefined,
-			// ].filter((v) => v),
+			].filter((v) => v),
 			tableProps: [
 				{
 					prop: 'maintainOrderNumber',
@@ -182,16 +182,14 @@ export default {
 					filter: (val) =>
 						val != null ? ['-', '计划型', '非计划型'][val] : '-',
 				},
-				this.$auth.hasPermi('equipment:maintain-record:query')
+				{
-					? {
 					prop: '_detail',
 					label: '详情',
 					entryText: '详情',
 					minWidth: 60,
 					subcomponent: TableBtn,
-					  }
+				},
-					: '',
+			],
-			].filter((v) => v),
 			searchBarFormConfig: [
 				{
 					type: 'select',
@@ -224,12 +222,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: 'separate',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: this.$auth.hasPermi('se:maintain-record:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/Repair.vue

@@ -88,19 +88,19 @@ export default {
 				'specialType',
 			],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:repair:finish')
+				this.$auth.hasPermi('se:repair:finish')
 					? {
 							type: 'finish',
 							btnName: '完成',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:repair:query')
+				this.$auth.hasPermi('se:repair:update')
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:repair:delete')
+				this.$auth.hasPermi('se:repair:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -212,31 +212,17 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						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' : '',
+					type: this.$auth.hasPermi('se:repair:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('se:repair:create') ? 'button' : '',
-						'equipment:repair:create',
-						'base:core-worker:query',
-						'system:user:list',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,

src/views/specialEquipment/maintain/WaitingList.vue

@@ -147,25 +147,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						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.hasPermiAnd([
+					type: this.$auth.hasPermi('se:maintain-record-pre:create')
-						'equipment:maintain-record:create',
-						'base:core-worker:query',
-						'base:core-production-line:query',
-						'base:core-department:query',
-					])
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -174,7 +159,7 @@ export default {
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:update')
+					type: this.$auth.hasPermi('se:maintain-record-pre:confirm-all')
 						? 'button'
 						: '',
 					btnName: '批量确认',
@@ -183,7 +168,7 @@ export default {
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+					type: this.$auth.hasPermi('se:maintain-record-pre:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/specialEquipment/maintain/WaitingListTable.vue

@@ -144,7 +144,7 @@
 			label="操作">
 			<template slot-scope="scope">
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:maintain-record:update')"
+					v-if="$auth.hasPermi('se:maintain-record-pre:confirm')"
 					content="确认"
 					placement="top">
 					<el-button
@@ -158,11 +158,11 @@
 				<!-- line  -->
 				<span
 					style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
-					v-if="$auth.hasPermi('equipment:maintain-record:query')">
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')">
 					|
 				</span>
 				<el-tooltip
-					v-if="$auth.hasPermi('equipment:maintain-record:query')"
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')"
 					content="查看详情"
 					placement="top">
 					<el-button
@@ -175,29 +175,11 @@
 				<!-- line  -->
 				<span
 					style="margin: 0 4px; font-size: 18px; color: #e5e7eb"
-					v-if="
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')">
-						$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',
-						])
-					">
 					|
 				</span>
 				<el-tooltip
-					v-if="
+					v-if="$auth.hasPermi('se:maintain-record-pre:update')"
-						$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
@@ -208,13 +190,8 @@
 					</el-button>
 				</el-tooltip>
 				<!-- line  -->
-				<span
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</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