فهرست منبع

feature:代码变更,内容更新

ZZH-wl 3 سال پیش
والد
کامیت
37b6c1df21
4فایلهای تغییر یافته به همراه43 افزوده شده و 173 حذف شده
  1. 1 6
      src/api/system/user.js
  2. 15 64
      src/views/system/group/index.vue
  3. 15 64
      src/views/system/post/index.vue
  4. 12 39
      src/views/system/role/components/RoleDataScopeEdit.vue

+ 1 - 6
src/api/system/user.js

@@ -4,12 +4,7 @@ const basePath = process.env.VUE_APP_AdminPath
 console.log(basePath)
 export default {
   login(query) {
-    return micro_request.postRequestWithClientInfo(
-      basePath,
-      'Auth',
-      'Login',
-      query
-    )
+    return micro_request.postRequestWithClientInfo(basePath, 'Auth', 'Login', query)
   },
   logout(query) {
     return micro_request.postRequest(basePath, 'Auth', 'LogOut', query)

+ 15 - 64
src/views/system/group/index.vue

@@ -2,32 +2,16 @@
   <div class="user-management-container">
     <vab-query-form>
       <vab-query-form-left-panel :span="5">
-        <el-button
-          icon="el-icon-plus"
-          type="primary"
-          @click="handleEdit($event)">
-          添加
-        </el-button>
-        <el-button
-          icon="el-icon-delete"
-          type="danger"
-          @click="handleDelete($event)">
-          删除
-        </el-button>
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit($event)">添加</el-button>
+        <el-button icon="el-icon-delete" type="danger" @click="handleDelete($event)">删除</el-button>
       </vab-query-form-left-panel>
       <vab-query-form-right-panel :span="19">
         <el-form :inline="true" :model="queryForm" @submit.native.prevent>
-          <el-form-item label="用户组名称" prop="dictName">
-            <el-input
-              v-model.trim="queryForm.groupName"
-              clearable
-              placeholder="请输入用户组名称" />
+          <el-form-item label="用户组名称" prop="groupName">
+            <el-input v-model.trim="queryForm.groupName" clearable placeholder="请输入用户组名称" />
           </el-form-item>
-          <el-form-item label="用户组编码" prop="dictType">
-            <el-input
-              v-model.trim="queryForm.groupCode"
-              clearable
-              placeholder="请输入用户组编码" />
+          <el-form-item label="用户组编码" prop="groupCode">
+            <el-input v-model.trim="queryForm.groupCode" clearable placeholder="请输入用户组编码" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryForm.status" clearable placeholder="状态">
@@ -36,70 +20,37 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">
-              查询
-            </el-button>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
           </el-form-item>
         </el-form>
       </vab-query-form-right-panel>
     </vab-query-form>
 
-    <el-table
-      v-loading="listLoading"
-      border
-      :data="list"
-      :height="height"
-      @selection-change="setSelectRows">
+    <el-table v-loading="listLoading" border :data="list" :height="height" @selection-change="setSelectRows">
       <el-table-column align="center" show-overflow-tooltip type="selection" />
-      <el-table-column
-        align="center"
-        label="用户组编号"
-        prop="id"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="用户组名称"
-        prop="groupName"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="用户组编码"
-        prop="groupCode"
-        show-overflow-tooltip />
+      <el-table-column align="center" label="用户组编号" prop="id" show-overflow-tooltip />
+      <el-table-column align="center" label="用户组名称" prop="groupName" show-overflow-tooltip />
+      <el-table-column align="center" label="用户组编码" prop="groupCode" show-overflow-tooltip />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="{ row }">
           {{ row.status === '10' ? '正常' : '停用' }}
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        label="用户组排序"
-        prop="sort"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="备注"
-        prop="remark"
-        show-overflow-tooltip />
+      <el-table-column align="center" label="用户组排序" prop="sort" show-overflow-tooltip />
+      <el-table-column align="center" label="备注" prop="remark" show-overflow-tooltip />
       <el-table-column align="center" label="创建时间" prop="createdTime">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createdTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        label="操作"
-        show-overflow-tooltip
-        width="85">
+      <el-table-column align="center" label="操作" show-overflow-tooltip width="85">
         <template #default="{ row }">
           <el-button type="text" @click="handleEdit(row)">编辑</el-button>
           <el-button type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
       <template #empty>
-        <el-image
-          class="vab-data-empty"
-          :src="require('@/assets/empty_images/data_empty.png')" />
+        <el-image class="vab-data-empty" :src="require('@/assets/empty_images/data_empty.png')" />
       </template>
     </el-table>
     <el-pagination

+ 15 - 64
src/views/system/post/index.vue

@@ -2,32 +2,16 @@
   <div class="user-management-container">
     <vab-query-form>
       <vab-query-form-left-panel :span="5">
-        <el-button
-          icon="el-icon-plus"
-          type="primary"
-          @click="handleEdit($event)">
-          添加
-        </el-button>
-        <el-button
-          icon="el-icon-delete"
-          type="danger"
-          @click="handleDelete($event)">
-          删除
-        </el-button>
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit($event)">添加</el-button>
+        <el-button icon="el-icon-delete" type="danger" @click="handleDelete($event)">删除</el-button>
       </vab-query-form-left-panel>
       <vab-query-form-right-panel :span="19">
         <el-form :inline="true" :model="queryForm" @submit.native.prevent>
-          <el-form-item label="岗位名称" prop="dictName">
-            <el-input
-              v-model.trim="queryForm.postName"
-              clearable
-              placeholder="请输入岗位名称" />
+          <el-form-item label="岗位名称" prop="postName">
+            <el-input v-model.trim="queryForm.postName" clearable placeholder="请输入岗位名称" />
           </el-form-item>
-          <el-form-item label="岗位编码" prop="dictType">
-            <el-input
-              v-model.trim="queryForm.postCode"
-              clearable
-              placeholder="请输入岗位编码" />
+          <el-form-item label="岗位编码" prop="postCode">
+            <el-input v-model.trim="queryForm.postCode" clearable placeholder="请输入岗位编码" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryForm.status" clearable placeholder="状态">
@@ -36,70 +20,37 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">
-              查询
-            </el-button>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
           </el-form-item>
         </el-form>
       </vab-query-form-right-panel>
     </vab-query-form>
 
-    <el-table
-      v-loading="listLoading"
-      border
-      :data="list"
-      :height="height"
-      @selection-change="setSelectRows">
+    <el-table v-loading="listLoading" border :data="list" :height="height" @selection-change="setSelectRows">
       <el-table-column align="center" show-overflow-tooltip type="selection" />
-      <el-table-column
-        align="center"
-        label="岗位编号"
-        prop="id"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="岗位名称"
-        prop="postName"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="岗位编码"
-        prop="postCode"
-        show-overflow-tooltip />
+      <el-table-column align="center" label="岗位编号" prop="id" show-overflow-tooltip />
+      <el-table-column align="center" label="岗位名称" prop="postName" show-overflow-tooltip />
+      <el-table-column align="center" label="岗位编码" prop="postCode" show-overflow-tooltip />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="{ row }">
           {{ row.status === '10' ? '正常' : '停用' }}
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        label="岗位排序"
-        prop="sort"
-        show-overflow-tooltip />
-      <el-table-column
-        align="center"
-        label="备注"
-        prop="remark"
-        show-overflow-tooltip />
+      <el-table-column align="center" label="岗位排序" prop="sort" show-overflow-tooltip />
+      <el-table-column align="center" label="备注" prop="remark" show-overflow-tooltip />
       <el-table-column align="center" label="创建时间" prop="createdTime">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createdTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        align="center"
-        label="操作"
-        show-overflow-tooltip
-        width="85">
+      <el-table-column align="center" label="操作" show-overflow-tooltip width="85">
         <template #default="{ row }">
           <el-button type="text" @click="handleEdit(row)">编辑</el-button>
           <el-button type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
       <template #empty>
-        <el-image
-          class="vab-data-empty"
-          :src="require('@/assets/empty_images/data_empty.png')" />
+        <el-image class="vab-data-empty" :src="require('@/assets/empty_images/data_empty.png')" />
       </template>
     </el-table>
     <el-pagination

+ 12 - 39
src/views/system/role/components/RoleDataScopeEdit.vue

@@ -1,11 +1,6 @@
 <template>
   <!-- 分配角色数据权限对话框 -->
-  <el-dialog
-    append-to-body
-    :close-on-click-modal="false"
-    :title="title"
-    :visible.sync="openDataScope"
-    width="500px">
+  <el-dialog append-to-body :close-on-click-modal="false" :title="title" :visible.sync="openDataScope" width="500px">
     <el-form ref="form" label-width="80px" :model="form" :rules="rules">
       <el-form-item label="角色名称">
         <el-input v-model="form.roleName" :disabled="true" />
@@ -16,27 +11,13 @@
 
       <el-form-item label="权限范围">
         <el-select v-model="form.dataScope">
-          <el-option
-            v-for="item in dataScopeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value" />
+          <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item v-show="form.dataScope == 2" label="数据权限">
-        <el-checkbox
-          v-model="deptExpand"
-          @change="handleCheckedTreeExpand($event, 'dept')">
-          展开/折叠
-        </el-checkbox>
-        <el-checkbox
-          v-model="deptNodeAll"
-          @change="handleCheckedTreeNodeAll($event, 'dept')">
-          全选/全不选
-        </el-checkbox>
-        <el-checkbox
-          v-model="form.deptCheckStrictly"
-          @change="handleCheckedTreeConnect($event, 'dept')">
+        <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+        <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+        <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">
           父子联动
         </el-checkbox>
         <el-tree
@@ -82,23 +63,23 @@
         // 数据范围选项
         dataScopeOptions: [
           {
-            value: '1',
+            value: '10',
             label: '全部数据权限',
           },
           {
-            value: '2',
+            value: '20',
             label: '自定数据权限',
           },
           {
-            value: '3',
+            value: '30',
             label: '本部门数据权限',
           },
           {
-            value: '4',
+            value: '40',
             label: '本部门及以下数据权限',
           },
           {
-            value: '5',
+            value: '50',
             label: '仅本人数据权限',
           },
         ],
@@ -155,19 +136,11 @@
           }
           roleApi.updateRoleDataScope(data).then((response) => {
             if (response.code === 200) {
-              this.$baseMessage(
-                response.msg,
-                'success',
-                'vab-hey-message-success'
-              )
+              this.$baseMessage(response.msg, 'success', 'vab-hey-message-success')
               this.openDataScope = false
               this.getList()
             } else {
-              this.$baseMessage(
-                response.msg,
-                'error',
-                'vab-hey-message-success'
-              )
+              this.$baseMessage(response.msg, 'error', 'vab-hey-message-success')
             }
           })
         }