huoran
/
FE_huoran_data
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

bug修复

Browse Source
master
yujialong 3 years ago
parent 77b9f71d87
commit 463b34d399
9 changed files with 31 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/layouts/footer/index.vue
  2. 6
      src/libs/util.js
  3. 4
      src/pages/account/login/index.vue
  4. 16
      src/pages/data/list/index.vue
  5. 12
      src/pages/index/list/index.vue
  6. 2
      src/pages/role/list/index.vue
  7. 2
      src/pages/user/list/index.vue
  8. 8
      src/plugins/requests/index.js
  9. 2
      src/setting.js

2
src/layouts/footer/index.vue
Unescape View File

@ -8,7 +8,7 @@
<template> <template>
<div class="footer"> <div class="footer">
<div class="info"> <div class="info">
<span class="m-r-20">客服邮箱：service@huorantech.cn</span> <!-- <span class="m-r-20">客服邮箱：service@huorantech.cn</span> -->
<span>联系人：孙经理 18565785395</span> <span>联系人：孙经理 18565785395</span>
</div> </div>
<div class="copyright"> <div class="copyright">

6
src/libs/util.js
Unescape View File

@ -121,15 +121,15 @@ const util = {
}, },
// 成功提示 // 成功提示
successMsg(message,duration = 1500) { 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) { 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) { errorMsg(message,duration = 1500) {
return Message.error({message,showClose: true,offset: (document.documentElement.clientHeight - 40) / 2,duration}) return Message.error({message,showClose: true,duration})
}, },
} }

4
src/pages/account/login/index.vue
Unescape View File

@ -322,11 +322,11 @@ export default {
// 验证手机号 // 验证手机号
verifyPhone(phone) { verifyPhone(phone) {
if (!phone) { if (!phone) {
util.warningMsg("请输入手机号") this.$message.error("请输入手机号")
return false 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)) { 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 false
} }
return true return true

16
src/pages/data/list/index.vue
Unescape View File

@ -18,17 +18,17 @@
<div class="source"><img src="@/assets/img/data2.png" alt=""> 数据来源：{{dataSource}}</div> <div class="source"><img src="@/assets/img/data2.png" alt=""> 数据来源：{{dataSource}}</div>
<div class="page-content"> <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 :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 type="index" width="60" 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 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="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"> <el-table-column prop="dataSize" label="数据大小" width="90" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.dataSize}}M {{scope.row.dataSize}}M
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="更新时间" width="170" align="center"></el-table-column> <el-table-column prop="updateTime" label="更新时间" width="155" align="center"></el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="preview(scope.row)" v-auth>预览</el-button> <el-button type="text" @click="preview(scope.row)" v-auth>预览</el-button>
<el-button type="text" @click="download(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; display: flex;
padding-bottom: 20px !important; padding-bottom: 20px !important;
/deep/.left{ /deep/.left{
height: calc(100vh - 166px); width: 239px;
height: calc(100vh - 190px);
margin-right: 20px; margin-right: 20px;
overflow: auto; overflow: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {
@ -553,8 +554,7 @@ export default {
} }
} }
.right{ .right{
flex: 1; width: calc(100% - 260px);
max-width: calc(100% - 220px);
.page{ .page{
margin-bottom: 20px; margin-bottom: 20px;
.source { .source {

12
src/pages/index/list/index.vue
Unescape View File

@ -29,17 +29,17 @@
</div> </div>
<el-table :data="listData" class="table" ref="table" stripe header-align="center"> <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="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="timeRange" label="起止日期" width="180" align="center"></el-table-column>
<el-table-column prop="dataTotal" label="数据总量" align="center"></el-table-column> <el-table-column prop="dataTotal" label="数据总量" width="90" align="center"></el-table-column>
<el-table-column prop="dataSize" label="数据大小" align="center"> <el-table-column prop="dataSize" label="数据大小" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.dataSize}}M {{scope.row.dataSize}}M
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="更新时间" align="center"></el-table-column> <el-table-column prop="createTime" label="更新时间" width="155" align="center"></el-table-column>
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="preview(scope.row)">预览</el-button> <el-button type="text" @click="preview(scope.row)">预览</el-button>
<el-button type="text" @click="download(scope.row)">下载</el-button> <el-button type="text" @click="download(scope.row)">下载</el-button>

2
src/pages/role/list/index.vue
Unescape View File

@ -117,7 +117,7 @@ export default {
}, },
methods: { methods: {
getData() { 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.listData = res.rolePage.records
this.total = res.rolePage.total this.total = res.rolePage.total
if(!this.listData.length && this.total){ if(!this.listData.length && this.total){

2
src/pages/user/list/index.vue
Unescape View File

@ -310,7 +310,7 @@ export default {
}, },
// 获取全部角色 // 获取全部角色
getRole(){ 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 const list = res.rolePage.records
this.roleList = list this.roleList = list
}).catch(res => {}) }).catch(res => {})

8
src/plugins/requests/index.js
Unescape View File

@ -4,6 +4,7 @@ import router from '@/router/index'
import Setting from '@/setting' import Setting from '@/setting'
import store from '@/store' import store from '@/store'
import api from '@/api' import api from '@/api'
import { Message } from 'element-ui'
const baseURL = Setting.apiBaseURL const baseURL = Setting.apiBaseURL
const service = axios.create({ const service = axios.create({
@ -69,6 +70,13 @@ service.interceptors.response.use(
return Promise.resolve(res).catch(e => {}) return Promise.resolve(res).catch(e => {})
}else if(!res.status){ }else if(!res.status){
return Promise.resolve(res).catch(e => {}) 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 { }else {
util.errorMsg(res.message) util.errorMsg(res.message)
res.message === '该账号无权限！' && setTimeout(() => { res.message === '该账号无权限！' && setTimeout(() => {

2
src/setting.js
Unescape View File

@ -25,7 +25,7 @@ const Setting = {
* 正式：http://www.dataforward.cn:9000 * 正式：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' : '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/`, cryptoBaseURL: `http://159.138.53.111/`,
// 接口请求返回错误时，弹窗的持续时间，单位：秒 // 接口请求返回错误时，弹窗的持续时间，单位：秒

Write Preview
Loading…
Cancel
Save