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

bug修复
2022-06-30 19:06:55 +08:00 · 2022-06-30 19:04:35 +08:00
4 changed files with 52 additions and 25 deletions
--- a/front/public/index.html
+++ b/front/public/index.html
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.wuhongjian
 * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-30 18:30:56
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-30 19:06:47
 * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@ -47,7 +47,7 @@
    window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
    window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
    // 穿透版本
    // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 11:32:22
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-20 18:58:46
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-30 17:06:56
 * @Description: 算法详情页
 -->
 <template>
@ -23,6 +23,7 @@
    ></algorithm-display>
    <!-- 关联能力 -->
    <algorithm-associated-ability
+      v-if="!loading"
      :associatedComponents="associatedComponents"
      id="algorithm-associated-ability"
      class="scrollBox"
@ -93,6 +94,7 @@
  const router = useRouter()
  const scrollTop = ref(0)
  const domArr = ref([])
+  const loading = ref(true)
  const selectNow = ref('')
  const dataList = reactive({ data: {} })
  const id = router.currentRoute.value.query.id
@ -162,6 +164,7 @@
        }
        queryPartAppByKeyId2(queryPartAppByKeyIdParams).then((res) => {
          associatedComponents.value[index].dataList = res.data.data
+          loading.value = false
        })
      })
    } else if (obj) {
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
@ -1,6 +1,6 @@
 <template>
  <div class="application-associated-ability" v-if="flag">
-    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <detals-title title="关联应用" type="ASSOCIATED"></detals-title>
    <div class="application-associated-ability-main">
      <div
        class="associated-ability-card"
@ -34,14 +34,18 @@
  const oldid = router.currentRoute.value.query.id
  //点击查看详情
  const switchFunction = (id) => {
-    router.push({
-      path: '/details',
-      query: {
-        id: id,
-      },
-    })
+    // router.push({
+    //   path: '/details',
+    //   query: {
+    //     id: id,
+    //   },
+    // })
+    window.open(window.SITE_CONFIG.previewUrl+ '#/details?id=' + id)
+    // alert(id)
  }
-  if (props.associatedComponents) {
+  console.log('这个是空值', props.associatedComponents[0])
+  if (props.associatedComponents[0].dataList.length > 0) {
+    console.log('这个是空值', props.associatedComponents)
    flag.value = true
    dataFrom.value = props.associatedComponents
    console.log('dataFrom.value', dataFrom.value)
@ -82,7 +86,7 @@
      margin-top: 0.4rem;
      width: 13.3rem;
      display: flex;
-      justify-content: space-between;
+      justify-content: space-around;
      .associated-ability-card {
        width: 3.2rem;
        display: flex;
@ -106,6 +110,7 @@
            color: #999;
            margin-right: 0.15rem;
            margin-top: 0.15rem;
+            text-align: center;
          }
        }
      }
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.liangjunhua
 * @Date: 2022-06-08 14:54:01
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-15 18:32:23
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-30 17:09:40
 * @Description: 算法详情页导航
 -->
 <template>
@ -21,8 +21,14 @@
  </div>
 </template>
 <script setup>
-  import { ref, defineProps, watch } from 'vue'
+  import { ref, defineProps, watch, getCurrentInstance } from 'vue'
+  import { useRouter } from 'vue-router'
  import mybus from '@/myplugins/mybus'
+  import { queryPartAppByKeyId2 } from '@/api/home'
+  // 获取当前路由地址
+  const router = useRouter();
+  const keyId = router.currentRoute.value.query.id;
+  console.log('123', keyId)
  const navList = ref([
    {
      name: '算法展示',
@ -32,10 +38,6 @@
      name: '算法优势',
      key: 'algorithm-advantage',
    },
-    {
-      name: '关联能力',
-      key: 'algorithm-associated-ability',
-    },
    {
      name: '应用场景',
      key: 'application-scenarios',
@ -61,12 +63,30 @@
      key: 'common-problem',
    },
  ])
+  const list = ref([])
+    // 根据能力id查询是否存在关联应用
+  queryPartAppByKeyId2({keyId: keyId}).then(
+    res=>{
+    console.log('ressssssss', res)
+    if (res.data.data.length > 0) {
+      // 存在关联应用时在导航栏加入关联应用
+      navList.value.unshift({
+        name: '关联应用',
+        key: 'algorithm-associated-ability',
+        show: true
+      })
+      // list.value.push('关联应用')
+      console.log('navList', navList)
+    }
+  })
  const props = defineProps({
    selectNow: { type: String, default: '' },
    dataList: { type: Object, default: null },
-  })
+  }
+  )
+
  const select = ref('algorithm-display')
-  const list = ref([])
+
  const selectNav = (key) => {
    select.value = key
    mybus.emit('flyToView', select.value)
@ -91,7 +111,6 @@
        list.value.push('使用方式')
      }
    })
-    list.value.push('关联能力')
    navList.value.forEach((item) => {
      console.log(item)
      if (list.value.indexOf(item.name) > -1) {
@ -136,7 +155,7 @@
            list.value.push('使用方式')
          }
        })
-        list.value.push('关联能力')
+        list.value.push('关联应用')
        navList.value.forEach((item) => {
          console.log(item)
          if (list.value.indexOf(item.name) > -1) {
Author	SHA1	Message	Date
wuhongjian	2663665321	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-06-30 19:06:55 +08:00
wuhongjian	8fcdff051b	bug修复	2022-06-30 19:04:35 +08:00