From aff2ebda88737d4aece09011e8a89b92422144cb Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 1 Jul 2022 10:33:11 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   | 30 ++++++++++++-----
 .../components/AtlasResources.vue             | 32 +++++++++----------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 74fc2a7c..709f0fcc 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 18:17:07
+ * @LastEditTime: 2022-07-01 09:29:57
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -183,16 +183,30 @@ export default {
             })
           }
           this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
+          const obj = {
+            name: '申请摄像头列表',
+            type: '基础设施',
+            describe: ''
+          }
+          let flag = false
           res.data.tAbilityApplicationDTOList.map(val => {
-            this.$http.get('/resource/' + val.resourceId).then(res1 => {
-              console.log(res1.data.data, '1111111111111111111111111111111111')
-              this.dataList.push({
-                name: res1.data.data.name,
-                type: res1.data.data.type,
-                describe: res1.data.data.description
+            if (val.cameraList) {
+              flag = true
+              obj.describe += val.system
+            } else {
+              this.$http.get('/resource/' + val.resourceId).then(res1 => {
+                // console.log(res1.data.data, '1111111111111111111111111111111111')
+                this.dataList.push({
+                  name: res1.data.data.name,
+                  type: res1.data.data.type,
+                  describe: res1.data.data.description
+                })
               })
-            })
+            }
           })
+          if (flag) {
+            this.dataList.push(obj)
+          }
         })
         .catch(() => {})
     },
diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue
index 375b6f73..4c93e14a 100644
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@@ -121,6 +121,7 @@
 <script setup>
   import { nextTick, ref } from 'vue'
   import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import { getCategoryTreePage } from '@/api/personalCenter'
   import {
     capabilityShareCapabilitySet,
     selectResourceListByDept,
@@ -317,23 +318,20 @@
   // 右侧列表
   const dataList = ref([])
   // 所有领域类型
-  const allType = ref([
-    '社会治安',
-    '城市管理',
-    '疫情防控',
-    '危化品管理',
-    '交通运输',
-    '森林防火',
-    '防汛抗旱',
-    '文化旅游',
-    '非煤矿山',
-    '医疗卫生',
-    '安全生产',
-    '生态环境',
-    '农业农村',
-    '市场监管',
-    '政务服务',
-  ])
+  const allType = ref([])
+  getCategoryTreePage({
+    page: 1,
+    limit: 99,
+    dictTypeId: '1513712507692818433',
+  }).then((res) => {
+    // console.log('kasdjflkajsdlkf ', res.data.data)
+    allType.value = []
+    res.data.data.list.map((val) => {
+      if (val.dictLabel !== '其他') {
+        allType.value.push(val.dictLabel)
+      }
+    })
+  })
   const flag = ref('')
   const nowShow = ref(false)
   const showDetails = (item) => {