From 9df921cbe3cf2ddc135a5928e512c50dfc6d35d5 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 13 Oct 2022 21:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SharingSituation.vue           | 49 ++++++++++---------
 .../components/CapabilityConvergence.vue      |  4 ++
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index 9b3a5d98..9bc27605 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@@ -201,31 +201,32 @@
   let dataLists = ref([])
   const myApplyAmount = () => {
     applyAmount().then((res) => {
-      dataLists.value = res.data.data
+      dataLists.value = []
       res.data.data.map((item) => {
-        switch (item.type) {
-          case '应用资源':
-            dataLists.value[0] = item
-            break
-          case '业务组件':
-            dataLists.value[3] = item
-            break
-          case '图层服务':
-            dataLists.value[1] = item
-            break
-          case '开发组件':
-            dataLists.value[2] = item
-            break
-          case '智能算法':
-            dataLists.value[4] = item
-            break
-          case '会客厅':
-            dataLists.value[5] = item
-            break
-          default:
-            dataLists.value.push(item)
-            break
-        }
+        dataLists.value.push(item)
+        // switch (item.type) {
+        //   case '应用资源':
+        //     dataLists.value[0] = item
+        //     break
+        //   case '业务组件':
+        //     dataLists.value[1] = item
+        //     break
+        //   case '图层服务':
+        //     dataLists.value[1] = item
+        //     break
+        //   case '开发组件':
+        //     dataLists.value[2] = item
+        //     break
+        //   case '智能算法':
+        //     dataLists.value[4] = item
+        //     break
+        //   case '会客厅':
+        //     dataLists.value[5] = item
+        //     break
+        //   default:
+        //     dataLists.value.push(item)
+        //     break
+        // }
       })
       photo.value.map((item, index) => {
         dataLists.value[index].photo = item
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index 622ddc3b..f003cccb 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -153,6 +153,10 @@ const getAppResources = (type, obj) => {
             })
           }
         }
+         jcList.value.push({
+              name: '会客厅',
+              num: 3,
+            })
         // 西海岸-单兵设备、无人机 获取数量
         if (whoShow1.value.itShowXiHaiAn) {
           getSoldierData('无人机')