Skip to content

W
web
Commit 6a130718 authored by mzx's avatar mzx
Browse files
Options

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

parents c98a7cad 1968a4cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 8 deletions
src/components/ImageUpload/index.vue
View file @ 6a130718
......@@ -42,7 +42,7 @@
<template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template>
</div>
<el-dialog :visible.sync="dialogVisible" width="800" append-to-body>
<el-dialog :visible.sync="dialogVisible" width="800" append-to-body :close-on-click-modal="false">
<img
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto"
......@@ -248,14 +248,26 @@ export default {
::v-deep .el-dialog {
background: none;
width: 100%;
box-shadow: none;
}
::v-deep .el-dialog__headerbtn {
top: 8px !important;
background: url('../../assets/icons/svg/guanbi.png') left no-repeat;
background-size: cover;
}
//::v-deep .el-dialog__headerbtn {
// top: 8px !important;
// background: url('../../assets/icons/svg/guanbi.svg') left no-repeat;
// background-size: cover;
//}
::v-deep .el-dialog__headerbtn i {
font-size: 25px;
visibility: hidden;
font-size: 35px;
color: white;
//visibility: hidden;
}
// Dialog悬停样式
::v-deep .el-dialog__headerbtn:focus .el-dialog__close,
::v-deep .el-dialog__headerbtn:hover .el-dialog__close {
color: white !important;
}
// MessageBox悬停样式
::v-deep .el-message-box__headerbtn:focus .el-message-box__close,
::v-deep .el-message-box__headerbtn:hover .el-message-box__close {
color: white !important;
}
</style>
src/views/task/testReview/confirmation-test/index.vue 0 → 100644
View file @ 6a130718
This diff is collapsed.
src/views/task/testReview/review-form/index.vue 0 → 100644
View file @ 6a130718
<template>
<!--查看试验方案页面-->
<task-standard v-loading="loading">
<div slot="header-right">
<header-button
icon="arrow-left"
class="back-btn"
type="no-line"
@click="goBack"
>
返回
</header-button>
</div>
<!--2-统计值-->
<div class="main-content-style">
<!--任务编号,名称,单位-->
<div class="task">
<div class="task-item">
<span class="task-label">任务编号:</span>
<span class="task-content">
{{ model.systemReviewTask.taskNo }}
</span>
</div>
<div class="task-item">
<span class="task-label">任务名称:</span>
<span class="task-content">
{{ task.taskName }}
</span>
</div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{ task.entrustedUnit }}
</span>
</div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.task_test_status,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div>
<!--查看试验方案列表-->
<div>
<div class="form-review-questionnaire">
<!--查看试验方案列表-->
<table class="table">
<col style="width: 100px" />
<thead>
<tr>
<th>章节号</th>
<th>标准技术要求</th>
<th>标准测试方法</th>
<th>测试场景</th>
<th>测试类型</th>
<th>用例编号</th>
<th>用例名称</th>
<th>工具</th>
<th>对应输入</th>
<th>测试用例</th>
</tr>
</thead>
<tbody>
<!-- 循环遍历 keyPointList -->
<template v-for="(i, PointIndex) in tableData.keyPointList">
<tr :key="'PointIndex1' + PointIndex">
<td align="center" :rowspan="getRows(i)">
{{ '7.1.1' }}
</td>
<td align="center" :rowspan="getRows(i)">
{{ i.text }}
</td>
<td align="center" :rowspan="getRows(i)">
{{ i.text }}
</td>
</tr>
<!-- 循环遍历 reviewDetailsList -->
<template v-for="(v, reviewDetailIndex) in i.reviewDetailsList">
<tr
:key="'reviewDetailIndex' + PointIndex + reviewDetailIndex"
>
<td align="center">
{{ '测试场景' }}
</td>
<td align="center">
{{ '测试类型' }}
</td>
<td align="center">
{{ '用例编号' }}
</td>
<td align="center">
{{ '用例名称' }}
</td>
<td align="center">
{{ '工具' }}
</td>
<td align="center">
{{ v.text }}
</td>
<td align="center">
<template
v-for="(a, reviewSceneIndex) in v.reviewSceneList"
>
<div
:key="
'reviewSceneIndex' +
PointIndex +
reviewDetailIndex +
reviewSceneIndex
"
>
<span>{{
reviewSceneIndex + 1 + '、' + a.text
}}</span>
<br />
</div>
</template>
</td>
</tr>
</template>
</template>
</tbody>
</table>
</div>
<!--返回按钮-->
<div class="bottom-btn">
<footer-button
type="default"
icon="arrow-left"
@click="$router.go(-1)"
>
返回
</footer-button>
<!-- <el-button type="primary" @click="goToProcessedReview">
确认提交
</el-button> -->
</div>
</div>
</div>
</task-standard>
</template>
<!--js逻辑-->
<script>
import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable'
import routerMixins from '@/mixins/router'
import { listInspection } from '../../../../api/setting/standardTerms'
export default {
mixins: [routerMixins],
dicts: ['task_test_status'],
data() {
return {
tableData: [],
model: {
systemReviewTask: {},
reviewSceneChangeTasks: {},
detailsList: []
},
task: {},
taskId: '',
loading: false
}
},
mounted() {
this.init()
},
methods: {
/**
* 获取任务详情
*/
async getTest() {
// this.loading = true
// const res = await reviewTaskDetail({
// taskId: '1767377960098127873'
// })
// this.loading = false
// if (res.code === 200) {
// await this.getTaskDetail()
// this.model = res.data
// } else {
// this.$modal.msgError(res.msg)
// }
},
// async getTaskDetail() {
// const result = await getBySubtaskId({
// id: '1767377960098127873'
// })
// if (result.code === 200) {
// this.task = result.data
// }
// }
getRows,
getRows2,
/** 获取体系审查、车型审查检验内容 */
init() {
this.loading = true
listInspection({ id: '1744181159757221888' }).then(res => {
this.tableData = res.data
this.loading = false
})
}
}
}
</script>
<style scoped>
.table th {
background-color: #f2f2f2 !important;
}
</style>
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