From 2bbfac3363d3d5dfca526de3334dcb807182c124 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 6 Jul 2022 13:16:13 +0800
Subject: [PATCH] bug

---
 .../views/detailsAll/ApplicationDetails.vue   | 304 ++++++++----------
 .../ApplicationDeploymentAndSecurity.vue      |  27 +-
 2 files changed, 152 insertions(+), 179 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 4da1ccb3..262063d5 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -8,191 +8,161 @@
 <template>
   <div class="application-details" :class="{ fixed2: scrollTop >= 600 }">
     <!-- 头部基本信息 -->
-    <application-top-details
-      :dataList="dataList.data"
-    ></application-top-details>
+    <application-top-details :dataList="dataList.data"></application-top-details>
     <!-- 导航 -->
-    <application-navigation
-      :dataList="dataList.data"
-      :associatedComponents="associatedComponents"
-      :class="{ fixed: scrollTop >= 600 }"
-      :selectNow="selectNow"
-    ></application-navigation>
-    <!-- 应用展示  视频 -->
-    <application-presentation
-      :dataList="dataList.data"
-      id="application-presentation"
-      class="scrollBox"
-    ></application-presentation>
-    <!-- 关联组件 -->
-    <application-associated-components
-      :dataList="dataList.data"
-      id="application-associated-components"
-      class="scrollBox"
-      v-if="false"
-    ></application-associated-components>
+    <application-navigation :dataList="dataList.data" :associatedComponents="associatedComponents"
+      :class="{ fixed: scrollTop >= 600 }" :selectNow="selectNow"></application-navigation>
     <!-- 关联能力 -->
-    <application-associated-ability
-      v-if="!loading"
-      :associatedComponents="associatedComponents"
-      id="application-associated-ability"
-      class="scrollBox"
-    ></application-associated-ability>
+    <application-associated-ability v-if="!loading" :associatedComponents="associatedComponents"
+      id="application-associated-ability" class="scrollBox"></application-associated-ability>
+    <!-- 应用展示  视频 -->
+    <application-presentation :dataList="dataList.data" id="application-presentation" class="scrollBox">
+    </application-presentation>
+    <!-- 关联组件 -->
+    <application-associated-components :dataList="dataList.data" id="application-associated-components"
+      class="scrollBox" v-if="false"></application-associated-components>
+
     <!-- 功能介绍-->
-    <application-function-intorduction
-      :dataList="dataList.data"
-      id="function-introduction"
-      class="scrollBox"
-    ></application-function-intorduction>
+    <application-function-intorduction :dataList="dataList.data" id="function-introduction" class="scrollBox">
+    </application-function-intorduction>
     <!-- 使用能力 -->
-    <application-ability-toise
-      :dataList="dataList.data"
-      id="ability-to-use"
-      class="scrollBox"
-    ></application-ability-toise>
+    <application-ability-toise :dataList="dataList.data" id="ability-to-use" class="scrollBox">
+    </application-ability-toise>
     <!-- 部署与安全-->
-    <application-deployment-and-security
-      :dataList="dataList.data"
-      id="deployment-and-security"
-      class="scrollBox"
-    ></application-deployment-and-security>
+    <application-deployment-and-security :dataList="dataList.data" id="deployment-and-security" class="scrollBox">
+    </application-deployment-and-security>
     <!-- 归属部门与服务商-->
-    <application-owning-department-and-service-provider
-      :dataList="dataList.data"
-      id="department-and-service-provider"
-      class="scrollBox"
-    ></application-owning-department-and-service-provider>
+    <application-owning-department-and-service-provider :dataList="dataList.data" id="department-and-service-provider"
+      class="scrollBox"></application-owning-department-and-service-provider>
     <!-- 常见问题-->
-    <application-common-problem
-      :dataList="dataList.data"
-      id="common-problem"
-      class="scrollBox"
-    ></application-common-problem>
+    <application-common-problem :dataList="dataList.data" id="common-problem" class="scrollBox">
+    </application-common-problem>
   </div>
 </template>
 <script setup>
-  import ApplicationAbilityToise from '@/views/detailsAll/components/Application/ApplicationAbilityToise.vue'
-  import ApplicationAssociatedComponents from '@/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue'
-  import ApplicationAssociatedAbility from '@/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue'
-  import ApplicationOwningDepartmentAndServiceProvider from '@/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue'
-  import ApplicationFunctionIntorduction from '@/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue'
-  import ApplicationDeploymentAndSecurity from '@/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue'
-  import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
-  import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
-  import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
-  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
-  import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
-  import mybus from '@/myplugins/mybus'
-  const associatedComponents = ref([{ type: '组件服务', dataList: [] }])
-  let loading = ref(true)
-  const router = useRouter()
-  const scrollTop = ref(0)
-  const domArr = ref([])
-  const selectNow = ref('')
-  const dataList = reactive({ data: {} })
-  const id = router.currentRoute.value.query.id
-  const obj = JSON.parse(window.sessionStorage.getItem('preview'))
-  document.documentElement.style.transition = 'all 0.3s ease'
-  document.documentElement.scrollTop = 0
-  document.body.style.transition = 'all 0.3s ease'
-  document.body.scrollTop = 0
-  mybus.on('flyToView', (id) => {
-    let top = document.querySelector('#' + id).offsetTop - 50
-    // console.log(top, document.querySelector('#' + id).offsetTop-50)
-    document.documentElement.scrollTop = top
-    document.body.scrollTop = top
-  })
-  onMounted(() => {
-    // console.clear()
-    window.addEventListener('scroll', () => {
-      domArr.value = document.querySelectorAll('.scrollBox')
-      scrollTop.value =
-        document.documentElement.scrollTop || document.body.scrollTop
-      for (let i = 0; i < domArr.value.length; i++) {
-        if (i === 0) {
-          if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
-            selectNow.value = domArr.value[i].id
-          }
-        } else if (i == domArr.value.length - 1) {
-          if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
-            selectNow.value = domArr.value[i].id
-          }
-        } else {
-          if (
-            scrollTop.value >= domArr.value[i].offsetTop - 50 &&
-            scrollTop.value <= domArr.value[i + 1].offsetTop - 50
-          ) {
-            selectNow.value = domArr.value[i].id
-          }
+import ApplicationAbilityToise from '@/views/detailsAll/components/Application/ApplicationAbilityToise.vue'
+import ApplicationAssociatedComponents from '@/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue'
+import ApplicationAssociatedAbility from '@/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue'
+import ApplicationOwningDepartmentAndServiceProvider from '@/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue'
+import ApplicationFunctionIntorduction from '@/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue'
+import ApplicationDeploymentAndSecurity from '@/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue'
+import ApplicationTopDetails from '@/views/detailsAll/components/Application/ApplicationTopDetails.vue'
+import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
+import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
+import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
+import mybus from '@/myplugins/mybus'
+const associatedComponents = ref([{ type: '组件服务', dataList: [] }])
+let loading = ref(true)
+const router = useRouter()
+const scrollTop = ref(0)
+const domArr = ref([])
+const selectNow = ref('')
+const dataList = reactive({ data: {} })
+const id = router.currentRoute.value.query.id
+const obj = JSON.parse(window.sessionStorage.getItem('preview'))
+document.documentElement.style.transition = 'all 0.3s ease'
+document.documentElement.scrollTop = 0
+document.body.style.transition = 'all 0.3s ease'
+document.body.scrollTop = 0
+mybus.on('flyToView', (id) => {
+  let top = document.querySelector('#' + id).offsetTop - 50
+  // console.log(top, document.querySelector('#' + id).offsetTop-50)
+  document.documentElement.scrollTop = top
+  document.body.scrollTop = top
+})
+onMounted(() => {
+  // console.clear()
+  window.addEventListener('scroll', () => {
+    domArr.value = document.querySelectorAll('.scrollBox')
+    scrollTop.value =
+      document.documentElement.scrollTop || document.body.scrollTop
+    for (let i = 0; i < domArr.value.length; i++) {
+      if (i === 0) {
+        if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else if (i == domArr.value.length - 1) {
+        if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else {
+        if (
+          scrollTop.value >= domArr.value[i].offsetTop - 50 &&
+          scrollTop.value <= domArr.value[i + 1].offsetTop - 50
+        ) {
+          selectNow.value = domArr.value[i].id
         }
       }
-    })
+    }
   })
+})
 
-  const init = (id) => {
-    if (id) {
-      selectOne(id).then((res) => {
-        // console.clear()
-        dataList.data = res.data.data
-        const arrList = ref([])
-        arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
-        console.log(
-          '初始化详情页=========================>',
-          dataList.data,
-          arrList.value
-        )
-        if (arrList.value && arrList.value.indexOf(id) === -1) {
-          arrList.value.push(id)
-          updateVisits({
-            id: res.data.data.id,
-            visits: res.data.data.visits || '0',
-          }).then(() => {
-            window.sessionStorage.setItem(
-              'visits',
-              JSON.stringify(arrList.value)
-            )
-          })
-        }
-      })
-      associatedComponents.value.map((item, index) => {
-        let queryPartAppByKeyIdParams = {
-          keyId: id,
-          type: item.type,
-        }
-        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
-          associatedComponents.value[0].dataList = res.data.data
-          loading.value = false
+const init = (id) => {
+  if (id) {
+    selectOne(id).then((res) => {
+      // console.clear()
+      dataList.data = res.data.data
+      const arrList = ref([])
+      arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+      console.log(
+        '初始化详情页=========================>',
+        dataList.data,
+        arrList.value
+      )
+      if (arrList.value && arrList.value.indexOf(id) === -1) {
+        arrList.value.push(id)
+        updateVisits({
+          id: res.data.data.id,
+          visits: res.data.data.visits || '0',
+        }).then(() => {
+          window.sessionStorage.setItem(
+            'visits',
+            JSON.stringify(arrList.value)
+          )
         })
+      }
+    })
+    associatedComponents.value.map((item, index) => {
+      let queryPartAppByKeyIdParams = {
+        keyId: id,
+        type: item.type,
+      }
+      queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+        associatedComponents.value[0].dataList = res.data.data
+        loading.value = false
       })
-    } else if (obj) {
-      dataList.data = obj
-      console.log('预览==============', obj)
-    }
+    })
+  } else if (obj) {
+    dataList.data = obj
+    console.log('预览==============', obj)
   }
-  const associatedComponentsFunction = () => {
-    if (
-      associatedComponents.value[0].dataList.length > 0 ||
-      associatedComponents.value[1].dataList.length > 0 ||
-      associatedComponents.value[2].dataList.length > 0
-    ) {
-      return associatedComponents.value
-    }
+}
+const associatedComponentsFunction = () => {
+  if (
+    associatedComponents.value[0].dataList.length > 0 ||
+    associatedComponents.value[1].dataList.length > 0 ||
+    associatedComponents.value[2].dataList.length > 0
+  ) {
+    return associatedComponents.value
   }
-  init(id)
-  onBeforeUnmount(() => {
-    mybus.off('flyToView')
-  })
+}
+init(id)
+onBeforeUnmount(() => {
+  mybus.off('flyToView')
+})
 </script>
 <style lang="less" scoped>
-  .fixed {
-    position: fixed;
-    z-index: 2000;
-    top: 0;
-    left: 0;
-  }
-  .fixed2 > div:nth-of-type(3) {
-    margin-top: 0.84rem;
-  }
+.fixed {
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  left: 0;
+}
+
+.fixed2>div:nth-of-type(3) {
+  margin-top: 0.84rem;
+}
 </style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index 02ac23fc..135cff66 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -39,11 +39,6 @@ let dataFrom = ref({
     },
   ],
 })
-let objUrl = {
-  attrType: '访问地址',
-  attrValue: '' || '------',
-}
-dataFrom.value.content[0].childrenContent.push(objUrl)
 //数据初始化
 const props = defineProps({
   dataList: { type: Object, default: null },
@@ -62,7 +57,11 @@ if (props.dataList.infoList) {
     ) {
       dataFrom.value.content[1].childrenContent.push(item)
     } else if (item.attrType === '访问地址') {
-      objUrl.value = item.value
+      let obj = {
+        attrType: '访问地址',
+        attrValue: item.attrValue || '------',
+      }
+      dataFrom.value.content[0].childrenContent.push(obj)
     }
   })
   if (dataFrom.value.content[1].childrenContent.length <= 0) {
@@ -85,11 +84,6 @@ watch(
   () => props.dataList,
   (val) => {
     if (val) {
-      let obj = {
-        attrType: '访问地址',
-        attrValue: props.dataList.link || '------',
-      }
-      dataFrom.value.content[0].childrenContent.push(obj)
       dataFrom.value.content[0].childrenContent = []
       dataFrom.value.content[1].childrenContent = []
       props.dataList.infoList.map((item) => {
@@ -105,7 +99,11 @@ watch(
         ) {
           dataFrom.value.content[1].childrenContent.push(item)
         } else if (item.attrType === '访问地址') {
-          objUrl.value = item.value
+          let obj = {
+            attrType: '访问地址',
+            attrValue: item.attrValue || '------',
+          }
+          dataFrom.value.content[0].childrenContent.push(obj)
         }
       })
       if (dataFrom.value.content[1].childrenContent.length <= 0) {
@@ -123,6 +121,11 @@ watch(
           dataFrom.value.content[1].childrenContent.push(itemContent)
         })
       }
+      // let obj = {
+      //   attrType: '访问地址',
+      //   attrValue: props.dataList.link || '------',
+      // }
+      // dataFrom.value.content[0].childrenContent.push(obj)
     }
   }
 )