From 1eb4e4f46ee3ca24dbfe0a33a2a1d3699ea0e714 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 6 Dec 2022 17:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |  14 +-
 front/src/views/home/DetailsPageconetent.vue  |  11 +-
 .../views/home/detailsPageconetentTree.vue    | 145 ++++++++++--------
 3 files changed, 99 insertions(+), 71 deletions(-)

diff --git a/front/src/api/home.js b/front/src/api/home.js
index 722783b3..1e5c88d4 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-12-01 17:53:16
+ * @LastEditTime: 2022-12-06 11:43:03
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -302,7 +302,7 @@ export function workdynamicsDetails(params) {
     params,
   })
 }
-//工作状态详情
+// 应用资源 组件服务左侧树
 export function selectDeptList(data) {
   return request({
     url: '/resource/selectDeptList',
@@ -310,7 +310,15 @@ export function selectDeptList(data) {
     data,
   })
 }
-//工作状态详情
+// 数据资源左侧树
+export function getDataResourceDeptList(data) {
+  return request({
+    url: '/resource/getDataResourceDeptList',
+    method: 'post',
+    data,
+  })
+}
+
 export function updateRes(data) {
   return request({
     url: '/resource/update',
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 4df38c0f..52fdfd2d 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -2,10 +2,17 @@
   <!-- 青岛 -->
   <div class="details-pageconetent" v-if="whoShow1 && whoShow1.itShowQingDao">
     <home-header></home-header>
-    <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
+    <div
+      class="details-pageconetent-left"
+      v-if="
+        Cardsname === '应用资源' ||
+        Cardsname === '组件服务' ||
+        Cardsname === '数据资源'
+      "
+    >
       <detailsPageconetentTree />
     </div>
-    <div class="details-pageconetent-left" v-else>
+    <div class="details-pageconetent-left" v-else-if="Cardsname === '基础设施'">
       <detailsPageInfrastructureTree v-if="flag == '1'" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue
index d3bd2e2f..f0478cb1 100644
--- a/front/src/views/home/detailsPageconetentTree.vue
+++ b/front/src/views/home/detailsPageconetentTree.vue
@@ -113,7 +113,7 @@
 
 <script>
   import { defineComponent, ref, watch } from 'vue'
-  import { selectDeptList } from '@/api/home.js'
+  import { selectDeptList, getDataResourceDeptList } from '@/api/home.js'
   import mybus from '@/myplugins/mybus'
   import { useRouter } from 'vue-router'
   import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
@@ -128,65 +128,45 @@
         title: 'name',
       }
       const store = useStore()
-    // 用户信息
-    const user = ref({
-      deptName: store.getters['user/deptName'],
-      deptId: store.getters['user/deptId'],
-    })
+      // 用户信息
+      const user = ref({
+        deptName: store.getters['user/deptName'],
+        deptId: store.getters['user/deptId'],
+      })
       const showKey = ref(0)
       const treeData = ref([])
-      const init = () => {
-        treeData.value = []
-        console.log(
-          'router.currentRoute.value.query.select',
-          router.currentRoute.value.query.select
-        )
-        let select = router.currentRoute.value.query.select
-        if (select === '123') {
-          select = ''
-        }
-    
-        console.log(
-          '获取url中的select=====================>',
-          router.currentRoute.value.query.select
-        )
-        if (
-          select !== '基础设施' &&
-          select !== '数据资源' &&
-          select !== '知识库'
-        ) {
-          selectDeptList({ type: select }).then((res) => {
-            // console.log('区划数据=========================>', res.data.data)
-            res.data.data.forEach((val) => {
-              if (val.type !== '全部能力目录') {
-                let obj = {
-                  title: val.type,
-                  total: val.total,
-                  show: val.type === '市级' ? true : false,
-                  select: false,
-                  key: val.type,
-                  children: [],
-                }
-                switch (val.type) {
-                  case '市级':
-                  case '企业':
-                  case '其他':
-                    generateChildren(val, obj)
-                    break
-                  case '区级':
-                    generateChildren2(val, obj)
-                    break
-                }
-                treeData.value.push(obj)
-              }
-            })
-            // 排序
-            const sortArr = ['全部能力目录', '市级', '区级', '企业', '其他']
-            treeData.value.sort((a, b) => {
-              return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
-            })
-            //根据不同的权限展示不同的能力超市左侧树
-          //  let deptId=user.value.deptId
+      // 处理数据
+      const processingData = (res) => {
+        res.data.data.forEach((val) => {
+          if (val.type !== '全部能力目录') {
+            let obj = {
+              title: val.type,
+              total: val.total,
+              show: val.type === '市级' ? true : false,
+              select: false,
+              key: val.type,
+              children: [],
+            }
+            switch (val.type) {
+              case '市级':
+              case '企业':
+              case '其他':
+                generateChildren(val, obj)
+                break
+              case '区级':
+                generateChildren2(val, obj)
+                break
+            }
+            treeData.value.push(obj)
+          }
+        })
+        // 排序
+        const sortArr = ['全部能力目录', '市级', '区级', '企业', '其他']
+        treeData.value.sort((a, b) => {
+          return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
+        })
+        //根据不同的权限展示不同的能力超市左侧树
+        //  let deptId=user.value.deptId
         //     treeData.value.forEach((child) => {
         //       let childern=child.children
         //       childern.forEach((childs) => {//第一层：市级
@@ -209,11 +189,46 @@
         //    })
         //    }
         //  })
-          
+
         //   })
-            console.log('左侧树结构数据======================>', treeData.value)
-        
-            showKey.value++
+        console.log('左侧树结构数据======================>', treeData.value)
+
+        showKey.value++
+      }
+      const init = () => {
+        treeData.value = []
+        console.log(
+          'router.currentRoute.value.query.select',
+          router.currentRoute.value.query.select
+        )
+        let select = router.currentRoute.value.query.select
+        if (select === '123') {
+          select = ''
+        }
+
+        console.log(
+          '获取url中的select=====================>',
+          router.currentRoute.value.query.select
+        )
+        if (
+          select !== '基础设施' &&
+          select !== '数据资源' &&
+          select !== '知识库'
+        ) {
+          selectDeptList({ type: select }).then((res) => {
+            // console.log('区划数据=========================>', res.data.data)
+            if (res.data.msg !== 'success') {
+              return
+            }
+            processingData(res)
+          })
+        } else if (select === '数据资源') {
+          getDataResourceDeptList({ type: select }).then((res) => {
+            // console.log('区划数据=========================>', res.data.data)
+            if (res.data.msg !== 'success') {
+              return
+            }
+            processingData(res)
           })
         }
       }
@@ -222,7 +237,6 @@
       })
       // 生成children
       const generateChildren = (val, obj) => {
-      
         if (val.dataList.length > 0) {
           val.dataList.forEach((child) => {
             let children = {
@@ -232,14 +246,13 @@
               total: child.deptCount,
               key: child.deptId,
             }
-  
+
             obj.children.push(children)
           })
         }
       }
       // 区级特殊处理
       const generateChildren2 = (val, obj) => {
-       
         if (val.dataList.length > 0) {
           val.dataList.forEach((dis) => {
             let children = {
@@ -259,7 +272,7 @@
                   select: false,
                   key: child.deptId,
                 }
-              
+
                 children.children.push(children2)
               })
             }