Skip to content

M
mes-ui
Commit 4a028c6d authored by 周远喜's avatar 周远喜
Browse files
Options

ok

parent 8ba6f75a
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 83 deletions
pages/account/login/index.vue
View file @ 4a028c6d
......@@ -3,7 +3,7 @@
<Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
<!-- <CarouselItem>
<div class="bg bg0">1</div>
</CarouselItem> -->
</CarouselItem>-->
<CarouselItem>
<div class="bg bg1">1</div>
</CarouselItem>
......@@ -16,30 +16,32 @@
</Carousel>
<!-- <div v-if="showI18n" class="page-account-header">
<i-header-i18n />
</div> -->
</div>-->
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
</div>
<div class="login">
<div class="page-account-top">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
<div class="cen">
<div class="page-account-top">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
</div>
<!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
<h3 class="mb20">用户登陆</h3>
<Login @on-submit="handleSubmit">
<UserName name="username" value="13211111111" />
<Password name="password" value="1" enter-to-submit />
<div class="page-account-auto-login mb20">
<Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div>
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div>
<h3 class="mb20">用户登陆</h3>
<Login @on-submit="handleSubmit">
<UserName name="username" value="13211111111" />
<Password name="password" value="1" enter-to-submit />
<div class="page-account-auto-login mb20">
<Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div>
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div>
</div>
</div>
......@@ -102,13 +104,13 @@ export default {
let info = res.result;
info.auth = ["admin"];
info.avatar = info.avatarUrl;
info.userId=info.id;
info.name=info.userName;
info.userId = info.id;
info.name = info.userName;
this.$store.dispatch("admin/user/set", info, {
root: true
});
// setUserInfo
this.$store.commit("setUserInfo",info)
this.$store.commit("setUserInfo", info);
this.$router.replace(this.$route.query.redirect || "/");
} else {
this.$Message.error("用户信息22查询失败!");
......@@ -162,26 +164,30 @@ export default {
flex: 1;
text-align: center;
img {
margin-top: 400px;
margin-top:26%;
}
}
.login {
background-color: white;
width: 600px;
padding: 150px 90px;
// background-image: url("../../../assets/images/login/33.png");
// background-repeat: no-repeat;
// background-position-y: 525px;
.ivu-input-wrapper {
margin-bottom: 5px;
}
.mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px 5px 15px #2680eb;
padding: 0 90px;
display: flex;
align-items: center;
flex-direction: row;
.cen {
width: 100%;
margin-top: -50px;
.ivu-input-wrapper {
margin-bottom: 5px;
}
.ivu-btn-large {
height: 50px !important;
.mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px 5px 15px #2680eb;
}
.ivu-btn-large {
height: 50px !important;
}
}
}
}
......
static/config.js
View file @ 4a028c6d
const systemApi = {
//本地测试：
// dev:'192.168.0.88',
dev: '39.100.148.168',
bjdev: 'localhost',
//本地88服务器：
localServer: '39.100.148.168',
local: '192.168.0.88',
// localServer:'192.168.0.159',
//云上228服务器：
cloudServer: '39.100.148.168',
product:"49.232.68.61",
//云上113服务器：
//cloudServer:'47.92.111.113',
//上传文件
fileServer: '192.168.0.204',
//此处添加其他环境：
//……
const systemApi = {
local: 'localhost',
product: '39.100.148.168',
dev:"49.232.68.61",
aps:'47.92.102.113'
}
//环境切换（只修改此处）：
//let address=systemApi.dev;
let local = systemApi.dev;
let hostAddress = "localhost"; //192.168.0.159
let filePath = '39.100.148.168'; //文件上传ip
let filePathDown = '39.100.148.168'; //文件上传ip
let apsAdress = '47.92.102.113'
let address = systemApi.cloudServer;
let address=systemApi.dev;
//let address=systemApi.product;
//let address=systemApi.local;
//占位符自动替换：
window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.authUrl = `http://${address}:10010`; //Authentication-api //统一登陆认证
window.designUrl = `http://${address}:10030/api/services/app`; //Process-api 工艺规程
window.PlanUrl = `http://${address}:10050/api/services/app`; //Process-api
window.routeUrl = `http://${address}:10050/api/services/app`; //Process-api
window.bugUrl = `http://${address}:10070/api/services/app`; //Process-api
window.fileUrl = `http://${filePath}:10080/fileServer`; //文件上传url
window.fileUrlDown = `http://${filePathDown}:80`; //文件下载url
window.fileUrl = `http://${address}:10080/fileServer`; //文件上传url
window.fileUrlDown = `http://${address}`; //文件下载url
window.resourceUrl = `http://${address}:10040/api/services/app`; // 制造资源地址
window.workflowUrl = `http://${address}:10060/api/services/app`; // 工作流地址
window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
window.iconImg = `http://${address}:3006/imgicon/`; //待办任务图标路径
window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
window.technologyUrl =`http://${address}:10031/api/services/app/`;
//oidc配置：
window.authConfig = {
authority: `http://${address}:10010`,
client_id: 'js',
redirect_uri: `http://${hostAddress}:3006/callback`,
response_type: 'code',
scope: 'openid profile system process plan resource qms bug workflow crm aps',
post_logout_redirect_uri: `http://${hostAddress}:3006/`
};
\ No newline at end of file
window.iconImg = `http://${address}:3000/imgicon/`; //待办任务图标路径
window.apsUrl = `http://${systemApi.aps}:10110/api/services/app`;//aps排产
window.technologyUrl =`http://${address}:10031/api/services/app/`;
\ No newline at end of file
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