Skip to content

W
web
Commit bc9e965c authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

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

# Conflicts:
#	src/views/task/edit/index.vue
#	src/views/task/new/index.vue
#	src/views/task/task-detail/index.vue
parents 3f73f0e0 c2158393
Hide whitespace changes
Inline Side-by-side
Showing with 345 additions and 225 deletions
src/api/setting/standard.js 0 → 100644
View file @ bc9e965c
import request from '@/utils/request'
export function projectList(data) {
return request({
url: '/standard/getById',
method: 'post',
data: data
})
}
src/views/echartHome/useCaseRisk.vue
View file @ bc9e965c
...@@ -47,6 +47,8 @@ export default { ...@@ -47,6 +47,8 @@ export default {
var b = heightObj[0].count / total var b = heightObj[0].count / total
this.height = Math.round(b * 100) this.height = Math.round(b * 100)
} }
} else {
console.log('323248888')
} }
}, },
init() { init() {
......
src/views/index.vue
View file @ bc9e965c
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<StandardClassification></StandardClassification> <StandardClassification></StandardClassification>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="10">
<div class="cardThree"> <div class="cardThree">
<div class="cardTitle">任务完成情况占比</div> <div class="cardTitle">任务完成情况占比</div>
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
...@@ -196,11 +196,6 @@ ...@@ -196,11 +196,6 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="5">
<div class="cardStyle">
<ConfidentialityTasks></ConfidentialityTasks>
</div>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="14"> <el-col :span="14">
...@@ -348,7 +343,6 @@ export default { ...@@ -348,7 +343,6 @@ export default {
AverageTest, AverageTest,
UseCaseTest, UseCaseTest,
UseCaseRisk, UseCaseRisk,
ConfidentialityTasks,
StandardClassification StandardClassification
}, },
data() { data() {
...@@ -360,33 +354,42 @@ export default { ...@@ -360,33 +354,42 @@ export default {
averageInspectionRate: [], averageInspectionRate: [],
taskCompleted: [], taskCompleted: [],
taskCompletedGroup: [], taskCompletedGroup: [],
userCaseMsg: { userCaseMsg: {}
riskLevel: []
}
} }
}, },
created() { created() {
this.getTestHome()
this.getQuantityStatistics() this.getQuantityStatistics()
this.getTaskCompleted() this.getTaskCompleted()
this.getTestHome()
}, },
mounted() { mounted() {
this.getAverageInspectionRate() this.getAverageInspectionRate()
}, },
methods: { methods: {
getTestHome() { getTestHome() {
selectTest({ name: '汽车整车信息安全技术要求' }).then(res => { selectTest({ name: '汽车整车信息安全技术要求' })
this.userCaseMsg = res.data .then(res => {
this.$nextTick(() => { this.userCaseMsg = res.data
this.useCaseTestShow = true this.$nextTick(() => {
this.UseCaseRiskShow = true this.useCaseTestShow = true
this.UseCaseRiskShow = true
})
})
.catch(r => {
this.$nextTick(() => {
this.useCaseTestShow = true
this.UseCaseRiskShow = true
})
}) })
})
}, },
riskLevelFilter(value) { riskLevelFilter(value) {
var obj = this.userCaseMsg.riskLevel.filter(obj => obj.value === value) if (this.userCaseMsg.riskLevel) {
if (obj.length > 0) { var obj = this.userCaseMsg.riskLevel.filter(obj => obj.value === value)
return obj[0].count if (obj.length > 0) {
return obj[0].count
} else {
return 0
}
} else { } else {
return 0 return 0
} }
......
src/views/informationBase/viewStandard/index.vue
View file @ bc9e965c
<template> <template>
<page-standard> <page-standard>
<el-form
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
label-width="68px"
>
<el-form-item prop="standardType">
<el-select
v-model="queryParams.standardType"
placeholder="请选择标准分类"
clearable
>
<el-option
v-for="item in classFicationList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
{{ item.dictLabel }}</el-option
>
</el-select>
</el-form-item>
<el-form-item prop="standardNo">
<el-input
v-model="queryParams.standardNo"
placeholder="请输入标准号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入标准名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="standardStatus">
<el-select
v-model="queryParams.standardStatus"
placeholder="请选择标准状态"
clearable
>
<el-option
v-for="item of standardFicationList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
{{ item.dictLabel }}</el-option
>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置</el-button
>
</el-form-item>
</el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
border border
......
src/views/informationBase/viewStandardTerms/components/vehicleModelDialog.vue
View file @ bc9e965c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
title="检验内容" title="检验内容"
:visible.sync="dialogManger.dialogVisible" :visible.sync="dialogManger.dialogVisible"
direction="rtl" direction="rtl"
size="40%" size="35%"
:before-close="handleClose" :before-close="handleClose"
> >
<template slot="title"> <template slot="title">
......
src/views/processing/carTest/execution-test-plan/components/SchemeView.vue
View file @ bc9e965c
...@@ -120,14 +120,14 @@ ...@@ -120,14 +120,14 @@
<collapse-item <collapse-item
v-for="(item, key) in model" v-for="(item, key) in model"
:key="key" :key="key"
:name="item.chapter" :name="item.serial_number"
> >
<span slot="title" style="width: 100%"> <span slot="title" style="width: 100%">
<div class="standard-box"> <div class="standard-box">
<div class="standard-left"> <div class="standard-left">
<div class="standard-title"> <div class="standard-title">
<div class="standard">标准要求：</div> <div class="standard">标准要求：</div>
{{ item.chapter + item.text }} {{ item.serial_number + item.requirements }}
</div> </div>
</div> </div>
<!-- <div class="standard-result"> <!-- <div class="standard-result">
...@@ -146,19 +146,19 @@ ...@@ -146,19 +146,19 @@
<th>对应输入</th> <th>对应输入</th>
<th class="investigate-result">测试结果</th> <th class="investigate-result">测试结果</th>
</tr> </tr>
<template v-for="(v, k) in item.testCaseList"> <template v-for="(v, k) in item.case_result_list">
<tr :key="k"> <tr :key="k">
<td> <td>
{{ v.testScenario }} {{ v.scenario }}
</td> </td>
<td> <td>
{{ v.testScenario }} {{ v.test_type }}
</td> </td>
<td> <td>
{{ v.usecaseNo }} {{ v.serial_number }}
</td> </td>
<td> <td>
{{ v.testScenario }} {{ v.name }}
</td> </td>
<td></td> <td></td>
<td align="center" class="investigate-result"> <td align="center" class="investigate-result">
...@@ -236,7 +236,7 @@ export default { ...@@ -236,7 +236,7 @@ export default {
/** 全部展开 */ /** 全部展开 */
openAll() { openAll() {
this.activeNames = this.model.map(i => { this.activeNames = this.model.map(i => {
return i.chapter return i.serial_number
}) })
}, },
/** 全部收起 */ /** 全部收起 */
......
src/views/processing/carTest/source-record/index.vue
View file @ bc9e965c
...@@ -30,12 +30,6 @@ ...@@ -30,12 +30,6 @@
{{ task.entrustedUnit }} {{ task.entrustedUnit }}
</span> </span>
</div> </div>
<!-- <div class="task-item">-->
<!-- <span class="task-label">任务状态:</span>-->
<!-- <span class="task-content">-->
<!-- {{ getDictData(dict.type.task_test_status, task.taskStatus) }}-->
<!-- </span>-->
<!-- </div>-->
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -44,7 +38,7 @@ ...@@ -44,7 +38,7 @@
<div class="message-detail"> <div class="message-detail">
<div class="detail-title">测试用例(条)</div> <div class="detail-title">测试用例(条)</div>
<div class="detail-num mt10"> <div class="detail-num mt10">
{{ model.carReviewTask.details }} {{ task.useCaseNum }}
</div> </div>
</div> </div>
<svg-icon <svg-icon
...@@ -58,7 +52,7 @@ ...@@ -58,7 +52,7 @@
<div class="message-detail"> <div class="message-detail">
<div class="detail-title">标准条款（条）</div> <div class="detail-title">标准条款（条）</div>
<div class="detail-num mt10"> <div class="detail-num mt10">
{{ model.carReviewTask.detailsPass }} {{ task.standardNum }}
</div> </div>
</div> </div>
<svg-icon <svg-icon
...@@ -71,9 +65,7 @@ ...@@ -71,9 +65,7 @@
<div class="message-box" style="background-color: #eca740"> <div class="message-box" style="background-color: #eca740">
<div class="message-detail"> <div class="message-detail">
<div class="detail-title">测试通过率(%)</div> <div class="detail-title">测试通过率(%)</div>
<div class="detail-num mt10"> <div class="detail-num mt10">{{ task.testPass }} %</div>
{{ model.carReviewTask.standards }} %
</div>
</div> </div>
<svg-icon <svg-icon
class="message-icon" class="message-icon"
...@@ -86,7 +78,7 @@ ...@@ -86,7 +78,7 @@
<div class="message-detail"> <div class="message-detail">
<div class="detail-title">测试通过(个)</div> <div class="detail-title">测试通过(个)</div>
<div class="detail-num mt10"> <div class="detail-num mt10">
{{ model.carReviewTask.standardsPass }} {{ task.testPassNum }}
</div> </div>
</div> </div>
<svg-icon <svg-icon
...@@ -100,7 +92,7 @@ ...@@ -100,7 +92,7 @@
<div class="message-detail"> <div class="message-detail">
<div class="detail-title">测试未通过（个）</div> <div class="detail-title">测试未通过（个）</div>
<div class="detail-num mt10"> <div class="detail-num mt10">
{{ model.carReviewTask.person }} {{ task.testNoPassNum }}
</div> </div>
</div> </div>
<svg-icon <svg-icon
...@@ -114,116 +106,18 @@ ...@@ -114,116 +106,18 @@
</div> </div>
</div> </div>
<!--测试情况概要--> <!--PDF-->
<div> <div>
<div class="form-review-questionnaire"> <div>
<div class="title-display"> <div class="pdf-box">
<span class="title-i"></span> <iframe
<span class="title-content">测试情况概要</span> v-loading="loadingFile"
</div> :src="fileUrl"
<!--审查表单概要--> frameborder="0"
<table class="table"> style="width: 100%; height: 100%"
<col style="width: 100px" /> ></iframe>
<thead>
<tr>
<th style="width: 100px">章节号</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>
</thead>
<tbody>
<template v-for="(i, PointIndex) in tableData">
<tr :key="'PointIndex1' + PointIndex">
<td align="center" :rowspan="getRows3(i)">
{{ i.chapter }}
</td>
<td align="center" :rowspan="getRows3(i)">
{{ i.text }}
</td>
<td align="center" :rowspan="getRows3(i)">
{{ i.testMethod }}
</td>
</tr>
<template v-for="(v, testCaseIndex) in i.testCaseList">
<tr :key="'testCaseIndex' + PointIndex + testCaseIndex">
<td align="center" rowspan="1">
{{ v.testScenario }}
</td>
<td align="center" rowspan="1">
{{ v.testType }}
</td>
<td align="center" rowspan="1">
{{ v.usecaseNo }}
</td>
<td align="center" rowspan="1">
{{ '' }}
</td>
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.name }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.tools }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.input }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.description }}-->
<!-- </td>-->
</tr>
</template>
</template>
</tbody>
</table>
</div>
<!--签字确认-->
<div class="form-signature-confirmation">
<div class="title-display">
<span class="title-i"></span>
<span class="title-content">签字确认</span>
</div>
<div class="img-display">
<div class="img-item">
<div class="img-label label-required">检验负责人</div>
<img
v-if="ruleForm.inspectionLeader"
class="img"
:src="ruleForm.inspectionLeader"
/>
<div v-else class="img">
<iconpark-icon name="wuqianzi" size="120"></iconpark-icon>
<div class="img-text">暂无签字</div>
</div>
</div>
</div> </div>
</div> </div>
<!--返回按钮-->
<div class="bottom-btn">
<footer-button
type="default"
icon="arrow-left"
@click="$router.go(-1)"
>
返回
</footer-button>
<footer-button
v-if="this.isLeader !== false"
type="primary"
icon="hard-disk-one"
@click="goToProcessedReview"
>
确认提交
</footer-button>
</div>
</div> </div>
</div> </div>
</task-standard> </task-standard>
...@@ -231,76 +125,43 @@ ...@@ -231,76 +125,43 @@
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import routerMixins from '@/mixins/router' import routerMixins from '@/mixins/router'
import { getRows3 } from '@/utils/reviewDetailsTable'
import { testDetail } from '@/api/task/test' import { testDetail } from '@/api/task/test'
import { getBySubtaskId, taskImageSubmit } from '@/api/task/task' import { pdfDownload } from '@/api/task/task'
export default { export default {
name: 'Index', name: 'Index',
dicts: ['task_test_status'], dicts: ['task_test_status'],
mixins: [routerMixins], mixins: [routerMixins],
data() { data() {
return { return {
tableData: [],
task: {}, task: {},
model: {
carReviewTask: {},
reviewSceneChangeTasks: {},
detailsList: []
},
ruleForm: {
enterpriseLeader: '',
inspectionLeader: '',
result: []
},
loading: false, loading: false,
isLeader: '' fileUrl: '',
loadingFile: false
} }
}, },
mounted() { mounted() {
this.getTest()
this.getTestDetail() this.getTestDetail()
}, },
methods: { methods: {
getRows3,
/* 返回跳转*/
goToProcessedReview() {
// this.ruleForm.taskId = '1771093631118106626'
const formData = {
// imagesUrl: [
// this.ruleForm.enterpriseLeader,
// this.ruleForm.inspectionLeader
// ],
imagesUrl: [{}],
taskId: this.$route.query.id
}
console.log('formData', formData)
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
const auditors = res.data.auditors
this.isLeader = auditors.some(item => item.isLeader === 1)
console.log('found', this.isLeader) // 输出: true 如果找到，否则输出: false
}
})
},
getTestDetail() { getTestDetail() {
this.loading = true this.loading = true
testDetail({ taskId: this.$route.query.id }).then(res => { testDetail({ taskId: this.$route.query.modelTestTaskId }).then(res => {
this.tableData = res.data this.task = res.data
this.loading = false this.loading = false
this.getPdf()
})
},
getPdf() {
this.loadingFile = true
pdfDownload({
taskId: this.$route.query.id,
type: '2'
}).then(res => {
this.fileUrl =
process.env.VUE_APP_IMAGE_API +
'/vehicle-quality-review-oss/' +
res.data
this.loadingFile = false
}) })
} }
} }
...@@ -316,4 +177,7 @@ export default { ...@@ -316,4 +177,7 @@ export default {
.table th { .table th {
background-color: #f2f2f2 !important; background-color: #f2f2f2 !important;
} }
.pdf-box {
height: 100vh;
}
</style> </style>
src/views/processing/processed-review/index.vue
View file @ bc9e965c
...@@ -181,8 +181,10 @@ ...@@ -181,8 +181,10 @@
size="mini" size="mini"
@click=" @click="
goNext( goNext(
'/processing/carTest/source-record?id=' + '/processing/carTest/source-record?modelTestTaskId=' +
item.modelTestTaskId item.modelTestTaskId +
'&id=' +
item.id
) )
" "
>车型试验原始记录</el-button >车型试验原始记录</el-button
...@@ -281,6 +283,7 @@ export default { ...@@ -281,6 +283,7 @@ export default {
}, },
/* 跳转到问卷详情*/ /* 跳转到问卷详情*/
goNext(url) { goNext(url) {
console.log(url)
this.$router.push({ path: url }) this.$router.push({ path: url })
} }
} }
......
src/views/setting/standard/components/Tixidialog.vue
View file @ bc9e965c
...@@ -74,6 +74,21 @@ ...@@ -74,6 +74,21 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="检验项目(可多选)" prop="inspectionItemList">
<div class="test-scenario-container">
<div
v-for="(item, index) in inspectionItemList"
:key="index"
:class="{
'test-scenario': item.check === false,
'check-test-scenario': item.check === true
}"
@click="handleInspectionItem(item)"
>
<div>{{ item.label }}</div>
</div>
</div>
</el-form-item>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button @click="handleClose()"> 取消 </el-button> <el-button @click="handleClose()"> 取消 </el-button>
...@@ -82,6 +97,9 @@ ...@@ -82,6 +97,9 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { getDicts } from '@/api/system/dict/data'
import { projectList } from '@/api/setting/standard'
export default { export default {
props: { props: {
dialogManger: { dialogManger: {
...@@ -106,9 +124,11 @@ export default { ...@@ -106,9 +124,11 @@ export default {
name: '', name: '',
standardStatus: '', standardStatus: '',
releaseDate: '', releaseDate: '',
implementationDate: '' implementationDate: '',
dictList: []
} }
}), }),
inspectionItemList: [],
rules: { rules: {
standardType: [ standardType: [
{ required: true, message: '标准分类不能为空', trigger: 'blur' } { required: true, message: '标准分类不能为空', trigger: 'blur' }
...@@ -143,6 +163,20 @@ export default { ...@@ -143,6 +163,20 @@ export default {
{}, {},
() => { () => {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
const dictList = this.model.dictList
if (dictList.length > 0) {
dictList.forEach((item, index) => {
this.inspectionItemList.forEach((item2, index2) => {
if (item2.value === item.dictCode) {
item2.check = true
}
})
})
} else {
this.inspectionItemList.forEach((item, index) => {
item.check = false
})
}
}, },
() => { () => {
this.$emit('refresh') this.$emit('refresh')
...@@ -150,9 +184,33 @@ export default { ...@@ -150,9 +184,33 @@ export default {
) )
} }
}, },
mounted() {
this.getInspectionItemDict()
},
methods: { methods: {
handleInspectionItem(item) {
// console.log('字典', item)
item.check = !item.check
},
/** 获取检验项目字典数据 */
getInspectionItemDict() {
getDicts('inspection_item').then(response => {
this.inspectionItemList = response.data.map(
({ dictCode, dictLabel, ...rest }) => ({
label: dictLabel,
value: dictCode,
check: false,
...rest
})
)
console.log('inspectionItemList', this.inspectionItemList)
})
},
handleClose() { handleClose() {
this.model.reset() this.model.reset()
this.inspectionItemList.forEach((item, index) => {
item.check = false
})
this.dialogManger.dialogEditId = null this.dialogManger.dialogEditId = null
this.dialogManger.dialogVisible = false this.dialogManger.dialogVisible = false
// this.$emit('close') // this.$emit('close')
...@@ -165,11 +223,17 @@ export default { ...@@ -165,11 +223,17 @@ export default {
// console.log('体系审查') // console.log('体系审查')
// } // }
// }) // })
this.model.dictList = []
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
console.log('表单验证通过') this.inspectionItemList.forEach((item, index) => {
if (item.check === true) {
this.model.dictList.push({ dictCode: item.value })
}
})
this.model.save( this.model.save(
() => { () => {
this.model.dictList = []
this.$message.success('保存成功') this.$message.success('保存成功')
this.$emit('refresh') this.$emit('refresh')
this.handleClose() this.handleClose()
...@@ -186,4 +250,37 @@ export default { ...@@ -186,4 +250,37 @@ export default {
} }
} }
</script> </script>
<style scoped></style> <style scoped lang="scss">
.test-scenario-container {
display: flex;
flex-wrap: wrap;
.test-scenario {
width: 228px;
height: 32px;
border: 1px solid #dcdfe6;
background-color: #ffffff;
margin: 0 10px 10px 0;
border-radius: 30px;
div {
text-align: center;
position: relative;
}
}
.check-test-scenario {
width: 228px;
height: 32px;
border: 1px solid #1a6fd7;
background-color: #e3eefc;
margin: 0 10px 10px 0;
border-radius: 30px;
div {
color: #1a6fd7;
text-align: center;
position: relative;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
}
}
</style>
src/views/setting/standard/index.vue
View file @ bc9e965c
<template> <template>
<page-standard> <page-standard>
<el-form
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
label-width="68px"
>
<el-form-item prop="standardType">
<el-select
v-model="queryParams.standardType"
placeholder="请选择标准分类"
clearable
>
<el-option
v-for="item in classFicationList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
{{ item.dictLabel }}</el-option
>
</el-select>
</el-form-item>
<el-form-item prop="standardNo">
<el-input
v-model="queryParams.standardNo"
placeholder="请输入标准号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入标准名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="standardStatus">
<el-select
v-model="queryParams.standardStatus"
placeholder="请选择标准状态"
clearable
>
<el-option
v-for="item of standardFicationList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
{{ item.dictLabel }}</el-option
>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置</el-button
>
</el-form-item>
</el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
border border
......
src/views/setting/standardTerms/components/vehicleModelDialog.vue
View file @ bc9e965c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-drawer <el-drawer
:visible.sync="dialogManger.dialogVisible" :visible.sync="dialogManger.dialogVisible"
direction="rtl" direction="rtl"
size="80%" size="35%"
:before-close="handleClose" :before-close="handleClose"
> >
<template slot="title"> <template slot="title">
......
src/views/setting/useCaseLibrary/index.vue
View file @ bc9e965c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
> >
<el-form-item prop="status"> <el-form-item prop="status">
<el-select <el-select
v-model="queryParams.testScenarioId" v-model="queryParams.scenario"
placeholder="请选择测试场景" placeholder="请选择测试场景"
clearable clearable
> >
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="status"> <el-form-item prop="status">
<el-select <el-select
v-model="queryParams.testTypeId" v-model="queryParams.method"
placeholder="请选择测试方法" placeholder="请选择测试方法"
clearable clearable
> >
...@@ -141,6 +141,8 @@ export default { ...@@ -141,6 +141,8 @@ export default {
queryParams: { queryParams: {
offset: 0, offset: 0,
limit: 10, limit: 10,
scenario: '',
method: '',
searchKeywords: '' searchKeywords: ''
}, },
total: 0, total: 0,
...@@ -228,7 +230,11 @@ export default { ...@@ -228,7 +230,11 @@ export default {
field: this.orderBy.field, field: this.orderBy.field,
order: this.orderBy.order order: this.orderBy.order
}, },
search: this.queryParams.searchKeywords searchFields: {
name: this.queryParams.searchKeywords,
scenario: this.queryParams.scenario,
method: this.queryParams.method
}
} }
listTestCase(data).then(res => { listTestCase(data).then(res => {
this.tableData = res.data.useCases this.tableData = res.data.useCases
......
src/views/task/edit/index.vue
View file @ bc9e965c
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
testScenarioList: [], // 选择的测试场景 testScenarioList: [], // 选择的测试场景
taskNo: '', // 任务号 taskNo: '', // 任务号
taskName: '', // 任务名称测试 taskName: '', // 任务名称测试
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -430,7 +430,7 @@ export default { ...@@ -430,7 +430,7 @@ export default {
model: { model: {
taskNo: '', // 任务号 taskNo: '', // 任务号
taskName: '', // 任务名称 taskName: '', // 任务名称
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -499,9 +499,9 @@ export default { ...@@ -499,9 +499,9 @@ export default {
vehicleIdentificationNumber: [ vehicleIdentificationNumber: [
{ required: true, message: '车辆识别码不能为空', trigger: 'blur' } { required: true, message: '车辆识别码不能为空', trigger: 'blur' }
], ],
confidentialityLevel: [ // confidentialityLevel: [
{ required: true, message: '保密等级不能为空', trigger: 'change' } // { required: true, message: '保密等级不能为空', trigger: 'change' }
], // ],
sampleName: [ sampleName: [
{ required: true, message: '样品名称不能为空', trigger: 'blur' } { required: true, message: '样品名称不能为空', trigger: 'blur' }
], ],
......
src/views/task/new/index.vue
View file @ bc9e965c
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
testScenarioList: [], // 选择的测试场景 testScenarioList: [], // 选择的测试场景
taskNo: '', // 任务号 taskNo: '', // 任务号
taskName: '', // 任务名称 taskName: '', // 任务名称
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -432,7 +432,7 @@ export default { ...@@ -432,7 +432,7 @@ export default {
model: { model: {
taskNo: '', // 任务号 taskNo: '', // 任务号
taskName: '', // 任务名称 taskName: '', // 任务名称
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -510,9 +510,9 @@ export default { ...@@ -510,9 +510,9 @@ export default {
vehicleIdentificationNumber: [ vehicleIdentificationNumber: [
{ required: true, message: '车辆识别码不能为空', trigger: 'blur' } { required: true, message: '车辆识别码不能为空', trigger: 'blur' }
], ],
confidentialityLevel: [ // confidentialityLevel: [
{ required: true, message: '保密等级不能为空', trigger: 'change' } // { required: true, message: '保密等级不能为空', trigger: 'change' }
], // ],
sampleName: [ sampleName: [
{ required: true, message: '样品名称不能为空', trigger: 'blur' } { required: true, message: '样品名称不能为空', trigger: 'blur' }
], ],
......
src/views/task/task-detail/index.vue
View file @ bc9e965c
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,7 @@ export default {
taskList: [], // 选择的任务(检查项目) taskList: [], // 选择的任务(检查项目)
taskNo: '', // 任务编号 taskNo: '', // 任务编号
taskName: '', // 任务名称 taskName: '', // 任务名称
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -356,7 +356,7 @@ export default { ...@@ -356,7 +356,7 @@ export default {
model: { model: {
taskNo: '', // 任务编号 taskNo: '', // 任务编号
taskName: '', // 任务名称 taskName: '', // 任务名称
confidentialityLevel: '', // 保密等级 // confidentialityLevel: '', // 保密等级
productName: '', // 产品名称 productName: '', // 产品名称
productModel: '', // 车辆型号 productModel: '', // 车辆型号
entrustedUnit: '', // 委托单位 entrustedUnit: '', // 委托单位
...@@ -426,9 +426,9 @@ export default { ...@@ -426,9 +426,9 @@ export default {
vehicleIdentificationNumber: [ vehicleIdentificationNumber: [
{ required: true, message: '车辆识别码不能为空', trigger: 'blur' } { required: true, message: '车辆识别码不能为空', trigger: 'blur' }
], ],
confidentialityLevel: [ // confidentialityLevel: [
{ required: true, message: '保密等级不能为空', trigger: 'change' } // { required: true, message: '保密等级不能为空', trigger: 'change' }
], // ],
sampleName: [ sampleName: [
{ required: true, message: '样品名称不能为空', trigger: 'blur' } { required: true, message: '样品名称不能为空', trigger: 'blur' }
], ],
......
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