From bc4b696dd795453cf551b94ee89965bc655a9589 Mon Sep 17 00:00:00 2001
From: Joel <479214531@qq.com>
Date: Mon, 8 Nov 2021 19:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8E=E5=8F=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue   | 35 +++++++++++++++----------------
 src/layouts/navbar/index.vue   |  7 ++++++-
 src/pages/data/list/index.vue  | 38 ++++++++++++++--------------------
 src/pages/index/list/index.vue |  4 ++--
 src/pages/stat/list/index.vue  | 12 ++++++-----
 src/setting.js                 |  6 +++---
 src/store/modules/user.js      |  2 +-
 src/styles/common.scss         |  4 ++--
 8 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index fe0f1f7..0541c7d 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,17 +1,16 @@
 <template>
     <div class="header">
         <a class="logo" @click="toIndex">
-            <!-- <span v-if="token && isManager && !showSetting">{{schoolName}}</span> -->
             <img src="@/assets/img/logo.png" alt="">
         </a>
         <div class="inner">
             <div style="height: 64px;"></div>
             <navbar ref="nav"></navbar>
             <div class="action" v-if="token">
-                <img v-if="isManager && showSetting" class="icon" :class="{'m-r-20': !isCustomer}" src="../../assets/img/setting.png" alt="" @click="toManager">
+                <img v-if="showSetting && isCustomer" class="icon m-r-20" src="../../assets/img/setting.png" alt="" @click="toManager">
                 <el-dropdown class="user-wrap" @command="userCommand">
                     <div class="user">
-                        <el-avatar :size="40" :src="avatar" v-if="!isCustomer"></el-avatar>
+                        <el-avatar :size="40" :src="avatar"></el-avatar>
                         <span class="username">{{userName}}</span>
                     </div>
                     <el-dropdown-menu slot="dropdown">
@@ -68,7 +67,6 @@ export default {
       keyword: '',
       searchTimer: null,
       userName: '',
-      isUser: false,
       showSetting: true,
       id: '',
       schoolName: '',
@@ -83,7 +81,7 @@ export default {
   components: { navbar },
   computed: {
     ...mapState('user', [
-      'avatar', 'isManager', 'schoolId', 'isCustomer'
+      'avatar', 'schoolId', 'isCustomer'
     ]),
     ...mapState('auth', [
       'routes'
@@ -114,8 +112,15 @@ export default {
       let customer = atob(decodeURI(this.customer)) == 'false' ? false : true
       this.setCustomer(customer)
     }
+    // 如果是管理员，并且已经进入到了后台，那么就要把进入后台的图标给隐藏
+    let mg = this.$route.query.mg
+    if (mg && atob(decodeURI(mg)) === 'true') {
+      this.showSetting = false
+    }
     // 如果登录了,并且非客户，才调用用户信息的接口（客户是没有用户信息的，也不能进入后台）
-    this.token && this.isCustomer && this.getUserInfo()
+    setTimeout(() => {
+      this.token && !this.isCustomer && this.getUserInfo()
+    }, 1000)
   },
   methods: {
     ...mapActions('user', [
@@ -125,13 +130,6 @@ export default {
       this.$get(this.api.userInfo).then(res => {
         let userInfo = res.userInfo ? res.userInfo : {}
         let userAccount = res.userAccount
-        let isManager = userAccount.roleId != '0' // 判断该用户是普通用户还是其他角色，普通用户无法进入后台，要把后台那个图标隐藏
-        this.isUser = isManager
-        let mg = this.$route.query.mg
-        // 如果是管理员
-        if (mg && atob(decodeURI(mg)) === 'true') {
-          this.showSetting = false
-        }
         this.userName = userAccount.account
         this.id = userAccount.id
         this.schoolName = res.schoolName
@@ -139,14 +137,15 @@ export default {
           avatar: userInfo.userAvatars,
           schoolId: userAccount.schoolId,
         })
-        this.setManager(isManager)
       }).catch(err => { })
     },
     toIndex() {
-      this.$refs.nav.jump({
-        index: '/index/list',
-        title: '首页'
-      })
+      this.$route.path === '/index/list'
+        ? location.reload()
+        : this.$refs.nav.jump({
+          index: '/index/list',
+          title: '首页'
+        })
     },
     toSearch() {
       this.$refs.nav.jump({
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 9e96592..0113333 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -44,6 +44,9 @@ export default {
     };
   },
   computed: {
+    ...mapState('user', [
+      'isCustomer'
+    ]),
     ...mapState('auth', [
       'routes'
     ])
@@ -59,7 +62,9 @@ export default {
   },
   mounted() {
     if (util.local.get(Setting.tokenKey)) {// 如果是登录状态
-      this.getPer()
+      setTimeout(() => {
+        this.isCustomer ? this.getPer() : this.initMenu()
+      }, 100)
       if (this.managerStr && atob(decodeURI(this.managerStr)) === 'true') {
         this.isManager = true
         this.setManager(false)
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index cd7158a..e4e7903 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -104,7 +104,7 @@
                 <div class="page-content">
                   <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="showName" label="数据表名称" align="center" :show-overflow-tooltip="true"></el-table-column>
                       <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
                       <el-table-column label="起止时间" width="220" align="center">
                           <template slot-scope="scope">
@@ -125,7 +125,7 @@
                       </el-table-column>
                   </el-table>
                   <div class="pagination">
-                      <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+                      <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
                   </div>
                 </div>
             </div>
@@ -403,26 +403,20 @@ export default {
       }).then(res => {
         this.curRow = row
         this.downloadVisible = true
-
-        // 查询有数据的时间段,接口会返回开始时间和结束时间,但也有写数据是没有这两个时间的
-        this.$get(`${this.api.getTableTime}`, {
-          tableId: row.id
-        }).then(res => {
-          let list = res.message
-          if (list.startTime) {
-            startTimeLimit = new Date(list.startTime).getTime()
-          } else {
-            // 如果没有开始时间,则禁止选择开始时间
-            this.startTimeDisabled = true
-          }
-          if (list.endTime) {
-            endTimeLimit = new Date(list.endTime).getTime()
-            this.timeDefault = list.endTime
-          } else {
-            // 如果没有结束时间,则禁止选择结束时间
-            this.endTimeDisabled = true
-          }
-        }).catch(res => { })
+        // 查询有数据的时间段,接口会返回开始时间和结束时间,但也有些数据是没有这两个时间的
+        if (row.startTime) {
+          startTimeLimit = new Date(row.startTime).getTime()
+        } else {
+          // 如果没有开始时间,则禁止选择开始时间
+          this.startTimeDisabled = true
+        }
+        if (row.endTime) {
+          endTimeLimit = new Date(row.endTime).getTime()
+          this.timeDefault = row.endTime
+        } else {
+          // 如果没有结束时间,则禁止选择结束时间
+          this.endTimeDisabled = true
+        }
 
         this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
           let comment = res.comment
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 03b0711..81547c7 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -27,7 +27,7 @@
             
             <el-table :data="listData" class="table" ref="table" stripe header-align="center">
                 <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="showName" label="数据表名称" align="center" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="createTime" 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">
@@ -44,7 +44,7 @@
                 </el-table-column>
             </el-table>
             <div class="pagination" v-show="total">
-                <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+                <el-pagination background @current-change="handleCurrentChange" :current-page="page" layout="total, prev, pager, next, jumper" :total="total"></el-pagination>
             </div>
             <div class="none" v-if="!total">
                 <img src="@/assets/img/index/index19.png" alt="">
diff --git a/src/pages/stat/list/index.vue b/src/pages/stat/list/index.vue
index 3635fa7..6850687 100644
--- a/src/pages/stat/list/index.vue
+++ b/src/pages/stat/list/index.vue
@@ -69,7 +69,7 @@
                         <el-table-column prop="download" label="下载量" align="center"></el-table-column>
                         <el-table-column prop="click" label="点击量" align="center"></el-table-column>
                     </el-table>
-                    <div class="fold" v-if="listData.length > 10">
+                    <div class="fold" v-if="listData.length > initShowLen">
                         <span :class="{active}" @click="toggleList">
                             展开更多
                             <i class="el-icon-arrow-down"></i>
@@ -131,6 +131,7 @@ export default {
             listData: [],
             listDataKeyword: [],
             listDataAll: [],
+            initShowLen: 5, // 按数据库统计使用概况默认展示的数据条数
             multipleSelection: [],
             monthData: [
                 {
@@ -242,7 +243,7 @@ export default {
             this.$get(`${this.api.queryDatabaseInfo}?schoolId=${this.schoolId}&startTime=${this.startTime}&endTime=${this.endTime}`).then(res => {
                 let list = JSON.parse(res.databaseInfo)
                 // 只展示前十条，页面上点展开更多去展示全部
-                this.listData = list.slice(0,10)
+                this.listData = list.slice(0,this.initShowLen)
                 this.listDataAll = list // 把全部数据先存起来，点展开的时候直接取这个列表
             }).catch(res => {})
         },
@@ -253,7 +254,7 @@ export default {
             list.map(n => {
                 (n.categoryOne.includes(this.keyword) || n.categoryTwo.includes(this.keyword)) && result.push(n)
             })
-            this.listData = this.active ? result : result.slice(0,10)
+            this.listData = this.active ? result : result.slice(0,this.initShowLen)
             this.listDataKeyword = result
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -279,16 +280,17 @@ export default {
         },
         // 展开收缩
         toggleList(){
+            const len = this.initShowLen
             // 如果是输入了关键词，则不是取默认的listDataAll列表，而是取模糊查询后的全部数据列表 listDataKeyword
             if(this.keyword){
                 if(this.active){
-                    this.listData = this.listDataKeyword.slice(0,10)
+                    this.listData = this.listDataKeyword.slice(0,len)
                 }else{
                     this.listData = this.listDataKeyword
                 }
             }else{
                 if(this.active){
-                    this.listData = this.listDataAll.slice(0,10)
+                    this.listData = this.listDataAll.slice(0,len)
                 }else{
                     this.listData = this.listDataAll
                 }
diff --git a/src/setting.js b/src/setting.js
index e827024..7f796df 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-11-03 14:33:21
- * @LastEditTime: 2021-11-08 15:41:55
- * @LastEditors: your name
+ * @LastEditTime: 2021-11-08 16:19:17
+ * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \questionnaired:\code\FE_huoran_data\src\setting.js
  */
@@ -24,7 +24,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.125:9000' : 'http://39.108.250.202:9000',// 佳坤
-    apiBaseURL: env === 'development' ? 'http://192.168.31.151: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/store/modules/user.js b/src/store/modules/user.js
index b2ab1e5..e83dd7f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-03 14:33:21
- * @LastEditTime: 2021-11-08 15:26:33
+ * @LastEditTime: 2021-11-08 19:20:52
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \questionnaired:\code\FE_huoran_data\src\store\modules\user.js
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 16724f4..d184de4 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -156,9 +156,9 @@
 .pagination {
     margin: 20px 0;
     text-align: center;
-    button,.number,.more{
+    button,.number,.more,.el-input__inner{
         min-width: 32px !important;
-        height: 32px;
+        height: 32px !important;
         line-height: 32px;
         color: #333 !important;
         background-color: transparent !important;