diff --git a/src/components/datav/index.vue b/src/components/datav/index.vue
index a89e85a..42f4f67 100644
--- a/src/components/datav/index.vue
+++ b/src/components/datav/index.vue
@@ -25,7 +25,7 @@
-
+
Loading...
@@ -75,6 +75,8 @@ export default {
leftData: [],
reportedList: [],
scrollList: [],
+ scrollList2: [],
+ listName2:'',
todayData: [],
bottomData: [],
allNum: 0,
@@ -83,14 +85,17 @@ export default {
loadingDone: false
}
},
- created () {
- this.createdData()
+ created (e) {
+ console.log(window.location.href.split('?')[1])
+ let params = window.location.href.split('?')[1];
+ let Aid = params.split('=')[1];
+ this.createdData(Aid)
},
methods: {
- createdData () {
+ createdData (Aid) {
let that = this
- this.$api.post2('/api/web/GetScreenReport?category=A1').then(res => {
+ this.$api.post2('/api/web/GetScreenReport?category='+Aid).then(res => {
if (res.code === '200') {
let data = res.data;
this.chartData1 = data.reportSettings[0];
@@ -101,12 +106,21 @@ export default {
if(item.setting.reportType != 'rank'){
this.totalData.push(item)
}
+ if(item.code == 'BI_ProcessFlowSheet_Person_Report'){
+ this.showData.scrollList = data.reportSettings[3].data.map(item => {
+ return [item.employee_name,item.proc_name,item.value]
+ });
+ }
+ 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]
+ });
+ }
})
}
if(data.reportSettings[3].data.length>0){
- this.showData.scrollList = data.reportSettings[3].data.map(item => {
- return [item.employee_name,item.proc_name,item.value]
- });
+
}
this.showData.name = '永盛大屏数据看板'
this.loadingDone = true
@@ -194,13 +208,14 @@ export default {
.main-content {
flex: 1;
+ height: calc(100% - 1rem);
display: flex;
flex-direction: column;
}
.block-left-right-content {
// flex: 1;
- height: 70%;
+ height: 65%;
display: flex;
margin-top: 0.2rem;
}
diff --git a/src/components/datav/scrollBoardBottom.vue b/src/components/datav/scrollBoardBottom.vue
index 4502dd9..778a001 100644
--- a/src/components/datav/scrollBoardBottom.vue
+++ b/src/components/datav/scrollBoardBottom.vue
@@ -1,5 +1,6 @@
@@ -7,7 +8,7 @@