Commit ee08f2e2 authored by 何小勇's avatar 何小勇

配置调整

parent 265f2a0b
......@@ -46,7 +46,7 @@ export default {
return this.$store.state.menuObj
},
navShow(){
return false||!['/','/404','/login'].includes(this.$route.path)
return false||!['/404','/login'].includes(this.$route.path)
},
pageShow(){
return false||!['/404','/login'].includes(this.$route.path)
......
......@@ -210,7 +210,7 @@ export default {
if(this.$store.state.menuObj[n].menuType=='font'||this.$store.state.menuObj[n].menuType=='system'){
temp = '/apaas/ui/#'
}else if(this.$store.state.menuObj[n].menuType=='manager'){
temp = '/apaas/manager/#'
temp = '/apaas/system/uir/#'
}
window.location.href = temp+n
}
......@@ -248,7 +248,7 @@ export default {
if(this.$store.state.menuObj[path].menuType=='font'||this.$store.state.menuObj[path].menuType=='system'){
temp = '/apaas/ui/#'
}else if(this.$store.state.menuObj[path].menuType=='manager'){
temp = '/apaas/manager/#'
temp = '/apaas/system/uir/#'
}
window.location.href = temp+path
}
......
......@@ -38,7 +38,7 @@ import menu from './router/function.js'
//获取用户信息
function getUser() {
return axios.get(`/msg/system/getUserInfo`)
return axios.get(`/apaas/system/getUserInfo`)
}
//处理菜单成为对象
......
......@@ -17,12 +17,12 @@
></span> -->
</el-input>
</el-form-item>
<el-form-item prop="yzm" class="yzm">
<!-- <el-form-item prop="yzm" class="yzm">
<div class="yzm_ctx">
<el-input class="yzm_ipt" v-model.trim="form.yzm" placeholder="请输入验证码" :validate-event="false" @keyup.enter="login_remember_info()"></el-input>
<img class="yzm_img" title="看不清?换一张" :src="imgSrc" @click="getImg()" />
</div>
</el-form-item>
</el-form-item> -->
<div class="apaas_button">
<el-button class="btn_sub" type="primary" @click.prevent="login_remember_info()">登 录</el-button>
</div>
......@@ -71,7 +71,7 @@ export default {
});
},
getUser() {
this.$axios.get(`/msg/system/getUserInfo`).then((res) => {
this.$axios.get(`/apaas/system/getUserInfo`).then((res) => {
if (res.data.code == 200) {
this.$store.commit("setUserInfo", res.data.data);
if (res.data.data.userType == 1) {
......@@ -93,28 +93,29 @@ export default {
});
},
login_remember_info() {
if (!this.form.userid) {
return this.$message.error("请输入账号");
}
if (!this.form.password) {
return this.$message.error("请输入密码");
}
if (!this.form.yzm) {
return this.$message.error("请输入验证码");
}
this.$axios
.get(`/msg/system/checkCaptcha/${this.imgId}/${this.form.yzm}`)
.then((res) => {
if (res.data.code == 200) {
// if (!this.form.userid) {
// return this.$message.error("请输入账号");
// }
// if (!this.form.password) {
// return this.$message.error("请输入密码");
// }
// if (!this.form.yzm) {
// return this.$message.error("请输入验证码");
// }
// this.$axios
// .get(`/apaas/system/checkCaptcha/${this.imgId}/${this.form.yzm}`)
// .then((res) => {
// if (res.data.code == 200) {
// this.login();
// } else {
// this.$message.error(res.data.desc);
// }
// });
this.login();
} else {
this.$message.error(res.data.desc);
}
});
},
login() {
this.$axios
.post(`/msg/system/login`, {
.post(`/apaas/system/login`, {
userId: this.form.userid,
userPassword: this.form.password,
})
......@@ -131,7 +132,7 @@ export default {
});
},
getImg() {
this.$axios.get(`/msg/system/getCaptcha`).then((res) => {
this.$axios.get(`/apaas/system/getCaptcha`).then((res) => {
if (res.data.code == 200) {
this.imgId = res.data.data.key;
this.imgSrc = res.data.data.image;
......
......@@ -157,8 +157,8 @@ var adminMenu = [
{
menuName: "管理中心",
path: "/system",
name:"system",
path: "/manage",
name:"manage",
parentPath:null,
menuType:'manager',
show: true,
......@@ -301,7 +301,7 @@ menu.forEach(e => {
//叶子层级需要加载到对应文件
//对首页做兼容
if(e.path=='/'){
e.component = () => import('../page/main/index/index.vue')
e.component = () => import('../page/main/develop/account/index.vue')
}else{
e.component= getViews(e.path)
}
......
......@@ -14,7 +14,7 @@ export default {
vue()
],
//本地运行基础路径,如:http://localhost:5173/apaas/ui/
base: "/apaas/system/ui/",
base: "/apaas/manage/ui",
clearScreen:false,
resolve:{
//别名,代码引入时方便引入
......@@ -30,16 +30,16 @@ export default {
hmr:true,//热更新
proxy: {
// 选项写法
'/msg/system':{
target: 'https://apaas5.wodcloud.com/msg/system', // 所要代理的目标地址
rewrite: path => path.replace(/^\/msg\/system/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的)
'/apaas/system':{
target: 'https://apaas5.wodcloud.com/apaas/system', // 所要代理的目标地址
rewrite: path => path.replace(/^\/apaas\/system/, ''), // 重写传过来的path路径,比如 `/api/index/1?id=10&name=zs`(注意:path路径最前面有斜杠(/),因此,正则匹配的时候不要忘了是斜杠(/)开头的;选项的 key 也是斜杠(/)开头的)
changeOrigin: true, // true/false, Default: false - changes the origin of the host header to the target URL
secure: false,//解决证书缺失问题
}
}
},
build:{
outDir:'dist/apaas/system/ui',//打包输出文件夹
outDir:'dist/apaas/manage/ui',//打包输出文件夹
assetsDir:'static',//打包输出静态文件
},
......
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