diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue
index 18dc623d..1d04b2fb 100644
--- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue
+++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue
@@ -16,15 +16,21 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="primary" @click="moldAddFn(null, true)"
-          >新增</el-button
-        >
-        <el-button type="danger" @click="handleBatchDelete">删 除 </el-button>
+        <el-button type="primary" v-if="permission.wastewater1_add" @click="moldAddFn(null, true)">
+          新增
+        </el-button>
+        <el-button type="danger" v-if="permission.wastewater1_del" @click="handleBatchDelete">
+          删 除
+        </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary" @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.wastewater1_import" @click="handleImport">
+          导入
+        </el-button>
       </template>
     </avue-crud>
     <!-- 新增 -->
@@ -62,6 +68,7 @@ import {
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogDischargeRec from './addEditDialogDischargeRec.vue';
 import { getTeam } from '@/api/tankSolutionSystem/info';
+import { mapGetters } from 'vuex';
 
 export default {
   components: {
@@ -264,8 +271,18 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      query: {},
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        editBtn: this.validData(this.permission.wastewater1_edit, false),
+        delBtn: this.validData(this.permission.wastewater1_del, false),
+      };
+    },
+  },
   mounted() {
     this.getTeamList();
     this.getTypeList();
@@ -366,6 +383,20 @@ export default {
       this.query = {};
       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;
diff --git a/src/views/safetyManagement/wastewater/components/dosingRecord.vue b/src/views/safetyManagement/wastewater/components/dosingRecord.vue
index 40f7b2f4..365cf684 100644
--- a/src/views/safetyManagement/wastewater/components/dosingRecord.vue
+++ b/src/views/safetyManagement/wastewater/components/dosingRecord.vue
@@ -17,15 +17,21 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
       :search.sync="search"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="primary"  @click="moldAddFn(null, true)"
-          >新增</el-button
-        >
-        <el-button type="danger" @click="handleBatchDelete">删 除 </el-button>
+        <el-button type="primary" v-if="permission.wastewater2_add" @click="moldAddFn(null, true)">
+          新增
+        </el-button>
+        <el-button type="danger" v-if="permission.wastewater2_del" @click="handleBatchDelete">
+          删 除
+        </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary" @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.wastewater2_import" @click="handleImport">
+          导入
+        </el-button>
       </template>
     </avue-crud>
     <!-- 新增弹窗 -->
@@ -60,6 +66,7 @@ import {
 } from '@/api/safetyManagement/dosingRecord.js';
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue';
+import { mapGetters } from 'vuex';
 
 export default {
   components: {
@@ -74,7 +81,7 @@ export default {
       selectionList: [],
       dosingManList: [],
       search: {
-        dorType:'2',
+        dorType: '2',
       },
       option: {
         addBtn: false,
@@ -250,6 +257,15 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        editBtn: this.validData(this.permission.wastewater2_edit, false),
+        delBtn: this.validData(this.permission.wastewater2_del, false),
+      };
+    },
+  },
   mounted() {
     this.fetchDosingManList();
   },
@@ -374,6 +390,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;
diff --git a/src/views/safetyManagement/wastewater/components/meterParameter.vue b/src/views/safetyManagement/wastewater/components/meterParameter.vue
index 91fcf159..e58e1444 100644
--- a/src/views/safetyManagement/wastewater/components/meterParameter.vue
+++ b/src/views/safetyManagement/wastewater/components/meterParameter.vue
@@ -15,6 +15,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left>
         <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
@@ -146,7 +147,7 @@ export default {
   methods: {
     // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
 
     handleDelete() {
@@ -164,18 +165,33 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    // 排序
+    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({
-        deviceId:"9651128"
-      }).then(res => {
+        deviceId: '9651128',
+      })
+        .then(res => {
           // const data = res.data.data;
           // this.page.total = data.total;
           // this.data = data.records;
           // this.loading = false;
           const obj = {};
-          res.data.data.forEach((item) => {
+          res.data.data.forEach(item => {
             obj[item.identifierName] = item.defaultValue;
           });
           this.objData = obj;
@@ -185,221 +201,221 @@ export default {
               gageValue: obj['PH102'],
               lowerLimit: obj['PH102L'],
               superiorLimit: obj['PH102H'], // 上限
-              consultValue: '10——11'
+              consultValue: '10——11',
             },
             {
               name: 'PH-104 pH调整池II(混)',
               gageValue: obj['PH104'],
               lowerLimit: obj['PH104L'],
               superiorLimit: obj['PH104H'], // 上限
-              consultValue: '7.0——8.0'
+              consultValue: '7.0——8.0',
             },
             {
               name: 'PH-203 pH调整池I(铬)',
               gageValue: obj['PH203'],
               lowerLimit: obj['PH203L'],
               superiorLimit: obj['PH203H'], // 上限
-              consultValue: '2.0——3.0'
+              consultValue: '2.0——3.0',
             },
             {
               name: 'PH-205 pH调整池II(铬)',
               gageValue: obj['PH205'],
               lowerLimit: obj['PH205L'],
               superiorLimit: obj['PH205H'], // 上限
-              consultValue: '8.0——9.0'
+              consultValue: '8.0——9.0',
             },
             {
               name: 'PH-402 pH调整池(电镍)',
               gageValue: obj['PH402'],
               lowerLimit: obj['PH402L'],
               superiorLimit: obj['PH402H'], // 上限
-              consultValue: '9.0——10'
+              consultValue: '9.0——10',
             },
             {
               name: 'PH-502 pH调整池I(氰)',
               gageValue: obj['PH502'],
               lowerLimit: obj['PH502L'],
               superiorLimit: obj['PH502H'], // 上限
-              consultValue: '10——11'
+              consultValue: '10——11',
             },
             {
               name: 'PH-504 pH调整池II(氰)',
               gageValue: obj['PH504'],
               lowerLimit: obj['PH504L'],
               superiorLimit: obj['PH504H'], // 上限
-              consultValue: '7.0——8.0'
+              consultValue: '7.0——8.0',
             },
             {
               name: 'PH-506 pH调整池III(氰)',
               gageValue: obj['PH506'],
               lowerLimit: obj['PH506L'],
               superiorLimit: obj['PH506H'], // 上限
-              consultValue: '8.0——9.0'
+              consultValue: '8.0——9.0',
             },
             {
               name: 'PH-511 中间水池(综)',
               gageValue: obj['PH511'],
               lowerLimit: obj['PH511L'],
               superiorLimit: obj['PH511H'], // 上限
-              consultValue: '7.0——8.0'
+              consultValue: '7.0——8.0',
             },
             {
               name: 'PH-601 化学镍调节池',
               gageValue: obj['PH601'],
               lowerLimit: obj['PH601L'],
               superiorLimit: obj['PH601H'], // 上限
-              consultValue: '2.0——3.0'
+              consultValue: '2.0——3.0',
             },
             {
               name: 'PH-607 pH调整池(化镍)',
               gageValue: obj['PH607'],
               lowerLimit: obj['PH607L'],
               superiorLimit: obj['PH607H'], // 上限
-              consultValue: '9.0——10'
+              consultValue: '9.0——10',
             },
             {
               name: 'PH-701 前处理调节池',
               gageValue: obj['PH701'],
               lowerLimit: obj['PH701L'],
               superiorLimit: obj['PH701H'], // 上限
-              consultValue: '2.0——3.0'
+              consultValue: '2.0——3.0',
             },
             {
               name: 'PH-706 pH调整池(前)',
               gageValue: obj['PH706'],
               lowerLimit: obj['PH706L'],
               superiorLimit: obj['PH706H'], // 上限
-              consultValue: '8.0——9.0'
+              consultValue: '8.0——9.0',
             },
             {
               name: 'PH-710 中间水池(前)',
               gageValue: obj['PH710'],
               lowerLimit: obj['PH710L'],
               superiorLimit: obj['PH710H'], // 上限
-              consultValue: '7.0——8.0'
+              consultValue: '7.0——8.0',
             },
             {
               name: 'ORP-103 一级破氰池(混)',
               gageValue: obj['ORP103'],
               lowerLimit: obj['ORP103L'],
               superiorLimit: obj['ORP103H'], // 上限
-              consultValue: '350——400'
+              consultValue: '350——400',
             },
             {
               name: 'ORP-105 二级破氰池(混)',
               gageValue: obj['ORP105'],
               lowerLimit: obj['ORP105L'],
               superiorLimit: obj['ORP105H'], // 上限
-              consultValue: '600——650'
+              consultValue: '600——650',
             },
             {
               name: 'ORP-204 还原池(铬)',
               gageValue: obj['ORP204'],
               lowerLimit: obj['ORP204L'],
               superiorLimit: obj['ORP204H'], // 上限
-              consultValue: '600——650'
+              consultValue: '600——650',
             },
             {
               name: 'ORP-503 一级破氰池(氰)',
               gageValue: obj['ORP503'],
               lowerLimit: obj['ORP503L'],
               superiorLimit: obj['ORP503H'], // 上限
-              consultValue: '350——400'
+              consultValue: '350——400',
             },
             {
               name: 'ORP-505 二级破氰池(氰)',
               gageValue: obj['ORP505'],
               lowerLimit: obj['ORP505L'],
               superiorLimit: obj['ORP505H'], // 上限
-              consultValue: '600——650'
+              consultValue: '600——650',
             },
             {
               name: 'ORP-604 Feton池(化镍)',
               gageValue: obj['ORP604'],
               lowerLimit: obj['ORP604L'],
               superiorLimit: obj['ORP604H'], // 上限
-              consultValue: '600——650'
+              consultValue: '600——650',
             },
             {
               name: 'ORP-703 Feton池(前)',
               gageValue: obj['ORP703'],
               lowerLimit: obj['ORP703L'],
               superiorLimit: obj['ORP703H'], // 上限
-              consultValue: '600——650'
+              consultValue: '600——650',
             },
             {
               name: 'DL-101 混排废水流量计',
               gageValue: obj['DL101'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-201 含铬废水流量计',
               gageValue: obj['DL201'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-202 酸性废水流量计',
               gageValue: obj['DL202'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-301 焦铜废水流量计',
               gageValue: obj['DL301'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-401 电镀镍废水流量计',
               gageValue: obj['DL401'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-501 含氰废水流量计',
               gageValue: obj['DL501'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-601 化镍废水流量计',
               gageValue: obj['DL601'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-701 前处理废水流量计',
               gageValue: obj['DL701'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-710 中继提升泵流量计',
               gageValue: obj['DL710'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
+              consultValue: '',
             },
             {
               name: 'DL-600 化镍废液流量计',
               gageValue: obj['DL600'],
               lowerLimit: '',
               superiorLimit: '', // 上限
-              consultValue: ''
-            }
+              consultValue: '',
+            },
           ];
-          this.data = this.pageData
-          this.loading = false
+          this.data = this.pageData;
+          this.loading = false;
         })
         .catch(() => {
           this.loading = false;
diff --git a/src/views/safetyManagement/wastewater/components/testRecord.vue b/src/views/safetyManagement/wastewater/components/testRecord.vue
index 9ed29c6f..a2b80dd0 100644
--- a/src/views/safetyManagement/wastewater/components/testRecord.vue
+++ b/src/views/safetyManagement/wastewater/components/testRecord.vue
@@ -16,13 +16,21 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
+      :permission="permissionList"
     >
       <template #menu-left>
-        <el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
-        <el-button type="danger" @click="handleBatchDelete">删 除 </el-button>
+        <el-button type="primary" v-if="permission.wastewater3_add" @click="moldAddFn(null, true)"
+          >新增</el-button
+        >
+        <el-button type="danger" v-if="permission.wastewater3_del" @click="handleBatchDelete"
+          >删 除
+        </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary" @click="handleImport">导入 </el-button>
+        <el-button type="primary" v-if="permission.wastewater3_import" @click="handleImport"
+          >导入
+        </el-button>
       </template>
     </avue-crud>
     <!-- 导入 -->
@@ -51,6 +59,7 @@
 import { getList, update, getUserList, remove } from '@/api/safetyManagement/testRecord.js';
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogTestRecord from './addEditDialogTestRecord.vue';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -277,8 +286,18 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      query: {},
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        editBtn: this.validData(this.permission.wastewater3_edit, false),
+        delBtn: this.validData(this.permission.wastewater3_del, false),
+      };
+    },
+  },
   methods: {
     // 化验人
     fetchUserList() {
@@ -387,6 +406,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(this.page, this.query);
+    },
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;