Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue

front/src/views/assertReport/components/ReservoirBottom.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="right-survey">
+
     <div class="platform-overview-bottom">
       <div class="top"><span class="title">资源汇聚总量</span></div>
+      <div class="jiesheng"> <img src="../image/xing2.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing2.png" /></div>
       <div class="bottom">
+       
         <div
           v-for="(item, index) in servicesNum"
           :key="index"
@@ -17,8 +20,11 @@
 </template>
 
 <script>
-  import { selectTotal } from '@/api/assertReport'
-  export default {
+  import {
+    selectTotal
+  } from '@/api/assertReport'
+export default {
+ 
   components: {},
 
   mounted() {
@@ -27,22 +33,32 @@
   data() {
     //这里存放数据
     return {
+     total:'',
       servicesNum: [],
     }
   },
 
   methods: {
-      selectAllTotal() {
+
+    selectAllTotal(){
       selectTotal().then((res) => {
-          this.servicesNum = res.data.data.total.filter(
-            (item) => item.type !== '知识库'
-          )
-        })
-      },
-    },
+        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
+      })
+    }
+}
+}
 </script>
-<style lang="less" scoped>
+<style lang='less' scoped>
   @keyframes turn {
   0% {
     border-image: linear-gradient(to right, #003194, #00ffea) 1;
@@ -59,38 +75,46 @@
   100% {
     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 {
+.top5-content::-webkit-scrollbar {
   width: 6px;
   /*height: 4px;*/
-  }
+}
 
-  .top5-content::-webkit-scrollbar-thumb {
+.top5-content::-webkit-scrollbar-thumb {
   background-color: #00deff;
-  }
-  .map-search-result::-webkit-scrollbar-track,
-  .top5-content::-webkit-scrollbar-track {
+}
+.map-search-result::-webkit-scrollbar-track,
+.top5-content::-webkit-scrollbar-track {
   background-color: #424748;
-  }
-  @keyframes topup50 {
+}
+@keyframes topup50 {
   from {
     top: 50%;
   }
   to {
     top: -100%;
   }
-  }
-  .right-survey {
+}
+.right-survey {
+
   height: 100%;
   color: #f0fafa;
   font-size: 18px;
   display: flex;
   flex-direction: column;
 
+
   .platform-overview-bottom {
-      margin-top: 20px;
+    margin-top: 5px;
     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);
@@ -101,17 +125,17 @@
     transition: all 100ms ease-out;
     .top {
       font-size: 24px;
-        background: url('~@/assets/capabilityCloud/infrastructure_title.png')
-          no-repeat;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
       background-size: 100% 100%;
       text-align: center;
+
     }
     .bottom {
       margin-top: 20px;
       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;
@@ -138,6 +162,6 @@
   .platform-overview-bottom:hover {
   border: 2px solid;
   animation: turn 5s linear infinite;
-    }
-  }
+}
+}
 </style>

front/src/views/assertReport/components/ReservoirRight.vue

@@ -14,6 +14,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,60 +31,11 @@
             </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>
@@ -94,6 +46,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" />
@@ -111,6 +64,7 @@
             </div>
           </div>
         </div>
+      </div>
       <div class="bottom2">
         <div class="bottom-item">
           <div class="inner-title">