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] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E7=AE=A1=E7=90=86-=E9=85=B8=E9=9B=BE=E5=A1=94?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86-=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E7=82=B9=E8=AE=BE=E7=BD=AE-=E6=96=B0=E5=A2=9E=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F/=E6=9D=83=E9=99=90=20=E5=AE=89=E7=8E=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E9=85=B8?=
 =?UTF-8?q?=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);
       // 后端要字符串类型