1.角色总览修改；2.组织总览修改；

src/views/permissionManagement/roleOverview.vue

@@ -4,6 +4,7 @@
             <p class="info">角色总览</p>
             <el-input class="searchBox" placeholder="请输入关键字" suffix-icon="el-icon-search" v-model="filterText"></el-input>
         </div>
+        <el-button class="delete" @click="batchDelete">批量删除</el-button>
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :header-cell-style="{ textAlign: 'center' }"
             :cell-style="{ textAlign: 'center' }" height="400" style="width: 98%" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50">
@@ -17,59 +18,34 @@
             <el-table-column prop="associated_ORN" label="关联组织">
             </el-table-column>
             <el-table-column prop="operation" label="操作">
-                <el-button size="mini" type="text">查看</el-button>
-                <el-button size="mini" type="text">编辑</el-button>
-                <el-button size="mini" type="text">删除</el-button>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="roleDetail(scope.row)">查看</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6"
+                        @click="roleEdit(scope.row)">编辑</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="deleteRole(scope.row)">删除</el-button>
+                </template>
             </el-table-column>
         </el-table>
         <div class="bottom">
-            <div class="bottom_button" v-show="show">
-                <el-button class="delete" type="text">批量删除</el-button>
-            </div>
             <page class="page" :paginationData="paginationData"></page>
         </div>
     </div>
 </template>
 
 <script>
-import page from '@/components/pagination/index'
+import page from '@/components/pagination/index';
+import { getRoleList } from '@/api/role/role';
 export default {
     components: { page },
     data() {
         return {
             filterText: '',
-            data: [{
-                label: '决策组',
-                children: [{
-                    label: '决策组',
-                }, {
-                    label: '管理员组'
-                }, {
-                    label: '普通用户组'
-                }]
-            }],
             defaultProps: {
                 children: 'children',
                 label: 'label'
             },
-            tableData: [{
-                rolename: '决策组',
-                role_desc: '描述',
-                role_members: '300人',
-                associated_ORN: '3家',
-            }, {
-                rolename: '决策组-1',
-                role_desc: '描述',
-                role_members: '300人',
-                associated_ORN: '3家',
-            }, {
-                rolename: '决策组-2',
-                role_desc: '描述',
-                role_members: '300人',
-                associated_ORN: '3家',
-            }],
+            tableData: [],
             multipleSelection: [],
-            show: true,
             currentPageSize: 10,
             currentPage: 1,
             paginationData: {
@@ -77,7 +53,7 @@ export default {
                 pagerCount: 5,
                 currentPage: 1,
                 pageSizes: [5, 10, 20, 30],
-                total: 30,
+                total: 0,
                 currentChange: (val) => {
                     this.getTableData(val);
                 },
@@ -89,17 +65,15 @@ export default {
     },
     watch: {
         filterText(val) {
-            this.$refs.tree.filter(val);
+            //
         }
     },
-
+    mounted() {
+        this.initData();
+    },
     methods: {
-        cancleChecked() {
-            //
-        },
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.label.indexOf(value) !== -1;
+        initData() {
+            this.getTableData(1);
         },
         handleClick() {
             //
@@ -107,18 +81,45 @@ export default {
         handleNodeClick() {
 
         },
-        handleSelectionChange() {
-
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
         },
-        getTableData() {
+        getTableData(page) {
             this.tableData = [];
-            //
+            getRoleList(
+                page,
+                this.currentPageSize
+            ).then((res) => {
+                if (res.data.code === 0 && res.data.data.length > 0 ) {
+                    this.paginationData.total = res.data.total;
+                    console.log(res);
+                    this.tableData = res.data.data.map((e) => {
+                        return {
+                            rolename:e.rolename,
+                            role_desc:e.description,
+                            role_members:e.members,
+                            associated_ORN:e.org,
+                        }
+                    })
+                }
+            })
         },
         handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
             this.currentPageSize = val;
             this.getTableData(this.currentPage);
         },
+        batchDelete() {
+
+        },
+        deleteRole(){
+
+        },
+        roleEdit(){
+
+        },
+        roleDetail(){
+
+        }
     }
 }
 </script>
@@ -135,17 +136,17 @@ export default {
 
     .header {
         padding-top: 20px;
+        display: flex;
+
         .info {
-            text-align: left;
-            padding: 20px;
+            padding: 20px 20px 20px 40px;
             font-size: 25px;
         }
 
         .searchBox {
-            position: absolute;
+            position: relative;
             top: 15px;
-            right: 141px;
-            bottom: 11px;
+            left: 1150px;
             width: 350px;
             height: 35px;
             line-height: 20px;
@@ -161,6 +162,19 @@ export default {
         }
     }
 
+    .delete {
+        padding: 3px;
+        width: 80px;
+        height: 30px;
+        float: left;
+        left: 90px;
+        position: relative;
+        color: #fff;
+        border-radius: 4px;
+        right: 10px;
+        background-color: #b3b3b3;
+    }
+
     .el-table {
         position: relative;
         top: 10px;

src/views/userManagement/groupManagement/index.vue

@@ -5,7 +5,8 @@
             <el-tree ref="tree" :data="data" :props="defaultProps" node-key="id" default-expand-all
                 :filter-node-method="filterNode" @node-click="handleNodeClick">
             </el-tree>
-            <el-button><i class="el-icon-s-order"></i>添加公司</el-button>
+            <el-button @click="addCompany" style="color: #fff; background: #3da0d6"><i
+                    class="el-icon-s-order"></i>添加公司</el-button>
         </div>
         <div class="right-pane">
             <overView></overView>
@@ -50,6 +51,9 @@ export default {
         },
         handleClick() {
 
+        },
+        addCompany() {
+
         }
     }
 }
@@ -69,16 +73,16 @@ export default {
     .left-pane {
         width: 300px;
         padding: 15px;
-
+        height: calc(98% - 30px);
         .el-tree {
-            height: 700px;
-            margin-top: 15px;
+            margin-top: 10px;
+            height: calc(98% - 30px);
             background-color: rgb(247, 245, 243);
         }
 
         .el-button {
             position: absolute;
-            left: 35px;
+            left: 25px;
             bottom: 40px;
             width: 250px;
             background-color: rgb(131, 208, 243);

src/views/userManagement/groupManagement/tables/corporationOverview.vue

@@ -1,9 +1,9 @@
 <template>
     <div>
         <p class="info">公司总览</p>
-        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" 
-            :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" style="width: 98%"
-            @selection-change="handleSelectionChange">
+        <el-button class="delete" @click="batchDelete">批量删除</el-button>
+        <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" :header-cell-style="{ textAlign: 'center' }"
+            :cell-style="{ textAlign: 'center' }" height="400" style="width: 98%" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50">
             </el-table-column>
             <el-table-column prop="corporation_name" label="公司名称">
@@ -17,15 +17,14 @@
             <el-table-column prop="contact_phone" label="联系电话">
             </el-table-column>
             <el-table-column prop="operation" label="操作">
-                <el-button size="mini" type="text">查看</el-button>
-                <el-button size="mini" type="text">编辑</el-button>
-                <el-button size="mini" type="text">删除</el-button>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="infoDetail(scope.row)">查看</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="infoEdit(scope.row)">编辑</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="deleteInfo(scope.row)">删除</el-button>
+                </template>
             </el-table-column>
         </el-table>
         <div class="bottom">
-            <div class="bottom_button">
-                <el-button class="delete" type="text">批量删除</el-button>
-            </div>
             <page class="page" :paginationData="paginationData"></page>
         </div>
     </div>
@@ -38,6 +37,7 @@ export default {
     components: { checkbox, page },
     data() {
         return {
+            filterText: '',
             tableData: [{
                 corporation_name: '中讯邮电咨询设计院有限公司',
                 Sccode: '4032',
@@ -58,7 +58,6 @@ export default {
                 contact_phone: '12345678901',
             }],
             multipleSelection: [],
-            show: true,
             currentPageSize: 10,
             currentPage: 1,
             paginationData: {
@@ -76,27 +75,65 @@ export default {
             },
         }
     },
+    watch: {
+        filterText(val) {
+            //
+        }
+    },
+    mounted(){
+        this.initData();
+    },
     methods: {
         handleClick() {
             //
         },
-        handleSelectionChange(){
-            //
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        initData(){
+            this.getTableData(1);
+        },
+        getTableData(page){
+            
+        },
+        infoDetail(){
+
+        },
+        infoEdit(){
+
+        },
+        deleteInfo(){
+
+        },
+        batchDelete(){
+
         }
     }
 }
 </script>
 <style lang="less" scoped>
 .info {
-    text-align: left;
-    padding: 25px;
+    padding: 20px 20px 20px 40px;
     font-size: 25px;
+    text-align: left;
+}
+
+.delete {
+    padding: 3px;
+    width: 80px;
+    height: 30px;
+    float: left;
+    left: 90px;
+    position: relative;
+    color: #fff;
+    border-radius: 4px;
+    right: 10px;
+    background-color: #b3b3b3;
 }
 
 .el-table {
-    position: absolute;
-    top: 60px;
-    left: 0;
+    position: relative;
+    top: 10px;
     margin-left: 1%;
     height: 400px;
     border: 1px solid #f0f2f2;
@@ -150,6 +187,7 @@ export default {
         }
     }
 }
+
 .bottom {
     position: absolute;
     bottom: 10px;

src/views/userManagement/personManagement/index.vue

@@ -45,7 +45,6 @@ export default {
         activeShow() {
             this.show = true;
             this.show1 = false;
-            this.$refs.buttonFocus.$el.focus();
         },
         deactiveShow() {
             this.show = false;

src/views/userManagement/personManagement/tables/activeUser.vue

@@ -64,7 +64,7 @@ export default {
                 pagerCount: 5,
                 currentPage: 1,
                 pageSizes: [5, 10, 20, 30],
-                total: 30,
+                total: 0,
                 currentChange: (val) => {
                     this.getTableData(val);
                 },

src/views/userManagement/personManagement/tables/deactiveUser.vue

@@ -32,9 +32,12 @@
                 </template>
             </el-table-column>
             <el-table-column prop="operation" label="操作">
-                <el-button size="mini" type="text">查看</el-button>
-                <el-button size="mini" type="text">编辑</el-button>
-                <el-button size="mini" type="text">删除</el-button>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="userDetail(scope.row)">查看</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6"
+                        @click="userInfoEdit(scope.row)">编辑</el-button>
+                    <el-button size="mini" type="text" style="color: #2ea8e6" @click="deleteUser(scope.row)">删除</el-button>
+                </template>
             </el-table-column>
         </el-table>
         <div class="bottom">
@@ -59,7 +62,7 @@ export default {
                 pagerCount: 5,
                 currentPage: 1,
                 pageSizes: [5, 10, 20, 30],
-                total: 30,
+                total: 0,
                 currentChange: (val) => {
                     this.getTableData(val);
                 },
@@ -85,7 +88,7 @@ export default {
         getTableData(page) {
             this.tableData = [];
             getUserList(
-                0,
+                1,
                 page,
                 this.currentPageSize
             ).then((res) => {