Skip to content

W
web
Commit 95d32c21 authored by mzx's avatar mzx
Browse files
Options

feat(确认试验方案): 接口对接

parent 2053f598
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 114 deletions
src/api/task/task.js
View file @ 95d32c21
...@@ -217,4 +217,16 @@ export function geTaskCase(data) { ...@@ -217,4 +217,16 @@ export function geTaskCase(data) {
data data
}) })
} }
/**
*提交确认表单
*/
export function taskImageSubmit(data) {
return request({
url: '/car/test/task/submit',
method: 'post',
data
})
}
src/views/processing/carTest/confirmation-test/index.vue
View file @ 95d32c21
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务编号:</span> <span class="task-label">任务编号:</span>
<span class="task-content"> <span class="task-content">
{{ model.carReviewTask.taskNo }} {{ task.taskNo }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -33,12 +33,7 @@ ...@@ -33,12 +33,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务状态:</span> <span class="task-label">任务状态:</span>
<span class="task-content"> <span class="task-content">
{{ {{ getDictData(dict.type.task_test_status, task.taskStatus) }}
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span> </span>
</div> </div>
</div> </div>
...@@ -131,45 +126,53 @@ ...@@ -131,45 +126,53 @@
<col style="width: 100px" /> <col style="width: 100px" />
<thead> <thead>
<tr> <tr>
<th>章节号</th> <th style="width: 100px">章节号</th>
<th>标准技术要求</th> <th>标准技术要求</th>
<th>标准测试方法</th> <th>标准测试方法</th>
<th>测试场景</th> <th>测试场景</th>
<th>测试类型</th> <th>测试类型</th>
<th>用例编号</th> <th>用例编号</th>
<th>测试结果</th> <th>用例名称</th>
<th>工具</th>
<th>对应输入</th>
<th style="width: 370px">测试用例</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- 循环遍历 keyPointList --> <template v-for="(i, PointIndex) in tableData">
<template v-for="(i, PointIndex) in tableData.keyPointList">
<tr :key="'PointIndex1' + PointIndex"> <tr :key="'PointIndex1' + PointIndex">
<td align="center" :rowspan="getRows(i)"> <td align="center" :rowspan="getRows3(i)">
{{ '7.1.1' }} {{ i.chapter }}
</td> </td>
<td align="center" :rowspan="getRows(i)"> <td align="center" :rowspan="getRows3(i)">
{{ i.text }} {{ i.text }}
</td> </td>
<td align="center" :rowspan="getRows(i)"> <td align="center" :rowspan="getRows3(i)">
{{ i.text }} {{ i.testMethod }}
</td> </td>
</tr> </tr>
<!-- 循环遍历 reviewDetailsList --> <template v-for="(v, testCaseIndex) in i.testCaseList">
<template v-for="(v, reviewDetailIndex) in i.reviewDetailsList"> <tr :key="'testCaseIndex' + PointIndex + testCaseIndex">
<tr <td align="center" rowspan="1">
:key="'reviewDetailIndex' + PointIndex + reviewDetailIndex" {{ v.testScenario }}
> </td>
<td align="center"> <td align="center" rowspan="1">
{{ '测试场景' }} {{ v.testType }}
</td>
<td align="center" rowspan="1">
{{ v.usecaseNo }}
</td>
<td align="center" rowspan="1">
{{ v.name }}
</td> </td>
<td align="center"> <td align="center" rowspan="1">
{{ '测试类型' }} {{ v.tools }}
</td> </td>
<td align="center"> <td align="center" rowspan="1">
{{ '用例编号' }} {{ v.input }}
</td> </td>
<td align="center"> <td align="center" rowspan="1">
{{ '测试结果' }} {{ v.description }}
</td> </td>
</tr> </tr>
</template> </template>
...@@ -223,11 +226,12 @@ ...@@ -223,11 +226,12 @@
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import routerMixins from '@/mixins/router' import routerMixins from '@/mixins/router'
import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable' import { getRows3 } from '../../../../utils/reviewDetailsTable'
import { listInspection } from '../../../../api/setting/standardTerms' import { testDetail } from '../../../../api/task/test'
import { getBySubtaskId, taskImageSubmit } from '../../../../api/task/task'
export default { export default {
name: 'Index', name: 'Index',
dicts: ['test_cartype_type'], dicts: ['task_test_status'],
mixins: [routerMixins], mixins: [routerMixins],
data() { data() {
return { return {
...@@ -243,95 +247,51 @@ export default { ...@@ -243,95 +247,51 @@ export default {
inspectionLeader: '', inspectionLeader: '',
result: [] result: []
}, },
rules: {
enterpriseLeader: [
{ required: true, message: '请输入车企负责人', trigger: 'blur' }
],
inspectionLeader: [
{ required: true, message: '请输入检验负责人', trigger: 'blur' }
]
},
taskId: '',
loading: false loading: false
} }
}, },
// async mounted() {
// if (this.$route.query.id) {
// this.taskId = this.$route.query.id
// }
// await this.getTask()
// this.openAll()
// },
mounted() { mounted() {
this.init() this.getTest()
this.getTestDetail()
}, },
methods: { methods: {
getRows, getRows3,
getRows2, /* 返回跳转*/
/** 获取体系审查、车型审查检验内容 */ goToProcessedReview() {
init() { // this.ruleForm.taskId = '1771093631118106626'
const formData = {
// imagesUrl: [
// this.ruleForm.enterpriseLeader,
// this.ruleForm.inspectionLeader
// ],
imagesUrl: ['1', '2'],
taskId: '1771093631118106626'
}
taskImageSubmit(formData).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess('确认提交成功')
// this.$router.push({
// path: '/processing/unprocessed-review'
// })
} else {
this.$modal.msgError(res.msg)
}
})
},
/** 获取任务详情 */
getTest() {
getBySubtaskId({ id: this.$route.query.id }).then(res => {
if (res.code === 200) {
this.task = res.data
}
})
},
getTestDetail() {
this.loading = true this.loading = true
listInspection({ id: '1744181159757221888' }).then(res => { testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data this.tableData = res.data
this.loading = false this.loading = false
}) })
},
/**
* 获取任务详情
*/
// async getTask() {
// this.loading = true
// const res = await checkTaskDetail({
// taskId: this.taskId
// })
// this.loading = false
// if (res.code === 200) {
// this.model = res.data
// await this.getTaskDetail()
// if (this.model.carReviewTask.imagesUrl) {
// const imgs = this.model.carReviewTask.imagesUrl.split(',')
// this.ruleForm.enterpriseLeader
// ? process.env.VUE_APP_IMAGE_API + imgs[0]
// : ''
// this.ruleForm.inspectionLeader
// ? process.env.VUE_APP_IMAGE_API + imgs[1]
// : ''
// }
// } else {
// this.$modal.msgError(res.msg)
// }
// },
/**
* 获取任务详情
*/
// async getTaskDetail() {
// const result = await getBySubtaskId({
// id: this.taskId
// })
// if (result.code === 200) {
// this.task = result.data
// }
// },
/* 返回跳转*/
goToProcessedReview() {
// this.ruleForm.taskId = this.taskId
// const formData = {
// imagesUrl: [
// this.ruleForm.enterpriseLeader,
// this.ruleForm.inspectionLeader
// ],
// taskId: this.taskId
// }
// carTaskSubmit(formData).then(res => {
// if (res.code === 200) {
// this.$modal.msgSuccess('确认提交成功')
// this.$router.push({
// path: '/processing/unprocessed-review'
// })
// } else {
// this.$modal.msgError(res.msg)
// }
// })
} }
} }
} }
......
src/views/processing/carTest/review-form/index.vue
View file @ 95d32c21
...@@ -139,7 +139,6 @@ export default { ...@@ -139,7 +139,6 @@ export default {
detailsList: [] detailsList: []
}, },
task: {}, task: {},
taskId: '',
loading: false loading: false
} }
}, },
...@@ -150,7 +149,7 @@ export default { ...@@ -150,7 +149,7 @@ export default {
methods: { methods: {
getRows3, getRows3,
getTest() { getTest() {
getBySubtaskId({ id: '1768527384203460609' }).then(res => { getBySubtaskId({ id: this.$route.query.id }).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.task = res.data this.task = res.data
} }
...@@ -159,7 +158,7 @@ export default { ...@@ -159,7 +158,7 @@ export default {
/** 获取任务详情 */ /** 获取任务详情 */
getTestDetail() { getTestDetail() {
this.loading = true this.loading = true
testDetail({ taskId: '1768527384203460609' }).then(res => { testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data this.tableData = res.data
this.loading = false this.loading = false
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment