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

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

@@ -150,18 +150,18 @@
             <collapse-item
               v-for="(item, key) in tableData"
               :key="key"
-              :name="item.chapter"
+              :name="item.serial_number"
             >
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
                     <div class="standard-title">
                       <div class="standard">标准：</div>
-                      {{ item.chapter + item.text }}
+                      {{ item.serial_number + item.requirements }}
                     </div>
                   </div>
                   <div class="standard-result">
-                    <el-button type="text" @click="testmMthod"
+                    <el-button type="text" @click="testmMthod(item)"
                       >标准测试方法</el-button
                     >
                   </div>
@@ -174,23 +174,29 @@
                   <th>用例编号</th>
                   <th>用例名称</th>
                   <th>对应输入</th>
+                  <th>测试结果</th>
                 </tr>
-                <template v-for="(keyPoint, keyPointKey) in item.testCaseList">
+                <template
+                  v-for="(keyPoint, keyPointKey) in item.case_result_list"
+                >
                   <tr :key="keyPointKey">
                     <td rowspan="1">
-                      {{ keyPoint.testScenario }}
+                      {{ keyPoint.scenario }}
                     </td>
                     <td rowspan="1">
-                      {{ keyPoint.testMethod }}
+                      {{ keyPoint.test_type }}
                     </td>
                     <td rowspan="1">
-                      {{ keyPoint.usecaseNo }}
+                      {{ keyPoint.serial_number }}
                     </td>
                     <td rowspan="1">
                       {{ keyPoint.name }}
                     </td>
                     <td rowspan="1">
-                      {{ keyPoint.input }}
+                      {{ keyPoint.requirements }}
+                    </td>
+                    <td rowspan="1">
+                      {{ keyPoint.status }}
                     </td>
                   </tr>
                 </template>
@@ -241,6 +247,7 @@
       </div>
     </div>
     <el-dialog title="标准测试方法" :visible.sync="open" append-to-body>
+      <div>{{ activeValue }}</div>
     </el-dialog>
   </task-standard>
 </template>
@@ -261,6 +268,7 @@ export default {
   mixins: [routerMixins],
   data() {
     return {
+      activeValue: '',
       open: false,
       activeNames: [],
       tableData: [],
@@ -272,7 +280,7 @@ export default {
       },
       taskDetail: {},
       ruleForm: {
-        enterpriseLeader: '',
+        // enterpriseLeader: '',
         inspectionLeader: '',
         result: []
       },
@@ -290,13 +298,14 @@ export default {
   },
   methods: {
     getRows3,
-    testmMthod() {
+    testmMthod(i) {
       this.open = true
+      this.activeValue = i.test_method
     },
     /** 全部展开 */
     openAll() {
       this.activeNames = this.tableData.map(i => {
-        return i.chapter
+        return i.serial_number
       })
     },
     /** 全部收起 */
@@ -307,14 +316,15 @@ export default {
     goToProcessedReview() {
       // this.ruleForm.taskId = '1771093631118106626'
       const formData = {
-        // imagesUrl: [
+        imagesUrl: [
           // this.ruleForm.enterpriseLeader,
-        //   this.ruleForm.inspectionLeader
-        // ],
-        imagesUrl: [{}],
+          this.ruleForm.inspectionLeader
+        ],
+        // imagesUrl: [{}],
         taskId: this.$route.query.id
       }
       console.log('formData', formData)
+      if (formData.imagesUrl.length > 0) {
         taskImageSubmit(formData).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess('确认提交成功')
@@ -325,6 +335,7 @@ export default {
             this.$modal.msgError(res.msg)
           }
         })
+      }
     },
     /** 获取任务详情 */
     getTest() {
@@ -343,6 +354,7 @@ export default {
       testDetail({ taskId: this.$route.query.id }).then(res => {
         this.taskDetail = res.data
         this.tableData = res.data.modelTestTaskViewResponseList
+        this.ruleForm.inspectionLeader = res.data.imgUrl
         this.loading = false
         this.openAll()
       })

src/views/processing/carTest/review-form/index.vue

@@ -171,7 +171,7 @@
       </div>
     </div>
     <el-dialog title="标准测试方法" :visible.sync="open" append-to-body>
-      {{ activeValue }}
+      <div>{{ activeValue }}</div>
     </el-dialog>
   </task-standard>
 </template>