From aaa23ce32517be5f9f92ce837af6a164c84ff479 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 12 Aug 2022 11:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/countryCardRelease.vue         |  7 +++++--
 .../components/countryCardView.vue            | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index 9e34a7f28..ba3d5fef4 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -298,10 +298,13 @@
           }
         })
       },
-      viewClick() {
+      viewClick(row) {
         let newUrl = this.$router.resolve({
           path: '/countryCardView',
-          query: {}
+          query: {
+            applyMarket: row.applyMarket,
+            id: row.id
+          }
         })
         window.open(newUrl.href, '_blank')
       },
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index 0e804b721..93adee56b 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
@@ -26,7 +26,7 @@
               <div style="width: 100%" v-for="(item1,index) in contentList" class="content-box-top">
                 <div v-for="(item2,index2) in item1.list" style="width: 340px;display: inline-block"
                      class="content-box-left">
-                  <div class="content-box-box-top" v-if="index == 0">
+                  <div class="content-box-box-top" style="cursor: default" v-if="index == 0">
                     <img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
                     <img :src="item2.img" v-else class="content-box-box-img" alt="">
                     <span v-if="index2 == 0" class="content-box-box-text"></span>
@@ -36,15 +36,28 @@
 
                   </div>
                   <div class="content-box-box" v-else>
+                    <a v-if="index2 == 0 && item2.relevantUrl"
+                       style="color: rgb(33, 201, 204)"
+                       :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
+                       class="content-box-box-text content-box-box-text-index"
+                       :href="item2.relevantUrl" target="_blank">{{item2.lableName}}</a>
                     <span style="color: #21c9cc"
                           :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
                           class="content-box-box-text content-box-box-text-index"
                           @click="viewFileClick(item2.lableName)"
-                          v-if="item2.lableType == 7 && item2.lableName && index2 != 0">
+                          v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0">
                          {{$t('viewFile')}}
                     </span>
+                    <span class="content-box-box-text content-box-box-text-index"
+                          v-else-if="item2.lableType != 7 && !item2.lableName && index2 != 0"
+                          style="cursor: default"
+                          :title="item2.lableName"
+                          :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}">
+                        {{item2.lableName}}
+                    </span>
                     <span class="content-box-box-text content-box-box-text-index"
                           v-else
+                          style="cursor: default"
                           :title="item2.lableName"
                           :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}">
                         {{item2.lableName}}
@@ -169,12 +182,14 @@
           })
         }
         if (content && content.length > 0) {
+          console.log(content)
           content.forEach((res, index) => {
             this.contentList[index + 1] = { name: res.lableName }
             this.contentList[index + 1].list = []
             this.contentList[index + 1].list.push({
               lableName: res.lableName,
-              lableType: res.lableType
+              lableType: res.lableType,
+              relevantUrl: res.relevantUrl
             })
           })
         }