支部会议管理接口权限字符修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchMeetingMgrController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-06-07
  */
 @RestController
-@RequestMapping("/system/mgr")
+@RequestMapping("/branch/meeting")
 public class TBranchMeetingMgrController extends BaseController
 {
     @Autowired
@@ -38,7 +38,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 查询支部会议管理列表
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:list')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TBranchMeetingMgr tBranchMeetingMgr)
     {
@@ -50,7 +50,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 导出支部会议管理列表
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:export')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:export')")
     @Log(title = "支部会议管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TBranchMeetingMgr tBranchMeetingMgr)
@@ -63,7 +63,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 获取支部会议管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:query')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:query')")
     @GetMapping(value = "/{meetingId}")
     public AjaxResult getInfo(@PathVariable("meetingId") Long meetingId)
     {
@@ -73,7 +73,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 新增支部会议管理
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:add')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:add')")
     @Log(title = "支部会议管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
@@ -84,7 +84,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 修改支部会议管理
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:edit')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:edit')")
     @Log(title = "支部会议管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBranchMeetingMgr tBranchMeetingMgr)
@@ -95,7 +95,7 @@ public class TBranchMeetingMgrController extends BaseController
     /**
      * 删除支部会议管理
      */
-    @PreAuthorize("@ss.hasPermi('system:mgr:remove')")
+    @PreAuthorize("@ss.hasPermi('branch:meeting:remove')")
     @Log(title = "支部会议管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{meetingIds}")
     public AjaxResult remove(@PathVariable Long[] meetingIds)

ruoyi-ui/src/api/branch/meeting.js

@@ -1,44 +1,44 @@
 import request from '@/utils/request'
 
 // 查询支部会议管理列表
-export function listMgr(query) {
+export function listMeeting(query) {
   return request({
-    url: '/system/mgr/list',
+    url: '/branch/meeting/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询支部会议管理详细
-export function getMgr(meetingId) {
+export function getMeeting(meetingId) {
   return request({
-    url: '/system/mgr/' + meetingId,
+    url: '/branch/meeting/' + meetingId,
     method: 'get'
   })
 }
 
 // 新增支部会议管理
-export function addMgr(data) {
+export function addMeeting(data) {
   return request({
-    url: '/system/mgr',
+    url: '/branch/meeting',
     method: 'post',
     data: data
   })
 }
 
 // 修改支部会议管理
-export function updateMgr(data) {
+export function updateMeeting(data) {
   return request({
-    url: '/system/mgr',
+    url: '/branch/meeting',
     method: 'put',
     data: data
   })
 }
 
 // 删除支部会议管理
-export function delMgr(meetingId) {
+export function delMeeting(meetingId) {
   return request({
-    url: '/system/mgr/' + meetingId,
+    url: '/branch/meeting/' + meetingId,
     method: 'delete'
   })
 }

ruoyi-ui/src/views/branch/meeting/index.vue

@@ -103,7 +103,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:mgr:add']"
+          v-hasPermi="['branch:meeting:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -114,7 +114,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:mgr:edit']"
+          v-hasPermi="['branch:meeting:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -125,9 +125,19 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:mgr:remove']"
+          v-hasPermi="['branch:meeting:remove']"
         >删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:meeting:edit']"
+        >导入</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -135,13 +145,13 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:mgr:export']"
+          v-hasPermi="['branch:meeting:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="mgrList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="mgrList" @selection-change="handleSelectionChange"  :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="会议类型" align="center" prop="meetingType">
       </el-table-column>
@@ -175,14 +185,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:mgr:edit']"
+            v-hasPermi="['branch:meeting:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:mgr:remove']"
+            v-hasPermi="['branch:meeting:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -253,6 +263,7 @@ export default {
   name: "Mgr",
   data() {
     return {
+      clientHeight:300,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -299,6 +310,10 @@ export default {
     };
   },
   created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight -250
+    })
     this.getList();
   },
   methods: {