Skip to content

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

结果对比

parent 87028f68
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 81 deletions
pages/aps/results/api.js
View file @ 9f7bccf6
......@@ -23,4 +23,7 @@ export default {
processschemedispatchinsert(params) { //排产方案下发--普通+干扰；如果result.retcode=0,调用：
return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch_insert`, params);
},
getResults(){
return Api.post(`${apsUrl}/apspoolappservices/messehemacensorgetall`)
}
}
pages/aps/results/compare.vue
View file @ 9f7bccf6
<template>
<div class="compare">
<div class="compare_box" :style="{height:treeHeight+'px'}">
<div class="compare_box">
<div class="left_list">
<ul class="left_ul">
<li class="left_ul_title">
隐藏相同
<i-switch size="small" v-model="switch1" @on-change="change" />
<!-- 隐藏相同
<i-switch size="small" v-model="switch1" @on-change="change" /> -->
</li>
<li>延期交付批次数</li>
<li>延期交付天数</li>
......@@ -20,31 +20,32 @@
<li>离散值平均值</li>
<li>任务平衡工序数</li>
<li>效率系数</li>
<li>加工设备数</li>
<li>设备工作天数</li>
</ul>
</div>
<div class="right_add flex">
<div class="fg list_box" v-for="a of 5" :class="a%2 == 1?'dip_bg':''" :key="a">
<div v-if="items.length>0" class="fg list_box" v-for="(li,a) in items" :class="a%2 == 1?'dip_bg':''" :key="a">
<ul class="right_ul">
<li class="right_ul_title">
<a class="del_case">
<Icon type="md-close" size="16" @click="delitedCase" title="删除" />
</a>
<span class="case">方案一{{a}}</span>
<span class="case_time">2020-03-22 13:26:35</span>
</li>
<li>延期交付批次数</li>
<li>延期交付天数</li>
<li>提前交付批次数</li>
<li>提前交付天数</li>
<li>周日加班设备数</li>
<li>周日设备工作小时数</li>
<li>周六加班设备数</li>
<li>周六设备工作小时数</li>
<li>重叠法工序数</li>
<li>离散法工序数</li>
<li>离散值平均值</li>
<li>任务平衡工序数</li>
<li>效率系数</li>
<li>{{li.deferNum}}&nbsp;</li>
<li>{{li.deferTime}}&nbsp;</li>
<li>{{li.aheadNum}}&nbsp;</li>
<li>{{li.aheadTime}}&nbsp;</li>
<li>{{li.weekdayEquip}}&nbsp;</li>
<li>{{li.weekdayTime}}&nbsp;</li>
<li>{{li.saturdayEquip}}&nbsp;</li>
<li>{{li.saturdayTime }}&nbsp;</li>
<li>{{li.superposeTask}}&nbsp;</li>
<li>{{li.disperseTask }}&nbsp;</li>
<li>{{li.disvalueAvg }}&nbsp;</li>
<li>{{li.poiseTask }}&nbsp;</li>
<li>{{li.efficiencyAvg}}&nbsp;</li>
<li>{{li.runEquip}}&nbsp;</li>
<li>{{li.runEquipTime}}&nbsp;</li>
</ul>
</div>
</div>
......@@ -60,33 +61,33 @@ export default {
name: "添加",
tree: [],
switch1: true,
treeHeight: ""
list:[],
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
props:{
schemas:{
//方案集合
type:Array
}
},
components: {},
created() {
this.treeHeight = window.innerHeight - 170;
this.load()
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 170;
})();
};
},
methods: {
async load(){
let {result} = await Api.getResults();
console.log(result)
this.list=result;
},
change(status) {
this.$Message.info("开关状态：" + status);
},
// 删除方案
delitedCase() {
this.$Message.info("删除方案");
},
tabChange(name) {
if (name == "technicalcoordination") {
this.$refs.technicalcoordination.loadchangelist();
......@@ -95,6 +96,16 @@ export default {
this.$refs.unqualifiedorder.loadchangelist();
}
}
},
computed:{
items(){
var items=[];
this.schemas.map(p=>{
var info=this.list.filter(u=>u.schedule_Id==p.scheduleId)[0];
items.push(info);
})
return items;
}
}
};
</script>
pages/aps/results/index.vue
View file @ 9f7bccf6
......@@ -18,7 +18,7 @@
:key="index"
:class="isactive == index ? 'addclass' : '' "
>
<Checkbox v-model="li.checked" class="i-checkbox" @on-change="changeCheck(li)"></Checkbox>
<Checkbox v-model="li.checked" class="i-checkbox" @on-change="changeCheck(li,index)"></Checkbox>
<div class="title-t" @click="listData(li.schedule_Id,index)">排产方案：{{li.schedule_Id}}</div>
<div class="fa">排产时间：{{li.plan_Date}}</div>
<div class="fa">
......@@ -34,18 +34,18 @@
<h4 :text="title">{{title}}</h4>
</Col>
<Col span="10">
<a href="#" @click="comeBlck" class="black">返回</a>
<a href="#" @click="comeBlck" class="black">APS排产</a>
</Col>
<Col span="10" style="text-align: right;" v-if="gant">
<a href="#" @click="gantChart" class="gant">甘特图</a>
</Col>
</Row>
<component :is="detail" :eid="id" />
<component :is="detail" :eid="id" :schemas="schemas"/>
</Content>
</Layout>
<div class="footer" v-if="showFooter">
<span>已选：{{total}}项</span>&nbsp;&nbsp;&nbsp;
<span>已选：{{schemas.length}}项</span>&nbsp;&nbsp;&nbsp;
<Button type="primary" @click="submit">方案对比</Button>&nbsp;
<Button type="default" @click="cancel">取消</Button>
</div>
......@@ -78,6 +78,7 @@ export default {
blacks: false,
gant: false,
gantt:null,
curPage:null
};
},
async fetch({ store, params }) {
......@@ -109,12 +110,6 @@ export default {
this.isactive = index;
this.id = id;
this.title = "排产方案结果";
this.list.map(u => {
if ((u.checked = true)) {
u.checked = false;
}
});
this.contrastList = [];
},
clear() {
if (this.list.length > 0) {
......@@ -156,49 +151,26 @@ export default {
this.modal1Gant = true;
this.gantt = () => import("./gantt");
},
changeCheck(item) {
this.isactive = null;
(this.id = null), (this.blacks = true);
if (item.checked == true) {
this.contrastList.push(item.schedule_Id);
} else if (item.checked == false) {
let index = this.contrastList.indexOf(item.schedule_Id);
if (index > -1) {
this.contrastList.splice(index, 1);
}
}
if (this.contrastList.length > 1) {
this.showFooter = true;
}
this.total = this.contrastList.length;
if (this.total == 0) {
this.showFooter = false;
changeCheck(item,i) {
this.$set(this.list,i,item);
if(this.title!='排产方案对比'){
this.showFooter=true;
}
},
submit() {
if (this.total >= 2) {
this.detail = () => import("./compare");
this.title = "排产方案比对";
this.list.map(u => {
if ((u.checked = true)) {
u.checked = false;
}
});
this.contrastList = [];
this.showFooter = false;
this.gant = false;
} else {
this.$Message.error("请选择大于等于2项方案进去比对");
}
this.title = "排产方案对比";
this.showFooter=false;
},
cancel() {
this.showFooter = false;
this.list.map(u => {
if ((u.checked = true)) {
u.checked = false;
}
});
this.contrastList = [];
}
},
computed:{
schemas(){
return this.list.filter(u=>{
return u.checked==true;
})
}
}
};
......
pages/aps/results/results.less
View file @ 9f7bccf6
......@@ -136,7 +136,7 @@
}
li {
line-height: 50px;
line-height: 40px;
text-align: center;
border-bottom: 1px solid #ccc;
}
......@@ -181,7 +181,7 @@
}
li {
line-height: 50px;
line-height: 40px;
text-align: center;
border-bottom: 1px solid #ccc;
}
......
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