Skip to content

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

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

parents f35ec95d aa63d0ce
Expand all Show whitespace changes
Inline Side-by-side
Showing with 416 additions and 517 deletions
components/page/dataGrid.vue
View file @ ba7bdcf9
<template>
<div class="table-content myBug flex fd">
<div class="table-tools" v-if="tool" ref="tools">
<div class="table-content">
<div class="table-tools" v-if="tool">
<div class="table-search" v-if="easy">
<slot name="easySearch">
<Input
......@@ -11,30 +11,28 @@
v-model="keys"
/>
</slot>
</div>
<Button v-if="high" @click="modalSearch=true" type="text">
<Icon type="md-search" />高级
</Button>
</div>
<div class="searchBack">
<slot name="searchBack"></slot>
</div>
<div class="btns">
<slot name="buttons"></slot>
<Button v-if="set&&type=='table'" @click="config=!config">
<Icon type="md-build" class="table-set" size="14" title="列设置" />
<Icon type="md-build" title="列设置" />
</Button>
</div>
</div>
<div class="fg" ref="ftable">
<div v-if="type=='card'" class="table-card">
<Row :gutter="gutter">
<div class="table-main" ref="main">
<Row v-if="type=='card'">
<Col :span="span" v-for="(row,i) in list" :key="i">
<slot name="card" :row="row">
<span>{{row.id}}</span>
</slot>
</Col>
</Row>
</div>
<Table
v-else
:border="border"
......@@ -42,25 +40,21 @@
:data="list"
:height="tableHeight"
:draggable="draggable"
:size="size"
:row-key="rowKey"
ref="table"
class="tableCommon fg"
class="tableCommon"
@on-expand="expand"
@on-drag-drop="onDragDrop"
@on-selection-change="selectionChange"
@on-select="onSelect"
:loading="loading"
></Table>
<div class="table-footer" ref="footer">
<div>
</div>
<div class="table-footer">
<slot name="footer"></slot>
</div>&nbsp;
<Page
v-if="page"
:total="search.total"
:current="search.page"
class="mr15 mt15 fr"
class="fr"
show-total
size="small"
show-elevator
......@@ -71,7 +65,6 @@
@on-page-size-change="pageSizeChange"
/>
</div>
</div>
<Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search">
<slot name="searchForm"></slot>
<div slot="footer">
......@@ -107,13 +100,10 @@
</li>
</ul>
</Drawer>
<FooterToolbar style="height:60px" v-if="batch" v-show="footerToolbar">
<div class="tip">
已选{{selectItems.length}}项
<FooterToolbar v-if="batch" v-show="footerToolbar">
<div class="tip">已选{{selectItems.length}}项</div>
<slot name="batch"></slot>
</div>
<Button @click="cancelFooterToolbar" class="btn">取消</Button>
<Button @click="footerToolbar=false">取消</Button>
</FooterToolbar>
</div>
</template>
......@@ -141,8 +131,7 @@ export default {
configLoad: false,
userConfig: null, //用户页面配置信息。,
// userId: 1
userId: this.$store.state.userInfo.userId,
loading: false
userId: this.$store.state.userInfo.userId
};
},
props: {
......@@ -165,10 +154,6 @@ export default {
type: String,
default: "请输入关键字"
},
size: {
type: String,
default: "default"
},
height: {
type: Number,
default: 0
......@@ -237,17 +222,9 @@ export default {
return ["table", "card", "list"].indexOf(value) !== -1;
}
},
gutter:{
type:Number,
default:0
},
span: {
type: Number,
default: 24
},
//table控件children子数据控制功能
rowKey: {
type: [String, Number]
}
},
created() {
......@@ -261,28 +238,29 @@ export default {
mounted() {
if (this.data && this.data.length > 0) {
this.list = this.data;
//return;
return;
}
this.keys = "";
this.intY();
if (this.lazy == true) {
return;
}
if (this.userId > 0) {
this.loadUserConfig();
} else {
this.easySearch();
}
if (this.height === 0) {
this.tableHeight = this.$refs.main.offsetHeight;
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
// console.log(this.$refs.table)
window.screenHeight = window.innerHeight;
this.tableHeight = window.screenHeight - this.firstY - 60;
this.tableHeight = this.$refs.main.offsetHeight;
})();
};
} else {
this.tableHeight = this.height;
}
//注册拖拽事件。
this.$dragging.$on("dragend", e => {
// console.log("dragend",e);
......@@ -296,20 +274,10 @@ export default {
this.tableHeight = window.innerHeight - this.firstY - 60;
}
if (this.action) {
this.loading = true;
this.$api
.post(this.action, this.search)
.then(r => {
this.$api.post(this.action, this.search).then(r => {
this.list = r.result.items;
this.search.total = r.result.totalCount;
this.loading = false;
})
.catch(
function(err) {
this.loading = false;
this.$Message.error("加载失败");
}.bind(this)
);
this.search.total = r.result.totalCount || r.result.count;
});
}
},
columnInit() {
......@@ -401,11 +369,7 @@ export default {
this.$emit("on-drag-drop", a, b);
},
easySearch() {
if (
this.conditions &&
this.conditions.keys &&
this.conditions.keys.default
) {
if (this.conditions && this.conditions.keys.default) {
//判断没有传入条件的用默认的查询
this.conditions.keys.value = this.keys;
}
......@@ -487,10 +451,6 @@ export default {
},
selectAll(status) {
this.$refs.table.selectAll(status);
},
cancelFooterToolbar() {
this.$refs.table.selectAll(false);
this.footerToolbar = false;
}
},
computed: {
......@@ -533,16 +493,6 @@ export default {
});
};
}
if (u.type == "outputTime") {
u.render = (h, params) => {
let values = u.key;
return h("OutputTime", {
props: {
value: params.row[values]
}
});
};
}
return !u.hide;
});
return cols;
......@@ -559,69 +509,51 @@ export default {
};
</script>
<style lang="less" scoped>
<style lang="less">
.table-content {
position: relative;
height: 100%;
.table-tools {
padding-top: 5px;
height: 50px;
overflow: hidden;
.table-search {
float: left;
line-height: 50px;
.ivu-form-item {
margin-bottom: 0;
}
}
.btns {
float: right;
text-align: right;
height: 40px;
}
}
.tableCommon {
width: 100%;
}
display: flex;
flex-direction: column;
.tip {
display: inline;
}
.tableCommon tr th {
line-height: 30px;
font-size: 14px;
background: #f5f6fa;
}
.fg {
overflow: auto;
.table-card{
overflow: hidden;
}
form {
display: inline-block;
.ivu-form-item {
margin: 0;
vertical-align: middle;
}
.tableCommon tr td {
line-height: 25px;
font-size: 14px;
padding: 0 2px;
}
.tableCommon tr td .ivu-table-cell {
padding: 0 5px;
}
.table-card {
.table-main {
width: 100%;
text-align: left;
padding: 0;
display: block;
overflow-y: auto;
flex-grow: 1;
tr td .ivu-table-cell {
padding: 0 5px;
}
.table-set {
cursor: pointer;
}
.table-set:hover {
color: orange;
.table-tools {
display: flex;
line-height: 50px;
.table-search {
flex-grow: 1;
}
.btns {
min-width: 200px;
text-align: right;
}
}
.table-footer {
height: 40px;
line-height: 45px;
}
.ivu-footer-toolbar {
text-align: left;
background: rgba(0, 0, 0, 0.7);
color: #fff;
}
}
.table-columns {
......
pages/account/login/index.vue
View file @ ba7bdcf9
<template>
<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>
<div class="bg bg1"></div>
</CarouselItem>
......@@ -10,7 +10,7 @@
<CarouselItem>
<div class="bg bg3"></div>
</CarouselItem>
</Carousel>
</Carousel> -->
<div class="main">
<div class="ad">
<div class="page_log">
......@@ -21,20 +21,19 @@
<div class="login">
<div class="cen">
<div class="log_code_box">
<div class="log_code">
<div class="log_code" @click="handlTrance">
<img src="@/assets/images/login/erwei.jpg" alt="logoCode" />
<img src="@/assets/images/login/sanjiao.png" alt="" class="sanjiao" />
<transition name="animation">
<!-- <img v-if="imgFlag" src="@/assets/images/login/sanjiao.png" alt="" class="sanjiao" /> -->
<div v-if="imgFlag" class="sanjiao"></div>
</transition>
</div>
</div>
<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">
<Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div> -->
<div class="mt20">
<Login @on-submit="handleSubmit" class="form_sub">
<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>
......@@ -57,7 +56,8 @@ export default {
data() {
return {
value1: 0,
autoLogin: true
autoLogin: true,
imgFlag: true,
};
},
created() {
......@@ -113,6 +113,9 @@ export default {
this.$Message.error("用户信息22查询失败!");
}
});
},
handlTrance(){
this.imgFlag = !this.imgFlag
}
}
};
......@@ -124,6 +127,7 @@ export default {
width: 100%;
top: 0;
bottom: 0;
background-image: url("../../../assets/images/login/login01.png");
.zmd {
z-index: 1;
position: absolute;
......@@ -155,9 +159,10 @@ export default {
bottom: 168px;
left: 360px;
right: 360px;
background: url("../../../assets/images/login/login02.jpg") no-repeat -177px -16px;
background-size: 94%;
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;
......@@ -171,8 +176,8 @@ export default {
}
.login {
background-color: white;
width: 420px;
padding: 0 50px;
width: 410px;
padding: 0 40px;
display: flex;
// align-items: center;
flex-direction: row;
......@@ -180,12 +185,18 @@ export default {
width: 100%;
.log_code_box{
text-align: right;
height: 130px;
margin: 0 -50px 0 0;
height: 110px;
margin: 0 -40px 0 0;
.log_code{
width: 100px;
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;
......@@ -193,19 +204,39 @@ export default {
}
}
.ivu-input-wrapper {
margin-bottom: 5px;
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;
// }
}
.mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px 5px 15px #2680eb;
}
.ivu-btn-large {
height: 50px !important;
}
}
}
}
}
.animation-enter-to,.animation-leave-to{
animation: mymove 1s 1s linear;
}
@keyframes mymove {
0%{
transform: translateX(0px);
}
100%{
transform: translateX(-45px);
}
}
</style>
\ No newline at end of file
pages/bug/index.vue
View file @ ba7bdcf9
This diff is collapsed.
pages/produce/execute/api.js 0 → 100644
View file @ ba7bdcf9
import Api from '@/plugins/request'
export default {
index: `${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`,
getpaged(params) {
return Api.get(`${PlanUrl}/orderexecutequalityrecord/dispatchproductcodes`, params);
},
submitData(params) {
return Api.post(`${PlanUrl}/orderexecutequalityrecord/checkdispatchproduct`, params);
},
}
\ No newline at end of file
pages/produce/execute/execute.less
View file @ ba7bdcf9
......@@ -445,7 +445,7 @@
}
.fei_right{
float: right;
padding-top: 10px;
padding-top: 15px;
line-height: 50px;
width: 460px;
}
......
pages/produce/execute/judgment/index.vue
View file @ ba7bdcf9
This diff is collapsed.
pages/produce/orderlist.vue
View file @ ba7bdcf9
......@@ -194,8 +194,8 @@ export default {
created() {
let oldStr=localStorage.getItem('admin');
let userlist = this.$store.getters.getUser(2);
console.info(userlist)
console.warn(localStorage)
// console.info(userlist)
// console.warn(localStorage)
// console.warn("02",sessionStorage)
// console.log("user",oldStr)
},
......
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