From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

---
 src/views/system/sysConfig.vue |   64 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/views/system/sysConfig.vue b/src/views/system/sysConfig.vue
index af3e8f5..193164a 100644
--- a/src/views/system/sysConfig.vue
+++ b/src/views/system/sysConfig.vue
@@ -21,32 +21,32 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <el-button 
-          type="primary" 
+        <el-button
+          type="primary"
           icon="el-icon-plus"
-          v-if="permission.sysConfig_add" 
+          v-if="permissionList.addBtn"
           @click="$refs.crud.rowAdd()"
-        >新 增</el-button>
+        >新增</el-button>
         <el-button
           type="danger"
-          icon="el-icon-delete"
           plain
-          v-if="permission.sysConfig_delete"
+          icon="el-icon-delete"
+          v-if="permissionList.delBtn"
           @click="handleDelete"
-        >删 除</el-button>
+        >删除</el-button>
       </template>
-      <template #menu="scope">
+      <template #menu="{ row, index }">
         <el-button
           type="text"
           icon="el-icon-view"
-          v-if="permission.sysConfig_view"
-          @click.stop="$refs.crud.rowView(scope.row,scope.index)"
+          v-if="permissionList.viewBtn"
+          @click.stop="$refs.crud.rowView(row, index)"
         >查看</el-button>
         <el-button
           type="text"
           icon="el-icon-edit"
-          v-if="permission.sysConfig_edit"
-          @click.stop="$refs.crud.rowEdit(scope.row,scope.index)"
+          v-if="permissionList.editBtn"
+          @click.stop="$refs.crud.rowEdit(row, index)"
         >编辑</el-button>
       </template>
     </avue-crud>
@@ -70,15 +70,17 @@
       },
       selectionList: [],
       option: {
-        height: 'auto',
-        calcHeight: 32,
         dialogWidth: 950,
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
         border: true,
         index: true,
-        viewBtn: true,
+        // 禁用默认按钮
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
         selection: true,
         excelBtn: true,
         dialogClickModal: false,
@@ -101,9 +103,9 @@
           {
             label: '所属单位',
             prop: 'deptName',
-            addDisplay:false,
-            editDisplay:false,
-            viewDisplay:false,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
             rules: [
               {
                 required: true,
@@ -117,13 +119,12 @@
             prop: 'deptId',
             hide: true,
             type: 'tree',
-            defaultExpandAll:true,
+            defaultExpandAll: true,
             dicUrl: '/blade-system/dept/getTree',
             props: {
               label: 'name',
               value: 'id',
             },
-            // dataType: 'number',
             rules: [
               {
                 required: true,
@@ -142,8 +143,8 @@
                 trigger: 'blur',
               },
             ],
-            span:24,
-            type:'textarea'
+            span: 24,
+            type: 'textarea'
           },
         ],
       },
@@ -154,10 +155,10 @@
     ...mapGetters(['permission']),
     permissionList() {
       return {
-        addBtn: this.validData(this.permission.sysConfig_add, false),
-        viewBtn: this.validData(this.permission.sysConfig_view, false),
-        delBtn: this.validData(this.permission.sysConfig_delete, false),
-        editBtn: this.validData(this.permission.sysConfig_edit, false),
+        addBtn: this.permission.sysConfig_add,
+        viewBtn: this.permission.sysConfig_view,
+        delBtn: this.permission.sysConfig_delete,
+        editBtn: this.permission.sysConfig_edit,
       };
     },
     ids() {
@@ -301,4 +302,13 @@
 };
 </script>
 
-<style></style>
+<style scoped lang="scss">
+  :deep(){
+    .avue-crud__body{
+      .el-form{
+        height: 745px;
+        overflow: auto;
+      }
+    }
+  }
+</style>

--
Gitblit v1.9.3