From 463b34d399fbcad9e3df50c10acd46122dac0bd7 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 8 Jun 2022 18:28:22 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/footer/index.vue      |  2 +-
 src/libs/util.js                  |  6 +++---
 src/pages/account/login/index.vue |  4 ++--
 src/pages/data/list/index.vue     | 16 ++++++++--------
 src/pages/index/list/index.vue    | 12 ++++++------
 src/pages/role/list/index.vue     |  2 +-
 src/pages/user/list/index.vue     |  2 +-
 src/plugins/requests/index.js     |  8 ++++++++
 src/setting.js                    |  2 +-
 9 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 4dda486..4c9f84b 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -8,7 +8,7 @@
 <template>
     <div class="footer">
         <div class="info">
-            <span class="m-r-20">客服邮箱：service@huorantech.cn</span>
+            <!-- <span class="m-r-20">客服邮箱：service@huorantech.cn</span> -->
             <span>联系人：孙经理 18565785395</span>
         </div>
         <div class="copyright">
diff --git a/src/libs/util.js b/src/libs/util.js
index 75b5864..c73d140 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -121,15 +121,15 @@ const util = {
   },
   // 成功提示
   successMsg(message,duration = 1500) {
-    return Message.success({message,showClose: true,offset: (document.documentElement.clientHeight - 40) / 2,duration})
+    return Message.success({message,showClose: true,duration})
   },
   // 警告提示
   warningMsg(message,duration = 1500) {
-    return Message.warning({message,showClose: true,offset: (document.documentElement.clientHeight - 40) / 2,duration})
+    return Message.warning({message,showClose: true,duration})
   },
   // 错误提示
   errorMsg(message,duration = 1500) {
-    return Message.error({message,showClose: true,offset: (document.documentElement.clientHeight - 40) / 2,duration})
+    return Message.error({message,showClose: true,duration})
   },
 }
 
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index e214f5b..4105a6c 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -322,11 +322,11 @@ export default {
         // 验证手机号
         verifyPhone(phone) {
           if (!phone) {
-            util.warningMsg("请输入手机号")
+            this.$message.error("请输入手机号")
             return false
           }
           if (!/^1[3456789]\d{9}$/.test(phone) && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(phone)) {
-            util.warningMsg("请输入正确的手机号/邮箱")
+            this.$message.error("请输入正确的手机号/邮箱")
             return false
           }
           return true
diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue
index 512c1ae..e9c1fae 100644
--- a/src/pages/data/list/index.vue
+++ b/src/pages/data/list/index.vue
@@ -18,17 +18,17 @@
                 <div class="source"><img src="@/assets/img/data2.png" alt=""> 数据来源：{{dataSource}}</div>
                 <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="数据表名称" min-width="300" align="center" :show-overflow-tooltip="true"></el-table-column>
+                      <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+                      <el-table-column prop="showName" label="数据表名称" min-width="220" 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 prop="timeRange" label="起止时间" width="220" align="center"></el-table-column>
+                      <el-table-column prop="timeRange" label="起止时间" width="175" align="center"></el-table-column>
                       <el-table-column prop="dataSize" label="数据大小" width="90" align="center">
                           <template slot-scope="scope">
                               {{scope.row.dataSize}}M
                           </template>
                       </el-table-column>
-                      <el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column>
-                      <el-table-column label="操作" width="200" align="center">
+                      <el-table-column prop="updateTime" label="更新时间" width="155" align="center"></el-table-column>
+                      <el-table-column label="操作" width="100" align="center">
                           <template slot-scope="scope">
                               <el-button type="text" @click="preview(scope.row)" v-auth>预览</el-button>
                               <el-button type="text" @click="download(scope.row)" v-auth>下载</el-button>
@@ -487,7 +487,8 @@ export default {
         display: flex;
         padding-bottom: 20px !important;
         /deep/.left{
-            height: calc(100vh - 166px);
+            width: 239px;
+            height: calc(100vh - 190px);
             margin-right: 20px;
             overflow: auto;
             &::-webkit-scrollbar {
@@ -553,8 +554,7 @@ export default {
             }
         }
         .right{
-            flex: 1;
-            max-width: calc(100% - 220px);
+            width: calc(100% - 260px);
             .page{
                 margin-bottom: 20px;
                 .source {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 3243028..bb48f73 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -29,17 +29,17 @@
             </div>
             
             <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 type="index" width="60" 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="timeRange" label="起止日期" width="220" 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="timeRange" label="起止日期" width="180" align="center"></el-table-column>
+                <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
+                <el-table-column prop="dataSize" label="数据大小" width="80" align="center">
                     <template slot-scope="scope">
                         {{scope.row.dataSize}}M
                     </template>
                 </el-table-column>
-                <el-table-column prop="createTime" label="更新时间" align="center"></el-table-column>
-                <el-table-column label="操作" width="180">
+                <el-table-column prop="createTime" label="更新时间" width="155" align="center"></el-table-column>
+                <el-table-column label="操作" width="100">
                     <template slot-scope="scope">
                         <el-button type="text" @click="preview(scope.row)">预览</el-button>
                         <el-button type="text" @click="download(scope.row)">下载</el-button>
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index 158ec12..df0560d 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -117,7 +117,7 @@ export default {
     },
     methods: {
         getData() {
-            this.$get(`${this.api.listRole}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}&platformId=${Setting.platformId}`).then(res => {
+            this.$get(`${this.api.listRole}?page=${this.page}&size=${this.pageSize}&name=${this.keyword}&platformId=${Setting.platformId}&port=0`).then(res => {
                 this.listData = res.rolePage.records
                 this.total = res.rolePage.total
                 if(!this.listData.length && this.total){
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index 3443235..ad9de0f 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -310,7 +310,7 @@ export default {
         },
         // 获取全部角色
         getRole(){
-            this.$get(`${this.api.listRole}?page=1&size=1000&name=&platformId=${Setting.platformId}`).then(res => {
+            this.$get(`${this.api.listRole}?page=1&size=1000&name=&platformId=${Setting.platformId}&port=0`).then(res => {
                 const list = res.rolePage.records
                 this.roleList = list
             }).catch(res => {})
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 2322e35..348b5f7 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -4,6 +4,7 @@ import router from '@/router/index'
 import Setting from '@/setting'
 import store from '@/store'
 import api from '@/api'
+import { Message } from 'element-ui'
 
 const baseURL = Setting.apiBaseURL
 const service = axios.create({
@@ -69,6 +70,13 @@ service.interceptors.response.use(
             return Promise.resolve(res).catch(e => {})
         }else if(!res.status){
             return Promise.resolve(res).catch(e => {})
+        } else if (res.status === 10008) {
+          Message.error({
+            message: res.message,
+            showClose: true,
+            duration: 1500
+          })
+          return Promise.reject(res)
         }else {
             util.errorMsg(res.message)
             res.message === '该账号无权限！' && setTimeout(() => {
diff --git a/src/setting.js b/src/setting.js
index 9d6f976..faeaa23 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -25,7 +25,7 @@ const Setting = {
      * 正式：http://www.dataforward.cn:9000
      * */
     // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://39.108.250.202:9000',
-    apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000/' : `${location.origin}:9000/`,
+    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000/' : `${location.origin}:9000/`,
     // 加密货币接口地址
     cryptoBaseURL: `http://159.138.53.111/`,
     // 接口请求返回错误时，弹窗的持续时间，单位：秒