顶部tab标签取消

src/api/user.js → src/api/login.js

@@ -2,10 +2,10 @@ import request from '@/utils/request'
 
 export function login(data) {
   return request({
-    url: '',
+    url: '/login',
     method: 'post',
     data
-  })
+  })  
 }
 
 export function getInfo(token) {

src/main.js

@@ -18,27 +18,27 @@ import './utils/directive'
 Vue.use(ElementUI, { locale });
 Vue.prototype.axios = axios;
 
-router.afterEach((to, from, next) => {
-  let stateName = []; //保存 遍历已保存的name
-  let dict = {} ;
-  const name = to.name;
-  const path = to.path;
-
-  if(name){
-    dict.name = name;
-    dict.path = path;
-
-    let stateRouterMenuMessage = store.state.routerMenuMessage;
-    for(let item of stateRouterMenuMessage){
-      stateName.push(item.name);
-    }
-    let isExist = stateName.indexOf(name);
-    if(isExist){
-      stateRouterMenuMessage.push(dict);
-    }
-  }
-  next();
-})
+// router.afterEach((to, from, next) => {
+//   let stateName = []; //保存 遍历已保存的name
+//   let dict = {} ;
+//   const name = to.name;
+//   const path = to.path;
+
+//   if(name){
+//     dict.name = name;
+//     dict.path = path;
+
+//     let stateRouterMenuMessage = store.state.routerMenuMessage;
+//     for(let item of stateRouterMenuMessage){
+//       stateName.push(item.name);
+//     }
+//     let isExist = stateName.indexOf(name);
+//     if(isExist){
+//       stateRouterMenuMessage.push(dict);
+//     }
+//   }
+//   next();
+// })
 
 
 new Vue({

src/router/index.js

@@ -40,13 +40,7 @@ const routes = [
       {
         path: 'role',
         name: 'role',
-        component: () => import('../views/permissionManagement/index.vue')
-      },
-
-      {
-        path: 'permission',
-        name: 'permission',
-        component: () => import('../views/permissionManagement/index.vue')
+        component: () => import('../views/permissionManagement/roleOverview.vue')
       },
       {
         path: 'system',

src/store/getter.js → src/store/getters.js

@@ -2,6 +2,6 @@ const getters = {
     token: state => state.user.token,
     avatar: state => state.user.avatar,
     name: state => state.user.name,
-    roles: state => state.user.roles
-  }
-  export default getters
+    roles: state => state.user.roles,
+}
+export default getters

src/store/index.js

@@ -1,22 +1,17 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import getters from './getter'
-import user from './modules/user'
+import user from './user'
+import getters from './getters'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
-  modules: {
-    getters,
-    modules: {
-      user
-    }
-  },
+  getters, user,
   state: {
     routerMenuMessage: [
       {
-        name:'首页',
-        path:'/home'
+        name: '首页',
+        path: '/home'
       }
     ],
     menus: [
@@ -40,11 +35,6 @@ export default new Vuex.Store({
         name: '角色管理',
         path: '/home/role'
       },
-      {
-        url: require('@/assets/images/permissionManagement@3x.png'),
-        name: '权限管理',
-        path: '/home/permission'
-      },
       {
         url: require('@/assets/images/systemConfiguration@3x.png'),
         name: '系统配置',

src/store/modules/user.js → src/store/user.js

@@ -1,4 +1,4 @@
-import { login } from '@/api/user'
+import { login } from '@/api/login'
 import { setToken } from '@/utils/auth'
 
 const user = {
@@ -38,6 +38,6 @@ const user = {
                 })
             })
         },
-    }
+    },
 }
 export default user

src/utils/request.js

@@ -1,12 +1,11 @@
 import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
+// import store from '@/store'
+// import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
+  baseURL: 'http://121.43.55.7:5000',
   timeout: 5000 // request timeout
 })
 

src/views/dataManagement/basicInfo/index.vue

@@ -47,13 +47,14 @@ export default {
 .container {
     position: absolute;
     left: 218px;
+    top: 77px;
     right: 16px;
-    top: 140px;
-    height: 800px;
+    bottom: 20px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    font-size: 14px;
     text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
 }
 
 .header {

src/views/dataManagement/index.vue

@@ -1,12 +1,5 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="报表配置" name="statementConfig"></el-tab-pane>
-                <el-tab-pane label="报告配置" name="reportConfig"></el-tab-pane>
-                <el-tab-pane label="基础信息" name="basicInfo"></el-tab-pane>
-            </el-tabs>
-        </div>
        <router-view></router-view>
     </div>
 </template>
@@ -15,7 +8,6 @@
 export default {
     data() {
         return {
-            activeName: 'statementConfig',
         }
     },
     methods: {
@@ -24,23 +16,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
 </style>

src/views/dataManagement/reportConfig.vue

@@ -60,10 +60,12 @@
             </div>
             <div class="bottom_button" v-show="show">
                 <el-button class="delete" type="text">批量删除</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="disabled" type="text">批量激活</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="export" type="text">导出数据</el-button>
             </div>
-            <page class="page"></page>
+            <page></page>
         </div>
     </div>
 </template>
@@ -127,7 +129,7 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 150px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;
@@ -143,12 +145,14 @@ export default {
         background-color: rgb(221, 220, 219);
 
         .el-form-item {
-            margin-bottom:0 !important;
+            margin-bottom: 0 !important;
             margin-right: 60px !important;
+
             /deep/.el-form-item {
                 margin-right: 50px;
                 margin-bottom: 0;
             }
+
             /deep/.el-form-item__content {
                 margin-left: 120px;
             }
@@ -188,10 +192,10 @@ export default {
 
     .bottom {
         position: absolute;
-        top: 700px;
-        left: 50px;
+        left: 20px;
+        right: 16px;
+        bottom: 20px;
         height: 50px;
-        width: 95%;
         line-height: 20px;
         background-color: rgba(255, 255, 255, 1);
         text-align: center;

src/views/dataManagement/statementConfig.vue

@@ -55,10 +55,12 @@
             </div>
             <div class="bottom_button" v-show="show">
                 <el-button class="delete" type="text">批量删除</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="disabled" type="text">批量激活</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="export" type="text">导出数据</el-button>
             </div>
-            <page class="page"></page>
+            <page></page>
         </div>
     </div>
 </template>
@@ -122,7 +124,7 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 150px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;
@@ -184,54 +186,54 @@ export default {
     }
 
     .bottom {
+    position: absolute;
+    left: 20px;
+    right: 16px;
+    bottom: 20px;
+    height: 50px;
+    line-height: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    text-align: center;
+
+    .checkbox {
         position: absolute;
-        top: 700px;
-        left: 50px;
-        height: 50px;
-        width: 95%;
-        line-height: 20px;
-        background-color: rgba(255, 255, 255, 1);
+        left: 29px;
+        top: 15px;
+        font-size: 14px;
+    }
+
+    .check-cancel {
+        position: absolute;
+        // line-height: 20px;
+        font-size: 14px;
         text-align: center;
+        left: 140px;
+        top: 10px;
+    }
 
-        .checkbox {
-            position: absolute;
-            left: 29px;
-            top: 15px;
+    .bottom_button {
+        position: absolute;
+        left: 200px;
+        margin-top: 15px;
+
+        .delete {
             font-size: 14px;
+            text-align: center;
+            padding: 1px;
         }
 
-        .check-cancel {
-            position: absolute;
-            // line-height: 20px;
+        .disabled {
             font-size: 14px;
             text-align: center;
-            left: 140px;
-            top: 10px;
+            padding: 1px;
         }
 
-        .bottom_button {
-            position: absolute;
-            left: 200px;
-            margin-top: 15px;
-
-            .delete {
-                font-size: 14px;
-                text-align: center;
-                padding: 1px;
-            }
-
-            .disabled {
-                font-size: 14px;
-                text-align: center;
-                padding: 1px;
-            }
-
-            .export {
-                font-size: 14px;
-                text-align: center;
-                padding: 1px;
-            }
+        .export {
+            font-size: 14px;
+            text-align: center;
+            padding: 1px;
         }
     }
 }
+}
 </style>

src/views/deviceManagement/deviceConfig.vue

@@ -149,7 +149,7 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     height: -webkit-fill-available;
     margin-bottom: 20px;

src/views/deviceManagement/deviceWarning.vue

@@ -30,7 +30,8 @@
                     <el-button size="mini" type="text">删除</el-button>
                 </el-table-column>
             </el-table>
-            <div class="bottom">
+        </div>
+        <div class="bottom">
                 <div>
                     <checkbox class="checkbox"></checkbox>
                     <el-button class="check-cancel" size="mini" type="text" @click="cancleChecked">取消</el-button>
@@ -40,7 +41,6 @@
                 </div>
                 <page class="page"></page>
             </div>
-        </div>
     </div>
 </template>
 
@@ -112,9 +112,10 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
-    //height: 800px;
+    height: -webkit-fill-available;
+    margin-bottom: 20px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);
     color: rgba(16, 16, 16, 1);
@@ -157,54 +158,43 @@ export default {
 }
 
 .bottom {
-    position: absolute;
-    top: 700px;
-    height: 50px;
-    width: 1340px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-
-    .checkbox {
         position: absolute;
-        left: 29px;
-        top: 15px;
-        font-size: 14px;
-    }
-
-    .check-cancel {
-        position: absolute;
-        // line-height: 20px;
-        font-size: 14px;
+        left: 330px;
+        right: 16px;
+        bottom: 20px;
+        height: 50px;
+        line-height: 20px;
+        background-color: rgba(255, 255, 255, 1);
         text-align: center;
-        left: 140px;
-        top: 10px;
-    }
 
-    .bottom_button {
-        position: absolute;
-        left: 200px;
-        margin-top: 15px;
-
-        .delete {
+        .checkbox {
+            position: absolute;
+            left: 29px;
+            top: 15px;
             font-size: 14px;
-            text-align: center;
-            padding: 1px;
         }
 
-        .disabled {
+        .check-cancel {
+            position: absolute;
+            // line-height: 20px;
             font-size: 14px;
             text-align: center;
-            padding: 1px;
+            left: 140px;
+            top: 10px;
         }
 
-        .export {
-            font-size: 14px;
-            text-align: center;
-            padding: 1px;
+        .bottom_button {
+            position: absolute;
+            left: 200px;
+            margin-top: 15px;
+
+            .delete {
+                font-size: 14px;
+                text-align: center;
+                padding: 1px;
+            }
         }
     }
-}
 
 .search {
     position: absolute;

src/views/deviceManagement/index.vue

@@ -1,11 +1,5 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="设备配置" name="deviceConfig"></el-tab-pane>
-                <el-tab-pane label="设备告警" name="deviceWarning"></el-tab-pane>
-            </el-tabs>
-        </div>
         <router-view></router-view>
     </div>
 </template>
@@ -14,34 +8,11 @@
 export default {
     data() {
         return {
-            activeName: 'deviceConfig',
         }
     },
     methods: {
-        handleClick() {
-            //
-        },
     }
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
 </style>

src/views/login/index.vue

@@ -55,7 +55,8 @@
 
 <script>
 import { validUsername } from '@/utils/validate';
-import identify from '@/components/Identify/index'
+import identify from '@/components/Identify/index';
+import { login } from '@/api/login';
 export default {
     components: { identify },
     data() {
@@ -130,9 +131,16 @@ export default {
         //         this.$refs.loginForm.validate(valid => {
         //             if (valid) {
         //                 this.loading = true;
-        //                 this.$store.dispatch('user/login', this.loginForm).then(() => {
-        //                     this.$router.push({ path: '/home' });
-        //                     this.loading = false;
+        //                 this.$store.dispatch('user/login', this.loginForm).then((res) => {
+        //                     if (res.data.code == 200) {
+        //                         let Authorization = res.data.token;
+        //                         localStorage.setItem('Authorization', Authorization);
+        //                         this.$message.success('登录成功');
+        //                         this.$router.push({ path: '/home' });
+        //                         this.loading = false;
+        //                     } else {
+        //                         this.$message.error(res.data.message);
+        //                     }
         //                 }).catch(() => {
         //                     this.loading = false;
         //                 })

src/views/permissionManagement/index.vue

@@ -1,49 +0,0 @@
-<template>
-    <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="角色管理" name="role"></el-tab-pane>
-            </el-tabs>
-        </div>
-        <test></test>
-    </div>
-</template>
-
-<script >
-import test from './roleOverview'
-export default {
-    components:{test},
-    data() {
-        return {
-            activeName: 'role',
-        }
-    },
-    methods: {
-        handleClick() {
-            //
-        },
-    }
-};
-</script>
-<style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
-
-</style>

src/views/permissionManagement/roleOverview.vue

@@ -28,16 +28,16 @@
                     <el-button size="mini" type="text">删除</el-button>
                 </el-table-column>
             </el-table>
-            <div class="bottom">
-                <div>
-                    <checkbox class="checkbox"></checkbox>
-                    <el-button class="check-cancel" size="mini" type="text" @click="cancleChecked">取消</el-button>
-                </div>
-                <div class="bottom_button" v-show="show">
-                    <el-button class="delete" type="text">批量删除</el-button>
-                </div>
-                <page class="page"></page>
+        </div>
+        <div class="bottom">
+            <div>
+                <checkbox class="checkbox"></checkbox>
+                <el-button class="check-cancel" size="mini" type="text" @click="cancleChecked">取消</el-button>
+            </div>
+            <div class="bottom_button" v-show="show">
+                <el-button class="delete" type="text">批量删除</el-button>
             </div>
+            <page class="page"></page>
         </div>
     </div>
 </template>
@@ -101,22 +101,23 @@ export default {
         handleClick() {
             //
         },
-         handleNodeClick() {
+        handleNodeClick() {
 
         },
-        handleSelectionChange(){
-            
+        handleSelectionChange() {
+
         }
     }
 }
 </script>
 <style lang="less" scoped>
 .container {
-    position: absolute;
+    position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
-    //height: 800px;
+    height: -webkit-fill-available;
+    margin-bottom: 20px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);
     color: rgba(16, 16, 16, 1);
@@ -162,17 +163,17 @@ export default {
 
 .bottom {
     position: absolute;
-    top: 700px;
-    //left: 330px;
+    left: 330px;
+    right: 16px;
+    bottom: 20px;
     height: 50px;
-    width: 1340px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);
     text-align: center;
 
     .checkbox {
         position: absolute;
-        left: 29px;
+        left: 30px;
         top: 15px;
         font-size: 14px;
     }
@@ -196,18 +197,6 @@ export default {
             text-align: center;
             padding: 1px;
         }
-
-        .disabled {
-            font-size: 14px;
-            text-align: center;
-            padding: 1px;
-        }
-
-        .export {
-            font-size: 14px;
-            text-align: center;
-            padding: 1px;
-        }
     }
 }
 </style>

src/views/securityManagement/index.vue

@@ -1,13 +1,5 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName">
-                <el-tab-pane label="日志监控" name="logMonitor">
-                </el-tab-pane>
-                <el-tab-pane label="系统监控" name="systemMonitor">
-                </el-tab-pane>
-            </el-tabs>
-        </div>
         <router-view></router-view>
     </div>
 </template>
@@ -16,7 +8,7 @@
 export default {
     data() {
         return {
-            activeName: 'logMonitor',
+
         }
     },
     methods: {
@@ -24,24 +16,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
-
 </style>

src/views/securityManagement/logMonitor.vue

@@ -56,7 +56,7 @@
                 <el-table-column prop="operationStatus" label="操作状态">
                     <template slot-scope="scope">
                         <el-tag style="width: 60px; height: 30px;"
-                            :type="scope.row.operationStatus == 'true' ? 'success' : 'danger' ">
+                            :type="scope.row.operationStatus == 'true' ? 'success' : 'danger'">
                             {{ scope.row.operationStatus == 'true' ? '成功' : '失败' }}
                         </el-tag>
                     </template>
@@ -72,10 +72,12 @@
             </div>
             <div class="bottom_button" v-show="show">
                 <el-button class="delete" type="text">批量删除</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="disabled" type="text">批量激活</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="export" type="text">导出数据</el-button>
             </div>
-            <page class="page"></page>
+            <page></page>
         </div>
     </div>
 </template>
@@ -152,7 +154,7 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 150px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;
@@ -199,10 +201,10 @@ export default {
 
     .bottom {
         position: absolute;
-        top: 700px;
-        left: 50px;
+        left: 20px;
+        right: 16px;
+        bottom: 20px;
         height: 50px;
-        width: 95%;
         line-height: 20px;
         background-color: rgba(255, 255, 255, 1);
         text-align: center;

src/views/securityManagement/messageDialog/alterTask.vue

@@ -103,6 +103,7 @@ export default {
             radio: 2,
             num1: 1,
             num2: 1,
+            value:'test',
             form: {
                 name: '',
                 groupName: '',

src/views/securityManagement/systemMonitor/encryptionMethod.vue

@@ -21,6 +21,7 @@ export default {
         return {
             form: {
             },
+            value:'test'
         }
     },
 }

src/views/securityManagement/systemMonitor/index.vue

@@ -36,7 +36,7 @@ export default {
 .container{
     position: absolute;
     left: 218px;
-    top: 150px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;

src/views/servicesManagement/allServices.vue

@@ -49,10 +49,12 @@
             </div>
             <div class="bottom_button" v-show="show">
                 <el-button class="delete" type="text">批量删除</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="disabled" type="text">批量激活</el-button>
+                <el-divider direction="vertical"></el-divider>
                 <el-button class="export" type="text">导出数据</el-button>
             </div>
-            <page class="page"></page>
+            <page></page>
         </div>
     </div>
 </template>
@@ -66,6 +68,7 @@ export default {
         return {
             input: '',
             show: true,
+            total:0,
             form:{},
             tableData: [
                 {
@@ -93,12 +96,18 @@ export default {
         }
     },
     methods: {
+        handleSelectionChange(){
+            //
+        },
+        cancleChecked(){
+            //
+        }
     }
 };
 </script>
 <style lang="less" scoped>
 .content {
-    top: 150px;
+    top: 77px;
     position: absolute;
     left: 218px;
     right: 16px;
@@ -125,11 +134,11 @@ export default {
 }
 
 .bottom {
-    position: relative;
-    top: 50%;
-    left: 2.5%;
+    position: absolute;
+    left: 20px;
+    right: 16px;
+    bottom: 20px;
     height: 50px;
-    width: 95%;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);
     text-align: center;
@@ -174,7 +183,6 @@ export default {
         }
     }
 }
-
 .search {
     position: absolute;
     width: 300px;

src/views/servicesManagement/index.vue

@@ -1,12 +1,5 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="全部服务" name="allServices"></el-tab-pane>
-                <el-tab-pane label="已安装服务" name="install"></el-tab-pane>
-                <el-tab-pane label="未安装服务" name="uninstall"></el-tab-pane>
-            </el-tabs>
-        </div>
         <router-view></router-view>
     </div>
 </template>
@@ -15,35 +8,11 @@
 export default {
     data() {
         return {
-            activeName: 'allServices',
         }
     },
     methods: {
-        handleClick() {
-            //
-        }
     }
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
-
 </style>

src/views/systemManagement/index.vue

@@ -1,13 +1,5 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="策略配置" name="strategy"></el-tab-pane>
-                <el-tab-pane label="消息配置" name="message"></el-tab-pane>
-                <el-tab-pane label="信息配置" name="information"></el-tab-pane>
-                <el-tab-pane label="指标配置" name="index"></el-tab-pane>
-            </el-tabs>
-        </div>
         <router-view></router-view>
     </div>
 </template>
@@ -16,34 +8,11 @@
 export default {
     data() {
         return {
-            activeName: 'strategy',
         }
     },
     methods: {
-        handleClick() {
-            //
-        },
     }
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
 </style>

src/views/systemManagement/indexConfiguration/index.vue

@@ -25,7 +25,7 @@ export default {
     position: absolute;
     left: 218px;
     right: 16px;
-    top: 140px;
+    top: 77px;
     height: 800px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);

src/views/systemManagement/indexConfiguration/smartBoard.vue

@@ -11,7 +11,7 @@
                 <p class="info">指标列表</p>
                 <el-button class="new_button">新建</el-button>
             </div>
-            <el-table ref="multipleTable" border :data="tableData" tooltip-effect="dark" 
+            <el-table ref="multipleTable" border :data="tableData" tooltip-effect="dark"
                 :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" style="width: 100%"
                 @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="50">
@@ -31,16 +31,16 @@
                     <el-button size="mini" type="text">删除</el-button>
                 </el-table-column>
             </el-table>
-            <div class="bottom">
-                <div>
-                    <checkbox class="checkbox" :total="total"></checkbox>
-                    <el-button class="check-cancel" size="mini" type="text" @click="cancleChecked">取消</el-button>
-                </div>
-                <div class="bottom_button" v-show="show">
-                    <el-button class="delete" type="text">批量删除</el-button>
-                </div>
-                <page class="page"></page>
+        </div>
+        <div class="bottom">
+            <div>
+                <checkbox class="checkbox" :total="total"></checkbox>
+                <el-button class="check-cancel" size="mini" type="text" @click="cancleChecked">取消</el-button>
             </div>
+            <div class="bottom_button" v-show="show">
+                <el-button class="delete" type="text">批量删除</el-button>
+            </div>
+            <page class="page"></page>
         </div>
     </div>
 </div></template>
@@ -54,50 +54,50 @@ export default {
         return {
             total: 0,
             filterText: '',
-            data:[
-            {
-                label: '人员画像',
-                children: [{
-                    label: '人员态势',
-                }, {
-                    label: '餐厅消费态势'
-                }, {
-                    label: '商超消费态势'
-                }]
-            },
-            {
-                label: '能源画像',
-                children: [{
-                    label: '用电态势',
-                }, {
-                    label: '用水态势'
-                }, {
-                    label: '用热态势'
-                }]
-            }
+            data: [
+                {
+                    label: '人员画像',
+                    children: [{
+                        label: '人员态势',
+                    }, {
+                        label: '餐厅消费态势'
+                    }, {
+                        label: '商超消费态势'
+                    }]
+                },
+                {
+                    label: '能源画像',
+                    children: [{
+                        label: '用电态势',
+                    }, {
+                        label: '用水态势'
+                    }, {
+                        label: '用热态势'
+                    }]
+                }
             ],
             tableData: [
-            {
-                indexName: '进入大楼人数',
-                indexUnit: '人数/时间',
-                defaultValue: '1000',
-                calculateRules: '测试中。。。',
-                operation: '',
-            },
-            {
-                indexName: '进入大楼人数',
-                indexUnit: '人数/时间',
-                defaultValue: '实时',
-                calculateRules: '测试中。。。',
-                operation: '',
-            },
-            {
-                indexName: '进入大楼人数',
-                indexUnit: '人数/时间',
-                defaultValue: '1000',
-                calculateRules: '测试中。。。',
-                operation: '',
-            }
+                {
+                    indexName: '进入大楼人数',
+                    indexUnit: '人数/时间',
+                    defaultValue: '1000',
+                    calculateRules: '测试中。。。',
+                    operation: '',
+                },
+                {
+                    indexName: '进入大楼人数',
+                    indexUnit: '人数/时间',
+                    defaultValue: '实时',
+                    calculateRules: '测试中。。。',
+                    operation: '',
+                },
+                {
+                    indexName: '进入大楼人数',
+                    indexUnit: '人数/时间',
+                    defaultValue: '1000',
+                    calculateRules: '测试中。。。',
+                    operation: '',
+                }
             ],
             defaultProps: {
                 children: 'children',
@@ -123,7 +123,7 @@ export default {
 .sub-container {
     position: fixed;
     left: 218px;
-    top: 220px;
+    top: 150px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;
@@ -167,72 +167,37 @@ export default {
         .el-table {
             margin-top: 10px;
         }
-        .el-select{
+
+        .el-select {
             width: 80px;
             margin-right: 20px;
         }
+    }
 
-        .bottom {
+    .bottom {
+        position: absolute;
+        left: 330px;
+        right: 16px;
+        bottom: 20px;
+        height: 50px;
+        line-height: 20px;
+        background-color: rgba(255, 255, 255, 1);
+        text-align: center;
+
+        .checkbox {
             position: absolute;
-            top:650px;
-            height: 50px;
-            width: 1340px;
-            line-height: 20px;
-            background-color: rgba(255, 255, 255, 1);
-            text-align: center;
-
-            .checkbox {
-                position: absolute;
-                left: 29px;
-                top: 15px;
-                font-size: 14px;
-            }
-
-            .check-cancel {
-                position: absolute;
-                // line-height: 20px;
-                font-size: 14px;
-                text-align: center;
-                left: 140px;
-                top: 10px;
-            }
-
-            .bottom_button {
-                position: absolute;
-                left: 200px;
-                top: 7px;
-
-                .delete {
-                    width: 95px;
-                    height: 30px;
-                    font-size: 14px;
-                    text-align: center;
-                    padding: 1px;
-                }
-
-                .disabled {
-                    width: 95px;
-                    height: 30px;
-                    font-size: 14px;
-                    text-align: center;
-                    padding: 1px;
-                }
-
-                .el-dropdown {
-                    margin-left: 15px;
-
-                    /deep/.el-button--primary {
-                        height: 30px;
-                        //background-color: rgba(255, 255, 255, 1);
-                    }
-                }
-            }
+            left: 30px;
+            top: 15px;
+            font-size: 14px;
+        }
 
-            .page {
-                position: absolute;
-                top: -10px;
-                right: 30px;
-            }
+        .check-cancel {
+            position: absolute;
+            // line-height: 20px;
+            font-size: 14px;
+            text-align: center;
+            left: 140px;
+            top: 10px;
         }
     }
 }

src/views/systemManagement/infoConfiguration/index.vue

@@ -62,7 +62,7 @@ export default {
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     bottom:20px;
     line-height: 20px;

src/views/systemManagement/infoConfiguration/infoConfigure.vue

@@ -73,7 +73,7 @@ export default {
 .container {
     position: absolute;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     //height: 800px;
     line-height: 20px;

src/views/systemManagement/messageConfiguration/commonMessage.vue

@@ -141,7 +141,7 @@ export default {
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;

src/views/systemManagement/messageConfiguration/messageCreate.vue

@@ -137,7 +137,7 @@ export default {
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;

src/views/systemManagement/messageConfiguration/messageRemind.vue

@@ -104,7 +104,7 @@ export default {
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;

src/views/systemManagement/strategyConfiguration/index.vue

@@ -23,7 +23,7 @@ export default {
     position: absolute;
     left: 218px;
     right: 16px;
-    top: 140px;
+    top: 77px;
     height: 800px;
     line-height: 20px;
     background-color: rgba(255, 255, 255, 1);

src/views/systemManagement/strategyConfiguration/smartMeeting.vue

@@ -107,7 +107,7 @@ export default {
 .sub-container {
     position: fixed;
     left: 218px;
-    top: 220px;
+    top: 150px;
     right: 16px;
     bottom: 20px;
     line-height: 20px;

src/views/userManagement/groupManagement/index.vue

@@ -58,30 +58,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
-
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     height: -webkit-fill-available;
     margin-bottom: 20px;

src/views/userManagement/index.vue

@@ -1,26 +1,13 @@
 <template>
     <div>
-        <div class="el-tab">
-            <el-tabs v-model="activeName">
-                <el-tab-pane label="人员管理" name="person">
-                    <personManagement></personManagement>
-                </el-tab-pane>
-                <el-tab-pane label="组织管理" name="group">
-                </el-tab-pane>
-            </el-tabs>
-        </div>
         <router-view></router-view>
     </div>
 </template>
 
 <script >
-import personManagement from './personManagement/index'
 export default {
-    name: 'userManagement',
-    components: { personManagement },
     data() {
         return {
-            activeName: 'person',
         }
     },
     methods: {
@@ -29,23 +16,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.el-tab {
-    position: absolute;
-    left: 218px;
-    right: 16px;
-    top: 77px;
-    height: 51px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.15);
-
-    /deep/.el-tabs__nav {
-        left: 25px;
-    }
-
-    /deep/.el-tabs__nav-wrap::after {
-        height: 0;
-    }
-}
 </style>

src/views/userManagement/personManagement/index.vue

@@ -1,15 +1,13 @@
 <template>
     <div class="container">
         <div class="header">
-            <el-button class="onlineUser" @click="activeShow()">
+            <el-button ref="buttonFocus" class="onlineUser" @click="activeShow()">
                 <i class="el-icon-user-solid"></i>在用账户
             </el-button>
             <el-button class="disableUser" @click="deactiveShow()">
                 <i class="el-icon-user"></i>停用账户
             </el-button>
-            <div class="searchBox">
-                <el-input v-model="input" placeholder="用户名；手机；单位" suffix-icon="el-icon-search"></el-input>
-            </div>
+                <el-input class="searchBox" v-model="input" placeholder="用户名；手机；单位" suffix-icon="el-icon-search"></el-input>
             <el-button class="addUser">
                 <i class="el-icon-user"></i>添加用户
             </el-button>
@@ -45,6 +43,7 @@ export default {
         activeShow() {
             this.show = true;
             this.show1 = false;
+            this.$refs.buttonFocus.$el.focus();
         },
         deactiveShow() {
             this.show = false;
@@ -58,7 +57,7 @@ export default {
 .container {
     position: fixed;
     left: 218px;
-    top: 140px;
+    top: 77px;
     right: 16px;
     height: -webkit-fill-available;
     margin-bottom: 20px;
@@ -80,15 +79,19 @@ export default {
             top: 15px;
             left: 20px;
             bottom: 4px;
-            width: 116px;
-            height: 40px;
+            width: 100px;
+            height: 35px;
             line-height: 20px;
-            border-radius: 3px 3px 0px 0px;
-            //background-color: rgba(255, 255, 255, 1);
-            color: rgba(0, 0, 0, 0.973);
+            border-radius: 20px;
+            background-color: #FFFFFF;
+            color: #C8C8C8;
             font-size: 14px;
             text-align: center;
-            //border: 1px solid rgba(187, 187, 187, 1);
+            padding: 5px;
+        }
+        .onlineUser:focus{
+            background-color: #2EA8E6;
+            color:#FFFFFF;
         }
 
         .disableUser {
@@ -96,44 +99,52 @@ export default {
             top: 15px;
             left: 135px;
             bottom: 4px;
-            width: 116px;
-            height: 40px;
+            width: 100px;
+            height: 35px;
             line-height: 20px;
-            border-radius: 3px 3px 0px 0px;
-            //background-color: rgba(255, 255, 255, 1);
-            color: rgba(0, 0, 0, 0.973);
+            border-radius: 20px;
+            background-color: #FFFFFF;
+            color: #C8C8C8;
             font-size: 14px;
             text-align: center;
-            //border: 1px solid rgba(187, 187, 187, 1);
+            padding: 5px;
+        }
+        .disableUser:focus{
+            background-color: #2EA8E6;
+            color:#FFFFFF;
         }
 
         .searchBox {
             position: absolute;
-            top: 16px;
+            top: 15px;
             right: 141px;
             bottom: 11px;
-            width: 224px;
-            height: 30px;
+            width: 350px;
+            height: 35px;
             line-height: 20px;
             border-radius: 3px;
-            background-color: rgba(255, 255, 255, 1);
-            color: rgba(16, 16, 16, 1);
+            background-color: #F7F9FA;
+            color: #D7D8D8;
             font-size: 14px;
             text-align: center;
-            border: 1px solid rgba(217, 217, 217, 1);
+            
+            /deep/.el-input__inner{
+                height: 35px;
+            } 
         }
 
         .addUser {
             position: absolute;
             right: 16px;
-            top: 17px;
-            width: 113px;
-            height: 40px;
-            border-radius: 4px;
-            background-color: rgba(64, 149, 229, 1);
-            color: rgba(255, 255, 255, 1);
+            top: 15px;
+            width: 100px;
+            height: 35px;
+            background-color: #2EA8E6;
+            color: #FFFFFF;
             font-size: 14px;
             text-align: center;
+            padding: 5px;
+            border-radius: 5px;
         }
     }