Merge pull request #192 from Kabimon/dev-1.0.0

LGTM
WeBankFinTech · Feb 28, 2022 · 94d5c18 · 94d5c18
2 parents 85d0eb5 + 5b7c08e
commit 94d5c18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/web/src/pages/jobManagement/components/jobDetail.vue b/web/src/pages/jobManagement/components/jobDetail.vue
@@ -328,7 +328,7 @@
               :scroll="{y:240}"
             >
               <template #jobExecutionId="{ record }">
-                <router-link :to="`/synchronizationHistory?jobExecutionId=${jobExecutionId}`">
+                <router-link :to="`/synchronizationHistory?jobExecutionId=${record.jobExecutionId}`">
                   {{record.jobExecutionId}}
                 </router-link>
               </template>

diff --git a/web/src/pages/jobManagement/components/job_card.vue b/web/src/pages/jobManagement/components/job_card.vue
@@ -13,6 +13,7 @@
                 ? 'content-main-c-desc-oneline'
                 : 'content-main-c-desc-2line',
             ]"
+            :title="jobData.jobDesc"
           >
             {{ jobData.jobDesc }}
           </p>
@@ -21,11 +22,16 @@
           class="content-main-c-tags"
           v-if="jobData.jobLabels && jobData.jobLabels.length > 0"
         >
-          <a-tag
-            v-for="(tag, index) in jobData.jobLabels.split(',')"
-            :key="index"
-            >{{ tag }}
-          </a-tag>
+          <template v-for="(tag, index) in jobData.jobLabels.split(',').slice(0,5)" :key="index">
+            <a-tooltip v-if="tag.length > 5" :title="tag">
+              <a-tag>
+                {{ `${tag.slice(0, 5)}...` }}
+              </a-tag>
+            </a-tooltip>
+            <a-tag v-else>
+              {{ tag }}
+            </a-tag>
+          </template>
         </div>
       </div>
     </div>

diff --git a/web/src/pages/projectManage/components/projectViewCard.vue b/web/src/pages/projectManage/components/projectViewCard.vue
@@ -45,6 +45,7 @@
                 ? 'card-main-desc-oneline'
                 : 'card-main-desc-2line',
             ]"
+            :title="describe"
           >
             {{ describe }}
           </p>