Compare commits

...

2 Commits

Author SHA1 Message Date
yujialong 7f18b99801 fix 4 months ago
yujialong 3bf5c1b98a fix 9 months ago
  1. 31
      src/layouts/footer/index.vue
  2. 173
      src/pages/account/login/index.vue
  3. 166
      src/pages/screen/list/index.vue
  4. 94
      src/plugins/requests/index.js
  5. 4
      src/setting.js
  6. 3
      vue.config.js

@ -9,22 +9,23 @@
<div class="footer">
<div class="info">
<!-- <span class="m-r-20">客服邮箱service@huorantech.cn</span> -->
<span>联系人郭经理 17671782660</span>
<span>联系人金经理 15218726836</span>
</div>
<div class="copyright">
<span>© Copyright 2021 Dataforward 数据前瞻</span>
<a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a>
<a href="https://beian.miit.gov.cn/#/Integrated/index"
target="_blank">粤ICP备20072679号</a>
</div>
</div>
</template>
<script>
export default {
data() {
data () {
return {
};
},
mounted(){
mounted () {
},
methods: {
@ -33,31 +34,31 @@ export default {
};
</script>
<style lang="scss" scoped>
.footer{
.footer {
padding: 17px 0 9px;
text-align: center;
background-color: #0F1D2E;
.info{
background-color: #0f1d2e;
.info {
margin-bottom: 7px;
font-size: 14px;
line-height: 20px;
color: #D7DFE7;
color: #d7dfe7;
}
.copyright{
.copyright {
font-size: 12px;
text-align: center;
line-height: 17px;
span{
span {
margin-right: 20px;
color: #757F8A;
color: #757f8a;
}
a{
color:#757F8A;
a {
color: #757f8a;
font-size: 12px;
&:hover{
&:hover {
color: #c7c7c7;
}
}
}
}
}
</style>

@ -4,63 +4,42 @@
<div class="form">
<h6 class="title">欢迎使用请登录</h6>
<ul class="tab">
<li v-for="(item,index) in tabList"
:key="index"
:class="{active: form.distinguish == item.id}"
@click="typeClick(item)">{{item.label}}</li>
<li v-for="(item, index) in tabList" :key="index" :class="{ active: form.distinguish == item.id }"
@click="typeClick(item)">{{ item.label }}</li>
</ul>
<el-form :model="form"
:rules="rules"
ref="form"
style="margin-top: 20px">
<el-form :model="form" :rules="rules" ref="form" style="margin-top: 20px">
<!-- 学号工号 -->
<div v-show="!form.distinguish">
<el-form-item class="school-select"
prop="schoolId">
<el-form-item class="school-select" prop="schoolId">
<label class="label school"></label>
<el-select v-model="form.schoolId"
clearable
filterable
placeholder="请选择学校">
<el-option v-for="(item, i) in schoolList"
:key="i"
:label="item.schoolName"
<el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校">
<el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName"
:value="item.schoolId"></el-option>
</el-select>
</el-form-item>
<el-form-item class="flex-1"
prop="workNumber">
<el-form-item class="flex-1" prop="workNumber">
<label class="label account"></label>
<el-input v-model.trim="form.workNumber"
:placeholder="'请输入学号/工号'"
<el-input v-model.trim="form.workNumber" :placeholder="'请输入学号/工号'"
@keyup.enter.native="submit"></el-input>
</el-form-item>
</div>
<!-- 手机号登录 -->
<el-form-item v-show="form.distinguish === 1"
prop="account">
<el-form-item v-show="form.distinguish === 1" prop="account">
<label class="label account"></label>
<el-input v-model.trim="form.account"
placeholder="请输入账号"
@keyup.enter.native="submit"></el-input>
<el-input v-model.trim="form.account" placeholder="请输入账号" @keyup.enter.native="submit"></el-input>
</el-form-item>
<template v-if="form.distinguish === 2">
<el-form-item prop="account">
<label class="label account"></label>
<el-input v-model.trim="form.account"
placeholder="请输入手机号/邮箱"
@keyup.enter.native="submit"></el-input>
<el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱" @keyup.enter.native="submit"></el-input>
</el-form-item>
<el-form-item prop="code">
<label class="label code"></label>
<div class="ver-code">
<el-input v-model="form.code"
placeholder="请输入验证码"
maxlength="6"
<el-input v-model="form.code" placeholder="请输入验证码" maxlength="6"
@keyup.enter.native="submit"></el-input>
<el-button type="text"
@click="sendPhoneCodeLogin"
:disabled="phoneDisabledLogin">{{ phoneBtnTextLogin }}
<el-button type="text" @click="sendPhoneCodeLogin" :disabled="phoneDisabledLogin">{{ phoneBtnTextLogin
}}
</el-button>
</div>
</el-form-item>
@ -68,88 +47,54 @@
<template v-if="form.distinguish !== 2">
<el-form-item prop="password">
<label class="password label"></label>
<el-input type="password"
placeholder="请输入密码"
v-model.trim="form.password"
@keyup.enter.native="submit">
<el-input type="password" placeholder="请输入密码" v-model.trim="form.password" @keyup.enter.native="submit">
</el-input>
</el-form-item>
<el-form-item prop="code">
<label class="label code"></label>
<el-input placeholder="请输入验证码"
v-model.trim="form.code"
@keyup.enter.native="submit">
<el-input placeholder="请输入验证码" v-model.trim="form.code" @keyup.enter.native="submit">
</el-input>
<img @click="getVerImg"
:src="verificationIMG"
class="ver-img"
alt="">
<img @click="getVerImg" :src="verificationIMG" class="ver-img" alt="">
</el-form-item>
</template>
<div v-show="!form.distinguish"
class="default-check">
<div v-show="!form.distinguish" class="default-check">
<el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
</div>
<el-button class="submit"
type="primary"
@click="submit">登录</el-button>
<el-button class="submit" type="primary" @click="submit">登录</el-button>
</el-form>
</div>
</div>
<el-dialog title="绑定手机号"
:visible.sync="phoneVisible"
:close-on-click-modal="false"
width="576px">
<el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" width="576px">
<p class="tips">依据国家政策法规需绑定手机号进行网络实名才可登录使用本平台</p>
<el-form label-width="60px">
<el-form-item label="手机号">
<el-input placeholder="请输入手机号"
v-model="phone"
maxlength="11"
@change="phoneChange"></el-input>
<el-input placeholder="请输入手机号" v-model="phone" maxlength="11" @change="phoneChange"></el-input>
</el-form-item>
<el-form-item label="验证码">
<div class="ver-code">
<el-input v-model="phoneCode"
placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="top: 1px"
type="text"
@click="sendPhoneCode(1)"
:disabled="binding === '' || phoneDisabled">{{phoneBtnText}}</el-button>
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="top: 1px" type="text" @click="sendPhoneCode(1)"
:disabled="binding === '' || phoneDisabled">{{ phoneBtnText }}</el-button>
</div>
</el-form-item>
</el-form>
<span slot="footer"
class="dialog-footer">
<el-button size="small"
@click="phoneVisible = false"> </el-button>
<el-button size="small"
type="primary"
@click="phoneSubmit"> </el-button>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="phoneVisible = false"> </el-button>
<el-button size="small" type="primary" @click="phoneSubmit"> </el-button>
</span>
</el-dialog>
<el-dialog title="请选择您要登录的用户"
:visible.sync="userVisible"
:close-on-click-modal="false"
custom-class="user-dia"
<el-dialog title="请选择您要登录的用户" :visible.sync="userVisible" :close-on-click-modal="false" custom-class="user-dia"
width="500px">
<p class="tips">该手机号已绑定以下用户信息</p>
<ul class="users">
<li :class="{isEnable: !user.isEnable}"
v-for="(user, i) in users"
:key="i"
@click="chooseUser(user)">
<span>{{ user.schoolName }}{{ user.userName }}{{ user.workNumber }}{{ user.isEnable ? '' : '(已禁用)'}}</span>
<li :class="{ isEnable: !user.isEnable }" v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
<span>{{ user.schoolName }}{{ user.userName }}{{ user.workNumber }}{{ user.isEnable ? '' : '(已禁用)' }}</span>
<i class="el-icon-right"></i>
</li>
</ul>
</el-dialog>
<el-dialog :visible.sync="infoVisible"
:close-on-click-modal="false"
:show-close="false"
custom-class="info-dia"
<el-dialog :visible.sync="infoVisible" :close-on-click-modal="false" :show-close="false" custom-class="info-dia"
width="400px">
<div class="info-header">
<i class="el-icon-warning"></i>
@ -158,26 +103,20 @@
<div class="info-wrap">
<p class="tips">该手机号已与以下用户绑定</p>
<ul class="users">
<li v-for="(user, i) in infos"
:key="i">
<li v-for="(user, i) in infos" :key="i">
<span>{{ user.userName }}{{ user.schoolName }}</span>
</li>
</ul>
<div class="info-footer">
<el-button size="small"
type="primary"
@click="bindPhone">是本人继续绑定</el-button>
<el-button class="unbind"
size="small"
@click="unbindPhone">不是本人解绑以上用户并绑定新用户</el-button>
<el-button size="small" type="primary" @click="bindPhone">是本人继续绑定</el-button>
<el-button class="unbind" size="small" @click="unbindPhone">不是本人解绑以上用户并绑定新用户</el-button>
</div>
</div>
</el-dialog>
<div class="footer">
<div class="copyright">
<a href="https://beian.miit.gov.cn/#/Integrated/index"
target="_blank">粤ICP备20072679号</a>
<a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">粤ICP备20072679号</a>
</div>
</div>
</div>
@ -540,14 +479,17 @@ export default {
min-height: 100%;
background-color: #f3f6fa;
}
.ver-code {
position: relative;
.el-button {
position: absolute;
top: 10px;
right: 10px;
}
}
.login {
min-height: calc(100vh - 70px);
padding-top: calc((100vh - 611px) / 2);
@ -557,12 +499,14 @@ export default {
url(../../../assets/img/shapes/shape4.png) (right 50%) / auto no-repeat,
url(../../../assets/img/shapes/shape5.png) (right 80%) / auto no-repeat,
url(../../../assets/img/shapes/shape6.png) (right bottom) / auto no-repeat;
.tab {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 24px;
border-bottom: 2px solid #e1e6f2;
li {
padding: 18px 0;
margin-bottom: -1px;
@ -570,25 +514,30 @@ export default {
color: #555;
cursor: pointer;
border-bottom: 4px solid transparent;
&:last-child {
margin-right: 0;
}
&.active {
color: $main-color;
border-bottom-color: $main-color;
}
}
}
.items {
display: flex;
align-items: center;
}
.form {
width: 436px;
padding: 38px 38px 60px;
margin: 0 auto 0;
border-radius: 6px;
background-color: #fff;
.title {
margin-bottom: 25px;
font-size: 26px;
@ -596,9 +545,11 @@ export default {
letter-spacing: 4px;
}
}
/deep/.el-form-item {
margin-bottom: 20px;
}
/deep/.el-input__inner {
position: relative;
height: 52px;
@ -608,12 +559,15 @@ export default {
border: 1px solid #e1e6f2;
border-radius: 4px !important;
}
.default-check {
text-align: right;
}
.el-select {
width: 100%;
}
.label {
z-index: 1;
position: absolute;
@ -623,32 +577,39 @@ export default {
height: 18px;
background: url(../../../assets/img/login/account.png) 0 0/100% 100% no-repeat;
}
.school {
background-image: url(../../../assets/img/login/school.png);
}
.workNumber {
width: 17px;
background-image: url(../../../assets/img/login/workNumber.png);
}
.password {
top: 18px;
background-image: url(../../../assets/img/login/password.png);
}
.code {
top: 18px;
background-image: url(../../../assets/img/login/code.png);
}
.ver-img {
position: absolute;
top: 1px;
right: 1px;
}
/deep/.el-form-item__error {
top: 105%;
left: auto;
right: 0;
color: #ffa94e;
}
.submit {
width: 100%;
height: 48px;
@ -661,31 +622,37 @@ export default {
border: 0;
}
}
.copyright {
padding: 18px 0;
font-size: 12px;
text-align: center;
background-color: #f3f6fa;
a {
color: #b1b4b8;
font-size: 12px;
&:hover {
opacity: 0.8;
}
}
}
.tips {
margin: 0 0 10px 5px;
font-size: 14px;
text-align: center;
color: #666;
}
/deep/.user-dia {
.tips {
margin-bottom: 20px;
text-align: center;
color: #666;
}
.users {
li {
display: flex;
@ -697,27 +664,33 @@ export default {
font-size: 14px;
background-color: #ebeef5;
cursor: pointer;
&.isEnable {
color: #c0c4cc;
background-color: #f5f7fa;
cursor: not-allowed;
}
&:last-child {
margin-bottom: 0;
}
&:hover {
background-color: #d3e0ff;
}
i {
font-size: 16px;
}
}
}
}
/deep/.info-dia {
.el-dialog__header {
border-bottom: 0;
}
.info-header {
position: absolute;
top: 20px;
@ -726,38 +699,46 @@ export default {
font-size: 16px;
color: #333;
}
.el-icon-warning {
margin-right: 10px;
color: #e6a23c;
font-size: 24px;
}
.info-wrap {
padding: 10px 33px;
}
.users {
max-height: 125px;
margin-top: 20px;
overflow: auto;
li {
margin: 5px;
font-size: 14px;
color: #333;
}
}
.info-footer {
display: flex;
justify-content: space-between;
// align-items: center;
margin-top: 20px;
}
.el-button {
width: 142px;
}
.unbind {
white-space: normal;
line-height: 1.6;
}
}
@media (max-height: 680px) {
.wrap .login {
padding: 40px 0;

@ -1,7 +1,10 @@
<template>
<div class="wrap">
<!-- 全屏 -->
<img class="full" src="@/assets/img/screen/full.png" alt="" @click="fullScreen">
<img class="full"
src="@/assets/img/screen/full.png"
alt=""
@click="fullScreen">
<!--header-->
<div class="header">
<div class="bg_header">
@ -34,10 +37,13 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_1.png" alt="">
<img src="@/assets/img/screen/t_1.png"
alt="">
中国宏观杠杆率
</div>
<div id="chart1" class="chart" style="height: 280px;"></div>
<div id="chart1"
class="chart"
style="height: 280px;"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -57,10 +63,13 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_2.png" alt="">
<img src="@/assets/img/screen/t_2.png"
alt="">
新增信贷数据
</div>
<div id="chart5" class="chart t_btn9" style="height: 280px;"></div>
<div id="chart5"
class="chart t_btn9"
style="height: 280px;"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -80,7 +89,8 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
{{ goodsSell.length ? goodsSell[0].operation_time.substr(0, 4) : 2021 }}年商品零售价格指数
</div>
<div class="main_table">
@ -93,10 +103,13 @@
</thead>
</table>
</div>
<div class="main_table" ref="tableWrap" style="height: 196px;margin-top: 0;overflow: auto">
<div class="main_table"
ref="tableWrap"
style="height: 196px;margin-top: 0;overflow: auto">
<table>
<tbody>
<tr v-for="(item, i) in goodsSell" :key="i">
<tr v-for="(item, i) in goodsSell"
:key="i">
<td width="70%">{{ item.hct }}</td>
<td>{{ item.rcpi }}</td>
</tr>
@ -106,7 +119,8 @@
</div>
</div>
<div class="middle">
<div class="item" style="height: 350px">
<div class="item"
style="height: 350px">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -128,7 +142,8 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_3.png" alt="">
<img src="@/assets/img/screen/t_3.png"
alt="">
中国GDP年率报告
</div>
<div class="main_table">
@ -141,11 +156,14 @@
</thead>
</table>
</div>
<div class="main_table" ref="gdpList" style="max-height: 260px;margin-top: 0;overflow: auto;">
<div class="main_table"
ref="gdpList"
style="max-height: 260px;margin-top: 0;overflow: auto;">
<table>
<tbody>
<template v-for="(item, i) in gdps">
<tr v-if="item.value != '0'" :key="i">
<tr v-if="item.value != '0'"
:key="i">
<td width="50%">{{ item.date_index }}</td>
<td width="50%">${{ item.value }}</td>
</tr>
@ -154,7 +172,8 @@
</table>
</div>
</div>
<div class="item" style="height: 520px;">
<div class="item"
style="height: 520px;">
<!--左上边框-->
<div class="t_line_box">
<i class="t_l_line"></i>
@ -176,15 +195,24 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_3.png" alt="">
<img src="@/assets/img/screen/t_3.png"
alt="">
主要央行利率
</div>
<div class="earth">
<img class="lbx" src="@/assets/img/screen/lbx.png" alt="">
<img class="jt" src="@/assets/img/screen/jt.png" alt="">
<img class="map" src="@/assets/img/screen/map.png" alt="">
<img class="lbx"
src="@/assets/img/screen/lbx.png"
alt="">
<img class="jt"
src="@/assets/img/screen/jt.png"
alt="">
<img class="map"
src="@/assets/img/screen/map.png"
alt="">
</div>
<div class="chart" id="chart7" style="height: 500px"></div>
<div class="chart"
id="chart7"
style="height: 500px"></div>
</div>
</div>
<div class="right">
@ -210,10 +238,13 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_4.png" alt="">
<img src="@/assets/img/screen/t_4.png"
alt="">
全国税收收入
</div>
<div id="chart3" class="echart t_btn7" style="height: 280px;"></div>
<div id="chart3"
class="echart t_btn7"
style="height: 280px;"></div>
</div>
<div class="item">
<!--左上边框-->
@ -237,10 +268,12 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_5.png" alt="">
<img src="@/assets/img/screen/t_5.png"
alt="">
央行货币当局资产负债
</div>
<div id="chart4" style="height: 280px;"></div>
<div id="chart4"
style="height: 280px;"></div>
</div>
<div class="item">
<div class="t_line_box">
@ -260,10 +293,13 @@
<i class="b_r_line"></i>
</div>
<div class="main_title">
<img src="@/assets/img/screen/t_7.png" alt="">
<img src="@/assets/img/screen/t_7.png"
alt="">
以美元计算进口年率
</div>
<div id="chart6" class="chart" style="height: 270px;"></div>
<div id="chart6"
class="chart"
style="height: 270px;"></div>
</div>
</div>
</div>
@ -278,7 +314,7 @@ import SockJS from 'sockjs-client'
import Stomp from 'stompjs'
import map from './map'
export default {
data() {
data () {
return {
stompClientMarket: null,
stompClient: null,
@ -287,32 +323,32 @@ export default {
gdps: []
}
},
mounted() {
mounted () {
this.getList()
this.renderChart()
this.renderMap()
},
methods: {
// gdp
getList() {
getList () {
this.$get(`${this.api.visualPreview}?tableName=hg_zg_gm_zhongguogdpnianlvbaogao&tableId=17`).then(({ comment, data }) => {
this.gdps = data
}).catch(res => {})
}).catch(res => { })
},
//
getCrypto() {
getCrypto () {
this.$get(`${this.api.getTopList}`).then(res => {
this.userCount = res.totalCount
}).catch(res => {})
}).catch(res => { })
},
// websocket
connect() {
connect () {
const socket = new SockJS(`${Setting.cryptoBaseURL}currency/websocket`) //广
// STOMP
this.stompClientMarket = new Stomp.over(socket)
this.stompClientMarket.debug = null
var this_ = this
this.stompClientMarket.connect({}, function(event) {
this.stompClientMarket.connect({}, function (event) {
//
if (this_.subObjMarket == null) {
this_.subscribeMarket()
@ -323,7 +359,7 @@ export default {
});
},
//
subscribeMarket() {
subscribeMarket () {
const this_ = this
this.subObjMarket = this.stompClientMarket.subscribe(
this_.api.market,
@ -342,11 +378,11 @@ export default {
}
);
},
disconnect() {
disconnect () {
this.stompClient && this.stompClient.disconnect()
},
//
fullScreen() {
fullScreen () {
//
if (document.fullscreenElement ||
document.mozFullScreenElement ||
@ -367,10 +403,10 @@ export default {
}
},
//
renderChart() {
renderChart () {
const animateChart = (chart, option, data, num = 6) => {
//
if (option.dataZoom[0].endValue == data.length ) {
if (option.dataZoom[0].endValue == data.length) {
option.dataZoom[0].endValue = num
option.dataZoom[0].startValue = 0
}
@ -402,7 +438,7 @@ export default {
},
legend: {
data: comment.map(e => e.comment),
textStyle:{
textStyle: {
color: '#fff'
},
top: '8%'
@ -423,7 +459,7 @@ export default {
endValue: 6 // 6
}
],
color: ['#6188e9','#9032f3','#a57de3','#4BF0FF','#44AFF0','#4E82FF','#584BFF','#BE4DFF','#F845F1'],
color: ['#6188e9', '#9032f3', '#a57de3', '#4BF0FF', '#44AFF0', '#4E82FF', '#584BFF', '#BE4DFF', '#F845F1'],
xAxis: {
type: 'category',
boundaryGap: ['20%', '20%'],
@ -459,7 +495,7 @@ export default {
setInterval(function () {
animateChart(chart[0], option, series)
}, 1500)
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.visualPreview}?tableName=hg_zg_jr_quanguoshuishoushouru&tableId=33`).then(res => {
@ -497,10 +533,10 @@ export default {
}
}
},
color: ['#4BF0FF','#44AFF0','#4E82FF','#584BFF','#BE4DFF','#F845F1'],
color: ['#4BF0FF', '#44AFF0', '#4E82FF', '#584BFF', '#BE4DFF', '#F845F1'],
legend: {
data: ['税收收入合计'],
textStyle:{
textStyle: {
color: '#fff'
},
top: '8%'
@ -542,7 +578,7 @@ export default {
setInterval(function () {
animateChart(chart[1], option, data)
}, 1500)
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.previewData}?tableName=hg_zg_jr_guojilvyouwaihuishourugoucheng&tableId=52`).then(res => {
@ -583,7 +619,7 @@ export default {
//[0, 360]
// startAngle: 0,
//
radius : '45%',
radius: '45%',
//
center: ['50%', '65%'],
//
@ -592,7 +628,7 @@ export default {
// roseType: 'radius',
// false
// avoidLabelOverlap: false,
color: ['#065aab', '#066eab', '#0682ab', '#0696ab', '#06a0ab','#06b4ab','#06c8ab','#06dcab','#06f0ab'],
color: ['#065aab', '#066eab', '#0682ab', '#0696ab', '#06a0ab', '#06b4ab', '#06c8ab', '#06dcab', '#06f0ab'],
label: {
normal: {
show: true,
@ -614,7 +650,7 @@ export default {
data: series
}]
})
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.previewData}?tableName=hg_zg_jr_yanghanghuobidangjuzichanfuzhai&tableId=55`).then(res => {
@ -774,7 +810,7 @@ export default {
setInterval(function () {
animateChart(chart[3], option, data, 3)
}, 1500)
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.previewData}?tableName=hg_zg_jr_shangpinlingshoujiagezhishu&tableId=60`).then(res => {
@ -788,7 +824,7 @@ export default {
})
})
this.goodsSell = [...goodsSell, ...goodsSell]
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.previewData}?tableName=hg_zg_jr_xinzengxindaishuju&tableId=34`).then(res => {
@ -934,7 +970,7 @@ export default {
setInterval(function () {
animateChart(chart[4], option, data, 3)
}, 1500)
}).catch(res => {})
}).catch(res => { })
//
this.$get(`${this.api.visualPreview}?tableName=hg_zg_my_yimeiyuanjisuanjinkounianlv&tableId=22`).then(res => {
@ -1039,7 +1075,7 @@ export default {
setInterval(function () {
animateChart(chart[5], option, data)
}, 1500)
}).catch(res => {})
}).catch(res => { })
this.scrollTable()
@ -1051,20 +1087,20 @@ export default {
})
},
//
async renderMap() {
async renderMap () {
// idname
const param = [
{tableId: 2, tableName: 'll_yh_usa'},
{tableId: 3, tableName: 'll_yh_euro'},
{tableId: 4, tableName: 'll_yh_newzealand'},
{tableId: 5, tableName: 'll_yh_china'},
{tableId: 6, tableName: 'll_yh_switzerland'},
{tableId: 7, tableName: 'll_yh_english'},
{tableId: 8, tableName: 'll_yh_australia'},
{tableId: 9, tableName: 'll_yh_japan'},
{tableId: 10, tableName: 'll_yh_russia'},
{tableId: 11, tableName: 'll_yh_india'},
{tableId: 12, tableName: 'll_yh_brazil'}
{ tableId: 2, tableName: 'll_yh_usa' },
{ tableId: 3, tableName: 'll_yh_euro' },
{ tableId: 4, tableName: 'll_yh_newzealand' },
{ tableId: 5, tableName: 'll_yh_china' },
{ tableId: 6, tableName: 'll_yh_switzerland' },
{ tableId: 7, tableName: 'll_yh_english' },
{ tableId: 8, tableName: 'll_yh_australia' },
{ tableId: 9, tableName: 'll_yh_japan' },
{ tableId: 10, tableName: 'll_yh_russia' },
{ tableId: 11, tableName: 'll_yh_india' },
{ tableId: 12, tableName: 'll_yh_brazil' }
]
this.$post(this.api.multipleTablePreview, param).then(res => {
//
@ -1219,10 +1255,10 @@ export default {
index = -1
}
}, 2000)
}).catch(res => {})
}).catch(res => { })
},
//
scrollTable() {
scrollTable () {
const dom = this.$refs.tableWrap
const dom1 = this.$refs.gdpList
setInterval(() => {
@ -1238,5 +1274,5 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../../styles/page/screen.scss";
@import '../../../styles/page/screen.scss';
</style>

@ -1,5 +1,5 @@
import axios from 'axios'
import util from '@/libs/util'
import Util from '@/libs/util'
import router from '@/router/index'
import Setting from '@/setting'
import store from '@/store'
@ -18,43 +18,43 @@ let check = true
let checkTimer = null
// 检测账号是否被禁用,如果禁用则提示并退出登录
function checkDisabled () {
const token = util.local.get(Setting.tokenKey)
const token = Util.local.get(Setting.tokenKey)
if (!token) return false
check = false
axios.get(baseURL + api.accountIsDisabled + '?token=' + token, {
token: util.local.get(Setting.tokenKey),
token: Util.local.get(Setting.tokenKey),
headers: {
token
}
}).then(res => {
if (res.data) {
util.errorMsg('账号被禁用,已强制退出,有疑问请联系管理员')
Util.errorMsg('账号被禁用,已强制退出,有疑问请联系管理员')
setTimeout(() => {
store.dispatch('user/logout')
}, 1500)
}
}).catch(res => {})
}).catch(res => { })
}
// 请求拦截器
service.interceptors.request.use(config => {
let token = util.local.get(Setting.tokenKey)
if(token) config.headers.token = token
let token = Util.local.get(Setting.tokenKey)
if (token) config.headers.token = token
let storeSchoolId = store.state.user.schoolId
let routeSchoolId = router.app._route.query.schoolId
if(routeSchoolId) routeSchoolId = atob(decodeURI(routeSchoolId))
if (routeSchoolId) routeSchoolId = atob(decodeURI(routeSchoolId))
// 如果store里没有schoolId,则取url里的schoolId,从用户跳转到后台的时候因为加载顺序的问题会出现这个情况,所以要做这个处理
if(storeSchoolId || routeSchoolId) config.headers.schoolId = storeSchoolId ? storeSchoolId : routeSchoolId
if (storeSchoolId || routeSchoolId) config.headers.schoolId = storeSchoolId ? storeSchoolId : routeSchoolId
clearTimeout(checkTimer)
check && checkDisabled()
checkTimer = setTimeout(() => {
check = true
}, 2000)
return config
},err => {
util.errorMsg({
}, err => {
Util.errorMsg({
message: '退出登陆',
onClose: function () {
router.push({name: '/login'})
router.push({ name: '/login' })
}
})
return Promise.reject(err)
@ -64,12 +64,26 @@ service.interceptors.request.use(config => {
service.interceptors.response.use(
response => {
const res = response.data
if(res.status == 200) {
return Promise.resolve(res).catch(e => {})
}else if(res.status == 30001) {
return Promise.resolve(res).catch(e => {})
}else if(!res.status){
return Promise.resolve(res).catch(e => {})
if (res.status == 200) {
return Promise.resolve(res).catch(e => { })
} else if (res.code === 401) {
// 账号互踢
if (!logouted) {
Util.local.remove(Setting.storeKey)
Util.local.remove(Setting.tokenKey)
Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录,您已被迫下线!' : '登录过期,请重新登录!')
setTimeout(() => {
router.replace({
path: '/login'
})
logouted = 0
}, 1500)
logouted = 1
}
} else if (res.status == 30001) {
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,
@ -77,8 +91,8 @@ service.interceptors.response.use(
duration: 1500
})
return Promise.reject(res)
}else {
util.errorMsg(res.message)
} else {
Util.errorMsg(res.message)
res.message === '该账号无权限!' && setTimeout(() => {
store.dispatch('user/logout')
}, 1500)
@ -93,9 +107,9 @@ service.interceptors.response.use(
// 未登录则跳转登录页面,并携带当前页面的路径
// 在登录成功后返回当前页面,这一步需要在登录页操作。
case 401:
util.local.remove(Setting.storeKey)
util.local.remove(Setting.tokenKey)
util.errorMsg('登录过期,请重新登录')
Util.local.remove(Setting.storeKey)
Util.local.remove(Setting.tokenKey)
Util.errorMsg('登录过期,请重新登录')
setTimeout(() => {
router.replace({
path: '/login'
@ -103,16 +117,16 @@ service.interceptors.response.use(
}, 1000)
break
case 500:
util.errorMsg('网络错误')
Util.errorMsg('网络错误')
break
// 403 token过期
// 登录过期对用户进行提示
// 清除本地token和清空vuex中token对象
// 跳转登录页面
case 403:
util.local.remove(Setting.storeKey)
util.local.remove(Setting.tokenKey)
util.errorMsg('登录过期,请重新登录')
Util.local.remove(Setting.storeKey)
Util.local.remove(Setting.tokenKey)
Util.errorMsg('登录过期,请重新登录')
// 清除token
// store.commit('loginSuccess', null);
// 跳转登录页面,并将要浏览的页面fullPath传过去,登录成功后跳转需要访问的页面
@ -127,11 +141,11 @@ service.interceptors.response.use(
break
// 404请求不存在
case 404:
util.errorMsg('网络请求不存在!')
Util.errorMsg('网络请求不存在!')
break
// 其他错误,直接抛出错误提示
default:
util.errorMsg(error.response.data.message)
Util.errorMsg(error.response.data.message)
Promise.reject(res)
}
return Promise.reject(error.response)
@ -139,9 +153,9 @@ service.interceptors.response.use(
}
);
function get(url, params){
return new Promise((resolve, reject) =>{
service.get(url, {params: params}).then(res => {
function get (url, params) {
return new Promise((resolve, reject) => {
service.get(url, { params: params }).then(res => {
resolve(res)
}).catch(err => {
reject(err)
@ -149,9 +163,9 @@ function get(url, params){
})
}
function post(url, params){
return new Promise((resolve, reject) =>{
service.post(url,params).then(res => {
function post (url, params) {
return new Promise((resolve, reject) => {
service.post(url, params).then(res => {
resolve(res)
}).catch(err => {
reject(err.data)
@ -159,8 +173,8 @@ function post(url, params){
})
}
function del(url, params){
return new Promise((resolve, reject) =>{
function del (url, params) {
return new Promise((resolve, reject) => {
service.delete(url, {
params
}).then(res => {
@ -171,8 +185,8 @@ function del(url, params){
})
}
function put(url, params){
return new Promise((resolve, reject) =>{
function put (url, params) {
return new Promise((resolve, reject) => {
service.put(url, {
params
}).then(res => {
@ -182,4 +196,4 @@ function put(url, params){
})
})
}
export { get,post,del,put }
export { get, post, del, put }

@ -11,8 +11,8 @@ const url = location.host
const dev = process.env.NODE_ENV === 'development' // 本地
let host = `${location.origin}/`
if (dev) {
host = 'http://121.37.12.51/'
// host = 'http://192.168.31.51:9000/'
host = 'https://www.dataforward.cn/'
// host = 'http://192.168.31.217:9000/'
}
const Setting = {

@ -14,5 +14,6 @@ module.exports = {
  assetsDir: Setting.assetsDir,
devServer: {
port: 8092
}
},
productionSourceMap: false,
}
Loading…
Cancel
Save