Merge branch 'v1.4' into master

frontend/src/business/components/track/home/TrackHome.vue

@@ -3,18 +3,17 @@
     <ms-main-container>
       <el-row :gutter="20">
         <el-col :span="15">
-          <related-test-plan-list ref="relatedTestPlanList"/>
+          <el-row>
+            <related-test-plan-list ref="relatedTestPlanList"/>
+          </el-row>
+          <el-row>
+            <review-list title="我的评审" ref="caseReviewList"/>
+          </el-row>
         </el-col>
         <el-col :span="9">
           <test-case-side-list :title="$t('test_track.home.recent_test')" ref="testCaseRecentList"/>
         </el-col>
       </el-row>
-      <div style="margin-top: 10px"/>
-      <el-row :gutter="20">
-        <el-col :span="15">
-          <review-list title="我的评审" ref="caseReviewList"/>
-        </el-col>
-      </el-row>
     </ms-main-container>
   </ms-container>
 </template>
@@ -52,4 +51,7 @@ export default {
   cursor: pointer;
 }
 
+.el-row {
+  padding-bottom: 20px;
+}
 </style>

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue

@@ -101,7 +101,7 @@
             <el-row>
               <el-col :offset="1">
                 <span class="cast_label">{{ $t('test_track.case.prerequisite') }}：</span>
-                <span class="cast_item">{{ testCase.prerequisite }}</span>
+                <span class="cast_item"><p>{{ testCase.prerequisite }}</p></span>
               </el-col>
             </el-row>
 
@@ -684,4 +684,9 @@ export default {
 .el-switch >>> .el-switch__label.is-active {
   color: #409EFF;
 }
+
+p {
+  white-space: pre-line;
+  line-height: 20px;
+}
 </style>