|
|
@@ -59,14 +59,18 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="body-box">
|
|
|
- <div>
|
|
|
- <dv-border-box-12 style="width: 25%;">
|
|
|
+ <div style="height: 370px;">
|
|
|
+ <dv-border-box-12 style="width: 20%;">
|
|
|
+ <NgTopData />
|
|
|
+ </dv-border-box-12>
|
|
|
+ <dv-border-box-12 style="width: 20%;">
|
|
|
<chartLeft />
|
|
|
</dv-border-box-12>
|
|
|
- <dv-border-box-12 style="width: 25%;">
|
|
|
+ <dv-border-box-12 style="width: 20%;">
|
|
|
<chartRight />
|
|
|
</dv-border-box-12>
|
|
|
- <dv-border-box-12 style="width: 50%; overflow: hidden;">
|
|
|
+
|
|
|
+ <dv-border-box-12 style="width: 40%; overflow: hidden;">
|
|
|
<div class="d-flex pt-2 pl-2" style="height: 5%;">
|
|
|
<span>
|
|
|
<icon name="chart-line" class="text-icon"></icon>
|
|
|
@@ -78,16 +82,19 @@
|
|
|
<dv-scroll-board class="dv-scr-board" style="height: 90%;" :config="config" ref="scroll-board" />
|
|
|
</dv-border-box-12>
|
|
|
</div>
|
|
|
- <div>
|
|
|
+ <div style="height: 570px;">
|
|
|
<div>
|
|
|
- <dv-border-box-12 style="height: 50%;">
|
|
|
+ <dv-border-box-12 style="height: 33%;">
|
|
|
+ <LineHourOut />
|
|
|
+ </dv-border-box-12>
|
|
|
+ <dv-border-box-12 style="height: 33%;">
|
|
|
<barLeft />
|
|
|
</dv-border-box-12>
|
|
|
- <dv-border-box-12 style="height: 50%;">
|
|
|
+ <dv-border-box-12 style="height: 33%;">
|
|
|
<barRight />
|
|
|
</dv-border-box-12>
|
|
|
</div>
|
|
|
- <dv-border-box-12 >
|
|
|
+ <dv-border-box-12>
|
|
|
<bottomRight />
|
|
|
</dv-border-box-12>
|
|
|
</div>
|
|
|
@@ -104,7 +111,9 @@ import chartLeft from "./chartLeft.vue";
|
|
|
import chartRight from "./chartRight.vue";
|
|
|
import barLeft from "./barLeft.vue";
|
|
|
import barRight from "./barRight.vue";
|
|
|
-import bottomRight from './bottomRight.vue'
|
|
|
+import LineHourOut from "./LineHourOut.vue";
|
|
|
+import bottomRight from './bottomRight.vue';
|
|
|
+import NgTopData from "./NgTopData.vue";
|
|
|
|
|
|
export default {
|
|
|
mixins: [drawMixin],
|
|
|
@@ -119,7 +128,7 @@ export default {
|
|
|
decorationColor: ["#568aea", "#000000"],
|
|
|
isFullScreen: false,
|
|
|
config: {
|
|
|
- header: ['线别', '投入','产出', '不良','良率%','计划数','达成率%'],
|
|
|
+ header: ['线别', '投入', '产出', '不良', '良率%', '计划数', '达成率%'],
|
|
|
data: [
|
|
|
],
|
|
|
rowNum: 6, //表格行数
|
|
|
@@ -127,10 +136,10 @@ export default {
|
|
|
headerBGC: '#0f1325', //表头
|
|
|
oddRowBGC: '#0f1325', //奇数行
|
|
|
evenRowBGC: '#171c33', //偶数行
|
|
|
- columnWidth: [110,100,100,80,90,100,90],
|
|
|
+ columnWidth: [110, 100, 100, 80, 90, 100, 90],
|
|
|
align: ['center']
|
|
|
},
|
|
|
- linename:11,
|
|
|
+ linename: 11,
|
|
|
};
|
|
|
},
|
|
|
components: {
|
|
|
@@ -139,6 +148,8 @@ export default {
|
|
|
barLeft,
|
|
|
barRight,
|
|
|
bottomRight,
|
|
|
+ LineHourOut,
|
|
|
+ NgTopData,
|
|
|
},
|
|
|
created() {
|
|
|
this.getLines();
|
|
|
@@ -232,40 +243,40 @@ export default {
|
|
|
async getdata() {
|
|
|
|
|
|
var caller = 'DPLANTOUTPUT!ZZ';
|
|
|
- if (sessionStorage.getItem('li_code') == '所有'){
|
|
|
+ if (sessionStorage.getItem('li_code') == '所有') {
|
|
|
caller = 'ZZ!DPLANTOUTPUT!ALL';
|
|
|
}
|
|
|
|
|
|
- // const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
|
|
|
- await this.$http.get("kanban/datalist.action?caller="+caller+"&_noc=1&page=1&pageSize=100",{
|
|
|
+ // const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
|
|
|
+ await this.$http.get("kanban/datalist.action?caller=" + caller + "&_noc=1&page=1&pageSize=100", {
|
|
|
params: {
|
|
|
- condition: "V_LICODE in ('CSC','CSB','ZZB','ZZC')"
|
|
|
+ condition: "V_LICODE in ('CSC','CSB','ZZB','ZZC')"
|
|
|
}
|
|
|
- }).then((result)=>{
|
|
|
+ }).then((result) => {
|
|
|
|
|
|
- let dataList = JSON.parse(result.data.data);
|
|
|
- let resultList = new Array();
|
|
|
- for (let index = 0; index < dataList.length; index++) {
|
|
|
- const element = dataList[index];
|
|
|
- let item = new Array();
|
|
|
- item.push(element.linecode);
|
|
|
- item.push("<span class='colorGrass'>"+element.inqty+"</span>");
|
|
|
- item.push("<span class='colorGrass'>"+element.value+"</span>");
|
|
|
- item.push("<span class='colorGrass'>"+element.ngqty+"</span>");
|
|
|
- item.push("<span class='colorGrass'>" + element.okrate + "</span>");
|
|
|
- item.push("<span class='colorGrass'>"+element.planqty+"</span>");
|
|
|
- item.push("<span class='colorGrass'>"+element.getrate+"</span>");
|
|
|
- this.linename = element.linecode;
|
|
|
- resultList.push(item);
|
|
|
- }
|
|
|
+ let dataList = JSON.parse(result.data.data);
|
|
|
+ let resultList = new Array();
|
|
|
+ for (let index = 0; index < dataList.length; index++) {
|
|
|
+ const element = dataList[index];
|
|
|
+ let item = new Array();
|
|
|
+ item.push(element.linecode);
|
|
|
+ item.push("<span class='colorGrass'>" + element.inqty + "</span>");
|
|
|
+ item.push("<span class='colorGrass'>" + element.value + "</span>");
|
|
|
+ item.push("<span class='colorGrass'>" + element.ngqty + "</span>");
|
|
|
+ item.push("<span class='colorGrass'>" + element.okrate + "</span>");
|
|
|
+ item.push("<span class='colorGrass'>" + element.planqty + "</span>");
|
|
|
+ item.push("<span class='colorGrass'>" + element.getrate + "</span>");
|
|
|
+ this.linename = element.linecode;
|
|
|
+ resultList.push(item);
|
|
|
+ }
|
|
|
|
|
|
- const scrollBoard = this.$refs['scroll-board'];
|
|
|
- //刷新数据
|
|
|
- scrollBoard.updateRows(resultList);
|
|
|
- },(result)=>{
|
|
|
- console.error(result)
|
|
|
- }
|
|
|
- );
|
|
|
+ const scrollBoard = this.$refs['scroll-board'];
|
|
|
+ //刷新数据
|
|
|
+ scrollBoard.updateRows(resultList);
|
|
|
+ }, (result) => {
|
|
|
+ console.error(result)
|
|
|
+ }
|
|
|
+ );
|
|
|
}
|
|
|
},
|
|
|
};
|
|
|
@@ -302,6 +313,7 @@ export default {
|
|
|
height: 50px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.dv-scr-board {
|
|
|
width: 98%;
|
|
|
height: 90%;
|