From dd7ec45029ffd6c43906494e99b6064addf7a03e Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:11:10 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86-=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BB=B4=E6=8A=A4-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templateMaintenance.vue                   | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue b/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue
index b31d461d..79669178 100644
--- a/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue
+++ b/src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue
@@ -17,16 +17,40 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handleAdd" v-if="permission.performanceAllocation_add">新增绩效</el-button>
+        <el-button type="primary" @click="handleAdd" v-if="permission.performanceAllocation_add">
+          新增绩效
+        </el-button>
         <!-- <el-button type="danger" @click="batchDelete">删除</el-button> -->
         <!-- <el-button type="primary" @click="maintenanceContents">绩效内容维护</el-button> -->
       </template>
       <template #menu="scope">
-        <el-button type="primary" text v-if="permission.performanceAllocation_edit" @click="editRow(scope.row)">修改</el-button>
-        <el-button type="primary" text v-if="permission.performanceAllocation_delete" @click="deleteRow(scope.row)">删除</el-button>
-        <el-button type="primary" text v-if="permission.performanceAllocation_issue" @click="taskAssignment(scope.row)">下发</el-button>
+        <el-button
+          type="primary"
+          text
+          v-if="permission.performanceAllocation_edit"
+          @click="editRow(scope.row)"
+        >
+          修改
+        </el-button>
+        <el-button
+          type="primary"
+          text
+          v-if="permission.performanceAllocation_delete"
+          @click="deleteRow(scope.row)"
+        >
+          删除
+        </el-button>
+        <el-button
+          type="primary"
+          text
+          v-if="permission.performanceAllocation_issue"
+          @click="taskAssignment(scope.row)"
+        >
+          下发
+        </el-button>
       </template>
     </avue-crud>
     <batchAddPerf
@@ -249,7 +273,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters([ 'permission']),
+    ...mapGetters(['permission']),
   },
   mounted() {},
   methods: {
@@ -376,6 +400,20 @@ export default {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
     },
+    // 表格排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad();
+    },
     onLoad() {
       this.loading = true;
       pageBsEfficiencyTemp({

From c483c4567883b4edba63739a9d819fb02bc73ff0 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:11:53 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86-=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performanceManagement/dataReporting.vue   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
index f3c871fe..13feee06 100644
--- a/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
+++ b/src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left>
         <el-button
@@ -205,6 +206,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      query: {},
       option: {
         height: 'auto',
         align: 'center',
@@ -285,7 +287,7 @@ export default {
               { label: '审批通过', value: 4, type: 'success' }, // 绿色 - 成功
               { label: '审批不通过', value: 5, type: 'danger' }, // 红色 - 失败/拒绝
               { label: '已超期', value: 6, type: 'danger' }, // 红色 - 失败/拒绝
-              {label:"任务失败",value:7,type:"danger"}
+              { label: '任务失败', value: 7, type: 'danger' },
             ],
           },
           {
@@ -529,6 +531,20 @@ export default {
         });
       });
     },
+    // 表格排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // 重新加载数据
+      this.onLoad();
+    },
     onLoad() {
       this.loading = true;
       const params = {
@@ -536,6 +552,7 @@ export default {
         currentPage: this.page.currentPage,
         ...this.query,
       };
+      console.log(params);
       pageBsEfficiencyTask(params)
         .then(res => {
           if (res.data.code === 200) {

From 3d4c8ac2a4afe5c5eba1920a04482e0fddcf4860 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:12:20 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86-=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E5=85=AC=E7=A4=BA-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performanceDisclosure.vue                     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
index b5d5943f..14c2cddc 100644
--- a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
+++ b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
@@ -15,6 +15,7 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
       @cell-click="cellClick"
+      @sort-change="sortChange"
     >
     </avue-crud>
     <prefDetail
@@ -287,6 +288,20 @@ export default {
       this.onLoad(this.page, this.query);
       done();
     },
+    // 表格排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad();
+    },
     // 列表加载
     async onLoad() {
       this.loading = true;

From e8ef721ddd5223954e337f52c83ab34bcd67759b Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:44:23 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86-=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E9=85=8D=E7=BD=AE-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyInspectionPoint/index.vue           | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/views/safetyManagement/safetyInspectionPoint/index.vue b/src/views/safetyManagement/safetyInspectionPoint/index.vue
index d185b816..ff93446e 100644
--- a/src/views/safetyManagement/safetyInspectionPoint/index.vue
+++ b/src/views/safetyManagement/safetyInspectionPoint/index.vue
@@ -16,14 +16,15 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left>
-        <el-button type="primary"  @click="handleAdd">新增 </el-button>
-        <el-button type="danger"  @click="handleDelete">删除 </el-button>
+        <el-button type="primary" @click="handleAdd">新增 </el-button>
+        <el-button type="danger" @click="handleDelete">删除 </el-button>
       </template>
       <template #menu-right>
         <!-- <el-button type="primary"  @click="handlePrint">打印 </el-button> -->
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+        <el-button type="primary" @click="handleImport">导入 </el-button>
       </template>
     </avue-crud>
     <!-- 导入 -->
@@ -37,25 +38,24 @@
       @closeDialog="closeImportDialog"
     ></basic-import>
     <!-- 新增弹窗 -->
-      <addInspectDailog
+    <addInspectDailog
       v-if="showDialog"
       :showDialog="showDialog"
       :moldAddMore="moldAddMore"
       @closeDialog="closeDialog"
       :title="title"
-    ></addInspectDailog> 
+    ></addInspectDailog>
   </basic-container>
 </template>
 
 <script>
 import basicImport from '@/components/basic-import/main.vue';
 import { getList, add, remove, update } from '@/api/safetyManagement/safetyInspectionPoint.js';
-import addInspectDailog from './addInspectDailog.vue'
-
+import addInspectDailog from './addInspectDailog.vue';
 export default {
   components: {
     basicImport,
-    addInspectDailog
+    addInspectDailog,
   },
   data() {
     return {
@@ -206,18 +206,18 @@ export default {
   methods: {
     // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
     // 保存
-    rowSave(row, done, loading) {   
-    add(row).then(
-      res => {
-        this.onLoad(this.page);
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-        });
-         done();
+    rowSave(row, done, loading) {
+      add(row).then(
+        res => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
         },
         error => {
           window.console.log(error);
@@ -275,7 +275,7 @@ export default {
         });
     },
     //更新
-    rowUpdate(row, index, done, loading) { 
+    rowUpdate(row, index, done, loading) {
       update(row).then(
         () => {
           this.onLoad(this.page);
@@ -297,15 +297,29 @@ export default {
     },
     // 搜索重置
     searchReset() {
-     this.query = {} 
-     this.onLoad(this.page)
+      this.query = {};
+      this.onLoad(this.page);
     },
     selectionClear() {
       this.selectionList = [];
       this.$refs.table.clearSelection();
     },
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     // 加载页面数据
-     onLoad(page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
         .then(res => {
@@ -326,9 +340,8 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params)
-      done()
-      
+      this.onLoad(this.page, params);
+      done();
     },
     // 关闭弹窗
     closeDialog() {

From 6e185d0f47adca923e1f09ad9913aabbcbd109f4 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 11:44:46 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86-=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyInspectionTask/index.vue                | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue
index 4319ec83..b841bfb1 100644
--- a/src/views/safetyManagement/safetyInspectionTask/index.vue
+++ b/src/views/safetyManagement/safetyInspectionTask/index.vue
@@ -16,6 +16,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -206,6 +207,20 @@ export default {
     };
   },
   methods: {
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {s
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;

From 84b519872b718eed38e8c7a53282ed510e023571 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 13:24:17 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86-=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E9=85=8D=E7=BD=AE-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyInspectionPoint/index.vue           | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/safetyManagement/safetyInspectionPoint/index.vue b/src/views/safetyManagement/safetyInspectionPoint/index.vue
index ff93446e..81be3048 100644
--- a/src/views/safetyManagement/safetyInspectionPoint/index.vue
+++ b/src/views/safetyManagement/safetyInspectionPoint/index.vue
@@ -17,14 +17,25 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
       @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handleAdd">新增 </el-button>
-        <el-button type="danger" @click="handleDelete">删除 </el-button>
+        <el-button type="primary" v-if="permission.safetyInspectionPoint_add" @click="handleAdd">
+          新增
+        </el-button>
+        <el-button type="danger" v-if="permission.safetyInspectionPoint_del" @click="handleDelete">
+          删除
+        </el-button>
       </template>
       <template #menu-right>
         <!-- <el-button type="primary"  @click="handlePrint">打印 </el-button> -->
-        <el-button type="primary" @click="handleImport">导入 </el-button>
+        <el-button
+          type="primary"
+          v-if="permission.safetyInspectionPoint_import"
+          @click="handleImport"
+        >
+          导入
+        </el-button>
       </template>
     </avue-crud>
     <!-- 导入 -->
@@ -52,6 +63,7 @@
 import basicImport from '@/components/basic-import/main.vue';
 import { getList, add, remove, update } from '@/api/safetyManagement/safetyInspectionPoint.js';
 import addInspectDailog from './addInspectDailog.vue';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -202,6 +214,13 @@ export default {
       });
       return ids.join(',');
     },
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        editBtn: this.validData(this.permission.safetyInspectionPoint_edit, false),
+        delBtn: this.validData(this.permission.safetyInspectionPoint_del, false),
+      };
+    },
   },
   methods: {
     // 点击导入按钮

From dd5a3ec442926c9b5c76d27eaf994bef182d04f4 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 13:36:13 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=82=B9=E9=85=8D=E7=BD=AE-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9D=83=E9=99=90/=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentInspectionPoint/index.vue        | 169 +++++++++++-------
 1 file changed, 103 insertions(+), 66 deletions(-)

diff --git a/src/views/safetyManagement/equipmentInspectionPoint/index.vue b/src/views/safetyManagement/equipmentInspectionPoint/index.vue
index 812bfda8..1239cada 100644
--- a/src/views/safetyManagement/equipmentInspectionPoint/index.vue
+++ b/src/views/safetyManagement/equipmentInspectionPoint/index.vue
@@ -8,7 +8,7 @@
       v-model:page="page"
       ref="crud"
       @row-del="rowDel"
-      @row-save="rowSave" 
+      @row-save="rowSave"
       @row-update="rowUpdate"
       @search-change="searchChange"
       @search-reset="searchReset"
@@ -17,43 +17,64 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handleAdd">新增 </el-button>
-        <el-button type="danger" @click="handleDelete"
-          >删除
+        <el-button type="primary" v-if="permission.equipmentInspectionPoint_add" @click="handleAdd">
+          新增
+        </el-button>
+        <el-button
+          type="danger"
+          v-if="permission.equipmentInspectionPoint_del"
+          @click="handleDelete"
+        >
+          删除
         </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleImport"
+        <el-button
+          type="primary"
+          v-if="permission.equipmentInspectionPoint_import"
+          @click="handleImport"
           >导入
         </el-button>
       </template>
     </avue-crud>
-      <!-- 导入 -->
-    <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
+    <!-- 导入 -->
+    <basic-import
+      v-if="isShowImport"
+      title="导入"
+      :isShow="isShowImport"
       templateUrl="/blade-desk/bsEpciuInspectionPoint/downloadExcelTemplate"
       templateName="环保巡检点配置表模板.xls"
       importUrl="/blade-desk/bsEpciuInspectionPoint/importExcel"
-      @closeDialog="closeImportDialog"></basic-import>
-      <!-- 新增弹窗 -->
-    <addInspectDailog v-if="showDialog" :showDialog="showDialog" :moldAddMore="moldAddMore" @closeDialog="closeDialog"
-      :title="title"></addInspectDailog>
+      @closeDialog="closeImportDialog"
+    ></basic-import>
+    <!-- 新增弹窗 -->
+    <addInspectDailog
+      v-if="showDialog"
+      :showDialog="showDialog"
+      :moldAddMore="moldAddMore"
+      @closeDialog="closeDialog"
+      :title="title"
+    ></addInspectDailog>
   </basic-container>
 </template>
 
 <script>
 import basicImport from '@/components/basic-import/main.vue';
 import { getList, add, remove, update } from '@/api/safetyManagement/equipmentInspectionPoint';
-import addInspectDailog from './addInspectDailog.vue'
+import addInspectDailog from './addInspectDailog.vue';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
-    addInspectDailog
+    addInspectDailog,
   },
   data() {
     return {
-      isShowImport:false,
+      isShowImport: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -62,7 +83,7 @@ export default {
       selectionList: [],
       data: [],
       option: {
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         tip: false,
         simplePage: true,
@@ -78,11 +99,11 @@ export default {
         delBtn: false,
         addBtn: false,
         editBtn: true,
-        editBtnText: "修改",
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
+        editBtnText: '修改',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
         labelWidth: 120,
         menuWidth: 80,
         dialogWidth: 600,
@@ -96,18 +117,18 @@ export default {
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
-        searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "center",
+        menuAlign: 'center',
         gridBtn: false,
-        searchMenuPosition: "right",
-        align: "center",
+        searchMenuPosition: 'right',
+        align: 'center',
         column: [
           {
-            label: "巡检点编号",
-            prop: "insNum",
+            label: '巡检点编号',
+            prop: 'insNum',
             sortable: true,
             filter: true,
             span: 24,
@@ -116,14 +137,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入巡检点编号",
-                trigger: "blur",
+                message: '请输入巡检点编号',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "巡检点位置",
-            prop: "insSite",
+            label: '巡检点位置',
+            prop: 'insSite',
             sortable: true,
             filter: true,
             span: 24,
@@ -132,14 +153,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入巡检点位置",
-                trigger: "blur",
+                message: '请输入巡检点位置',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "巡检点类型",
-            prop: "insType",
+            label: '巡检点类型',
+            prop: 'insType',
             sortable: true,
             filter: true,
             span: 24,
@@ -153,14 +174,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入巡检点位置",
-                trigger: "blur",
+                message: '请输入巡检点位置',
+                trigger: 'blur',
               },
             ],
           },
-            {
-            label: "巡检周期(h)",
-            prop: "insCycle",
+          {
+            label: '巡检周期(h)',
+            prop: 'insCycle',
             sortable: true,
             filter: true,
             span: 24,
@@ -170,14 +191,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入巡检周期(h)",
-                trigger: "blur",
+                message: '请输入巡检周期(h)',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "上次检验日期",
-            prop: "lastInsCycle",
+            label: '上次检验日期',
+            prop: 'lastInsCycle',
             sortable: true,
             filter: true,
             span: 24,
@@ -186,20 +207,20 @@ export default {
             searchLabelWidth: 100,
           },
           {
-            label: "备注",
-            prop: "memo",
+            label: '备注',
+            prop: 'memo',
             sortable: true,
             filter: true,
             span: 24,
             search: false,
-            type: "textarea",
+            type: 'textarea',
             searchLabelWidth: 90,
             rows: 3,
             rules: [
               {
                 required: false,
-                message: "请输入备注",
-                trigger: "blur",
+                message: '请输入备注',
+                trigger: 'blur',
               },
             ],
           },
@@ -208,6 +229,7 @@ export default {
       title: '新增',
       showDialog: false,
       moldAddMore: false,
+      query: {},
     };
   },
   computed: {
@@ -218,11 +240,18 @@ export default {
       });
       return ids.join(',');
     },
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        editBtn: this.validData(this.permission.equipmentInspectionPoint_edit, false),
+        delBtn: this.validData(this.permission.equipmentInspectionPoint_del, false),
+      };
+    },
   },
   methods: {
     // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
     // 关闭导入弹窗
     closeImportDialog() {
@@ -276,7 +305,6 @@ export default {
     },
     //更新
     rowUpdate(row, index, done, loading) {
-     
       update(row).then(
         () => {
           this.onLoad(this.page);
@@ -298,24 +326,35 @@ export default {
     },
     // 搜索重置
     searchReset() {
-      this.query = {}
-      this.onLoad(this.page)
+      this.query = {};
+      this.onLoad(this.page);
     },
     selectionClear() {
       this.selectionList = [];
       this.$refs.table.clearSelection();
     },
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-        (res) => {
-          this.data = res.data.data.records;
-          this.loading = false;
-          this.page.total = res.data.data.total;
-        }
-      );
-
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+      });
     },
     //刷新
     refreshChange() {
@@ -325,17 +364,15 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params)
-      done()
-
+      this.onLoad(this.page, params);
+      done();
     },
     // 关闭弹窗
-    closeDialog(isRefresh=false) {
+    closeDialog(isRefresh = false) {
       this.showDialog = false;
       if (isRefresh) {
         this.onLoad(this.page);
       }
-     
     },
     // 新增
     handleAdd() {

From f896288ad8fe70cbaba3055edd56c0ce68d1bf26 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 13:38:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentInspectionTask/index.vue             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/safetyManagement/equipmentInspectionTask/index.vue b/src/views/safetyManagement/equipmentInspectionTask/index.vue
index b8759842..f91faae7 100644
--- a/src/views/safetyManagement/equipmentInspectionTask/index.vue
+++ b/src/views/safetyManagement/equipmentInspectionTask/index.vue
@@ -16,6 +16,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left> </template>
       <template #menu-right> </template>
@@ -240,6 +241,20 @@ export default {
       this.query = { taskStatus: '1' };
       this.onLoad(this.page);
     },
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;

From b7bb4a6e298d26fa49ace70f8bca9b7fb87c221b Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Mon, 27 Apr 2026 13:53:22 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E9=85=B8=E9=9B=BE?=
 =?UTF-8?q?=E5=A1=94=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86-=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E7=82=B9=E8=AE=BE=E7=BD=AE-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F/=E6=9D=83=E9=99=90=20=E5=AE=89=E7=8E=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E9=85=B8=E9=9B=BE=E5=A1=94=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wasteGasSet/components/alarmPoint.vue     | 194 ++++++++++--------
 .../wasteGasSet/components/alarmRecord.vue    |  15 ++
 2 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue b/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
index 2c24ed18..0c62911c 100644
--- a/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
@@ -1,34 +1,36 @@
 <template>
   <div>
     <avue-crud
-    :option="option"
-    :table-loading="loading"
-    :data="data"
-    v-model="form"
-    v-model:page="page"
-    ref="crud"
-    @row-del="rowDel"
-    @row-save="rowSave"
-    @row-update="rowUpdate"
-    @search-change="searchChange"
-    @search-reset="searchReset"
-    @selection-change="selectionChange"
-    @current-change="currentChange"
-    @size-change="sizeChange"
-    @refresh-change="refreshChange"
-    @on-load="onLoad"
-  >
-    <template #menu-left>
-      <el-button type="danger" @click="handleDelete"
-        >删 除
-      </el-button>
-    </template>
-    <template #menu-right>
-      <el-button type="primary"  @click="handleImport"  
-        >导入
-      </el-button>
-    </template>
-  </avue-crud>
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
+    >
+      <template #menu-left>
+        <el-button type="danger" v-if="permission.acidMistTower1_del" @click="handleDelete"
+          >删 除
+        </el-button>
+      </template>
+      <template #menu-right>
+        <el-button type="primary" v-if="permission.acidMistTower1_import" @click="handleImport">
+          导入
+        </el-button>
+      </template>
+    </avue-crud>
     <!-- 导入 -->
     <basic-import
       v-if="isShowImport"
@@ -43,8 +45,8 @@
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue';
-import { getList, add, remove, update } from '@/api/safetyManagement/acidMistToweralarmPoint.js'
-
+import { getList, add, remove, update } from '@/api/safetyManagement/acidMistToweralarmPoint.js';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -55,7 +57,7 @@ export default {
       loading: false,
       selectionList: [],
       option: {
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         tip: false,
         simplePage: true,
@@ -69,12 +71,12 @@ export default {
         selection: true,
         viewBtn: false,
         delBtn: false,
-        editBtnText: "修改",
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        viewBtnText: "详情",
+        editBtnText: '修改',
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
         labelWidth: 120,
         menuWidth: 80,
         dialogWidth: 1040,
@@ -88,18 +90,18 @@ export default {
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
-        searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "center",
+        menuAlign: 'center',
         gridBtn: false,
-        searchMenuPosition: "right",
-        align: "center",
+        searchMenuPosition: 'right',
+        align: 'center',
         column: [
           {
-            label: "编码",
-            prop: "btCode",
+            label: '编码',
+            prop: 'btCode',
             sortable: true,
             filter: true,
             span: 12,
@@ -108,14 +110,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入编码",
-                trigger: "blur",
+                message: '请输入编码',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "名称",
-            prop: "btName",
+            label: '名称',
+            prop: 'btName',
             search: true,
             searchLabelWidth: 50,
             sortable: true,
@@ -124,14 +126,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入名称",
-                trigger: "blur",
+                message: '请输入名称',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "药品名称",
-            prop: "drugName",
+            label: '药品名称',
+            prop: 'drugName',
             search: false,
             sortable: true,
             filter: true,
@@ -139,31 +141,31 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入药品名称",
-                trigger: "blur",
+                message: '请输入药品名称',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "报警阙值",
-            prop: "threshold",
+            label: '报警阙值',
+            prop: 'threshold',
             search: true,
             searchLabelWidth: 80,
             sortable: true,
             filter: true,
-            type: "number", 
+            type: 'number',
             span: 12,
             rules: [
               {
                 required: true,
-                message: "请输入报警阙值",
-                trigger: "blur",
+                message: '请输入报警阙值',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "PH报警点位",
-            prop: "phPoint",
+            label: 'PH报警点位',
+            prop: 'phPoint',
             search: false,
             sortable: true,
             filter: true,
@@ -171,14 +173,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入PH报警点位",
-                trigger: "blur",
+                message: '请输入PH报警点位',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "风机运行点位",
-            prop: "fanRunPoint",
+            label: '风机运行点位',
+            prop: 'fanRunPoint',
             search: false,
             sortable: true,
             filter: true,
@@ -186,22 +188,22 @@ export default {
             rules: [
               {
                 required: true,
-                message: "请输入风机运行点位",
-                trigger: "blur",
+                message: '请输入风机运行点位',
+                trigger: 'blur',
               },
             ],
           },
           {
-            label: "风机报警点位",
-            prop: "fanPoint",
+            label: '风机报警点位',
+            prop: 'fanPoint',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
           },
           {
-            label: "循环泵报警点位",
-            prop: "pumpPoint",
+            label: '循环泵报警点位',
+            prop: 'pumpPoint',
             search: false,
             sortable: true,
             filter: true,
@@ -215,9 +217,11 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      query: {},
     };
   },
   computed: {
+    ...mapGetters(['permission']),
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
@@ -225,6 +229,13 @@ export default {
       });
       return ids.join(',');
     },
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.acidMistTower1_add, false),
+        editBtn: this.validData(this.permission.acidMistTower1_edit, false),
+        // delBtn: this.validData(this.permission.acidMistTower1_del, false),
+      };
+    },
   },
   // 关闭导入弹窗
   closeImportDialog() {
@@ -234,7 +245,7 @@ export default {
   methods: {
     // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
     //删除
     handleDelete() {
@@ -265,19 +276,20 @@ export default {
     },
     //新增
     rowSave(row, done, loading) {
-      add(row).then(res => {
-        this.onLoad(this.page)
-        this.$message({
-          type: 'success',
-          messge:'操作成功!'
-        })
-        done();
-      },
+      add(row).then(
+        res => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            messge: '操作成功!',
+          });
+          done();
+        },
         error => {
-        window.console.log(error)
-        loading()
-      }
-      )  
+          window.console.log(error);
+          loading();
+        }
+      );
     },
     //删除
     rowDel(row) {
@@ -330,6 +342,20 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
index b51e94be..58f242c2 100644
--- a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
@@ -17,6 +17,7 @@
     @size-change="sizeChange"
     @refresh-change="refreshChange"
     @on-load="onLoad"
+    @sort-change="sortChange"
   >
     <template #menu-left> </template>
     <template #menu-right> </template>
@@ -279,6 +280,20 @@ export default {
       this.selectionList = [];
       this.$refs.table.clearSelection();
     },
+    // 排序
+    sortChange({ prop, order }) {
+      if (!prop) {
+        // 如果取消排序，清空排序参数
+        this.query.orderByField = undefined;
+        this.query.isAsc = undefined;
+      } else {
+        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+        this.query.orderByField = orderByField;
+        this.query.isAsc = order === 'ascending' ? true : false;
+      }
+      // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     onLoad(page, params = {}) {
       const requestParams = Object.assign({}, params, this.query);
       // 后端要字符串类型