From 0de677cb57512af76e7226a2f81bf7e1de6dae28 Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Mon, 23 Sep 2024 10:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/datav/index.vue     | 32 ++++++++++++++++++------------
 src/components/datav/roseChart.vue |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/components/datav/index.vue b/src/components/datav/index.vue
index 23c1669..d7e47f6 100644
--- a/src/components/datav/index.vue
+++ b/src/components/datav/index.vue
@@ -10,7 +10,7 @@
         <!-- <digital-flop :TodayData="showData.todayData" :Type="type"/> -->
         <div class="block-left-right-content">
           <div class="row1-col1" :style="`width:${row1Style.width[0]}; height:${row1Style.height};padding-right:0.1rem;`">
-            <div v-for="(rcitem) in row1col1report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row1col1report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -29,12 +29,12 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
           <div class="row1-col2" v-if="row1col2report.length>0" :style="`width:${row1Style.width[1]}; height:${row1Style.height};padding-right:0.1rem;`">
-            <div v-for="(rcitem) in row1col2report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row1col2report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -53,7 +53,7 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
@@ -64,7 +64,7 @@
                   <bar-chart :key="index" v-if="item.setting.reportType == 'bar'" style="height: 45%;"  pieId="roseChart3" :chartData="item" :style="'height:'+item.setting.height+';width:'+item.setting.width+';'"/>
               </template>
             </div> -->
-            <div v-for="(rcitem) in row1col3report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row1col3report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -83,12 +83,12 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
           <div class="row2-col1" v-if="row2col1report.length>0" :style="`width:${row2Style.width[0]}; height:${row2Style.height};margin-top: 0.1rem;padding-right:0.1rem;`">
-            <div v-for="(rcitem) in row2col1report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row2col1report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -107,12 +107,12 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
           <div class="row2-col2" v-if="row2col2report.length>0" :style="`width:${row2Style.width[1]}; height:${row2Style.height};margin-top: 0.1rem;padding-right:0.1rem;`">
-            <div v-for="(rcitem) in row2col2report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row2col2report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -131,12 +131,12 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
           <div class="row2-col3" v-if="row2col3report.length>0" :style="`width:${row2Style.width[2]}; height:${row2Style.height};margin-top: 0.1rem;`">
-            <div v-for="(rcitem) in row2col3report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
+            <div v-for="(rcitem,rcindex) in row2col3report" :key="rcitem.setting.ID" :style="`width:${rcitem.setting.width}; height:${rcitem.setting.height};`">
               <div v-if="rcitem.setting.reportType == 'rank'" style="width: 100%;height: 100%;">
                 <div class="rankTitle" style="font-size: 0.2rem;line-height: 0.4rem;text-align: center;font-weight: bold; background-color: rgba(0, 102, 153, 0.4)">{{ rcitem.title }} </div>
                 <div class="rankHeader" style="display: flex;">
@@ -155,7 +155,7 @@
                 </vue-seamless-scroll>
               </div>
               <div v-if="rcitem.setting.reportType == 'pie'" style="width: 100%;height: 100%;">
-                <rose-chart :pieId="'roseChart'+rcitem.setting.ID" :chartData="rcitem" style="width: 100%;height: 100%;"/>
+                <rose-chart :pieId="'roseChart'+rcitem.setting.rowNumber+rcitem.setting.columnNumber+rcindex" :chartData="rcitem" style="width: 100%;height: 100%;"/>
               </div>
             </div>
           </div>
@@ -402,12 +402,18 @@ export default {
     let that = this;
     setInterval(()=>{
       that.createdData(Aid)
-    }, 100000)
+    }, 150000)
   },
   methods: {
     createdData (Aid) {
       let that = this
       that.loadingDone = false;
+      this.row1col1report = [];
+      this.row1col2report = [];
+      this.row1col3report = [];
+      this.row2col1report = [];
+      this.row2col2report = [];
+      this.row2col3report = [];
       that.showNotices = false;
       this.$api.post2('/api/web/GetScreenReport?category='+Aid).then(res => {
         if (res.code === '200') {
diff --git a/src/components/datav/roseChart.vue b/src/components/datav/roseChart.vue
index 6ce68e0..4c452e2 100644
--- a/src/components/datav/roseChart.vue
+++ b/src/components/datav/roseChart.vue
@@ -81,7 +81,7 @@ export default {
 
     createData()
 
-    setInterval(createData, 100000)
+    // setInterval(createData, 100000)
   }
 }
 </script>