From 9acaa0e8d304d5a2904efdf6e7b25ec3024882b3 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Tue, 29 Nov 2022 13:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ReservoirBottom.vue            | 26 ++++++--
 .../components/ReservoirRight.vue             | 66 +++----------------
 .../components/ReservoirThumbnail.vue         |  8 +--
 front/src/views/assertReport/index.vue        |  5 +-
 4 files changed, 37 insertions(+), 68 deletions(-)

diff --git a/front/src/views/assertReport/components/ReservoirBottom.vue b/front/src/views/assertReport/components/ReservoirBottom.vue
index 7e819dca..a36c5414 100644
--- a/front/src/views/assertReport/components/ReservoirBottom.vue
+++ b/front/src/views/assertReport/components/ReservoirBottom.vue
@@ -4,7 +4,9 @@
   
       <div class="platform-overview-bottom">
         <div class="top"><span class="title">资源汇聚总量</span></div>
+        <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing1.png" /></div>
         <div class="bottom">
+         
           <div
             v-for="(item, index) in servicesNum"
             :key="index"
@@ -32,7 +34,7 @@
     data() {
       //这里存放数据
       return {
-       
+       total:'',
         servicesNum: [],
       }
     },
@@ -41,7 +43,17 @@
 
       selectAllTotal(){
         selectTotal().then((res) => {
-         this.servicesNum=res.data.data.total
+          let result=res.data.data.total
+          let now=[]
+          let num=0;  
+          for(let i=0;i<result.length;i++){
+            if(result[i].type!=='知识库'){
+              now.push(result[i])
+              num=num+Number(result[i].count)
+            }
+          } 
+         this.servicesNum=now
+         this.total=num
         })
       }
   }
@@ -65,6 +77,12 @@
       border-image: linear-gradient(to right, #003194, #00ffea) 1;
     }
   }
+  .jiesheng{
+    margin:8px 8px;
+      text-align: center;
+    color: #f4fcfe; border-color: #107bb0;
+      box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
+      }
   .top5-content::-webkit-scrollbar {
     width: 6px;
     /*height: 4px;*/
@@ -97,7 +115,7 @@
     .platform-overview-bottom {
       margin-top: 20px;
       width: 100%;
-      height: 1.7rem;
+      height: 1.78rem;
       background: rgba(0, 108, 188, 0.2);
       border-radius: 2px;
       border: 1px solid rgba(0, 108, 188, 0.7);
@@ -118,7 +136,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding:0rem  0.2rem;
+        padding: 0px 10px;
         .component-services-content-right-left-content-son {
           background: url('~@/assets/capabilityCloud/Component_services_snum.png')
             no-repeat;
diff --git a/front/src/views/assertReport/components/ReservoirRight.vue b/front/src/views/assertReport/components/ReservoirRight.vue
index 50fdde13..c1e15142 100644
--- a/front/src/views/assertReport/components/ReservoirRight.vue
+++ b/front/src/views/assertReport/components/ReservoirRight.vue
@@ -15,6 +15,7 @@
             <div class="left-list1">应用数</div>
             <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
+         <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
           <div class="left-list" v-for="(item, index) in top5DistrictList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
@@ -30,61 +31,12 @@
               {{ item.applyPrice }}
             </div>
           </div>
+          </div>
         </div>
-        <!-- <div class="bottom-item">
-          <div class="inner-title">
-            <p style="width: 220px">市级部门审评节省资金排行</p>
-          </div>
-          <div class="left-list">
-            <div class="left-list1">排行</div>
-            <div class="left-list2">部门名称</div>
-            <div class="left-list1">应用数</div>
-            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
-          </div>
-          <div class="left-list" v-for="(item, index) in top5DeptFundList">
-            <div class="left-list1" v-if="item.img">
-              <img :src="item.img" />
-            </div>
-            <div class="left-list1" v-else>{{ index + 1 }}</div>
-            <a-tooltip>
-              <template #title>{{ item.deptName }}</template>
-              <div class="left-list2">{{ item.deptName }}</div>
-            </a-tooltip>
-
-            <div class="left-list1">{{ item.applyCount }}</div>
-            <div class="left-list1" style="color: #1ffefd">
-              {{ item.applyPrice }}
-            </div>
-          </div>
-        </div> -->
+       
       </div>
       <div class="bottom1">
-        <!-- <div class="bottom-item">
-          <div class="inner-title">
-            <p style="width: 220px">市级部门共享贡献资金排行</p>
-          </div>
-          <div class="left-list">
-            <div class="left-list1">排行</div>
-            <div class="left-list2">部门名称</div>
-            <div class="left-list1">应用数</div>
-            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
-          </div>
-          <div class="left-list" v-for="(item, index) in top5DistrictList">
-            <div class="left-list1" v-if="item.img">
-              <img :src="item.img" />
-            </div>
-            <div class="left-list1" v-else>{{ index + 1 }}</div>
-            <a-tooltip>
-              <template #title>{{ item.deptName }}</template>
-              <div class="left-list2">{{ item.deptName }}</div>
-            </a-tooltip>
-
-            <div class="left-list1">{{ item.resourceCount }}</div>
-            <div class="left-list1" style="color: #1ffefd">
-              {{ item.applyPrice }}
-            </div>
-          </div>
-        </div> -->
+     
         <div class="bottom-item">
           <div class="inner-title">
             <p style="width: 220px">市级部门审评节省资金排行</p>
@@ -95,6 +47,7 @@
             <div class="left-list1">应用数</div>
             <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
+          <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
           <div class="left-list" v-for="(item, index) in top5DeptFundList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
@@ -109,6 +62,7 @@
             <div class="left-list1" style="color: #1ffefd">
               {{ item.applyPrice }}
             </div>
+            </div>
           </div>
         </div>
       </div>
@@ -406,22 +360,20 @@ export default {
     }
     .bottom-item {
       height: 100%;
-      overflow-y: auto;
+    
       background: rgba(0, 108, 188, 0.2);
       border-radius: 2px;
       margin: 2px 5px;
       border: 1px solid #10496f;
      
       .inner-title {
-        margin-top: 10px;
-        margin-bottom: 10px;
+        margin-top: 5px;
         margin-right: 5px;
 
         font-weight: bold;
         color: #ffffff;
         p {
           font-size: 16px;
-          line-height: 27px;
           background: linear-gradient(
             90deg,
             #041d2f 0,
@@ -441,7 +393,7 @@ export default {
         width: 100%;
         height: 26px;
         margin-right: 10px;
-        margin-top: 5px;
+
         font-size: 16px;
         .left-list1 {
           font-size: 16x;
diff --git a/front/src/views/assertReport/components/ReservoirThumbnail.vue b/front/src/views/assertReport/components/ReservoirThumbnail.vue
index e4a8544d..d686a059 100644
--- a/front/src/views/assertReport/components/ReservoirThumbnail.vue
+++ b/front/src/views/assertReport/components/ReservoirThumbnail.vue
@@ -76,7 +76,7 @@ export default {
    
         },
         {
-          name: "西海岸",
+          name: "西海岸新区",
           value: [119.895518, 35.875138],
         
         },
@@ -98,13 +98,13 @@ export default {
         let resulrtData=res.data.data
         for(let i=0;i<resulrtData.length;i++){
           for(let j=0;j<districtData.length;j++){
-            if(resulrtData[i].districtName=districtData[j].name){
-              
+            if(resulrtData[i].districtName===districtData[j].name){
+        
               districtData[j].num=resulrtData[i].applyPrice
             }
           }
         }
-     
+     debugger
         this.initMap(districtData)
       })
 
diff --git a/front/src/views/assertReport/index.vue b/front/src/views/assertReport/index.vue
index 0997458e..0e63523b 100644
--- a/front/src/views/assertReport/index.vue
+++ b/front/src/views/assertReport/index.vue
@@ -158,15 +158,14 @@ export default {
       font-size: 0.46rem;
     }
     .bottom{
-      bottom: 12px;
+    bottom: 9px;
     position: absolute;
     left: 545px;
     width: 732px;
     align-items: center;
     z-index: 1004;
     text-align: center;
-  
-    height: 1.8rem;
+    height: 1.95rem;
 
     }
     .header1 {