Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue

@@ -6,7 +6,7 @@
  * @Description: 应用详情
 -->
 <template>
-  <div class="algorithm-on-trial" v-if="flag">
+  <div class="algorithm-on-trial" v-if="flag && whoShow1.itShowQingDao">
     <detals-title title="应用详情" type="PROBATION"></detals-title>
     <div class="main">
       <div class="main-left">
@@ -35,14 +35,16 @@
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
   let flag = ref(true)
+  const whoShow1 = ref(whoShow)
+  console.log('whoShow1', whoShow1.value.itShowQingDao)
   const props = defineProps({
     dataList: { type: Object, default: null },
   })
   const dataFrom = ref({
     linkName: '访问地址',
-    link: 'http://localhost:8080/#/detailsfdddffffffffffffffdfgdfgdfdgdfgdfg',
+    link: '',
     numberName: '试用账号',
-    number: 'zhangfeihu',
+    number: '',
     passwordName: '试用密码',
     password: '**************************',
     password2: '',
@@ -52,15 +54,17 @@
     if (obj !== '已申请') {
       flag.value = false
     } else {
+      dataFrom.value.link = props.dataList.link
       props.dataList.infoList.map((item) => {
-        if (item.attrType == '访问地址') {
+        if (item.attrType == '试用用户名') {
-          dataFrom.value.link = item.attrValue
-        } else if (item.attrType == '试用用户名') {
           dataFrom.value.number = item.attrValue
         } else if (item.attrType == '试用密码') {
           dataFrom.value.password2 = item.attrValue
         }
       })
+      if (dataFrom.value.password2 === '') {
+        dataFrom.value.password = ''
+      }
     }
   }
   const clickLink = (link) => {
@@ -68,15 +72,19 @@
   }
   //复制方法
   const copyFunction = (data, name) => {
-    let url = data
+    if (data !== '') {
-    let oInput = document.createElement('input')
+      let url = data
-    oInput.value = url
+      let oInput = document.createElement('input')
-    document.body.appendChild(oInput)
+      oInput.value = url
-    oInput.select() // 选择对象;
+      document.body.appendChild(oInput)
-    console.log(oInput.value)
+      oInput.select() // 选择对象;
-    document.execCommand('Copy') // 执行浏览器复制命令
+      console.log(oInput.value)
-    oInput.remove() // 执行浏览器复制命令
+      document.execCommand('Copy') // 执行浏览器复制命令
-    message.success(name + '成功')
+      oInput.remove() // 执行浏览器复制命令
+      message.success(name + '成功')
+    } else {
+      message.error('复制为空')
+    }
   }
   message.config({
     top: '100px', // 距离顶部的位置
@@ -96,15 +104,17 @@
         if (obj !== '已申请') {
           flag.value = false
         } else {
+          dataFrom.value.link = props.dataList.link
           props.dataList.infoList.map((item) => {
-            if (item.attrType == '访问地址') {
+            if (item.attrType == '试用用户名') {
-              dataFrom.value.link = item.attrValue
-            } else if (item.attrType == '试用用户名') {
               dataFrom.value.number = item.attrValue
             } else if (item.attrType == '试用密码') {
               dataFrom.value.password2 = item.attrValue
             }
           })
+          if (dataFrom.value.password2 === '') {
+            dataFrom.value.password = ''
+          }
         }
       }
     }

front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue

@@ -56,11 +56,19 @@
       },
     ],
   })
+  const whoShow1 = ref(whoShow)
   //数据初始化
   const props = defineProps({
     dataList: { type: Object, default: null },
   })
   if (props.dataList.infoList) {
+    if (!whoShow1.value.itShowQingDao) {
+      let obj = {
+        attrType: '访问地址',
+        attrValue: props.dataList.link || '------',
+      }
+      dataFrom.value.content[0].childrenContent.push(obj)
+    }
     props.dataList.infoList.map((item) => {
       if (
         item.attrType === '部署区域' ||
@@ -75,14 +83,13 @@
           attrValue: '是',
         }
         dataFrom.value.content[1].childrenContent.push(isAndNo)
+      } else if (item.attrType === '访问地址') {
+        let obj = {
+          attrType: '访问地址',
+          attrValue: item.attrValue || '------',
+        }
+        dataFrom.value.content[0].childrenContent.push(obj)
       }
-      // } else if (item.attrType === '访问地址') {
-      //   let obj = {
-      //     attrType: '访问地址',
-      //     attrValue: item.attrValue || '------',
-      //   }
-      //   dataFrom.value.content[0].childrenContent.push(obj)
-      // }
     })
     if (dataFrom.value.content[1].childrenContent.length <= 0) {
       let data = [
@@ -100,18 +107,25 @@
       })
     }
   }
-  // //访问地址跳转方法
+  //访问地址跳转方法
-  // const addressFunction = (name, itemValue) => {
+  const addressFunction = (name, itemValue) => {
-  //   if (name == '访问地址') {
+    if (name == '访问地址') {
-  //     window.open(itemValue)
+      window.open(itemValue)
-  //   }
+    }
-  // }
+  }
   watch(
     () => props.dataList,
     (val) => {
       if (val) {
         dataFrom.value.content[0].childrenContent = []
         dataFrom.value.content[1].childrenContent = []
+        if (!whoShow1.value.itShowQingDao) {
+          let obj = {
+            attrType: '访问地址',
+            attrValue: props.dataList.link || '------',
+          }
+          dataFrom.value.content[0].childrenContent.push(obj)
+        }
         props.dataList.infoList.map((item) => {
           if (
             item.attrType === '部署区域' ||
@@ -127,13 +141,6 @@
             }
             dataFrom.value.content[1].childrenContent.push(isAndNo)
           }
-          // } else if (item.attrType === '访问地址') {
-          //   let obj = {
-          //     attrType: '访问地址',
-          //     attrValue: item.attrValue || '------',
-          //   }
-          //   dataFrom.value.content[0].childrenContent.push(obj)
-          // }
         })
         if (dataFrom.value.content[1].childrenContent.length <= 0) {
           debugger

front/src/views/detailsAll/components/Application/ApplicationNavigation.vue

@@ -58,6 +58,7 @@
       key: 'common-problem',
     },
   ])
+  const whoShow1 = ref(whoShow)
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
@@ -100,13 +101,11 @@
         list.value.push(item.attrType)
       } else if (item.attrType === '应用展示视频') {
         list.value.push('应用展示')
-      } else if (
-        item.attrType === '访问地址' &&
-        props.dataList.applyState === '已申请'
-      ) {
-        list.value.push('应用详情')
       }
     })
+    if (props.dataList.link && whoShow1.value.itShowQingDao) {
+      list.value.push('应用详情')
+    }
     list.value.unshift('关联组件')
     list.value.push('部署与安全')
     list.value.push('归属部门与服务商')
@@ -146,13 +145,11 @@
             list.value.push(item.attrType)
           } else if (item.attrType === '应用展示视频') {
             list.value.push('应用展示')
-          } else if (
-            item.attrType === '访问地址' &&
-            props.dataList.applyState === '已申请'
-          ) {
-            list.value.push('应用详情')
           }
         })
+        if (props.dataList.link && whoShow1.value.itShowQingDao) {
+          list.value.push('应用详情')
+        }
         list.value.unshift('关联组件')
         list.value.push('部署与安全')
         list.value.push('归属部门与服务商')