From 06720a4283d98b98f58e52f1a37b55b6987e7d10 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 13 May 2021 11:31:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=BB=9F=E8=AE=A1=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestPlanService.java  | 6 ++++--
 .../components/track/plan/components/TestPlanList.vue       | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index d8b2056318..988a424674 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -841,8 +841,10 @@ public class TestPlanService {
                 for (IssuesDao i : issue) {
                     i.setModel(testCase.getNodePath());
                     i.setProjectName(testCase.getProjectName());
-                    String des = i.getDescription().replaceAll("<p>", "").replaceAll("</p>", "");
-                    i.setDescription(des);
+                    if (StringUtils.isNotBlank(i.getDescription())) {
+                        String des = i.getDescription().replaceAll("<p>", "").replaceAll("</p>", "");
+                        i.setDescription(des);
+                    }
                     if (i.getLastmodify() == null || i.getLastmodify() == "") {
                         if (i.getReporter() != null || i.getReporter() != "") {
                             i.setLastmodify(i.getReporter());
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 0d4aa41d4c..08a80dfd18 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -86,7 +86,7 @@
           show-overflow-tooltip
           :key="index">
           <template v-slot:default="scope">
-            <el-progress :percentage="calPassRate(scope)"></el-progress>
+            <el-progress :percentage="scope.row.testRate"></el-progress>
           </template>
         </el-table-column>
         <el-table-column
@@ -296,10 +296,6 @@ export default {
     inite() {
       this.initTableData()
     },
-    calPassRate(scope) {
-      let passRate = scope.row.passRate.substring(0, scope.row.passRate.length - 1);
-      return Number.parseInt(passRate, 10);
-    },
     customHeader() {
       this.$refs.headerCustom.open(this.tableLabel)
     },