|
|
@@ -10,7 +10,7 @@
|
|
|
</div>
|
|
|
<div class="bpb_orderlist">
|
|
|
<div ref="bpb_orderlist_title" class="bpb_order_num fontcolor" @click="showAllOrderList">
|
|
|
- <template v-if="orderQueryState==2">订单数:<b>{{ orderlist.length }}</b></template>
|
|
|
+ <template v-if="orderQueryState==2">订单数:<b>{{ orderlist.length }}</b></template>
|
|
|
</div>
|
|
|
<div class="itemlist" ref="orderItemList">
|
|
|
<div class="bpb_order_item" style="top:210px;transition: none;z-index: 0;"></div>
|
|
|
@@ -18,7 +18,7 @@
|
|
|
<div class="no">编号:{{ item.orderCode }}</div>
|
|
|
<div class="checkbox abs"><input :checked="item.checked" type="checkbox" name=""></div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="pbp_order_app" ref="pbp_order_app" style="top:258.5px;">
|
|
|
@@ -95,7 +95,7 @@
|
|
|
<span><img src="../../assets/image/CheckCircle.png">生产预测完成</span>
|
|
|
</template>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
<div class="bpb_order_resultlist" ref="bpb_order_resultlist" style="left:inherit;right: 50px;top:calc(0.7*710px)">
|
|
|
<div ref="bpb_order_resultlist_title" class="bpb_order_num fontcolor" @click="showAllResultList" :style="{'width': plcPredictState=='2'?'75%':'0px','text-align': 'center'}">
|
|
|
<div v-if="plcPredictState==2">预测结果 <b>{{ order_result_data.length }}</b></div>
|
|
|
@@ -240,9 +240,9 @@ export default {
|
|
|
let order_result_data_Top5 = ref([]);
|
|
|
let order_result_data = ref([]);
|
|
|
|
|
|
- function testData(){
|
|
|
-
|
|
|
-
|
|
|
+ function testData(){
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
function getOerderList(){
|
|
|
orderQueryState.value=1;//开始查询订单
|
|
|
@@ -251,11 +251,12 @@ export default {
|
|
|
"end":selectedDate2.value,
|
|
|
"days":days.value,
|
|
|
};
|
|
|
- api.GetOrderList(v).then((res) => {
|
|
|
+ api.GetOrderList(v).then((response) => {
|
|
|
+ let res = response.data;
|
|
|
if(res==null){
|
|
|
return;
|
|
|
}
|
|
|
- orderlist.value = res;
|
|
|
+ orderlist.value = res;
|
|
|
let tmpLst = [];
|
|
|
let top=0;
|
|
|
orderlistTop5.value = res.slice(0, 5);
|
|
|
@@ -265,8 +266,8 @@ export default {
|
|
|
top=210-(ind*30)+'px';
|
|
|
let zindex = 1+ind;
|
|
|
tmpLst.push({"id":item.orderCode,"orderCode":item.orderCode,customerName:item.customerName,orderDate:item.orderDate,bomlist:item.bomList,"top":top,"zindex":zindex,"checked":true,transition:'top '+(ind*0.3)+'s ease-in-out'});
|
|
|
- })
|
|
|
- orderlistTop5.value = tmpLst;
|
|
|
+ })
|
|
|
+ orderlistTop5.value = tmpLst;
|
|
|
layout();
|
|
|
},1000);
|
|
|
setTimeout(function(){
|
|
|
@@ -275,8 +276,8 @@ export default {
|
|
|
},2500);
|
|
|
});
|
|
|
}
|
|
|
- function init(){
|
|
|
- testData();
|
|
|
+ function init(){
|
|
|
+ testData();
|
|
|
|
|
|
getOrderDateList();
|
|
|
}
|
|
|
@@ -307,9 +308,9 @@ export default {
|
|
|
function layout(){
|
|
|
setTimeout(() => {
|
|
|
let lastOrderItemEle = orderItemList.value.firstElementChild;
|
|
|
- let sty1 = window.getComputedStyle(lastOrderItemEle);
|
|
|
- var orderH = parseInt(sty1.height)+lastOrderItemEle.offsetTop;
|
|
|
- bpb_orderlist_title.value.style.top = orderItemList.value.lastElementChild.offsetTop-10+'px';
|
|
|
+ let sty1 = window.getComputedStyle(lastOrderItemEle);
|
|
|
+ var orderH = parseInt(sty1.height)+lastOrderItemEle.offsetTop;
|
|
|
+ bpb_orderlist_title.value.style.top = orderItemList.value.lastElementChild.offsetTop-10+'px';
|
|
|
orderItemList.value.parentElement.style.height = orderH+'px';
|
|
|
pbp_order_app.value.style.top = lastOrderItemEle.offsetTop+(parseInt(sty1.height)/2)+'px';
|
|
|
let sty2 = window.getComputedStyle(order_app_linkpoint.value);
|
|
|
@@ -335,7 +336,7 @@ export default {
|
|
|
plc_wl_line.value.style.left = plc_app_linkpoint.value.offsetLeft + parseInt(window.getComputedStyle(plc_app_linkpoint.value).width)/2+30+'px';
|
|
|
plc_wl_line.value.style.top = plc_app_linkpoint.value.offsetTop - parseInt(window.getComputedStyle(plc_app_linkpoint.value).height) -30 + 'px';
|
|
|
plc_wl_line.value.style.width = (0.7*132)+"px";
|
|
|
- plc_wl_line.value.style.height = (0.7*173)+"px";
|
|
|
+ plc_wl_line.value.style.height = (0.7*173)+"px";
|
|
|
}, 1000);
|
|
|
}
|
|
|
function getOrderDateList(){
|
|
|
@@ -361,12 +362,12 @@ export default {
|
|
|
if(v==element){
|
|
|
ind = true;
|
|
|
datelist2.push(element);
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
orderDateList2.value = datelist2;
|
|
|
}
|
|
|
var boms = {};
|
|
|
- function selectedOrder(obj){
|
|
|
+ function selectedOrder(obj){
|
|
|
//let tempLst = orderlistTop5.value;
|
|
|
bpb_order_resultlist_title.value.style.top='0%';
|
|
|
storageQueryState.value = 0;
|
|
|
@@ -417,10 +418,10 @@ export default {
|
|
|
let obj = {"id":item.id,name:item.name,bomSpec:item.bomSpec,"top":top,"zindex":zindex,"left":left,"isalarm":item.isalarm,need:item.need,storage:item.storage,plc:item.plc,"neednum":0};
|
|
|
tempLst.push(obj);
|
|
|
});
|
|
|
- bpb_mt_item_data.value = tempLst;
|
|
|
- bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
+ bpb_mt_item_data.value = tempLst;
|
|
|
+ bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
queryStorage();
|
|
|
- }, 1000);
|
|
|
+ }, 1000);
|
|
|
}
|
|
|
//orderlistTop5.value = tempLst;
|
|
|
}
|
|
|
@@ -448,9 +449,9 @@ export default {
|
|
|
ele['opacity'] = 1;
|
|
|
ele['plc'] = bomItem.last;
|
|
|
})
|
|
|
- bpb_mt_item_data.value = tempLst;
|
|
|
- bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
- predict();
|
|
|
+ bpb_mt_item_data.value = tempLst;
|
|
|
+ bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
+ predict();
|
|
|
}, 1000);
|
|
|
}, 3000);
|
|
|
}
|
|
|
@@ -485,7 +486,7 @@ export default {
|
|
|
}).reverse();
|
|
|
order_result_data.value = temp2;
|
|
|
order_result_data_Top5.value = temp2.slice(0,6);
|
|
|
- setTimeout(() => {
|
|
|
+ setTimeout(() => {
|
|
|
//排列预测结果元素
|
|
|
let tmpLst = [];
|
|
|
order_result_data.value.forEach((item,ind)=>{
|
|
|
@@ -498,9 +499,9 @@ export default {
|
|
|
var tmpTop = parseInt(window.getComputedStyle(bpb_order_resultlist.value.querySelectorAll('.bpb_order_result_item')[0]).height)*0.7+((orderCount-1)*30);
|
|
|
order_result_line.value.style.left = 'inherit';
|
|
|
order_result_line.value.style.right = parseInt(window.getComputedStyle(bpb_order_resultlist.value).width) + 25 + 'px';
|
|
|
- order_result_line.value.style.top = tmpTop*-1+"px";
|
|
|
+ order_result_line.value.style.top = tmpTop*-1+"px";
|
|
|
bpb_order_resultlist_title.value.style.top = ((order_result_data_Top5.value.length-1)*-65)-10+'px';
|
|
|
- plcPredictState.value = 2;
|
|
|
+ plcPredictState.value = 2;
|
|
|
}, 5000);
|
|
|
}, 1000);
|
|
|
}
|
|
|
@@ -538,7 +539,7 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
result_list_all.value.style.top = t + 'px';
|
|
|
result_list_all.value.style.right = '160px';
|
|
|
- }, 20);
|
|
|
+ }, 20);
|
|
|
}
|
|
|
|
|
|
function closeAllBomList(){
|
|
|
@@ -590,7 +591,7 @@ export default {
|
|
|
tempLst.push(obj);
|
|
|
});
|
|
|
bpb_mt_item_data.value = tempLst;
|
|
|
- bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
+ bpb_mt_item_data_Top6.value = tempLst.slice(0,6);
|
|
|
queryStorage();
|
|
|
allOrderListShow.value=false;
|
|
|
}
|