Compare commits

..

No commits in common. '7f18b9980106039538b1f93bce07aab320b1d1f3' and '84c8412fe9149284cd0dd3557301a6063218296c' have entirely different histories.

  1. 13
      src/layouts/footer/index.vue
  2. 167
      src/pages/account/login/index.vue
  3. 86
      src/pages/screen/list/index.vue
  4. 46
      src/plugins/requests/index.js
  5. 4
      src/setting.js
  6. 3
      vue.config.js

@ -9,12 +9,11 @@
<div class="footer">
<div class="info">
<!-- <span class="m-r-20">客服邮箱service@huorantech.cn</span> -->
<span>联系人金经理 15218726836</span>
<span>联系人郭经理 17671782660</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>
@ -37,12 +36,12 @@ export default {
.footer{
padding: 17px 0 9px;
text-align: center;
background-color: #0f1d2e;
background-color: #0F1D2E;
.info{
margin-bottom: 7px;
font-size: 14px;
line-height: 20px;
color: #d7dfe7;
color: #D7DFE7;
}
.copyright{
font-size: 12px;
@ -50,10 +49,10 @@ export default {
line-height: 17px;
span{
margin-right: 20px;
color: #757f8a;
color: #757F8A;
}
a{
color: #757f8a;
color:#757F8A;
font-size: 12px;
&:hover{
color: #c7c7c7;

@ -4,42 +4,63 @@
<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 }"
<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>
@ -47,54 +68,88 @@
<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)"
<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)">
<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>
@ -103,20 +158,26 @@
<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>
@ -479,17 +540,14 @@ 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);
@ -499,14 +557,12 @@ 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;
@ -514,30 +570,25 @@ 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;
@ -545,11 +596,9 @@ export default {
letter-spacing: 4px;
}
}
/deep/.el-form-item {
margin-bottom: 20px;
}
/deep/.el-input__inner {
position: relative;
height: 52px;
@ -559,15 +608,12 @@ 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;
@ -577,39 +623,32 @@ 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;
@ -622,37 +661,31 @@ 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;
@ -664,33 +697,27 @@ 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;
@ -699,46 +726,38 @@ 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,10 +1,7 @@
<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">
@ -37,13 +34,10 @@
<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">
@ -63,13 +57,10 @@
<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">
@ -89,8 +80,7 @@
<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">
@ -103,13 +93,10 @@
</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>
@ -119,8 +106,7 @@
</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>
@ -142,8 +128,7 @@
<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">
@ -156,14 +141,11 @@
</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>
@ -172,8 +154,7 @@
</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>
@ -195,24 +176,15 @@
<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">
@ -238,13 +210,10 @@
<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">
<!--左上边框-->
@ -268,12 +237,10 @@
<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">
@ -293,13 +260,10 @@
<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>
@ -1274,5 +1238,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,17 +18,17 @@ 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)
@ -37,7 +37,7 @@ function checkDisabled () {
}
// 请求拦截器
service.interceptors.request.use(config => {
let token = Util.local.get(Setting.tokenKey)
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
@ -51,7 +51,7 @@ service.interceptors.request.use(config => {
}, 2000)
return config
},err => {
Util.errorMsg({
util.errorMsg({
message: '退出登陆',
onClose: function () {
router.push({name: '/login'})
@ -66,20 +66,6 @@ service.interceptors.response.use(
const res = response.data
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){
@ -92,7 +78,7 @@ service.interceptors.response.use(
})
return Promise.reject(res)
}else {
Util.errorMsg(res.message)
util.errorMsg(res.message)
res.message === '该账号无权限!' && setTimeout(() => {
store.dispatch('user/logout')
}, 1500)
@ -107,9 +93,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'
@ -117,16 +103,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传过去,登录成功后跳转需要访问的页面
@ -141,11 +127,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)

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

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