Merge branch 'mengzixuan' of http://gitlab.91isoft.com:90/car-test/web into develop

src/views/processing/carTest/confirmation-test/index.vue

@@ -46,7 +46,7 @@
               <div class="message-detail">
                 <div class="detail-title">测试用例(条)</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.details }}
+                  {{ taskDetail.useCaseNum }}
                 </div>
               </div>
               <svg-icon
@@ -60,7 +60,7 @@
               <div class="message-detail">
                 <div class="detail-title">标准条款（条）</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.detailsPass }}
+                  {{ taskDetail.standardNum }}
                 </div>
               </div>
               <svg-icon
@@ -73,9 +73,7 @@
             <div class="message-box" style="background-color: #eca740">
               <div class="message-detail">
                 <div class="detail-title">测试通过率(%)</div>
-                <div class="detail-num mt10">
-                  {{ model.carReviewTask.standards }} %
-                </div>
+                <div class="detail-num mt10">{{ taskDetail.testPass }} %</div>
               </div>
               <svg-icon
                 class="message-icon"
@@ -88,7 +86,7 @@
               <div class="message-detail">
                 <div class="detail-title">测试通过(个)</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.standardsPass }}
+                  {{ taskDetail.testPassNum }}
                 </div>
               </div>
               <svg-icon
@@ -102,7 +100,7 @@
               <div class="message-detail">
                 <div class="detail-title">测试未通过（个）</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.person }}
+                  {{ taskDetail.testNoPassNum }}
                 </div>
               </div>
               <svg-icon

src/views/processing/carTest/execution-test-plan/components/SchemeView.vue

@@ -16,9 +16,9 @@
       <div class="message-list">
         <div class="message-box" style="background-color: #2eba3c">
           <div class="message-detail">
-            <div class="detail-title">审查细则(条)</div>
+            <div class="detail-title">测试用例(条)</div>
             <div class="detail-num mt10">
-              <!-- {{ model.systemReviewTask.details }} -->
+              {{ model.useCaseNum }}
             </div>
           </div>
           <svg-icon
@@ -30,10 +30,8 @@
         </div>
         <div class="message-box" style="background-color: #477bba">
           <div class="message-detail">
-            <div class="detail-title">审查细则符合率（%）</div>
-            <div class="detail-num mt10">
-              <!-- {{ model.systemReviewTask.detailsPass }}% -->
-            </div>
+            <div class="detail-title">标准条款（条）</div>
+            <div class="detail-num mt10">{{ model.standardNum }}%</div>
           </div>
           <svg-icon
             class="message-icon"
@@ -44,9 +42,9 @@
         </div>
         <div class="message-box" style="background-color: #eca740">
           <div class="message-detail">
-            <div class="detail-title">标准条款(条)</div>
+            <div class="detail-title">测试通过率(%)</div>
             <div class="detail-num mt10">
-              <!-- {{ model.systemReviewTask.standards }} -->
+              {{ model.testPass }}
             </div>
           </div>
           <svg-icon
@@ -58,10 +56,8 @@
         </div>
         <div class="message-box" style="background-color: #47baba">
           <div class="message-detail">
-            <div class="detail-title">标准条款通过率(%)</div>
-            <div class="detail-num mt10">
-              <!-- {{ model.systemReviewTask.standardsPass }}% -->
-            </div>
+            <div class="detail-title">测试通过(个)</div>
+            <div class="detail-num mt10">{{ model.testPassNum }}%</div>
           </div>
           <svg-icon
             class="message-icon"
@@ -72,9 +68,9 @@
         </div>
         <div class="message-box" style="background-color: #6c47ba">
           <div class="message-detail">
-            <div class="detail-title">参与审查人数（人）</div>
+            <div class="detail-title">测试未通过（个）</div>
             <div class="detail-num mt10">
-              <!-- {{ model.systemReviewTask.person }} -->
+              {{ model.testNoPassNum }}
             </div>
           </div>
           <svg-icon
@@ -91,7 +87,7 @@
       <div class="form-review-questionnaire">
         <div class="title-display">
           <span class="title-i"></span>
-          <span class="title-content">审查表单概要</span>
+          <span class="title-content">试验表单概要</span>
           <div class="control-btns">
             <div class="control-btn" @click="openAll()">
               <icon-park
@@ -118,7 +114,7 @@
         <!--审查表单概要-->
         <collapse v-model="activeNames" class="mt10">
           <collapse-item
-            v-for="(item, key) in model"
+            v-for="(item, key) in model.modelTestTaskViewResponseList"
             :key="key"
             :name="item.serial_number"
           >
@@ -208,7 +204,9 @@ export default {
   data() {
     return {
       loading: true,
-      model: [],
+      model: {
+        modelTestTaskViewResponseList: []
+      },
       activeNames: []
     }
   },
@@ -229,13 +227,12 @@ export default {
     async getTestDetail(id) {
       this.loading = true
       const res = await testDetail({ taskId: id })
-
-      this.model = res.data.modelTestTaskViewResponseList
+      this.model = res.data
       this.loading = false
     },
     /** 全部展开 */
     openAll() {
-      this.activeNames = this.model.map(i => {
+      this.activeNames = this.model.modelTestTaskViewResponseList.map(i => {
         return i.serial_number
       })
     },

src/views/processing/carTest/execution-test-plan/index.vue

@@ -3,7 +3,7 @@
   <task-standard>
     <div slot="header-right">
       <header-button icon="preview-open" type="default" @click="handlePreview">
-        查看实验方案
+        查看试验方案
       </header-button>
       <header-button
         icon="arrow-left"