Compare commits

..

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

  1. 83
      src/layouts/footer/index.vue
  2. 593
      src/pages/account/login/index.vue
  3. 2254
      src/pages/screen/list/index.vue
  4. 306
      src/plugins/requests/index.js
  5. 4
      src/setting.js
  6. 3
      vue.config.js

@ -6,59 +6,58 @@
* @Description: In User Settings Edit * @Description: In User Settings Edit
--> -->
<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>联系人金经理 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>
</div>
</div> </div>
<div class="copyright">
<span>© Copyright 2021 Dataforward 数据前瞻</span>
<a href="https://beian.miit.gov.cn/#/Integrated/index"
target="_blank">粤ICP备20072679号</a>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
}; };
}, },
mounted () { mounted(){
}, },
methods: { methods: {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.footer { .footer{
padding: 17px 0 9px; padding: 17px 0 9px;
text-align: center;
background-color: #0f1d2e;
.info {
margin-bottom: 7px;
font-size: 14px;
line-height: 20px;
color: #d7dfe7;
}
.copyright {
font-size: 12px;
text-align: center; text-align: center;
line-height: 17px; background-color: #0F1D2E;
span { .info{
margin-right: 20px; margin-bottom: 7px;
color: #757f8a; font-size: 14px;
line-height: 20px;
color: #D7DFE7;
} }
a { .copyright{
color: #757f8a;
font-size: 12px; font-size: 12px;
&:hover { text-align: center;
color: #c7c7c7; line-height: 17px;
span{
margin-right: 20px;
color: #757F8A;
}
a{
color:#757F8A;
font-size: 12px;
&:hover{
color: #c7c7c7;
}
} }
} }
} }
}
</style> </style>

@ -4,42 +4,63 @@
<div class="form"> <div class="form">
<h6 class="title">欢迎使用请登录</h6> <h6 class="title">欢迎使用请登录</h6>
<ul class="tab"> <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"
@click="typeClick(item)">{{ item.label }}</li> :key="index"
:class="{active: form.distinguish == item.id}"
@click="typeClick(item)">{{item.label}}</li>
</ul> </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"> <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> <label class="label school"></label>
<el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校"> <el-select v-model="form.schoolId"
<el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName" clearable
:value="item.schoolId"></el-option> filterable
placeholder="请选择学校">
<el-option v-for="(item, i) in schoolList"
:key="i"
:label="item.schoolName"
:value="item.schoolId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="flex-1" prop="workNumber"> <el-form-item class="flex-1"
prop="workNumber">
<label class="label account"></label> <label class="label account"></label>
<el-input v-model.trim="form.workNumber" :placeholder="'请输入学号/工号'" <el-input v-model.trim="form.workNumber"
@keyup.enter.native="submit"></el-input> :placeholder="'请输入学号/工号'"
@keyup.enter.native="submit"></el-input>
</el-form-item> </el-form-item>
</div> </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> <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>
<template v-if="form.distinguish === 2"> <template v-if="form.distinguish === 2">
<el-form-item prop="account"> <el-form-item prop="account">
<label class="label account"></label> <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>
<el-form-item prop="code"> <el-form-item prop="code">
<label class="label code"></label> <label class="label code"></label>
<div class="ver-code"> <div class="ver-code">
<el-input v-model="form.code" placeholder="请输入验证码" maxlength="6" <el-input v-model="form.code"
@keyup.enter.native="submit"></el-input> placeholder="请输入验证码"
<el-button type="text" @click="sendPhoneCodeLogin" :disabled="phoneDisabledLogin">{{ phoneBtnTextLogin maxlength="6"
}} @keyup.enter.native="submit"></el-input>
<el-button type="text"
@click="sendPhoneCodeLogin"
:disabled="phoneDisabledLogin">{{ phoneBtnTextLogin }}
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
@ -47,55 +68,89 @@
<template v-if="form.distinguish !== 2"> <template v-if="form.distinguish !== 2">
<el-form-item prop="password"> <el-form-item prop="password">
<label class="password label"></label> <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-input>
</el-form-item> </el-form-item>
<el-form-item prop="code"> <el-form-item prop="code">
<label class="label code"></label> <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> </el-input>
<img @click="getVerImg" :src="verificationIMG" class="ver-img" alt=""> <img @click="getVerImg"
:src="verificationIMG"
class="ver-img"
alt="">
</el-form-item> </el-form-item>
</template> </template>
<div v-show="!form.distinguish" class="default-check"> <div v-show="!form.distinguish"
class="default-check">
<el-checkbox v-model="setDefault">设置为默认学校</el-checkbox> <el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
</div> </div>
<el-button class="submit" type="primary" @click="submit">登录</el-button> <el-button class="submit"
type="primary"
@click="submit">登录</el-button>
</el-form> </el-form>
</div> </div>
</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> <p class="tips">依据国家政策法规需绑定手机号进行网络实名才可登录使用本平台</p>
<el-form label-width="60px"> <el-form label-width="60px">
<el-form-item label="手机号"> <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>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="ver-code"> <div class="ver-code">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="phoneCode"
<el-button style="top: 1px" type="text" @click="sendPhoneCode(1)" placeholder="请输入验证码"
:disabled="binding === '' || phoneDisabled">{{ phoneBtnText }}</el-button> maxlength="6"></el-input>
<el-button style="top: 1px"
type="text"
@click="sendPhoneCode(1)"
:disabled="binding === '' || phoneDisabled">{{phoneBtnText}}</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
<el-button size="small" @click="phoneVisible = false"> </el-button> class="dialog-footer">
<el-button size="small" type="primary" @click="phoneSubmit"> </el-button> <el-button size="small"
@click="phoneVisible = false"> </el-button>
<el-button size="small"
type="primary"
@click="phoneSubmit"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="请选择您要登录的用户" :visible.sync="userVisible" :close-on-click-modal="false" custom-class="user-dia" <el-dialog title="请选择您要登录的用户"
width="500px"> :visible.sync="userVisible"
:close-on-click-modal="false"
custom-class="user-dia"
width="500px">
<p class="tips">该手机号已绑定以下用户信息</p> <p class="tips">该手机号已绑定以下用户信息</p>
<ul class="users"> <ul class="users">
<li :class="{ isEnable: !user.isEnable }" v-for="(user, i) in users" :key="i" @click="chooseUser(user)"> <li :class="{isEnable: !user.isEnable}"
<span>{{ user.schoolName }}{{ user.userName }}{{ user.workNumber }}{{ user.isEnable ? '' : '(已禁用)' }}</span> 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> <i class="el-icon-right"></i>
</li> </li>
</ul> </ul>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="infoVisible" :close-on-click-modal="false" :show-close="false" custom-class="info-dia" <el-dialog :visible.sync="infoVisible"
width="400px"> :close-on-click-modal="false"
:show-close="false"
custom-class="info-dia"
width="400px">
<div class="info-header"> <div class="info-header">
<i class="el-icon-warning"></i> <i class="el-icon-warning"></i>
提示 提示
@ -103,20 +158,26 @@
<div class="info-wrap"> <div class="info-wrap">
<p class="tips">该手机号已与以下用户绑定</p> <p class="tips">该手机号已与以下用户绑定</p>
<ul class="users"> <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> <span>{{ user.userName }}{{ user.schoolName }}</span>
</li> </li>
</ul> </ul>
<div class="info-footer"> <div class="info-footer">
<el-button size="small" type="primary" @click="bindPhone">是本人继续绑定</el-button> <el-button size="small"
<el-button class="unbind" size="small" @click="unbindPhone">不是本人解绑以上用户并绑定新用户</el-button> type="primary"
@click="bindPhone">是本人继续绑定</el-button>
<el-button class="unbind"
size="small"
@click="unbindPhone">不是本人解绑以上用户并绑定新用户</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<div class="footer"> <div class="footer">
<div class="copyright"> <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> </div>
</div> </div>
@ -476,272 +537,230 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.wrap { .wrap {
min-height: 100%; min-height: 100%;
background-color: #f3f6fa; background-color: #f3f6fa;
} }
.ver-code { .ver-code {
position: relative; position: relative;
.el-button {
.el-button { position: absolute;
position: absolute; top: 10px;
top: 10px; right: 10px;
right: 10px; }
}
} }
.login { .login {
min-height: calc(100vh - 70px); min-height: calc(100vh - 70px);
padding-top: calc((100vh - 611px) / 2); padding-top: calc((100vh - 611px) / 2);
background: url(../../../assets/img/shapes/shape1.png) (0 123px) / auto no-repeat, background: url(../../../assets/img/shapes/shape1.png) (0 123px) / auto no-repeat,
url(../../../assets/img/shapes/shape2.png) (35px 238px) / auto no-repeat, url(../../../assets/img/shapes/shape2.png) (35px 238px) / auto no-repeat,
url(../../../assets/img/shapes/shape3.png) (0 485px) / auto no-repeat, url(../../../assets/img/shapes/shape3.png) (0 485px) / auto no-repeat,
url(../../../assets/img/shapes/shape4.png) (right 50%) / auto no-repeat, 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/shape5.png) (right 80%) / auto no-repeat,
url(../../../assets/img/shapes/shape6.png) (right bottom) / auto no-repeat; url(../../../assets/img/shapes/shape6.png) (right bottom) / auto no-repeat;
.tab {
.tab { display: flex;
display: flex; justify-content: space-between;
justify-content: space-between; align-items: center;
align-items: center; margin-bottom: 24px;
margin-bottom: 24px; border-bottom: 2px solid #e1e6f2;
border-bottom: 2px solid #e1e6f2; li {
padding: 18px 0;
li { margin-bottom: -1px;
padding: 18px 0; font-size: 16px;
margin-bottom: -1px; color: #555;
font-size: 16px; cursor: pointer;
color: #555; border-bottom: 4px solid transparent;
cursor: pointer; &:last-child {
border-bottom: 4px solid transparent; margin-right: 0;
}
&:last-child { &.active {
margin-right: 0; color: $main-color;
} border-bottom-color: $main-color;
}
&.active { }
color: $main-color;
border-bottom-color: $main-color;
}
} }
} .items {
display: flex;
.items { align-items: center;
display: flex; }
align-items: center; .form {
} width: 436px;
padding: 38px 38px 60px;
.form { margin: 0 auto 0;
width: 436px; border-radius: 6px;
padding: 38px 38px 60px; background-color: #fff;
margin: 0 auto 0; .title {
border-radius: 6px; margin-bottom: 25px;
background-color: #fff; font-size: 26px;
color: #0b1d30;
.title { letter-spacing: 4px;
margin-bottom: 25px; }
font-size: 26px; }
color: #0b1d30; /deep/.el-form-item {
letter-spacing: 4px; margin-bottom: 20px;
}
/deep/.el-input__inner {
position: relative;
height: 52px;
padding: 0 20px 0 34px;
line-height: 50px;
background-color: #fbfbfb;
border: 1px solid #e1e6f2;
border-radius: 4px !important;
}
.default-check {
text-align: right;
}
.el-select {
width: 100%;
}
.label {
z-index: 1;
position: absolute;
top: 17px;
left: 11px;
width: 18px;
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;
margin-top: 30px;
line-height: 48px;
padding: 0;
font-size: 20px;
background-color: $main-color;
border-radius: 4px;
border: 0;
} }
}
/deep/.el-form-item {
margin-bottom: 20px;
}
/deep/.el-input__inner {
position: relative;
height: 52px;
padding: 0 20px 0 34px;
line-height: 50px;
background-color: #fbfbfb;
border: 1px solid #e1e6f2;
border-radius: 4px !important;
}
.default-check {
text-align: right;
}
.el-select {
width: 100%;
}
.label {
z-index: 1;
position: absolute;
top: 17px;
left: 11px;
width: 18px;
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;
margin-top: 30px;
line-height: 48px;
padding: 0;
font-size: 20px;
background-color: $main-color;
border-radius: 4px;
border: 0;
}
} }
.copyright { .copyright {
padding: 18px 0; padding: 18px 0;
font-size: 12px;
text-align: center;
background-color: #f3f6fa;
a {
color: #b1b4b8;
font-size: 12px; font-size: 12px;
text-align: center;
&:hover { background-color: #f3f6fa;
opacity: 0.8; a {
color: #b1b4b8;
font-size: 12px;
&:hover {
opacity: 0.8;
}
} }
}
} }
.tips { .tips {
margin: 0 0 10px 5px; margin: 0 0 10px 5px;
font-size: 14px; font-size: 14px;
text-align: center;
color: #666;
}
/deep/.user-dia {
.tips {
margin-bottom: 20px;
text-align: center; text-align: center;
color: #666; color: #666;
} }
/deep/.user-dia {
.users { .tips {
li { margin-bottom: 20px;
display: flex; text-align: center;
justify-content: space-between; color: #666;
align-items: center; }
padding: 0 15px; .users {
margin-bottom: 10px; li {
line-height: 40px; display: flex;
font-size: 14px; justify-content: space-between;
background-color: #ebeef5; align-items: center;
cursor: pointer; padding: 0 15px;
margin-bottom: 10px;
&.isEnable { line-height: 40px;
color: #c0c4cc; font-size: 14px;
background-color: #f5f7fa; background-color: #ebeef5;
cursor: not-allowed; cursor: pointer;
} &.isEnable {
color: #c0c4cc;
&:last-child { background-color: #f5f7fa;
margin-bottom: 0; cursor: not-allowed;
} }
&:last-child {
&:hover { margin-bottom: 0;
background-color: #d3e0ff; }
} &:hover {
background-color: #d3e0ff;
i { }
font-size: 16px; i {
} font-size: 16px;
}
}
} }
}
} }
/deep/.info-dia { /deep/.info-dia {
.el-dialog__header { .el-dialog__header {
border-bottom: 0; border-bottom: 0;
} }
.info-header {
.info-header { position: absolute;
position: absolute; top: 20px;
top: 20px; display: flex;
display: flex; align-items: center;
align-items: center; font-size: 16px;
font-size: 16px; color: #333;
color: #333; }
} .el-icon-warning {
margin-right: 10px;
.el-icon-warning { color: #e6a23c;
margin-right: 10px; font-size: 24px;
color: #e6a23c; }
font-size: 24px; .info-wrap {
} padding: 10px 33px;
}
.info-wrap { .users {
padding: 10px 33px; max-height: 125px;
} margin-top: 20px;
overflow: auto;
.users { li {
max-height: 125px; margin: 5px;
margin-top: 20px; font-size: 14px;
overflow: auto; color: #333;
}
li { }
margin: 5px; .info-footer {
font-size: 14px; display: flex;
color: #333; justify-content: space-between;
// align-items: center;
margin-top: 20px;
}
.el-button {
width: 142px;
}
.unbind {
white-space: normal;
line-height: 1.6;
} }
}
.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) { @media (max-height: 680px) {
.wrap .login { .wrap .login {
padding: 40px 0; padding: 40px 0;
} }
} }
</style> </style>

File diff suppressed because it is too large Load Diff

@ -1,5 +1,5 @@
import axios from 'axios' import axios from 'axios'
import Util from '@/libs/util' import util from '@/libs/util'
import router from '@/router/index' import router from '@/router/index'
import Setting from '@/setting' import Setting from '@/setting'
import store from '@/store' import store from '@/store'
@ -8,8 +8,8 @@ import { Message } from 'element-ui'
const baseURL = Setting.apiBaseURL const baseURL = Setting.apiBaseURL
const service = axios.create({ const service = axios.create({
baseURL, baseURL,
timeout: 10000000 timeout: 10000000
}) })
// post请求头 // post请求头
service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
@ -18,182 +18,168 @@ let check = true
let checkTimer = null let checkTimer = null
// 检测账号是否被禁用,如果禁用则提示并退出登录 // 检测账号是否被禁用,如果禁用则提示并退出登录
function checkDisabled () { function checkDisabled () {
const token = Util.local.get(Setting.tokenKey) const token = util.local.get(Setting.tokenKey)
if (!token) return false if (!token) return false
check = false check = false
axios.get(baseURL + api.accountIsDisabled + '?token=' + token, { axios.get(baseURL + api.accountIsDisabled + '?token=' + token, {
token: Util.local.get(Setting.tokenKey), token: util.local.get(Setting.tokenKey),
headers: { headers: {
token token
} }
}).then(res => { }).then(res => {
if (res.data) { if (res.data) {
Util.errorMsg('账号被禁用,已强制退出,有疑问请联系管理员') util.errorMsg('账号被禁用,已强制退出,有疑问请联系管理员')
setTimeout(() => { setTimeout(() => {
store.dispatch('user/logout') store.dispatch('user/logout')
}, 1500) }, 1500)
} }
}).catch(res => { }) }).catch(res => {})
} }
// 请求拦截器 // 请求拦截器
service.interceptors.request.use(config => { 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 if(token) config.headers.token = token
let storeSchoolId = store.state.user.schoolId let storeSchoolId = store.state.user.schoolId
let routeSchoolId = router.app._route.query.schoolId let routeSchoolId = router.app._route.query.schoolId
if (routeSchoolId) routeSchoolId = atob(decodeURI(routeSchoolId)) if(routeSchoolId) routeSchoolId = atob(decodeURI(routeSchoolId))
// 如果store里没有schoolId,则取url里的schoolId,从用户跳转到后台的时候因为加载顺序的问题会出现这个情况,所以要做这个处理 // 如果store里没有schoolId,则取url里的schoolId,从用户跳转到后台的时候因为加载顺序的问题会出现这个情况,所以要做这个处理
if (storeSchoolId || routeSchoolId) config.headers.schoolId = storeSchoolId ? storeSchoolId : routeSchoolId if(storeSchoolId || routeSchoolId) config.headers.schoolId = storeSchoolId ? storeSchoolId : routeSchoolId
clearTimeout(checkTimer) clearTimeout(checkTimer)
check && checkDisabled() check && checkDisabled()
checkTimer = setTimeout(() => { checkTimer = setTimeout(() => {
check = true check = true
}, 2000) }, 2000)
return config return config
}, err => { },err => {
Util.errorMsg({ util.errorMsg({
message: '退出登陆', message: '退出登陆',
onClose: function () { onClose: function () {
router.push({ name: '/login' }) router.push({name: '/login'})
} }
}) })
return Promise.reject(err) return Promise.reject(err)
}) })
// 响应拦截器 // 响应拦截器
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
const res = response.data const res = response.data
if (res.status == 200) { if(res.status == 200) {
return Promise.resolve(res).catch(e => { }) return Promise.resolve(res).catch(e => {})
} else if (res.code === 401) { }else if(res.status == 30001) {
// 账号互踢 return Promise.resolve(res).catch(e => {})
if (!logouted) { }else if(!res.status){
Util.local.remove(Setting.storeKey) return Promise.resolve(res).catch(e => {})
Util.local.remove(Setting.tokenKey) } else if (res.status === 10008) {
Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录,您已被迫下线!' : '登录过期,请重新登录!') Message.error({
setTimeout(() => { message: res.message,
router.replace({ showClose: true,
path: '/login' duration: 1500
}) })
logouted = 0 return Promise.reject(res)
}, 1500) }else {
logouted = 1 util.errorMsg(res.message)
} res.message === '该账号无权限!' && setTimeout(() => {
} else if (res.status == 30001) { store.dispatch('user/logout')
return Promise.resolve(res).catch(e => { }) }, 1500)
} else if (!res.status) { return Promise.reject(res)
return Promise.resolve(res).catch(e => { }) }
} else if (res.status === 10008) { },
Message.error({ // 服务器状态码不是200的情况
message: res.message, error => {
showClose: true, if (error.response.status) {
duration: 1500 switch (error.response.status) {
}) // 401: 未登录
return Promise.reject(res) // 未登录则跳转登录页面,并携带当前页面的路径
} else { // 在登录成功后返回当前页面,这一步需要在登录页操作。
Util.errorMsg(res.message) case 401:
res.message === '该账号无权限!' && setTimeout(() => { util.local.remove(Setting.storeKey)
store.dispatch('user/logout') util.local.remove(Setting.tokenKey)
}, 1500) util.errorMsg('登录过期,请重新登录')
return Promise.reject(res) setTimeout(() => {
} router.replace({
}, path: '/login'
// 服务器状态码不是200的情况 })
error => { }, 1000)
if (error.response.status) { break
switch (error.response.status) { case 500:
// 401: 未登录 util.errorMsg('网络错误')
// 未登录则跳转登录页面,并携带当前页面的路径 break
// 在登录成功后返回当前页面,这一步需要在登录页操作。 // 403 token过期
case 401: // 登录过期对用户进行提示
Util.local.remove(Setting.storeKey) // 清除本地token和清空vuex中token对象
Util.local.remove(Setting.tokenKey) // 跳转登录页面
Util.errorMsg('登录过期,请重新登录') case 403:
setTimeout(() => { util.local.remove(Setting.storeKey)
router.replace({ util.local.remove(Setting.tokenKey)
path: '/login' util.errorMsg('登录过期,请重新登录')
}) // 清除token
}, 1000) // store.commit('loginSuccess', null);
break // 跳转登录页面,并将要浏览的页面fullPath传过去,登录成功后跳转需要访问的页面
case 500: setTimeout(() => {
Util.errorMsg('网络错误') router.replace({
break path: '/login',
// 403 token过期 // query: {
// 登录过期对用户进行提示 // redirect: router.currentRoute.fullPath
// 清除本地token和清空vuex中token对象 // }
// 跳转登录页面 })
case 403: }, 1000)
Util.local.remove(Setting.storeKey) break
Util.local.remove(Setting.tokenKey) // 404请求不存在
Util.errorMsg('登录过期,请重新登录') case 404:
// 清除token util.errorMsg('网络请求不存在!')
// store.commit('loginSuccess', null); break
// 跳转登录页面,并将要浏览的页面fullPath传过去,登录成功后跳转需要访问的页面 // 其他错误,直接抛出错误提示
setTimeout(() => { default:
router.replace({ util.errorMsg(error.response.data.message)
path: '/login', Promise.reject(res)
// query: { }
// redirect: router.currentRoute.fullPath return Promise.reject(error.response)
// } }
})
}, 1000)
break
// 404请求不存在
case 404:
Util.errorMsg('网络请求不存在!')
break
// 其他错误,直接抛出错误提示
default:
Util.errorMsg(error.response.data.message)
Promise.reject(res)
}
return Promise.reject(error.response)
} }
}
); );
function get (url, params) { function get(url, params){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) =>{
service.get(url, { params: params }).then(res => { service.get(url, {params: params}).then(res => {
resolve(res) resolve(res)
}).catch(err => { }).catch(err => {
reject(err) reject(err)
})
}) })
})
} }
function post (url, params) { function post(url, params){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) =>{
service.post(url, params).then(res => { service.post(url,params).then(res => {
resolve(res) resolve(res)
}).catch(err => { }).catch(err => {
reject(err.data) reject(err.data)
})
}) })
})
} }
function del (url, params) { function del(url, params){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) =>{
service.delete(url, { service.delete(url, {
params params
}).then(res => { }).then(res => {
resolve(res) resolve(res)
}).catch(err => { }).catch(err => {
reject(err.data) reject(err.data)
})
}) })
})
} }
function put (url, params) { function put(url, params){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) =>{
service.put(url, { service.put(url, {
params params
}).then(res => { }).then(res => {
resolve(res) resolve(res)
}).catch(err => { }).catch(err => {
reject(err.data) reject(err.data)
})
}) })
})
} }
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' // 本地 const dev = process.env.NODE_ENV === 'development' // 本地
let host = `${location.origin}/` let host = `${location.origin}/`
if (dev) { if (dev) {
host = 'https://www.dataforward.cn/' host = 'http://121.37.12.51/'
// host = 'http://192.168.31.217:9000/' // host = 'http://192.168.31.51:9000/'
} }
const Setting = { const Setting = {

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