From 70636b91d006c75dcd24e7b920ce06ca29beefd3 Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Thu, 22 Aug 2024 11:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/datav/index.vue             | 33 ++++++++++++++++------
 src/components/datav/scrollBoardBottom.vue | 12 +++++---
 2 files changed, 32 insertions(+), 13 deletions(-)

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 @@
           </div>
           
         </div>
-        <scroll-board-bottom :ScrollList= "showData.scrollList" />
+        <scroll-board-bottom :ScrollList= "showData.scrollList2" :listName = "showData.listName2" />
       </div>
       <dv-loading v-else>Loading...</dv-loading>
       <!-- <div style="height: 5%;width: 100%;"></div> -->
@@ -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 @@
 <template>
   <div id="scroll-board-bottom">
+    <p style="width: 100%;text-align: center;font-size: 0.25rem;font-weight: bold;height: 0.4rem;line-height: 0.4rem;margin: 0;"> {{listName}}</p>
     <dv-scroll-board :config="config" />
   </div>
 </template>
@@ -7,7 +8,7 @@
 <script>
 export default {
   name: 'ScrollBoard',
-  props: ['ScrollList'],
+  props: ['ScrollList','listName'],
   data () {
     return {
       config: {
@@ -17,7 +18,7 @@ export default {
         // index: true,
         columnWidth: [1000],
         align: ['center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center', 'center'],
-        rowNum: 5,
+        rowNum: 6,
         headerBGC: '#1981f6',
         headerHeight: 50,
         oddRowBGC: 'rgba(0, 44, 81, 0.8)',
@@ -27,7 +28,7 @@ export default {
   },
   created () {
     this.config.headerHeight = this.$fontSize(0.50);
-    this.config.columnWidth = [this.$fontSize(1.5),this.$fontSize(6),this.$fontSize(1.5),this.$fontSize(1),this.$fontSize(1),this.$fontSize(1),this.$fontSize(1),this.$fontSize(1),this.$fontSize(1),this.$fontSize(3)];
+    this.config.columnWidth = [this.$fontSize(3),this.$fontSize(5),this.$fontSize(2),this.$fontSize(1.5),this.$fontSize(1),this.$fontSize(1.5),this.$fontSize(1),this.$fontSize(1.5),this.$fontSize(1),this.$fontSize(3)];
     this.config.data = JSON.parse(JSON.stringify(this.ScrollList))
   }
 }
@@ -38,12 +39,15 @@ export default {
   width:100%;
   box-sizing: border-box;
   padding:0.2rem;
-  height: 40%;
+  height: calc(35% - 0.3rem);
   overflow: hidden;
 }
 
 </style>
 <style>
+#scroll-board-bottom .dv-scroll-board{
+  /* height: calc(100% - 0.4rem); */
+}
 .dv-scroll-board .header{
   font-size: 0.2rem !important;
   font-weight: bold !important;