From 559a5d93825622dd2ce360fe7175cf077a46d08e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 10 Aug 2021 18:03:24 +0800
Subject: [PATCH] fix

---
 src/assets/img/school.png          | Bin 0 -> 6896 bytes
 src/layouts/footer/index.vue       |  12 +++-
 src/layouts/header/index.vue       |  83 +++++++++++++++++++---
 src/layouts/home/index.vue         |  25 +++----
 src/layouts/navbar/index.vue       |  17 +++--
 src/pages/account/login/index.vue  |  38 +++++-----
 src/pages/data/list/index.vue      | 108 +++++++++++------------------
 src/pages/index/list/index.vue     |  17 +++--
 src/pages/setting/person/index.vue |  41 ++++++-----
 src/pages/setting/person/info.vue  |   4 +-
 src/pages/stat/list/index.vue      |  51 +++++++++++---
 src/pages/user/list/index.vue      |  44 +++++++-----
 src/setting.js                     |   2 +-
 src/styles/layout/index.scss       |   2 +-
 src/styles/var.scss                |   3 +-
 vue.config.js                      |   2 +-
 16 files changed, 268 insertions(+), 181 deletions(-)
 create mode 100644 src/assets/img/school.png

diff --git a/src/assets/img/school.png b/src/assets/img/school.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdd4ae90bd333b77c11c75fdf3a01fd275cb7cbd
GIT binary patch
literal 6896
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

literal 0
HcmV?d00001

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 316b4f8..f7203a3 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -1,6 +1,8 @@
 <template>
     <div>
-        <div class="copyright"></div>
+        <div class="copyright">
+            <a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a>
+        </div>
     </div>
 </template>
 <script>
@@ -24,5 +26,13 @@ export default {
         color: rgba(0, 0, 0, 0.45);
         font-size: 12px;
         text-align: center;
+        background-color: #333;
+        a{
+            color:#fff;
+            font-size: 12px;
+            &:hover{
+                opacity: .8;
+            }
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index afaf313..5f0915e 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,9 +1,13 @@
 <template>
     <div class="header">
         <a class="logo" @click="toIndex">
-            <img width="180" v-if="isLogin || (isManager && showSetting) || !isUser" src="@/assets/img/logo.png" alt="">
+            <!-- <img width="180" v-if="isLogin || (isManager && showSetting) || !isUser" src="@/assets/img/logo.png" alt=""> -->
             <span v-if="token && isManager && !showSetting">{{schoolName}}</span>
         </a>
+        <div class="search" v-if="isData">
+            <input v-model="keyword" type="text" placeholder="请输入数据表名称">
+            <img src="../../assets/img/search.png" alt="" class="search-icon">
+        </div>
         <div class="inner">
             <div style="height: 80px;"></div>
             <navbar ref="nav"></navbar>
@@ -25,17 +29,14 @@
                 </el-dropdown>
             </div>
             <div v-else-if="!isLogin">
-                <div class="login" @click="toLogin">
+                <router-link class="login" to="/login" target="_blank">
                     <img src="@/assets/img/user.png" alt="">
                     <span>登录</span>
-                </div>
-            </div>
-            <div v-else>
-                <img class="search" src="../../assets/img/search.png" alt="" @click="toSearch">
+                </router-link>
             </div>
         </div>
 
-        <el-dialog title="修改密码" :visible.sync="passwordVisible" :close-on-click-modal="false" @close="closePassword" width="30%">
+        <el-dialog title="修改密码" :visible.sync="passwordVisible" :close-on-click-modal="false" :append-to-body="true" @close="closePassword" width="30%">
             <el-form ref="passwordForm" label-width="82px">
                 <el-form-item label="原密码">
                     <el-input type="password" v-model="passwordForm.password" placeholder="请输入原密码"></el-input>
@@ -59,12 +60,17 @@ import navbar from '../navbar'
 import { mapState,mapActions } from 'vuex'
 import Setting from '@/setting'
 import util from '@/libs/util'
+import bus from '@/libs/bus'
 export default {
     data() {
         return {
             token: util.local.get(Setting.tokenKey),
             isLogin: this.$route.path == '/login',
+            isData: this.$route.path == '/data/list',
             customer: this.$route.query.customer,
+            rendered: false,
+            keyword: '',
+            searchTimer: null,
             userName: '',
             isUser: false,
             showSetting: true,
@@ -87,6 +93,25 @@ export default {
             'routes'
         ])
     },
+    watch: {
+        keyword: function(val) {
+            clearTimeout(this.searchTimer)
+            if(!this.rendered){
+                this.searchTimer = setTimeout(() => {
+                    bus.$emit('initData',this.keyword)
+                },500)
+            }
+            this.rendered = false
+        },
+        '$route'(to,from) {
+            let isData = this.$route.path == '/data/list'
+            if(isData){
+                this.rendered = true
+                this.keyword = ''
+            }
+            this.isData = isData
+        }
+    },
     mounted(){
         if(this.customer){
             let customer = atob(decodeURI(this.customer)) == 'false' ? false : true
@@ -193,14 +218,20 @@ export default {
 </script>
 <style lang="scss" scoped>
     .header{
-        position: relative;
+        z-index: 10;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
         height: 80px;
         background-color: #fff;
         .inner{
             display: flex;
             justify-content: space-between;
             align-items: center;
-            width: $inner-width;
+            max-width: $max-width;
+            min-width: $min-width;
+            padding: 0 10px;
             margin: 0 auto;
         }
         .logo{
@@ -214,7 +245,39 @@ export default {
         }
         
         .search{
-            cursor: pointer;
+            z-index: 2;
+            position: absolute;
+            top: 0;
+            left: 70%;
+            transform: translate(-50%);
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            width: 300px;
+            height: 80px;
+            padding: 7px 20px;
+            margin: 0 auto;
+            background-color: #fff;
+            input{
+                width: 195px;
+                margin-left: 10px;
+                font-size: 14px;
+                color: #333;
+                background-color: transparent;
+                border: 0;
+                &::-webkit-input-placeholder{color: #999}
+                &::-moz-placeholder{color: #999}
+                &:-moz-placeholder{color: #999}
+                &:focus{
+                    outline: none;
+                }
+            }
+            .remove{
+                cursor: pointer;
+            }
+            .search-icon{
+                width: 18px;
+            }
         }
         .action{
             display: inline-flex;
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index 027bf7e..59c5640 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -9,7 +9,7 @@
                     </keep-alive>
                 </transition>
                 <el-backtop target=".content"></el-backtop>
-                <!-- <v-footer ref="footer"></v-footer> -->
+                <v-footer class="footer"></v-footer>
             </div>
         </div>
     </div>
@@ -24,7 +24,6 @@ export default {
     data() {
         return {
             tagsList: [],
-            collapse: false,
             hideNavList: Setting.layout.hideNavList
         };
     },
@@ -40,18 +39,7 @@ export default {
         }
     },
     created() {
-        bus.$on('collapse-content', msg => {
-            this.collapse = msg;
-        });
-
-        // 只有在标签页列表里的页面才使用keep-alive，即关闭标签之后就不保存到内存中了。
-        bus.$on('tags', msg => {
-            let arr = [];
-            for (let i = 0, len = msg.length; i < len; i++) {
-                msg[i].name && arr.push(msg[i].name)
-            }
-            this.tagsList = arr
-        });
+        
     }
 };
 </script>
@@ -59,9 +47,14 @@ export default {
     .main{
         min-height: 100%;
         background:  url(../../assets/img/login-bg.png) 0 0/100% 100% no-repeat;
+        .layout{
+            margin-top: 80px;
+        }
         .view{
-            width: $inner-width;
-            padding: 20px 0;
+            max-width: $max-width;
+            min-width: $min-width;
+            min-height: calc(100vh - 56px);
+            padding: 20px;
             margin: 0 auto;
         }
     }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index cac645c..43a497d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -17,14 +17,16 @@ export default {
             managerStr: this.$route.query.mg,
             isManager: false,
             active: this.$route.path,
-            defaultMenus: [{
+            defaultMenus: [],
+            // 前台菜单
+            dataMenu: [{
                 index: '/index/list',
                 title: '首页'
-            }],
-            dataMenu: [{
+            },{
                 index: '/data/list',
                 title: '数据'
             }],
+            // 后台菜单（下面要根据获取到的该角色拥有的权限来显示哪些菜单）
             managerMenus: [
                 {
                     index: '/stat/list',
@@ -56,7 +58,7 @@ export default {
         }
     },
     mounted() {
-        if(util.local.get(Setting.tokenKey)){
+        if(util.local.get(Setting.tokenKey)){// 如果是登录状态
             this.getPer()
             if(this.managerStr && atob(decodeURI(this.managerStr)) === 'true'){
                 this.isManager = true
@@ -71,7 +73,7 @@ export default {
             'setManager'
         ]),
         initMenu(){
-            if(this.isManager){
+            if(this.isManager){// 该值为true，则表示当前是在后台（是否是后台是通过url上面的managerStr来判断的）
                 this.defaultMenus = this.managerMenus
                 if(Setting.dynamicRoute){
                     let routes = this.routes
@@ -91,6 +93,7 @@ export default {
             this.active = item.index
             this.$router.push(item.index).catch(err => {})
         },
+        // 获取权限列表
         getPer(){
             this.$post(this.api.getPermissions).then(res => {
                 let routes = res.permissions[0].children
@@ -111,10 +114,10 @@ export default {
         left: 50%;
         transform: translateX(-50%);
         display: flex;
-        padding-bottom: 10px;
         li{
-            padding: 25px;
+            padding: 0 25px;
             font-size: 16px;
+            line-height: 80px;
             color: #0d0d0d;
             cursor: pointer;
             &.active{
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 39f77ab..241a2a4 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -1,11 +1,6 @@
 <template>
     <div class="wrap">
-        <vHead></vHead>
         <div class="login">
-            <div class="names">
-                <img class="logo" src="../../../assets/img/three.png" alt="">
-                <p class="text">或然数据平台</p>
-            </div>
             <div class="form">
                 <ul class="tab">
                     <li v-for="(item,index) in tabList" :key="index" :class="{active: form.distinguish == item.id}" @click="typeClick(item)">{{item.label}}</li>
@@ -32,7 +27,7 @@
         <el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" @close="closePhone" width="30%">
             <el-form ref="form" label-width="60px">
                 <el-form-item label="手机号">
-                    <el-input placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
+                    <el-input style="width: 394px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
                 </el-form-item>
                 <el-form-item label="验证码">
                     <div class="flex">
@@ -46,6 +41,8 @@
                 <el-button size="small" type="primary" @click="phoneSubmit">确 定</el-button>
             </span>
         </el-dialog>
+
+        <v-footer class="footer"></v-footer>
     </div>
 </template>
 
@@ -54,6 +51,7 @@ import { mapActions } from 'vuex'
 import vHead from '@/layouts/header'
 import util from '@/libs/util'
 import Setting from '@/setting'
+import vFooter from '@/layouts/footer'
 export default {
     data: function() {
         return {
@@ -87,7 +85,7 @@ export default {
             phoneBtnText: '发送验证码'
         };
     },
-    components: {vHead},
+    components: {vHead,vFooter},
     mounted(){
         this.getVerImg()
     },
@@ -203,28 +201,19 @@ export default {
         overflow: hidden;
         
         .login{
-            width: 500px;
-            margin: 0 auto;
+            width: 600px;
+            margin: 200px auto;
             text-align: center;
-            .names{
-                margin: 70px 0;
-                .text{
-                    margin-top: 10px;
-                    font-size: 20px;
-                    color: #fff;
-                }
-            }
 
             .form{
-                padding: 30px;
-                margin-top: 30px;
+                padding: 40px 40px 50px;
                 border-radius: 10px;
                 background-color: #fff;
                 .tab{
                     display: flex;
                     justify-content: center;
                     align-items: center;
-                    margin-bottom: 30px;
+                    margin-bottom: 60px;
                     border-bottom: 2px solid #e0e0e0;
                     li{
                         padding: 9px 20px;
@@ -254,7 +243,7 @@ export default {
                     border-radius: 0 !important;
                 }
                 .account,.password,.code{
-                    z-index: 10;
+                    z-index: 1;
                     position: absolute;
                     top: 11px;
                     left: 8px;
@@ -296,5 +285,12 @@ export default {
                 }
             }
         }
+        .footer{
+            z-index: 3;
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            width: 100%;
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index da5c024..476de05 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -1,11 +1,5 @@
 <template>
     <div class="wrap">
-        <div class="search">
-            <!-- <img src="../../../assets/img/remove-black.png" alt="" class="remove" @click="keyword = ''"> -->
-            <input v-model="keyword" type="text" placeholder="请输入数据表名称">
-            <img src="../../../assets/img/search.png" alt="" class="search-icon">
-        </div>
-
         <div class="left">
              <el-menu class="menu" ref="type" @open="openType" @select="selectType" unique-opened :default-active="defaultType" :default-openeds="defaultOpenType">
                 <template v-for="item in typeList">
@@ -81,14 +75,19 @@
                     <el-table :data="listData" class="table" ref="table" stripe header-align="center" row-key="id" highlight-current-row @current-change="previewCurrentChange">
                         <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                         <el-table-column prop="showName" label="数据表名称" align="center"></el-table-column>
-                        <el-table-column prop="dataTotal" label="数据总量" align="center"></el-table-column>
-                        <el-table-column prop="dataSize" label="数据大小" align="center">
+                        <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
+                        <el-table-column label="起止时间" width="190" align="center">
+                            <template slot-scope="scope">
+                                {{scope.row.startTime}}-{{scope.row.endTime}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="dataSize" label="数据大小" width="110" align="center">
                             <template slot-scope="scope">
                                 {{scope.row.dataSize}}M
                             </template>
                         </el-table-column>
-                        <el-table-column prop="updateTime" label="更新时间" align="center"></el-table-column>
-                        <el-table-column label="操作" width="220" align="center">
+                        <el-table-column prop="updateTime" label="更新时间" width="150" align="center"></el-table-column>
+                        <el-table-column label="操作" width="120" align="center">
                             <template slot-scope="scope">
                                 <el-button type="text" @click="preview(scope.row)">预览</el-button>
                                 <el-button type="text" @click="download(scope.row)">下载</el-button>
@@ -148,6 +147,7 @@ import { mapState } from 'vuex'
 import axios from 'axios'
 import util from '@/libs/util'
 import Setting from '@/setting'
+import bus from '@/libs/bus'
 
 let startTimeLimit = ''
 let endTimeLimit = ''
@@ -156,13 +156,12 @@ export default {
         return {
             that: this,
             token: util.local.get(Setting.tokenKey),
-            keyword: '',
-            searchTimer: null,
             typeId: this.$route.query.typeId,
             typeList: [],
             defaultType: '',
             defaultOpenType: [],
             introduce: '',
+            keyword: '',
             listData: [],
             listDataAll: [],
             searchListData: [],
@@ -215,15 +214,12 @@ export default {
             'schoolId'
         ]),
     },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer)
-            this.searchTimer = setTimeout(() => {
-                this.initData()
-            },500)
-        }
-    },
     mounted() {
+        bus.$on('initData',keyword => {
+            this.keyword = keyword
+            this.initData()
+        })
+
         this.getType()
         if(this.$route.query.download){
             this.download({
@@ -290,6 +286,7 @@ export default {
             this.$post(`${this.api.getIdQueryTable}?categoryId=${this.defaultType}&showName=${this.keyword}&pageNum=${this.page}&pageSize=${this.pageSize}&updateTime=`).then(res => {
                 this.listData = res.pageList.records
                 this.total = res.pageList.total
+                this.listData.length && this.preview(this.listData[0],1)
             }).catch(res => {})
         },
         initData(){
@@ -326,25 +323,30 @@ export default {
             this.previewData = []
             this.initData()
         },
+        findId(data,id){
+            let result = ''
+            data.forEach(n => {
+                if(n.id == id){
+                    if(n.children[0].children.length){
+                        return result = n.children[0].children[0].id
+                    }else{
+                        return result = n.children[0].id
+                    }
+                }else{
+                    this.findId(n.children,id)
+                }
+            })
+            return result
+        },
         openType(index,indexPath){
-            let typeList = this.typeList
-            let firstChild = typeList.find(n => n.id == index)
-            let id = ''
-            if(firstChild){
-                id = firstChild.children[0].id
-            }else{
-                typeList.map(n => {
-                    n.children.map(n => {
-                        if(n.id == index) id = n.children[0].id
-                    })
-                })
-            }
+            console.log(11,this.typeList)
+            let id = this.findId(this.typeList,index)
             this.selectType(id,indexPath)
         },
         previewCurrentChange(val){
             this.currentRow = val
         },
-        preview(row){
+        preview(row,isDefault){
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
                 this.$post(this.api.saveRecord,{
                     tableId: row.id,
@@ -365,7 +367,7 @@ export default {
                     }
                 })
                 this.previewData = data
-                this.$nextTick(() => {
+                isDefault || this.$nextTick(() => {
                     document.querySelector('#previewTable').scrollIntoView()
                 })
                 
@@ -492,41 +494,6 @@ export default {
 <style lang="scss" scoped>
     .wrap{
         display: flex;
-        .search{
-            z-index: 2;
-            position: absolute;
-            top: 0;
-            left: 70%;
-            transform: translate(-50%);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            width: 300px;
-            height: 80px;
-            padding: 7px 20px;
-            margin: 0 auto;
-            background-color: #fff;
-            input{
-                width: 195px;
-                margin-left: 10px;
-                font-size: 14px;
-                color: #333;
-                background-color: transparent;
-                border: 0;
-                &::-webkit-input-placeholder{color: #999}
-                &::-moz-placeholder{color: #999}
-                &:-moz-placeholder{color: #999}
-                &:focus{
-                    outline: none;
-                }
-            }
-            .remove{
-                cursor: pointer;
-            }
-            .search-icon{
-                width: 18px;
-            }
-        }
         /deep/.left{
             margin-right: 20px;
             
@@ -547,6 +514,9 @@ export default {
                 .el-submenu.is-active{
                     .el-submenu__title{
                         background-color: rgba(147,184,255,.3);
+                        &+.el-menu .el-submenu__title{
+                            background-color: rgba(147,184,255,.15);
+                        }
                     }
                 }
                 .el-menu-item.is-active{
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 1c20627..4ea0a97 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="wrap" :class="{result: keyword}">
         <hr class="shadow" v-if="keyword">
-        <div class="title" v-if="!keyword">欢迎来到<br>或然数据平台</div>
+        <div class="title" v-if="!keyword">准确，多元，海量数据</div>
         <div class="search-wrap">
             <div class="search">
                 <div class="icon-wrap">
@@ -119,17 +119,20 @@ export default {
                     this.$router.push(`/data?download=true&id=${row.id}&name=${row.name}&showName=${row.showName}`)
                 }).catch(res => {})
             }else{
-                this.$router.push('/login')
+                let route = this.$router.resolve({
+                    path: '/login'
+                })
+                window.open(route.href)
             }
         },
         toData(row){
             if(this.token){
                 this.$router.push(`/data?typeId=${row.categoryTwoId}`)
             }else{
-                util.errorMsg('请先登录！')
-                setTimeout(() => {
-                    this.$router.push('/login')
-                },1500)
+                let route = this.$router.resolve({
+                    path: '/login'
+                })
+                window.open(route.href)
             }
         }
     }
@@ -140,7 +143,7 @@ export default {
     .wrap{
         position: relative;
         .title{
-            margin: 70px 0 130px;
+            margin: 70px 0 90px;
             font-size: 50px;
             color: #fff;
             text-align: center;
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index e8be6bc..4fbddcb 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -10,16 +10,13 @@
                         </el-upload>
                     </div>
 
-                    <el-menu class="menu" :default-active="active" @select="handleSelect">
-                        <el-menu-item v-for="item in typeList" :index="item.index" :key="item.index">
-                            <i :class="item.icon"></i>
-                            <span slot="title">{{ item.title }}</span>
-                        </el-menu-item>
-                    </el-menu>
+                    <ul class="menu">
+                        <li v-for="item in typeList" :key="item.index" :class="{active: item.index == active}" @click="selectType(item.index)">{{ item.title }}</li>
+                    </ul>
                 </div>
             </div>
             <div class="right">
-                <info v-if="active == 1" @updateStatus="updateStatus"></info>
+                <info ref="info" v-if="active == 1" @updateStatus="updateStatus"></info>
                 <download v-else></download>
             </div>
         </div>
@@ -57,10 +54,11 @@ export default {
     },
     beforeRouteLeave(to, from, next) {
         if(this.edited){
-            this.$confirm(`您修改的信息还没有保存，是否确认离开？`, '提示', {
+            this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
                 type: 'warning'
             }).then(() => {
-                next()
+                this.$refs.info.save()
+                next(false)
             }).catch(() => {
                 next(false)
             })
@@ -78,13 +76,17 @@ export default {
         changeAvatar(res) {
             this.setAvatar(res.message)
         },
-        handleSelect(key, keyPath){
+        selectType(key){
             if(key == 2 && this.edited){
-                this.$confirm(`您修改的信息还没有保存，是否确认离开？`, '提示', {
+                this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
                     type: 'warning'
                 }).then(() => {
-                    this.active = key
-                }).catch(() => {})
+                    this.$refs.info.save()
+                    this.active = '1'
+                }).catch(() => {
+                    this.active = '1'
+                    this.$forceUpdate()
+                })
             }else{
                 this.active = key
             }
@@ -113,9 +115,16 @@ export default {
                 border-radius: 50%;
             }
             .menu{
-                .el-menu-item.is-active{
-                    color: #fff;
-                    background-color: $main-color;
+                li{
+                    padding: 0 20px;
+                    color: #303133;
+                    font-size: 14px;
+                    line-height: 56px;
+                    cursor: pointer;
+                    &.active{
+                        color: #fff;
+                        background-color: $main-color;
+                    }
                 }
             }
         }
diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue
index 0b6cc8f..95e43f6 100644
--- a/src/pages/setting/person/info.vue
+++ b/src/pages/setting/person/info.vue
@@ -188,7 +188,7 @@
         <el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'" :visible.sync="emailVisible" :close-on-click-modal="false" @close="closeEmail" width="30%">
             <el-form ref="form" :model="form" label-width="60px">
                 <el-form-item label="邮箱">
-                    <el-input placeholder="请输入邮箱" v-model="email"></el-input>
+                    <el-input style="width: 394px;" placeholder="请输入邮箱" v-model="email"></el-input>
                 </el-form-item>
                 <el-form-item label="验证码">
                     <div class="flex">
@@ -206,7 +206,7 @@
         <el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'" :visible.sync="phoneVisible" :close-on-click-modal="false" @close="closePhone" width="30%">
             <el-form ref="form" :model="form" label-width="60px">
                 <el-form-item label="手机号">
-                    <el-input placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
+                    <el-input style="width: 394px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
                 </el-form-item>
                 <el-form-item label="验证码">
                     <div class="flex">
diff --git a/src/pages/stat/list/index.vue b/src/pages/stat/list/index.vue
index b728d12..e6eb6db 100644
--- a/src/pages/stat/list/index.vue
+++ b/src/pages/stat/list/index.vue
@@ -1,17 +1,32 @@
 <template>
     <div class="wrap">
         <div class="left">
-            <div class="product" v-for="(item,index) in productList" :key="index">
-                <p class="product-name">{{item.productName}}</p>
-                <div class="date">
-                    <span class="name">使用期限：</span>
-                    <div class="val">
-                        {{item.endTime}}
+            <div class="products">
+                <img class="icon" width="100" src="@/assets/img/school.png" alt="">
+                <div class="product" v-for="(item,index) in productList" :key="index">
+                    <p class="product-name">{{item.productName}}</p>
+                    <div class="date">
+                        <span class="name">使用期限：</span>
+                        <div class="val">
+                            {{item.endTime}}
+                        </div>
                     </div>
+                    <p class="surplus" v-if="item.deadline"><span class="name">剩余期限：</span><span class="num">{{item.deadline}}</span> 天</p>
+                    <p class="surplus"><span class="name">账号数量：</span><span class="num">{{item.accountNum}}</span> 个</p>
+                    <el-button class="renew" size="small" type="primary" v-if="!item.deadline">续费</el-button>
+                </div>
+                <div class="product" v-for="(item,index) in productList" :key="index">
+                    <p class="product-name">{{item.productName}}</p>
+                    <div class="date">
+                        <span class="name">使用期限：</span>
+                        <div class="val">
+                            {{item.endTime}}
+                        </div>
+                    </div>
+                    <p class="surplus" v-if="item.deadline"><span class="name">剩余期限：</span><span class="num">{{item.deadline}}</span> 天</p>
+                    <p class="surplus"><span class="name">账号数量：</span><span class="num">{{item.accountNum}}</span> 个</p>
+                    <el-button class="renew" size="small" type="primary" v-if="!item.deadline">续费</el-button>
                 </div>
-                <p class="surplus" v-if="item.deadline"><span class="name">剩余期限：</span><span class="num">{{item.deadline}}</span> 天</p>
-                <p class="surplus"><span class="name">账号数量：</span><span class="num">{{item.accountNum}}</span> 个</p>
-                <el-button class="renew" size="small" type="primary" v-if="!item.deadline">续费</el-button>
             </div>
         </div>
         <div class="right">
@@ -325,12 +340,23 @@ export default {
         display: flex;
         .left{
             margin-right: 20px;
-            .product{
+            .products{
                 width: 200px;
                 padding: 15px;
-                margin-bottom: 15px;
+                text-align: center;
                 background-color: #fff;
                 border-radius: 8px;
+                .icon{
+                    margin-bottom: 10px;
+                }
+            }
+            .product{
+                margin-bottom: 30px;
+                text-align: left;
+                &:last-child{
+                    margin-bottom: 0;
+                }
+                
                 .product-name{
                     margin-bottom: 15px;
                     font-size: 16px;
@@ -364,6 +390,9 @@ export default {
                 }
             }
         }
+        .right{
+            max-width: calc(100% - 220px);
+        }
         .page{
             margin-bottom: 20px;
             .arrow{
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index 2dd22b4..f744fd5 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -7,7 +7,7 @@
                     <ul class="filter">
                         <li>
                             <label>创建时间：</label>
-                            <el-select v-model="month" placeholder="请选择创建时间" size="small" clearable class="w-150">
+                            <el-select v-model="month" placeholder="请选择创建时间" size="small" clearable class="flex-1">
                                 <el-option v-for="(item,index) in monthList" :key="index" :label="item.label" :value="item.id"></el-option>
                             </el-select>
                         </li>
@@ -17,7 +17,7 @@
                         </li>
                         <li>
                             <label style="width: auto;">角色：</label>
-                            <el-select v-model="role" placeholder="请选择角色" size="small" clearable class="w-150" @change="initData">
+                            <el-select v-model="role" placeholder="请选择角色" size="small" clearable @change="initData">
                                 <el-option label="不限" value=""></el-option>
                                 <el-option label="用户" value="0"></el-option>
                                 <el-option v-for="(item,index) in roleList" :key="index" :label="item.roleName" :value="item.id"></el-option>
@@ -25,7 +25,7 @@
                         </li>
                         <li>
                             <label>状态：</label>
-                            <el-select v-model="status" placeholder="请选择状态" size="small" clearable class="w-150" @change="initData">
+                            <el-select v-model="status" placeholder="请选择状态" size="small" clearable class="flex-1" @change="initData">
                                 <el-option v-for="(item,index) in statusList" :key="index" :label="item.label" :value="item.id"></el-option>
                             </el-select>
                         </li>
@@ -34,11 +34,13 @@
                             <el-input style="width: 250px" placeholder="请输入员工账号/姓名/工号" v-model="keyword" suffix-icon="el-icon-search" clearable size="small"></el-input>
                         </li>
                     </ul>
-                    <div>
-                        <el-button type="primary" size="small" round @click="addTeacher" v-auth="'/user/list:新增用户'">新增账号</el-button>
-                        <el-button type="primary" size="small" round @click="batchImport" v-auth>批量导入</el-button>
-                        <el-button type="primary" size="small" round @click="delAllSelection" v-auth>批量删除</el-button>
-                    </div>
+                    <div></div>
+                </div>
+                
+                <div class="tool" style="justify-content: flex-end;margin-bottom: 16px;">
+                    <el-button type="primary" size="small" round @click="add" v-auth="'/user/list:新增用户'">新增账号</el-button>
+                    <el-button type="primary" size="small" round @click="batchImport" v-auth>批量导入</el-button>
+                    <el-button type="primary" size="small" round @click="delAllSelection" v-auth>批量删除</el-button>
                 </div>
 
                 <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
@@ -87,12 +89,12 @@
                             <el-input v-model="form.userName" placeholder="请输入员工姓名"></el-input>
                         </el-form-item>
                         <el-form-item prop="roleId" label="账号角色">
-                            <el-radio v-model="defaultUser" label="user" disabled>用户</el-radio>
-                            <el-radio-group v-model="form.roleId">
+                            <el-checkbox-group v-model="form.roleId" :max="2">
+                                <el-checkbox label="user" disabled>用户</el-checkbox>
                                 <template v-for="(item,index) in roleList">
-                                    <el-radio v-if="item.id != '1409424489820102658'" :key="index" :label="item.id" :disabled="item.id == 'user'">{{item.roleName}}</el-radio>
+                                    <el-checkbox v-if="item.roleName != '超级管理员'" :key="index" :label="item.id" :disabled="item.id == 'user'" @change="changeRole">{{item.roleName}}</el-checkbox>
                                 </template>
-                            </el-radio-group>
+                            </el-checkbox-group>
                         </el-form-item>
                         <el-form-item prop="uniqueIdentification" label="唯一标识">
                             <el-input disabled v-model="form.uniqueIdentification" placeholder="唯一标识"></el-input>
@@ -177,7 +179,7 @@ export default {
             isDetail: false,
             userVisible: false,
             roleList: [],
-            defaultUser: 'user',
+            defaultUser: true,
             form: {
                 platformId: Setting.platformId,
                 // type: 1, // 0->教师端 1->学生端 可不传
@@ -185,7 +187,7 @@ export default {
                 userId: '',
                 accountId: '',
                 userName: '',
-                roleId: '',
+                roleId: ['user'],
                 phone: '',
                 uniqueIdentification: '', 
                 workNumber: '',
@@ -353,7 +355,7 @@ export default {
             this.accountRepeat = false
             this.workNumberRepeat = false
         },
-        addTeacher(){
+        add(){
             this.isDetail = false
             this.userVisible = true
         },
@@ -387,7 +389,11 @@ export default {
             this.isDetail = true
             this.getDetail(row.accountId)
         },
+        changeRole(val){
+            console.log(11,val)
+        },
         confirm(){
+            // return console.log(11,this.form.roleId)
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     if(this.accountRepeat) return util.errorMsg('该账号已存在！')
@@ -395,7 +401,11 @@ export default {
                     let data = this.form
                     data.schoolId = data.schoolId ? data.schoolId : this.schoolId
                     if(!data.userId) data.uniqueIdentification = new Date().getTime()
-                    if(!data.roleId) data.roleId = '0'
+                    if(data.roleId.length == 1){
+                        data.roleId = '0'
+                    }else{
+                        data.roleId = data.roleId[1]
+                    }
                     if(this.form.userId){
                         this.$post(this.api.modifyUser,data).then(res => {
                             this.userVisible = false
@@ -474,7 +484,7 @@ export default {
             this.getData()
         },
         downLoad(){
-            location.href = this.api.userTemplate
+            location.href = `${this.api.userTemplate}?id=${Math.random()}`
         },
         showFaild(){
             this.importVisible = false
diff --git a/src/setting.js b/src/setting.js
index db00e8c..03c6632 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,7 +16,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.216:9000' : 'http://39.108.250.202:9000',
-    apiBaseURL: env === 'development' ? 'http://192.168.31.216:9000' : 'http://39.108.250.202:9000',
+    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
diff --git a/src/styles/layout/index.scss b/src/styles/layout/index.scss
index 160ad90..4ca12d9 100644
--- a/src/styles/layout/index.scss
+++ b/src/styles/layout/index.scss
@@ -9,7 +9,7 @@ body,
 }
 
 body {
-    min-width: 1500px;
+    min-width: $min-width;
     font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
     font-size: 14px;
     background: rgba(0, 0, 0, 0.02);
diff --git a/src/styles/var.scss b/src/styles/var.scss
index 26786fc..d1e7b68 100644
--- a/src/styles/var.scss
+++ b/src/styles/var.scss
@@ -1,5 +1,6 @@
 $main-color: #568DF2;
-$inner-width: 1440px;
+$max-width: 1440px;
+$min-width: 1280px;
 
 @mixin ellipsis {
     overflow: hidden;
diff --git a/vue.config.js b/vue.config.js
index 0d248e6..8119fd6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,6 +23,6 @@ module.exports = {
   outputDir: Setting.outputDir,
   assetsDir: Setting.assetsDir,
   devServer: {
-    port: 8092
+    port: 8081
   }
 }
\ No newline at end of file