From e5fdaa744aab1eca01b9fa4d2725af1ebb641741 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 13 Oct 2022 11:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=84=8F=E8=A7=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue    |  5 +-
 .../views/home/integrationServicesDetails.vue | 67 ++++++++++---------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index d0d82917..c9495bdb 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -151,7 +151,10 @@
   const navList = ref(navListManagement.navList)
   const backFlag = ref(true)
   getUserInfo().then((res) => {
-    if (res.data.data.roleIdList.length == 0) {
+    if (
+      res.data.data.roleIdList.length == 0 &&
+      res.data.data.superAdmin === 0
+    ) {
       backFlag.value = false
     }
   })
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 593d66b7..836ed89c 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -107,11 +107,18 @@
             >
               <el-table-column
                 prop="name"
-                label="数据"
+                label="资源名称"
                 align="center"
                 width="200"
                 show-overflow-tooltip="true"
               ></el-table-column>
+              <el-table-column
+                prop="platform"
+                label="资源类型"
+                align="center"
+                width="100"
+                show-overflow-tooltip="true"
+              ></el-table-column>
               <el-table-column
                 prop="dept"
                 label="能力来源"
@@ -119,13 +126,6 @@
                 width="300"
                 show-overflow-tooltip="true"
               ></el-table-column>
-              <el-table-column
-                prop="platform"
-                label="申请平台"
-                align="center"
-                width="100"
-                show-overflow-tooltip="true"
-              ></el-table-column>
             </el-table>
           </div>
         </div>
@@ -312,44 +312,51 @@
               arr = resource.map((res) => ({
                 id: res.resource.idtCameraChannel,
                 name: res.resource.channelName,
-                dept: res.resource.nodeName,
-                platform: 'UCS',
+                dept: res.resource.nodeName
+                  .split('-')
+                  .splice(1)
+                  .join('-')
+                  .slice(1),
+                platform: '视频资源',
               }))
             } else if (item.title === '组件服务') {
               arr = resource.map((res) => ({
                 id: res.resource.id,
                 name: res.resource.name,
                 dept: res.resource.deptName,
-                platform: 'UCS',
+                platform:
+                  res.resource.infoList.find(
+                    (item) => item.attrType === '组件类型'
+                  )?.attrValue || '组件服务',
               }))
             } else if (item.title === '数据资源') {
               arr = resource.map((res) => ({
                 id: res.resource.zycode,
                 name: res.resource.zyname,
                 dept: res.resource.TGBM,
-                platform: '共享交换平台',
+                platform: '数据资源',
               }))
             }
           }
           if (item.title === '数据资源') {
-            item.list.push({
-              id: '数据资源1',
-              name: '城管案件数据',
-              dept: '市城管局',
-              platform: '政务信息共享交换网',
-            })
-            item.list.push({
-              id: '数据资源2',
-              name: '手机信令数据',
-              dept: '运营商（移动）',
-              platform: '政务信息共享交换网',
-            })
-            item.list.push({
-              id: '数据资源3',
-              name: '标准地址数据',
-              dept: '市自规局',
-              platform: '政务信息共享交换网',
-            })
+            // item.list.push({
+            //   id: '数据资源1',
+            //   name: '城管案件数据',
+            //   dept: '市城管局',
+            //   platform: '政务信息共享交换网',
+            // })
+            // item.list.push({
+            //   id: '数据资源2',
+            //   name: '手机信令数据',
+            //   dept: '运营商（移动）',
+            //   platform: '政务信息共享交换网',
+            // })
+            // item.list.push({
+            //   id: '数据资源3',
+            //   name: '标准地址数据',
+            //   dept: '市自规局',
+            //   platform: '政务信息共享交换网',
+            // })
           } else {
             item.list = arr
           }