diff --git a/src/views/energyManagement/components/electricityTarget.vue b/src/views/energyManagement/components/electricityTarget.vue
index 33f5bbe7..cff2bbc7 100644
--- a/src/views/energyManagement/components/electricityTarget.vue
+++ b/src/views/energyManagement/components/electricityTarget.vue
@@ -17,15 +17,16 @@
     @size-change="sizeChange"
     @refresh-change="refreshChange"
     @on-load="onLoad"
+    @sort-change="sortChange"
   >
     <template #menu-left>
-      <el-button type="danger"  @click="handleDelete"
+      <el-button type="danger"  @click="handleDelete" v-if="permission.electricityTarget_delete"
         >删除
       </el-button>
     </template>
     <template #menu-right>
-      <el-button type="primary"  @click="handleExport">导出</el-button>
-      <el-button type="primary"  @click="handleImport">导入</el-button>
+      <el-button type="primary"  @click="handleExport" v-if="permission.electricityTarget_export">导出</el-button>
+      <el-button type="primary"  @click="handleImport" v-if="permission.electricityTarget_import">导入</el-button>
     </template>
     <template #menu="scope"> </template>
   </avue-crud>
@@ -39,6 +40,7 @@
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue'
+import { mapGetters } from 'vuex';
 import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/energyManagement';
 export default {
   components: {
@@ -64,7 +66,8 @@ export default {
         selection: true,
         viewBtn: false,
         delBtn: false,
-        addBtn: true,
+        addBtn: false,
+        editBtn:false,
         editBtnText: "修改",
         viewBtnIcon: " ",
         delBtnIcon: " ",
@@ -160,7 +163,30 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+  },
+  created(){
+    console.log('permission-------',this.permission)
+    this.option.addBtn = this.permission.electricityTarget_add ? true : false;
+    this.option.editBtn = this.permission.electricityTarget_edit ? true : false;
+  },
   methods: {
+    // 表格排序
+    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);
+    },
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
diff --git a/src/views/energyManagement/components/waterQuota.vue b/src/views/energyManagement/components/waterQuota.vue
index e9583423..80a12b25 100644
--- a/src/views/energyManagement/components/waterQuota.vue
+++ b/src/views/energyManagement/components/waterQuota.vue
@@ -3,13 +3,34 @@
     <avue-crud :option="option" v-model:search="search" :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" 
-      :beforeOpen="beforeOpen">
+      :beforeOpen="beforeOpen"
+      @sort-change="sortChange"
+      >
+      <template #equipmentId-form="{type,disabled}">
+          <jhSelect
+            @input="val => (form.equipmentId = val)"
+            :value="form.equipmentId"
+            placeholder="请搜索选择"
+            api-url="/blade-desk/equipment/page"
+            echo-api="/blade-desk/equipment/page"
+            echoParamsKey="id"
+            echo-method="get"
+            api-method="get"
+            list-key="records"
+            total-key="total"
+            label-key="deviceName"
+            value-key="id"
+            search-key="deviceName"
+            :debounce-time="100"
+            @change="changeEquipment"
+          />
+      </template>
       <template #menu-left>
-        <el-button type="danger" @click="handleDelete">删除</el-button>
+        <el-button type="danger" @click="handleDelete" v-if="permission.waterQuota_delete">删除</el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleExport">导出</el-button>
-        <el-button type="primary"  @click="handleImport">导入</el-button>
+        <el-button type="primary"  @click="handleExport" v-if="permission.waterQuota_export">导出</el-button>
+        <el-button type="primary"  @click="handleImport" v-if="permission.waterQuota_import">导入</el-button>
       </template>
       <template #menu> </template>
     </avue-crud>
@@ -22,6 +43,7 @@
 <script>
 import basicImport from '@/components/basic-import/main.vue'
 import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/bsEnergyQuota';
+import { mapGetters } from 'vuex';
 export default {
   components: {
     basicImport,
@@ -48,7 +70,8 @@ export default {
         selection: true,
         viewBtn: false,
         delBtn: false,
-        addBtn: true,
+        addBtn: false,
+        editBtn:false,
         editBtnText: "修改",
         viewBtnIcon: " ",
         delBtnIcon: " ",
@@ -111,6 +134,40 @@ export default {
               this.form.workCenterName = filteredUsers.map(item => item.wcName).join(',')
             }
           },
+          {
+            label: "设备",
+            prop: "equipmentName",
+            // bind: "equipmentName",
+            search: false,
+            sortable: true,
+            filter: true,
+            display:false,
+            span: 24,
+          //   type: "select",
+          //   dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}",
+          //   props:{
+          //     label:"deviceName",
+          //     value:"id",
+          //     res:"data.records",
+          //   },
+          //   remote: true,
+          // //   dicData: [
+          // //     { label: "化学镀镍", value: "化学镀镍" },
+          // //     { label: "电镀设备", value: "电镀设备" },
+          // //     { label: "喷涂设备", value: "喷涂设备" },
+          // // ],
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请选择设备",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          //   change:(row) =>{
+          //     console.log('row------------------',row)
+          //     this.form.equipmentName = row && row.item && row.item.deviceName
+          //   }
+          },
           {
             label: "设备",
             prop: "equipmentId",
@@ -119,30 +176,7 @@ export default {
             sortable: true,
             filter: true,
             span: 24,
-            type: "select",
-            dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}",
-            props:{
-              label:"deviceName",
-              value:"id",
-              res:"data.records",
-            },
-            remote: true,
-          //   dicData: [
-          //     { label: "化学镀镍", value: "化学镀镍" },
-          //     { label: "电镀设备", value: "电镀设备" },
-          //     { label: "喷涂设备", value: "喷涂设备" },
-          // ],
-            rules: [
-              {
-                required: true,
-                message: "请选择设备",
-                trigger: "blur",
-              },
-            ],
-            change:(row) =>{
-              console.log('row------------------',row)
-              this.form.equipmentName = row && row.item && row.item.deviceName
-            }
+            hide:true
           },
           {
             label: "日期",
@@ -204,7 +238,35 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['permission']),
+  },
+  created(){
+    this.option.addBtn = this.permission.waterQuota_add ? true : false;
+    this.option.editBtn = this.permission.waterQuota_edit ? true : false;
+  },
   methods: {
+    // 表格排序
+    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);
+    },
+    changeEquipment(val, item){
+      console.log('val------------------',val)
+      console.log('item------------------',item)
+      this.form.equipmentId = val
+      this.form.equipmentName = item && item.deviceName
+    },
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
diff --git a/src/views/energyManagement/components/waterTarget.vue b/src/views/energyManagement/components/waterTarget.vue
index f90c57cd..9269f4d2 100644
--- a/src/views/energyManagement/components/waterTarget.vue
+++ b/src/views/energyManagement/components/waterTarget.vue
@@ -18,13 +18,14 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left>
-        <el-button type="danger" @click="handleDelete">删除 </el-button>
+        <el-button type="danger" @click="handleDelete" v-if="permission.waterTarget_delete">删除 </el-button>
       </template>
       <template #menu-right>
-         <el-button type="primary" @click="handleExport">导出 </el-button>
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+         <el-button type="primary" @click="handleExport" v-if="permission.waterTarget_export">导出 </el-button>
+        <el-button type="primary"  @click="handleImport" v-if="permission.waterTarget_import">导入 </el-button>
       </template>
       <template #menu> </template>
     </avue-crud>
@@ -42,6 +43,7 @@
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue'
+import { mapGetters } from 'vuex';
 import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/energyManagement';
 export default {
   components: {
@@ -70,7 +72,8 @@ export default {
         selection: true,
         viewBtn: false,
         delBtn: false,
-        addBtn: true,
+        addBtn:  false,
+        editBtn:  false,
         editBtnText: "修改",
         viewBtnIcon: " ",
         delBtnIcon: " ",
@@ -141,7 +144,30 @@ export default {
       },
     };
   },
+  created(){
+    console.log('permission-------',this.permission)
+    this.option.addBtn = this.permission.waterTarget_add ? true : false;
+    this.option.editBtn = this.permission.waterTarget_edit ? true : false;
+  },
+  computed: {
+    ...mapGetters(['permission']),
+  },
   methods: {
+    // 表格排序
+    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);
+    },
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();