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

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
+        // 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

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('无人机')