commit

src/pages/config/pages/operationLog/index.vue

@@ -97,7 +97,7 @@
                 </el-table-column>
                 <el-table-column prop="oper" label="操作类型">
                 </el-table-column>
-                <el-table-column prop="operLocation" label="操作内容">
+                <el-table-column prop="special" label="操作内容">
                 </el-table-column>
             </el-table>
             <loading :loading="dataLoading">数据处理中</loading>

src/pages/config/pages/roleManage/index.vue

@@ -44,7 +44,12 @@
                    class="common-button-primary add-button"
                    @click="RolesAdd(1)"
                    v-btn-permission="'3e0cee86b3522d4233df8f1f11ab02c7'"
-                   size="mini">新增角色
+                   size="mini">新增角色1
+        </el-button>
+        <el-button type="primary"
+                   class="common-button-primary add-button"
+                   @click="getRole"
+                   size="mini">查看人员
         </el-button>
       </div>
       <div class="content">
@@ -264,6 +269,77 @@
         </el-button>
       </div>
     </el-drawer>
+    <el-drawer
+            title="查看人员"
+            :visible.sync="RoleModel"
+            @close="RoleCancle"
+            size="1100px"
+            class="not-footer-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div class="search-area">
+            <div class="left">
+            <el-form inline :model="roleForm">
+              <el-form-item label="人员名称" class="search-item">
+                <el-input
+                        v-model="roleForm.userName"
+                        placeholder="根据人员名称查找"
+                        clearable></el-input>
+              </el-form-item>
+              <el-form-item label="人员账号" class="search-item">
+                <el-input
+                        v-model="roleForm.userId"
+                        placeholder="根据人员账号查找"
+                        clearable></el-input>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="getRole">查询
+                </el-button>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button
+                        class="common-button-default"
+                        size="mini"
+                        @click="clearRole">清空
+                </el-button>
+              </el-form-item>
+            </el-form>
+            </div>
+          </div>
+        <div class="roleTable">
+          <el-table
+                  ref="multipleTable"
+                  :data="roleData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  border
+                  height="100%"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+            <el-table-column
+                    align="center"
+                    prop="uname"
+                    label="人员名称">
+            </el-table-column>
+            <el-table-column
+                    align="center"
+                    prop="userId"
+                    label="人员账号">
+            </el-table-column>
+          </el-table>
+          <pagination
+                  :page="roleForm.pageNumber"
+                  :total="roleTotal"
+                  @pageChange="RolePageChange"
+                  @pageSizeChange="RolePageSizeChange"></pagination>
+        </div>
+        <loading :loading="roleLoading">数据处理中</loading>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -272,6 +348,17 @@ export default {
   name: 'role-manage',
   data() {
     return {
+      roleTotal: 0,
+      RoleModel: false,
+      roleData: [],
+      roleLoading: false,
+      roleForm: {
+        roleId: '',
+        userId: '',
+        userName: '',
+        pageNumber: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+      },
       twoLoading: false,
       type: '', // 新增/编辑状态
       addRoleTitle: '',
@@ -334,6 +421,48 @@ export default {
     }
   },
   methods: {
+    RolePageChange (page) {
+      this.roleForm.pageNumber = page
+      this.roleCheck()
+    },
+    RolePageSizeChange (pageSize) {
+      this.roleForm.pageSize = pageSize
+      this.roleCheck()
+    },
+    getRole () {
+      this.RoleModel = true
+      this.roleForm.pageNumber = 1
+      this.roleCheck()
+    },
+    clearRole () {
+      this. roleForm = {
+        userId: '',
+        userName: '',
+        pageNumber: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+      }
+      this.roleCheck()
+    },
+    RoleCancle () {
+      this. roleForm = {
+        userId: '',
+        userName: '',
+        pageNumber: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+      }
+    },
+    roleCheck () {
+      this.roleForm.roleId = this.id
+      this.$http.get('sarUser/user/selectUserByRole', this.roleForm, {
+        _this: this,
+        loading: "roleLoading",
+      }, res => {
+        if (res.ok) {
+          this.roleData = res.data.records
+          this.roleTotal = res.data.total
+        }
+      })
+    },
     handleCommand(command) {
       switch (command[1]) {
         case '编辑':
@@ -638,24 +767,19 @@ export default {
 .role-manage {
   display: flex;
   height: 100%;
-
+  .roleTable {
-  /deep/ .el-form-item__content {
+    height: calc(~'100% - 52px');
-    width: 100%;
   }
-
   .filter-tree1 {
     height: 100%;
   }
-
   .tree-close {
     .tree {
       left: -200px !important;
     }
-
     .tree-right {
       width: calc(~'100% - 15px') !important;
     }
-
       /deep/.el-form-item__content {
         margin-left: 40px !important;
       }
@@ -664,11 +788,9 @@ export default {
       color: #FFF;
     }
   }
-
   .tree-closed {
     width: 15px !important;
   }
-
   .tree-content {
     background: #fff;
     width: 16%;
@@ -685,7 +807,6 @@ export default {
       right: 0;
     }
   }
-
   .tree-right {
     overflow-y: hidden;
     padding: 0;
@@ -711,7 +832,6 @@ export default {
     }
   }
 }
-
 /deep/ .el-dialog {
   margin-top: 9vh !important;
   width: 35%;
@@ -723,23 +843,20 @@ export default {
   }
   /deep/.el-form-item__content {
     margin-left: 40px!important;
+    width: 100%;
   }
 }
-
 /deep/ .el-select__tags {
   overflow-x: hidden;
 }
-
 /deep/ .width-all {
   width: 100%;
 }
-
 .laws-tree {
   /deep/ .clearable {
     top: 20px;
   }
 }
-
 .add-form-item {
   display: flex;
 }