-
+
{{ reportSettings[2].title }}

#

{{ item.name }}

- +
  • @@ -24,15 +24,15 @@
- +
-
+
{{ reportSettings[3].title }}

#

{{ item.name }}

- +
  • @@ -45,7 +45,7 @@
-
+
-
+
{{ reportSettings[4].title }}

#

{{ item.name }}

- +
  • @@ -72,10 +72,10 @@
-
+
-
+
@@ -88,10 +88,12 @@
Loading... - - -
+
+
+

{{ notices[0].title }}

+
+
@@ -130,6 +132,8 @@ export default { setting: {}, totalData: [], todayData: [], + notices:[], + showNotices:false, showData: { name: '永盛陶瓷智能数据看榜', times: [], @@ -144,34 +148,7 @@ export default { allNum: 0, reportedNum: 0 }, - listData: [{ - 'title': '无缝滚动第一行无缝滚动第一行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第二行无缝滚动第二行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第三行无缝滚动第三行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第四行无缝滚动第四行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第五行无缝滚动第五行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第六行无缝滚动第六行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第七行无缝滚动第七行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第八行无缝滚动第八行', - 'date': '2017-12-16' - }, { - 'title': '无缝滚动第九行无缝滚动第九行', - 'date': '2017-12-16' - }], + reportSettings:[], rankHeader1:[ { @@ -194,7 +171,7 @@ export default { { name:'业务单号', key:'TSaleOrderCode', - width: '17%', + width: '16%', }, { name:'质检时间', @@ -204,22 +181,27 @@ export default { { name:'产品', key:'Inventoryname', - width: '40%', + width: '37%', }, { name:'质检人员', key:'QC_emp', - width: '10%', + width: '9%', }, { name:'缺陷名', key:'proc01_name', - width: '8%', + width: '7%', + }, + { + name:'缺陷率', + key:'proc01_QXL', + width: '7%', }, { name:'缺陷数', - key:'proc01_QXL', - width: '8%', + key:'proc01_SJ', + width: '7%', }, ], @@ -275,6 +257,20 @@ export default { width: '10%', }, ], + row1Style:{ + height:'65%', + width:['25%','50%','25%'], + }, + row1col1report:[], + row1col2report:[], + row1col3report:[], + row2col1report:[], + row2col2report:[], + row2col3report:[], + row2Style:{ + height:'35%', + width:['100%','0%', '0%'], + }, loadingDone: false } }, @@ -288,26 +284,53 @@ export default { methods: { createdData (Aid) { let that = this - + that.loadingDone = false; + that.showNotices = false; this.$api.post2('/api/web/GetScreenReport?category='+Aid).then(res => { if (res.code === '200') { let data = res.data; this.reportSettings = data.reportSettings; + this.notices = data.notices; + // console.log(data.notices.length>0 , data.notices[0].starttime , data.notices[0].Endtime) + if(data.notices.length>0 && data.notices[0].starttime && data.notices[0].Endtime){ + let nowtimestamp = new Date().getTime(); + let starttimestamp = new Date(this.notices[0].starttime).getTime(); + let endtimestamp = new Date(this.notices[0].Endtime).getTime(); + console.log(nowtimestamp, starttimestamp, endtimestamp) + if(nowtimestamp>=starttimestamp && nowtimestamp<=endtimestamp){ + this.showNotices = true; + }else{ + this.showNotices = false; + } + } + if(data.reportSettings.length>0){ data.reportSettings.forEach(item=>{ + if(item.setting.rowNumber==1 && item.setting.colNumber==1){ + this.row1col1report.push(item) + } + if(item.setting.rowNumber==1 && item.setting.colNumber==2){ + this.row1col2report.push(item) + } + if(item.setting.rowNumber==1 && item.setting.colNumber==3){ + this.row1col3report.push(item) + } + if(item.setting.rowNumber==2 && item.setting.colNumber==1){ + this.row2col1report.push(item) + } + if(item.setting.rowNumber==2 && item.setting.colNumber==2){ + this.row2col2report.push(item) + } + if(item.setting.rowNumber==2 && item.setting.colNumber==3){ + this.row2col3report.push(item) + } if(item.setting.reportType != 'rank'){ this.totalData.push(item) } - if(item.code == 'BI_ProduceQuality_KH_Report'){ - this.showData.listName2 = item.title; - this.showData.scrollList2 = item.data.map(item => { - return [item.TSaleOrderCode,item.Inventoryname,item.Productionquantity,item.proc01_SJ,item.proc01_SJv,item.proc02_SJ,item.proc02_SJv,item.proc03_SJ,item.proc03_SJv,item.SaleOrder_LastDate] - }); - } }) } - this.showData.name = '永盛大屏数据看板' + this.showData.name = '永盛科技数据看板' this.loadingDone = true } }); @@ -383,14 +406,17 @@ export default { background-color: #030409; color: #fff; - #dv-full-screen-container { + #dv-full-screen-container,#dv-full-screen-container2{ background-image: url('./img/bg.png'); background-size: 100% 100%; box-shadow: 0 0 3px blue; display: flex; flex-direction: column; } - + .row1-col1,.row1-col2,.row2-col1,.row2-col2{ + box-sizing: border-box; + overflow: hidden; + } .main-content { flex: 1; height: calc(100% - 1rem); @@ -460,5 +486,11 @@ export default { } } } + #dv-full-screen-container2 .inner-content{ + p{ + margin: 0; + font-size: 0.3rem; + } + } } diff --git a/src/components/datav/topHeader.vue b/src/components/datav/topHeader.vue index e5e5743..7ce8dec 100644 --- a/src/components/datav/topHeader.vue +++ b/src/components/datav/topHeader.vue @@ -1,7 +1,7 @@