diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue
index f91b42d1..05eb5c6f 100644
--- a/src/views/bigScreen/index_gx.vue
+++ b/src/views/bigScreen/index_gx.vue
@@ -156,7 +156,7 @@
:config="configData0"
class="inmBoxmain"
/>
-
+
@@ -166,7 +166,7 @@
:config="configData1"
class="inmBoxmain"
/>
-
+
@@ -176,7 +176,7 @@
:config="configData2"
class="inmBoxmain"
/>
-
+
@@ -186,7 +186,7 @@
:config="configData3"
class="inmBoxmain"
/>
-
+
@@ -196,7 +196,7 @@
:config="configData4"
class="inmBoxmain"
/>
-
+
@@ -244,7 +244,7 @@ const baseOption={
trigger: 'item',
},
grid:{
- top: '10%',
+ top: '20%',
bottom: '10%',
},
xAxis:{
@@ -905,28 +905,26 @@ export default {
//获取工序批次数据
getProcessDatas(name,index){
let that = this;
- let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
- let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
- let current_date = that.currentYear+'-'+month+'-'+day;
- let obj = {query:{current_date:current_date,mgroup_name:name}};
- that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
- if(res.data2.ds0){
- let lists = res.data2.ds0;
+ // let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
+ // let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
+ // let current_date = that.currentYear+'-'+month+'-'+day;
+ // let obj = {query:{current_date:current_date,mgroup_name:name}};
+ // that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
+ that.$API.wpm.ana.batchwork.req({mgroup_name:name}).then((res) => {
+ if(res.length>0){
//根据工段名称分组
let keys = 'configData'+index;
that[keys] = that.deepCopy(configData);
that[keys].data = [];
- if(lists.length>0){
- lists.forEach((item) => {
- let arr = [];
- arr[0] = item.批次号;
- arr[1] = item.待加工产物数;
- arr[2] = item.加工中产物领用数;
- arr[3] = item.今日生产数;
- arr[3] = item.今日合格数;
- that[keys].data.push(arr);
- })
- }
+ res.forEach((item) => {
+ let arr = [];
+ arr[0] = item.batch;
+ arr[1] = item.count_todo;
+ arr[2] = item.count_working;
+ arr[3] = item.count_real;
+ arr[3] = item.count_ok;
+ that[keys].data.push(arr);
+ })
}
});
},
@@ -1032,6 +1030,7 @@ export default {
height: 100vh;
width: 100vw;
position: relative;
+ overflow: hidden;
}
/* header-start */
.pageHeader {
@@ -1275,7 +1274,7 @@ export default {
.flexItem3Body{
width: 19.8vw;
height: 28.5vh;
- padding-top: 2.3vh;
+ padding-top: 2vh;
border: 1px solid #00ffff;
border-radius: 5px;
position: absolute;
@@ -1285,9 +1284,10 @@ export default {
.inmBoxmain{
flex: 1;
- height:12.96vh;
+ height:12.4vh;
width:98%;
margin:auto;
+ /* margin-bottom: 0.5vh; */
/* border-left: 2px solid #0f5b8e; */
box-shadow: -4px 0px 4px -1px #0f5b8e;
}