Skip to content

M
mes-ui
Commit 55fc7221 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents 376b47c8 7090e166
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 223 deletions
npm-shrinkwrap.json
View file @ 55fc7221
...@@ -1744,7 +1744,7 @@ ...@@ -1744,7 +1744,7 @@
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "5.5.2", "version": "5.5.2",
"resolved": "https://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz?cache=0&sync_timestamp=1597480760804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-5.5.2.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"dev": true, "dev": true,
"optional": true, "optional": true,
...@@ -1776,7 +1776,7 @@ ...@@ -1776,7 +1776,7 @@
}, },
"cross-spawn": { "cross-spawn": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz?cache=0&sync_timestamp=1590421014780&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-5.1.0.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true, "dev": true,
"optional": true, "optional": true,
...@@ -1856,7 +1856,7 @@ ...@@ -1856,7 +1856,7 @@
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
"dev": true, "dev": true,
"optional": true "optional": true
...@@ -1894,7 +1894,7 @@ ...@@ -1894,7 +1894,7 @@
}, },
"json-schema-traverse": { "json-schema-traverse": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
"dev": true, "dev": true,
"optional": true "optional": true
...@@ -1964,7 +1964,7 @@ ...@@ -1964,7 +1964,7 @@
}, },
"yallist": { "yallist": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
"dev": true, "dev": true,
"optional": true "optional": true
...@@ -4938,7 +4938,7 @@ ...@@ -4938,7 +4938,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.14.1", "version": "2.14.1",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz", "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao=" "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
} }
} }
...@@ -5467,7 +5467,7 @@ ...@@ -5467,7 +5467,7 @@
}, },
"crc-32": { "crc-32": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz", "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
"integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=", "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
"requires": { "requires": {
"exit-on-epipe": "~1.0.1", "exit-on-epipe": "~1.0.1",
...@@ -7364,7 +7364,7 @@ ...@@ -7364,7 +7364,7 @@
}, },
"exit-on-epipe": { "exit-on-epipe": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz", "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI=" "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
}, },
"expand-brackets": { "expand-brackets": {
...@@ -8015,7 +8015,7 @@ ...@@ -8015,7 +8015,7 @@
}, },
"frac": { "frac": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz", "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
"integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs=" "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
}, },
"fragment-cache": { "fragment-cache": {
...@@ -15087,7 +15087,7 @@ ...@@ -15087,7 +15087,7 @@
}, },
"printj": { "printj": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz", "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
"integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI=" "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
}, },
"private": { "private": {
...@@ -20540,7 +20540,7 @@ ...@@ -20540,7 +20540,7 @@
}, },
"script-loader": { "script-loader": {
"version": "0.7.2", "version": "0.7.2",
"resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz", "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
"integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=", "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -21128,7 +21128,7 @@ ...@@ -21128,7 +21128,7 @@
}, },
"ssf": { "ssf": {
"version": "0.10.3", "version": "0.10.3",
"resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz", "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
"integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=", "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": { "requires": {
"frac": "~1.1.2" "frac": "~1.1.2"
...@@ -23778,7 +23778,7 @@ ...@@ -23778,7 +23778,7 @@
}, },
"wmf": { "wmf": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz", "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
"integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto=" "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
}, },
"word-wrap": { "word-wrap": {
...@@ -23933,7 +23933,7 @@ ...@@ -23933,7 +23933,7 @@
}, },
"xlsx": { "xlsx": {
"version": "0.15.6", "version": "0.15.6",
"resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz", "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=", "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": { "requires": {
"adler-32": "~1.2.0", "adler-32": "~1.2.0",
...@@ -23948,7 +23948,7 @@ ...@@ -23948,7 +23948,7 @@
"dependencies": { "dependencies": {
"commander": { "commander": {
"version": "2.17.1", "version": "2.17.1",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz", "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=" "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
} }
} }
......
pages/account/login/index.vue
View file @ 55fc7221
<template> <template>
<div class="account"> <div class="account">
<!-- <Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd"> <!-- <Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
<CarouselItem> <CarouselItem>
<div class="bg bg1"></div> <div class="bg bg1"></div>
...@@ -12,241 +12,290 @@ ...@@ -12,241 +12,290 @@
</CarouselItem> </CarouselItem>
</Carousel> --> </Carousel> -->
<div class="main"> <div class="main">
<div class="ad"> <div class="ad">
<div class="page_log"> <div class="page_log">
<img class="img" src="@/assets/images/login/jz_logo.png" alt="logo" /> <img class="img" src="@/assets/images/login/jz_logo.png" alt="logo" />
</div>
<img src="@/assets/images/login/ivew01.png" alt=""/>
</div>
<div class="login">
<div class="cen">
<div class="log_code_box">
<div class="log_code" @click="handlTrance">
<img src="@/assets/images/login/erwei.jpg" alt="logoCode" />
<transition name="animation">
<div v-if="imgFlag" class="sanjiao"></div>
<!-- <img v-if="imgFlag" src="@/assets/images/login/sanjiao.png" alt="" class="sanjiao" /> -->
</transition>
</div> </div>
</div> <img src="@/assets/images/login/ivew01.png" alt="" />
<h2 class="mb20">登 录</h2> </div>
<Login @on-submit="handleSubmit" class="form_sub"> <div class="login">
<UserName name="username" class="user_name" value="" /> <div class="cen">
<Password name="password" class="pass_word" value="" enter-to-submit /> <div class="log_code_box">
<div class="sub_btn"> <div class="log_code" @click="handlTrance">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit> <img src="@/assets/images/login/erwei.jpg" alt="logoCode" />
<transition name="animation">
<div v-if="imgFlag" class="sanjiao"></div>
<!-- <img v-if="imgFlag" src="@/assets/images/login/sanjiao.png" alt="" class="sanjiao" /> -->
</transition>
</div>
</div>
<h2 class="mb20">登 录</h2>
<Login @on-submit="handleSubmit" class="form_sub">
<div class="mb20" style="height:40px;">
<Input v-model="tenantCode" size="large">
<span slot="prepend">租户号</span>
</Input>
</div>
<UserName name="username" class="user_name" value="" />
<Password name="password" class="pass_word" value="" enter-to-submit />
<div class="sub_btn">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div> </div>
</Login>
</div> </div>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import iCopyright from "@/components/copyright"; import iCopyright from "@/components/copyright";
import { mapActions } from "vuex"; import {
mapActions
} from "vuex";
import mixins from "../mixins"; import mixins from "../mixins";
import Oidc from "oidc-client"; import Oidc from "oidc-client";
import util from "@/libs/util"; import util from "@/libs/util";
var mgr = new Oidc.UserManager(window.authConfig); var mgr = new Oidc.UserManager(window.authConfig);
export default { export default {
layout: "empty", layout: "empty",
mixins: [mixins], mixins: [mixins],
components: { iCopyright }, components: {
data() { iCopyright
return {
value1: 0,
autoLogin: true,
imgFlag: true,
};
},
created() {
// this.oidc();
},
methods: {
...mapActions("admin/account", ["login"]),
/**
* @description 登录
* 表单校验已有 iView Pro 自动完成，如有需要修改，请阅读 iView Pro 文档
*/
handleSubmit(valid, values) {
if (valid) {
const { username, password } = values;
this.login({
username,
password
}).then(r => {
if (r > 0) {
this.$Message.success("登录成功！");
this.initUserInfo(r);
} else {
this.$Message.error("登录失败！");
}
}).catch(e=>{
console.log(e)
// this.$Message.error(e.message)
});
}
}, },
initUserInfo(id) { data() {
let parma = { return {
Id: id value1: 0,
}; autoLogin: true,
this.$http.sysUser.getuserinfo(parma).then(res => { imgFlag: true,
if (res.result) { tenantCode: '000001'
if ( };
res.result.avatarUrl &&
res.result.avatarUrl != "" &&
res.result.avatarUrl != null
) {
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
}
let info = res.result;
info.auth = ["admin"];
info.avatar = info.avatarUrl;
info.userId = info.id;
info.name = info.userName;
this.$store.dispatch("admin/user/set", info, {
root: true
});
// setUserInfo
this.$store.commit("setUserInfo", info);
this.$router.replace(this.$route.query.redirect || "/");
} else {
this.$Message.error("用户信息22查询失败!");
}
});
}, },
handlTrance(){ created() {
this.imgFlag = !this.imgFlag // this.oidc();
},
methods: {
...mapActions("admin/account", ["login"]),
/**
* @description 登录
* 表单校验已有 iView Pro 自动完成，如有需要修改，请阅读 iView Pro 文档
*/
handleSubmit(valid, values) {
if (valid) {
values.tenantcode = this.tenantCode
const {
username,
password,
tenantcode
} = values;
this.login({
username,
password,
tenantcode
}).then(r => {
if (r > 0) {
this.$Message.success("登录成功！");
this.initUserInfo(r);
} else {
this.$Message.error("登录失败！");
}
}).catch(e => {
console.log(e)
// this.$Message.error(e.message)
});
}
},
initUserInfo(id) {
let parma = {
Id: id
};
this.$http.sysUser.getuserinfo(parma).then(res => {
if (res.result) {
if (
res.result.avatarUrl &&
res.result.avatarUrl != "" &&
res.result.avatarUrl != null
) {
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
}
let info = res.result;
info.auth = ["admin"];
info.avatar = info.avatarUrl;
info.userId = info.id;
info.name = info.userName;
this.$store.dispatch("admin/user/set", info, {
root: true
});
// setUserInfo
this.$store.commit("setUserInfo", info);
this.$router.replace(this.$route.query.redirect || "/");
} else {
this.$Message.error("用户信息22查询失败!");
}
});
},
handlTrance() {
this.imgFlag = !this.imgFlag
}
} }
}
}; };
</script> </script>
<style lang="less"> <style lang="less">
@jianju: 40px; @jianju: 40px;
.account { .account {
width: 100%;
height: 100vh;
position: absolute;
// top: 0;
// bottom: 0;
background-image: url("../../../assets/images/login/login01.png");
.zmd {
z-index: 1;
position: absolute;
top: 0;
bottom: 0;
width: 100%;
}
.bg {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-size: 100% auto; position: absolute;
} // top: 0;
.bg0 { // bottom: 0;
background-image: url("../../../assets/images/login/login01.png");
}
.bg1 {
background-image: url("../../../assets/images/login/login01.png");
}
.bg2 {
background-image: url("../../../assets/images/login/login01.png");
}
.bg3 {
background-image: url("../../../assets/images/login/login01.png"); background-image: url("../../../assets/images/login/login01.png");
}
.main { .zmd {
z-index: 55; z-index: 1;
height: 603px; position: absolute;
width: 1210px; top: 0;
min-height: 500px; bottom: 0;
min-width: 1100px; width: 100%;
margin: 140px auto;
// position: absolute;
// top: 168px;
// bottom: 168px;
// left: 360px;
// right: 360px;
background: url("../../../assets/images/login/login02.jpg") no-repeat -70px 0px;
background-size: 80%;
display: flex;
h2{ padding: 4px 0 15px 0;}
.ad {
flex: 1;
text-align: center;
.page_log{
display: block;
width: 304px;
height: 72px;
}
.img { margin-top:30px; }
img { margin-top:23%; }
} }
.login {
background-color: white; .bg {
width: 410px;
padding: 0 40px;
display: flex;
// align-items: center;
flex-direction: row;
.cen {
width: 100%; width: 100%;
.log_code_box{ height: 100vh;
text-align: right; background-size: 100% auto;
height: 110px; }
margin: 0 -40px 0 0;
.log_code{ .bg0 {
position: relative; background-image: url("../../../assets/images/login/login01.png");
cursor: pointer; }
width: 90px;
height: 85PX; .bg1 {
float: right; background-image: url("../../../assets/images/login/login01.png");
.sanjiao{ }
width: 90px;
height: 90px; .bg2 {
border-bottom: 90px solid #ffffff; background-image: url("../../../assets/images/login/login01.png");
border-right: 90px solid transparent; }
position: absolute;
right: 0px; .bg3 {
top: 0px; background-image: url("../../../assets/images/login/login01.png");
} }
}
.main {
z-index: 55;
height: 603px;
width: 1210px;
min-height: 500px;
min-width: 1100px;
margin: 140px auto;
// position: absolute;
// top: 168px;
// bottom: 168px;
// left: 360px;
// right: 360px;
background: url("../../../assets/images/login/login02.jpg") no-repeat -70px 0px;
background-size: 80%;
display: flex;
h2 {
padding: 4px 0 15px 0;
} }
.ivu-input-wrapper {
margin-bottom: 6px; .ad {
flex: 1;
text-align: center;
.page_log {
display: block;
width: 304px;
height: 72px;
}
.img {
margin-top: 30px;
}
img {
margin-top: 23%;
}
} }
.sub_btn{
.shadown{ .login {
padding: 30px 0 0 0; background-color: white;
button{ width: 410px;
height: 50px; padding: 0 40px;
border-radius: 25px; display: flex;
box-shadow: 0px 9px 11px 3px #c2d6ec; // align-items: center;
letter-spacing: 3px; flex-direction: row;
font-size: 18px;
outline: none; .cen {
// background: url("../../../assets/images/login/btn_bg.png") no-repeat center; width: 100%;
// span{
// margin: -14px 0 0; .log_code_box {
// display: block; text-align: right;
// } height: 110px;
margin: 0 -40px 0 0;
.log_code {
position: relative;
cursor: pointer;
width: 90px;
height: 85PX;
float: right;
.sanjiao {
width: 90px;
height: 90px;
border-bottom: 90px solid #ffffff;
border-right: 90px solid transparent;
position: absolute;
right: 0px;
top: 0px;
}
}
}
.ivu-input-wrapper {
margin-bottom: 6px;
}
.sub_btn {
.shadown {
padding: 30px 0 0 0;
button {
height: 50px;
border-radius: 25px;
box-shadow: 0px 9px 11px 3px #c2d6ec;
letter-spacing: 3px;
font-size: 18px;
outline: none;
// background: url("../../../assets/images/login/btn_bg.png") no-repeat center;
// span{
// margin: -14px 0 0;
// display: block;
// }
}
}
}
} }
}
} }
}
} }
}
} }
.animation-enter-to,.animation-leave-to{
animation: mymove 1s 1s linear; .animation-enter-to,
.animation-leave-to {
animation: mymove 1s 1s linear;
} }
@keyframes mymove { @keyframes mymove {
0%{ 0% {
transform: translateX(0px); transform: translateX(0px);
} }
100%{
transform: translateX(-45px); 100% {
} transform: translateX(-45px);
}
} }
</style> </style>
\ No newline at end of file
store/admin/account.js
View file @ 55fc7221
...@@ -22,13 +22,15 @@ export const actions = { ...@@ -22,13 +22,15 @@ export const actions = {
dispatch dispatch
}, { }, {
username = '', username = '',
password = '' password = '',
tenantcode=''
} = {}) { } = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// 开始请求登录接口 // 开始请求登录接口
AccountLogin({ AccountLogin({
username, username,
password password,
tenantcode
}) })
.then(async res => { .then(async res => {
// 设置 cookie 一定要存 uuid 和 token 两个 cookie // 设置 cookie 一定要存 uuid 和 token 两个 cookie
...@@ -85,7 +87,7 @@ export const actions = { ...@@ -85,7 +87,7 @@ export const actions = {
sessionStorage.clear(); sessionStorage.clear();
localStorage.clear(); localStorage.clear();
//util.cookies.set('tenantCode', res.result.tenantCode ); //util.cookies.set('tenantCode', res.result.tenantCode );
$nuxt.$router.push("/account/login?tenant="+util.cookies.get('tenantCode')); $nuxt.$router.push("/account/login");
} }
if (confirm) { if (confirm) {
......
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