Skip to content

C
court-inner
Commit 49123c09 by 莫晓莉
Options

登录

parent 3b954bbc
Showing with 114 additions and 99 deletions
.env.development
ENV = 'development'
VUE_APP_BASE_API = 'http://192.168.11.43:9888'
VUE_APP_WS_API = 'ws://192.168.11.43:9888'
VUE_APP_FILE_API = 'http://192.168.11.43:9888'
VUE_APP_BASE_API = 'http://192.168.0.56:9888'
VUE_APP_WS_API = 'ws://192.168..0.56:9888'
VUE_APP_FILE_API = 'http://192.168.0.56:9888'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.11.43:9888/oauth/login?systemTag=oa-meetingss'
VUE_APP_LOGIN_API = 'http://171.106.48.55:36003/cas/login?service=http://192.168.0.56:9888/oauth/login?systemTag=oa-interInformation'
#获取菜单标识
VUE_APP_SYSTEAMTAG = ''
#退出登录标识
VUE_APP_LOGINOUT_TAG='oa-meetingss'
VUE_APP_LOGINOUT_TAG='oa-interInformation'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
package-lock.json
......@@ -3368,6 +3368,11 @@
}
}
},
"comutils": {
"version": "1.1.19",
"resolved": "https://registry.npmjs.org/comutils/-/comutils-1.1.19.tgz",
"integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw=="
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
......@@ -12187,6 +12192,14 @@
"resolved": "https://registry.nlark.com/vue-router/download/vue-router-3.5.2.tgz",
"integrity": "sha1-X1Xj8lGXDjbD6NiKfNLWejUK3lw="
},
"vue-seamless-scroll": {
"version": "1.1.23",
"resolved": "https://registry.npmjs.org/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz",
"integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==",
"requires": {
"comutils": "^1.1.9"
}
},
"vue-style-loader": {
"version": "4.1.3",
"resolved": "https://registry.nlark.com/vue-style-loader/download/vue-style-loader-4.1.3.tgz",
......
package.json
......@@ -23,6 +23,7 @@
"vue": "^2.6.10",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.5.2",
"vue-seamless-scroll": "^1.1.23",
"vue-ueditor-wrap": "^2.5.6",
"vuex": "^3.6.2"
},
......
src/router/routers.js
......@@ -11,11 +11,11 @@ Vue.prototype.push = function push(location) {
};
const constantRouterMap = [
// {
// path: "/verifyLogin",
// name: 'verifyLogin',
// component: resolve => require(["@/views/verifyLogin"], resolve),
// },
{
path: "/verifyLogin",
name: 'verifyLogin',
component: resolve => require(["@/views/verifyLogin"], resolve),
},
{
path: "/",
name: "home",
......
src/utils/request.js
......@@ -13,86 +13,86 @@ const service = axios.create({
})
// request拦截器
// service.interceptors.request.use(
// config => {
// if (getToken()) {
// config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
// }
// config.headers['Content-Type'] = 'application/json'
// return config
// },
// error => {
// Promise.reject(error)
// }
// )
service.interceptors.request.use(
config => {
if (getToken()) {
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
config.headers['Content-Type'] = 'application/json'
return config
},
error => {
Promise.reject(error)
}
)
// // response 拦截器
// // response 拦截器
// service.interceptors.response.use(
// response => {
// if (response.data.errCode == 401) {
// // removeToken().then(res => {})
// window.location.href = loginURL;
// return
// }
// const code = response.status;
// if (code < 200 || code > 300) {
// Notification.error({
// title: response.message
// });
// return Promise.reject("error");
// } else {
// return response.data;
// }
// },
// error => {
// let code = 0;
// try {
// code = error.response.data.status;
// } catch (e) {
// if (error.toString().indexOf("Error: timeout") !== -1) {
// Notification.error({
// title: "网络请求超时",
// duration: 5000
// });
// return Promise.reject(error);
// }
// }
// if (code) {
// if (code === 401) {
// // removeToken().then(res => {})
// window.location.href = loginURL;
// response 拦截器
// response 拦截器
service.interceptors.response.use(
response => {
if (response.data.errCode == 401) {
// removeToken().then(res => {})
window.location.href = loginURL;
return
}
const code = response.status;
if (code < 200 || code > 300) {
Notification.error({
title: response.message
});
return Promise.reject("error");
} else {
return response.data;
}
},
error => {
let code = 0;
try {
code = error.response.data.status;
} catch (e) {
if (error.toString().indexOf("Error: timeout") !== -1) {
Notification.error({
title: "网络请求超时",
duration: 5000
});
return Promise.reject(error);
}
}
if (code) {
if (code === 401) {
// removeToken().then(res => {})
window.location.href = loginURL;
// // toLogin().then(res=>{
// // console.log(res);
// // })
// toLogin().then(res=>{
// console.log(res);
// })
// // store.dispatch("LogOut").then(res => {
// // if (res.success) {
// // window.location.replace(res.data);
// // }
// // // Cookies.set("point", 401);
// // // 用户登录界面提示
// // //location.reload()
// // });
// } else if (code === 403) {
// router.push({ path: "/401" });
// } else {
// const errorMsg = error.response.data.message;
// if (errorMsg !== undefined) {
// Notification.error({
// title: errorMsg,
// duration: 5000
// });
// }
// }
// } else {
// Notification.error({
// title: "接口请求失败",
// duration: 5000
// });
// }
// return Promise.reject(error);
// }
// );
// store.dispatch("LogOut").then(res => {
// if (res.success) {
// window.location.replace(res.data);
// }
// // Cookies.set("point", 401);
// // 用户登录界面提示
// //location.reload()
// });
} else if (code === 403) {
router.push({ path: "/401" });
} else {
const errorMsg = error.response.data.message;
if (errorMsg !== undefined) {
Notification.error({
title: errorMsg,
duration: 5000
});
}
}
} else {
Notification.error({
title: "接口请求失败",
duration: 5000
});
}
return Promise.reject(error);
}
);
export default service
\ No newline at end of file
src/views/homePage/index.vue
......@@ -94,7 +94,7 @@
<div class="partnerInfo">
<ul class="ul-list">
<li v-for="(item,index) in headlist" :key="index" class="k-flex k-align-center" >
<img class="mr-5" :src="item.icon"></img>
<el-image class="mr-5" :src="item.icon"></el-image>
<div>
<div style="font-size:14px;">{{ item.name }}</div>
<div style="font-size:5px;">{{ item.nickName }}</div>
......@@ -111,7 +111,7 @@
<el-row class="mt-15 out-zone-style" :gutter="10" >
<el-col class="mb-10" :span="3" v-for="(item,index) in btnsList" :key="index">
<el-button>
<img class="mr-5 gong-icon" style="" :src="item.icon"></img>
<el-image class="mr-5 gong-icon" :src="item.icon"></el-image>
{{item.name}}
</el-button>
</el-col>
......@@ -171,7 +171,7 @@
</el-button>
<el-button type="text">
<div class="k-flex k-align-center button-inner" >
<el-image style="" :src="require('../../assets/icons/one.png')"></el-image>
<el-image style="" :src="require('../../assets/icons/one.pngel-image')"></el-image>
<div>党建专栏</div>
</div>
</el-button>
......@@ -798,33 +798,33 @@ export default {
nickName:'Assessment'
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/head/2.png"),
name:'建党专栏',
nickName:'Special column'
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/head/3.png"),
name:'审判管理',
nickName:'Administer'
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/head/4.png"),
name:'论坛交流',
nickName:'Forum'
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/head/5.png"),
name:'案例与期刊',
nickName:'Case-Jourbal'
},
],
btnsList:[
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/menhu.png"),
name:'综合门户',
},
{
icon:require("../../assets/home/head/1.png"),
icon:require("../../assets/home/btns/gongwenshouwen.png"),
name:'公文汇总',
},
{
......@@ -1315,7 +1315,7 @@ export default {
padding:10px 10px;
font-size:12px;
}
.ul-list li img{
.ul-list li .el-image{
width:30px;
height:30px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment