From 5035cc074a8132f6c5c25925ce608c30ef428660 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 6 Jul 2022 13:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationDeploymentAndSecurity.vue      | 294 +++++++++---------
 ...tionOwningDepartmentAndServiceProvider.vue |  13 +-
 2 files changed, 160 insertions(+), 147 deletions(-)

diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index f5d5c2a8..02ac23fc 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -2,17 +2,10 @@
 <template>
   <div class="application-deployment-and-security">
     <div class="title">
-      <DetalsTitle
-        :title="dataFrom.title"
-        :type="dataFrom.englishTitle"
-      ></DetalsTitle>
+      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
     </div>
     <div class="content">
-      <div
-        v-for="(item, index) in dataFrom.content"
-        :key="index"
-        class="content-card"
-      >
+      <div v-for="(item, index) in dataFrom.content" :key="index" class="content-card">
         <div class="card-title">{{ item.childrenTitle }}</div>
         <div class="card-content">
           <div v-for="carditem in item.childrenContent" :key="carditem">
@@ -29,162 +22,173 @@
 </template>
 
 <script setup>
-  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-  import { ref, defineProps, watch } from 'vue'
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+import { ref, defineProps, watch } from 'vue'
 
-  let dataFrom = ref({
-    title: '部署与安全',
-    englishTitle: 'DEPLOY&SAFE',
-    content: [
+let dataFrom = ref({
+  title: '部署与安全',
+  englishTitle: 'DEPLOY&SAFE',
+  content: [
+    {
+      childrenTitle: '部署',
+      childrenContent: [],
+    },
+    {
+      childrenTitle: '安全',
+      childrenContent: [],
+    },
+  ],
+})
+let objUrl = {
+  attrType: '访问地址',
+  attrValue: '' || '------',
+}
+dataFrom.value.content[0].childrenContent.push(objUrl)
+//数据初始化
+const props = defineProps({
+  dataList: { type: Object, default: null },
+})
+if (props.dataList.infoList) {
+  props.dataList.infoList.map((item) => {
+    if (
+      item.attrType === '部署区域' ||
+      item.attrType === '是否统一登录' ||
+      item.attrType === '部署位置'
+    ) {
+      dataFrom.value.content[0].childrenContent.push(item)
+    } else if (
+      item.attrType === '是否等保备案' ||
+      item.attrType === '等保定级'
+    ) {
+      dataFrom.value.content[1].childrenContent.push(item)
+    } else if (item.attrType === '访问地址') {
+      objUrl.value = item.value
+    }
+  })
+  if (dataFrom.value.content[1].childrenContent.length <= 0) {
+    let data = [
       {
-        childrenTitle: '部署',
-        childrenContent: [],
+        attrType: '是否等保备案',
+        attrValue: '------',
       },
       {
-        childrenTitle: '安全',
-        childrenContent: [],
+        attrType: '等保定级',
+        attrValue: '------',
       },
-    ],
-  })
-  //数据初始化
-  const props = defineProps({
-    dataList: { type: Object, default: null },
-  })
-  if (props.dataList.infoList) {
-    props.dataList.infoList.map((item) => {
-      if (
-        item.attrType === '部署区域' ||
-        item.attrType === '是否统一登录' ||
-        item.attrType === '部署位置'
-      ) {
-        dataFrom.value.content[0].childrenContent.push(item)
-      } else if (
-        item.attrType === '是否等保备案' ||
-        item.attrType === '等保定级'
-      ) {
-        dataFrom.value.content[1].childrenContent.push(item)
-      }
+    ]
+    data.map((itemContent) => {
+      dataFrom.value.content[1].childrenContent.push(itemContent)
     })
-    if (dataFrom.value.content[1].childrenContent.length <= 0) {
-      let data = [
-        {
-          attrType: '是否等保备案',
-          attrValue: '------',
-        },
-        {
-          attrType: '等保定级',
-          attrValue: '------',
-        },
-      ]
-      data.map((itemContent) => {
-        dataFrom.value.content[1].childrenContent.push(itemContent)
-      })
-    }
-
-    let obj = {
-      attrType: '访问地址',
-      attrValue: props.dataList.link || '------',
-    }
-    dataFrom.value.content[0].childrenContent.push(obj)
   }
-  watch(
-    () => props.dataList,
-    (val) => {
-      if (val) {
-        dataFrom.value.content[0].childrenContent = []
-        dataFrom.value.content[1].childrenContent = []
-        props.dataList.infoList.map((item) => {
-          if (
-            item.attrType === '部署区域' ||
-            item.attrType === '是否统一登录' ||
-            item.attrType === '部署位置'
-          ) {
-            dataFrom.value.content[0].childrenContent.push(item)
-          } else if (
-            item.attrType === '是否等保备案' ||
-            item.attrType === '等保定级'
-          ) {
-            dataFrom.value.content[1].childrenContent.push(item)
-          }
+}
+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) => {
+        if (
+          item.attrType === '部署区域' ||
+          item.attrType === '是否统一登录' ||
+          item.attrType === '部署位置'
+        ) {
+          dataFrom.value.content[0].childrenContent.push(item)
+        } else if (
+          item.attrType === '是否等保备案' ||
+          item.attrType === '等保定级'
+        ) {
+          dataFrom.value.content[1].childrenContent.push(item)
+        } else if (item.attrType === '访问地址') {
+          objUrl.value = item.value
+        }
+      })
+      if (dataFrom.value.content[1].childrenContent.length <= 0) {
+        let data = [
+          {
+            attrType: '是否等保备案',
+            attrValue: '------',
+          },
+          {
+            attrType: '等保定级',
+            attrValue: '------',
+          },
+        ]
+        data.map((itemContent) => {
+          dataFrom.value.content[1].childrenContent.push(itemContent)
         })
-        if (dataFrom.value.content[1].childrenContent.length <= 0) {
-          let data = [
-            {
-              attrType: '是否等保备案',
-              attrValue: '------',
-            },
-            {
-              attrType: '等保定级',
-              attrValue: '------',
-            },
-          ]
-          data.map((itemContent) => {
-            dataFrom.value.content[1].childrenContent.push(itemContent)
-          })
-        }
-        let obj = {
-          attrType: '访问地址',
-          attrValue: props.dataList.link || '------',
-        }
-        dataFrom.value.content[0].childrenContent.push(obj)
       }
     }
-  )
+  }
+)
 </script>
 
 <style lang="less" scoped>
-  .application-deployment-and-security {
-    padding: 0.8rem 0;
+.application-deployment-and-security {
+  padding: 0.8rem 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .title {
+    margin-bottom: 0.3rem;
+  }
+
+  .content {
     display: flex;
-    flex-direction: column;
-    align-items: center;
-    .title {
-      margin-bottom: 0.3rem;
-    }
-    .content {
-      display: flex;
-      width: 13rem;
-      justify-content: space-between;
-      .content-card {
-        height: 1.5rem;
-        width: 6.2rem;
-        border-radius: 0.2rem;
-        background: linear-gradient(
-          to right,
+    width: 13rem;
+    justify-content: space-between;
+
+    .content-card {
+      height: 1.5rem;
+      width: 6.2rem;
+      border-radius: 0.2rem;
+      background: linear-gradient(to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
-        padding: 0 0.3rem;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        .card-title {
-          font-size: 0.26rem;
-          line-height: 0.26rem;
-          color: #212956;
-          margin-bottom: 0.2rem;
-        }
-        .card-content {
-          div {
+          rgba(148, 163, 252, 0.4));
+      padding: 0 0.3rem;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+
+      .card-title {
+        font-size: 0.26rem;
+        line-height: 0.26rem;
+        color: #212956;
+        margin-bottom: 0.2rem;
+      }
+
+      .card-content {
+        div {
+          display: inline-block;
+          margin-right: 0.7rem;
+          color: rgba(33, 41, 86, 0.8);
+          font-size: 0.2rem;
+          line-height: 0.2rem;
+          max-width: 5.84rem;
+          overflow: hidden;
+          /*超出的隐藏*/
+          white-space: nowrap;
+          text-overflow: ellipsis;
+
+          /*超出的设置为省略号*/
+          span {
             display: inline-block;
-            margin-right: 0.7rem;
-            color: rgba(33, 41, 86, 0.8);
-            font-size: 0.2rem;
-            line-height: 0.2rem;
-            max-width: 5.84rem;
-            overflow: hidden; /*超出的隐藏*/
+            max-width: 4rem;
+            overflow: hidden;
+            /*超出的隐藏*/
             white-space: nowrap;
-            text-overflow: ellipsis; /*超出的设置为省略号*/
-            span {
-              display: inline-block;
-              max-width: 4rem;
-              overflow: hidden; /*超出的隐藏*/
-              white-space: nowrap;
-              text-overflow: ellipsis; /*超出的设置为省略号*/
-            }
+            text-overflow: ellipsis;
+            /*超出的设置为省略号*/
           }
         }
       }
     }
   }
+}
 </style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
index 41e214bb..c878f35e 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@@ -53,12 +53,12 @@ if (props.dataList.infoList) {
   dataFrom.value.content[0].childrenContent[0] = obj
   let deptContacts = {
     attrType: '部门联系人',
-    attrValue: props.dataList.deptContacts || '------',
+    attrValue: '',
   }
   dataFrom.value.content[0].childrenContent[1] = deptContacts
   let deptPhone = {
     attrType: '部门联系电话',
-    attrValue: props.dataList.deptPhone || '------',
+    attrValue: '',
   }
   dataFrom.value.content[0].childrenContent[2] = deptPhone
   props.dataList.infoList.map((item) => {
@@ -87,8 +87,13 @@ if (props.dataList.infoList) {
           dataFrom.value.content[1].childrenContent[2].attrValue = '------'
         }
       }
+    } else if (item.attrType === '部门联系人') {
+      deptContacts.attrValue = item.attrValue || '------'
+    } else if (item.attrType === '部门联系人电话') {
+      deptPhone.attrValue = item.attrValue || '------'
     }
   })
+
   console.log('obj', dataFrom.value)
 }
 watch(
@@ -147,6 +152,10 @@ watch(
                 '------'
             }
           }
+        } else if (item.attrType === '部门联系人') {
+          deptContacts.attrValue = item.attrValue || '------'
+        } else if (item.attrType === '部门联系人电话') {
+          deptPhone.attrValue = item.attrValue || '------'
         }
       })
       console.log('obj', dataFrom.value)