Skip to content

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

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

parents 664c4384 8e335d30
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 35 deletions
pages/account/login/index.vue
View file @ 3bbadb4e
<template>
<div class="account">
<Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
<!-- <CarouselItem>
<div class="bg bg0">1</div>
</CarouselItem>-->
<CarouselItem>
<div class="bg bg1">1</div>
<div class="bg bg1"></div>
</CarouselItem>
<CarouselItem>
<div class="bg bg2">1</div>
<div class="bg bg2"></div>
</CarouselItem>
<CarouselItem>
<div class="bg bg3">1</div>
<div class="bg bg3"></div>
</CarouselItem>
</Carousel>
<!-- <div v-if="showI18n" class="page-account-header">
<i-header-i18n />
</div>-->
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
<div class="page_log">
<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="page-account-top">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
<div class="log_code_box">
<div class="log_code">
<img src="@/assets/images/login/erwei.jpg" alt="logoCode" />
<img src="@/assets/images/login/sanjiao.png" alt="" class="sanjiao" />
</div>
<!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
</div>
<h3 class="mb20">用户登陆</h3>
<h2 class="mb20">登 录</h2>
<Login @on-submit="handleSubmit">
<UserName name="username" value="" />
<Password name="password" value="" enter-to-submit />
<div class="page-account-auto-login mb20">
<!-- <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> -->
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
......@@ -140,43 +137,61 @@ export default {
background-size: 100% auto;
}
.bg0 {
background-image: url("../../../assets/images/login/bg0.png");
background-image: url("../../../assets/images/login/login01.png");
}
.bg1 {
background-image: url("../../../assets/images/login/bg1.jpg");
background-image: url("../../../assets/images/login/login01.png");
}
.bg2 {
background-image: url("../../../assets/images/login/bg2.jpg");
background-image: url("../../../assets/images/login/login01.png");
}
.bg3 {
background-image: url("../../../assets/images/login/bg3.jpg");
background-image: url("../../../assets/images/login/login01.png");
}
.main {
position: absolute;
z-index: 55;
top: @jianju;
left: @jianju;
right: @jianju;
bottom: @jianju;
background: rgba(38, 128, 235, 0.3);
top: 168px;
bottom: 168px;
left: 360px;
right: 360px;
background: url("../../../assets/images/login/login02.jpg") no-repeat -177px -16px;
background-size: 94%;
display: flex;
.ad {
flex: 1;
text-align: center;
img {
margin-top:26%;
.page_log{
display: block;
width: 304px;
height: 72px;
}
.img { margin-top:30px; }
img { margin-top:23%; }
}
.login {
background-color: white;
width: 600px;
padding: 0 90px;
width: 420px;
padding: 0 50px;
display: flex;
align-items: center;
// align-items: center;
flex-direction: row;
.cen {
width: 100%;
margin-top: -50px;
.log_code_box{
text-align: right;
height: 130px;
margin: 0 -50px 0 0;
.log_code{
width: 100px;
float: right;
.sanjiao{
position: absolute;
right: 0px;
top: 0px;
}
}
}
.ivu-input-wrapper {
margin-bottom: 5px;
}
......
pages/account/login/indexold.vue 0 → 100644
View file @ 3bbadb4e
<template>
<div class="account">
<Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
<!-- <CarouselItem>
<div class="bg bg0">1</div>
</CarouselItem>-->
<CarouselItem>
<div class="bg bg1">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg2">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg3">1</div>
</CarouselItem>
</Carousel>
<!-- <div v-if="showI18n" class="page-account-header">
<i-header-i18n />
</div>-->
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
</div>
<div class="login">
<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>
<h3 class="mb20">用户登陆</h3>
<Login @on-submit="handleSubmit">
<UserName name="username" value="" />
<Password name="password" value="" 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>
</div>
</template>
<script>
import iCopyright from "@/components/copyright";
import { mapActions } from "vuex";
import mixins from "../mixins";
import Oidc from "oidc-client";
import util from "@/libs/util";
var mgr = new Oidc.UserManager(window.authConfig);
export default {
layout: "empty",
mixins: [mixins],
components: { iCopyright },
data() {
return {
value1: 0,
autoLogin: 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("登陆失败！");
}
});
}
},
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查询失败!");
}
});
}
}
};
</script>
<style lang="less">
@jianju: 40px;
.account {
position: fixed;
width: 100%;
top: 0;
bottom: 0;
.zmd {
z-index: 1;
position: absolute;
top: 0;
bottom: 0;
width: 100%;
}
.bg {
width: 100%;
height: 100vh;
background-size: 100% auto;
}
.bg0 {
background-image: url("../../../assets/images/login/bg0.png");
}
.bg1 {
background-image: url("../../../assets/images/login/bg1.jpg");
}
.bg2 {
background-image: url("../../../assets/images/login/bg2.jpg");
}
.bg3 {
background-image: url("../../../assets/images/login/bg3.jpg");
}
.main {
position: absolute;
z-index: 55;
top: @jianju;
left: @jianju;
right: @jianju;
bottom: @jianju;
background: rgba(38, 128, 235, 0.3);
display: flex;
.ad {
flex: 1;
text-align: center;
img {
margin-top:26%;
}
}
.login {
background-color: white;
width: 600px;
padding: 0 90px;
display: flex;
align-items: center;
flex-direction: row;
.cen {
width: 100%;
margin-top: -50px;
.ivu-input-wrapper {
margin-bottom: 5px;
}
.mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px 5px 15px #2680eb;
}
.ivu-btn-large {
height: 50px !important;
}
}
}
}
}
}
</style>
\ No newline at end of file
pages/mainProcess/index.vue
View file @ 3bbadb4e
......@@ -127,7 +127,7 @@
<InputNumber :max="maxnum" :min="1" v-model="chaiNum"></InputNumber>
<Slider v-model="chaiNum" :max="maxnum" show-stops :min="1"></Slider>
</Modal>
<!-- 专业工艺-添加人员单个，批量 -->
<!-- 主工艺-添加人员单个，批量 -->
<Modal v-model="userModal" title="添加人员" :width="770" :mask-closable="false" @on-ok="okUsers">
<UserSelect ref="userSelected" v-model="userIds" :type='2' :multiple="true" />
</Modal>
......
pages/produce/execute/execute.less
View file @ 3bbadb4e
......@@ -364,6 +364,7 @@
padding-left: 50px;
}
.mass_box{
h2{ height: 40px;}
.heger{ color: #2680EB;}
.rangb{ color: #515A6E;}
.fanxiu{ color: #FFA000;}
......@@ -405,6 +406,8 @@
}
.list02{
min-height: 50px;
max-height: 100px;
overflow-y: auto;
.tag_card02{
margin: 0 20px 15px 0;
}
......@@ -429,7 +432,7 @@
}
}
.fei_box{
width: calc(100% - 520px);
width: calc(100% - 482px);
display: inline-block;
.list02{
.tag_card02{
......
pages/produce/orderlist.vue
View file @ 3bbadb4e
......@@ -191,7 +191,14 @@ export default {
nowTime: new Date().getTime()//页面当前打开时间
};
},
created() {},
created() {
let oldStr=localStorage.getItem('admin');
let userlist = this.$store.getters.getUser(2);
console.info(userlist)
console.warn(localStorage)
// console.warn("02",sessionStorage)
// console.log("user",oldStr)
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
......
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