Skip to content

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

Merge branch 'develop' into developer/yanjiaxu

parents aac8907b 5afaabfc
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 80 deletions
src/api/system/sample.js
View file @ c98a7cad
...@@ -66,3 +66,11 @@ export function selectDataStatistics(data){ ...@@ -66,3 +66,11 @@ export function selectDataStatistics(data){
data: data data: data
}) })
} }
export function componentSelect(data){
return request({
url:'/system/enterprise/list',
method: 'post',
data: data
})
}
src/views/setting/sample/index.vue
View file @ c98a7cad
...@@ -274,14 +274,20 @@ ...@@ -274,14 +274,20 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="生产企业" prop="manufacturingEnterprise"> <el-form-item label="生产企业" prop="manufacturingEnterpriseId">
<el-input <el-select
v-model="editParamsForm.manufacturingEnterprise" v-model="editParamsForm.manufacturingEnterpriseId"
placeholder="请输入生产企业" placeholder="请选择"
clearable
maxlength="50"
style="width: 90%" style="width: 90%"
/> >
<el-option
v-for="item in componentSelect"
:key="item.id"
:label="item.enterpriseName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="商标" prop="trademark"> <el-form-item label="商标" prop="trademark">
<image-upload <image-upload
...@@ -390,6 +396,7 @@ import { ...@@ -390,6 +396,7 @@ import {
import MaterialLibrary from '@/views/setting/materialLibrary/index.vue' import MaterialLibrary from '@/views/setting/materialLibrary/index.vue'
import materialLibrary from '@/views/setting/materialLibrary/index.vue' import materialLibrary from '@/views/setting/materialLibrary/index.vue'
import { isExternal } from '@/utils/validate' import { isExternal } from '@/utils/validate'
import { componentSelect } from '../../../api/system/sample'
export default { export default {
components: { MaterialLibrary }, components: { MaterialLibrary },
...@@ -425,8 +432,8 @@ export default { ...@@ -425,8 +432,8 @@ export default {
manufactureDate: [ manufactureDate: [
{ required: true, message: '请选择生产日期', trigger: 'change' } { required: true, message: '请选择生产日期', trigger: 'change' }
], ],
manufacturingEnterprise: [ manufacturingEnterpriseId: [
{ required: true, message: '请输入生产企业', trigger: 'blur' } { required: true, message: '请选择生产企业', trigger: 'change' }
] ]
}, },
editParamsForm: { editParamsForm: {
...@@ -454,7 +461,8 @@ export default { ...@@ -454,7 +461,8 @@ export default {
dialogVisible: false, dialogVisible: false,
trademarkDisplay: true, trademarkDisplay: true,
dialogTitle: '新建', dialogTitle: '新建',
samplePhotosDisplay: true samplePhotosDisplay: true,
componentSelect: []
} }
}, },
computed: { computed: {
...@@ -484,8 +492,20 @@ export default { ...@@ -484,8 +492,20 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getComponentSelect()
}, },
methods: { methods: {
getComponentSelect() {
componentSelect({
pageNum: 1,
pageSize: 9999,
isAsc: 'desc',
orderByColumn: 'createTime'
}).then(res => {
this.componentSelect = res.rows
console.log('res', res)
})
},
closeMaterial(data) { closeMaterial(data) {
this.materialShow = data this.materialShow = data
}, },
......
src/views/setting/sample/taskDetails/index.vue
View file @ c98a7cad
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
<el-row :gutter="41"> <el-row :gutter="41">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检验依据："> <el-form-item label="检验依据：">
<sapn class="card-contnet">{{ taskForm.name }}</sapn> <sapn class="card-contnet">{{
taskForm.standardNo + '-' + taskForm.name
}}</sapn>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="card-title"> <el-col :span="8" class="card-title">
...@@ -53,10 +55,10 @@ ...@@ -53,10 +55,10 @@
</el-col> </el-col>
<el-col :span="8" class="card-title"> <el-col :span="8" class="card-title">
<el-form-item label="小组成员："> <el-form-item label="小组成员：">
<sapn class="card-contnet" <sapn class="card-contnet">
>{{ taskForm.leader ? taskForm.leader + '(组长)、' : '' }}
<div v-for="(item, index) in taskForm.auditors" :key="index"> <div v-for="(item, index) in taskForm.auditors" :key="index">
{{ item.name }} {{ item.name }}
<span v-show="index === 0">(组长)</span>
<span v-show="index + 1 != taskForm.auditors.length"> <span v-show="index + 1 != taskForm.auditors.length">
、 、
</span> </span>
...@@ -92,16 +94,25 @@ ...@@ -92,16 +94,25 @@
<el-row class="prograss-title"> 用例维度 </el-row> <el-row class="prograss-title"> 用例维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.systemDetailsPass) :percentage="
" percentageChange(dataStatistic.systemDetailsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="format" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>审查通过率</span>
<div>
{{
percentageChange(dataStatistic.systemDetailsPass)
}}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -167,16 +178,25 @@ ...@@ -167,16 +178,25 @@
<el-row class="prograss-title"> 合规维度 </el-row> <el-row class="prograss-title"> 合规维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.systemStandardsPass) :percentage="
" percentageChange(dataStatistic.systemStandardsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="format" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>审查通过率</span>
<div>
{{
percentageChange(dataStatistic.systemStandardsPass)
}}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -253,16 +273,23 @@ ...@@ -253,16 +273,23 @@
<el-row class="prograss-title"> 用例维度 </el-row> <el-row class="prograss-title"> 用例维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.carDetailsPass) :percentage="
" percentageChange(dataStatistic.carDetailsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="format" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>审查通过率</span>
<div>
{{ percentageChange(dataStatistic.carDetailsPass) }}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -326,16 +353,25 @@ ...@@ -326,16 +353,25 @@
<el-row class="prograss-title"> 合规维度 </el-row> <el-row class="prograss-title"> 合规维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.carStandardsPass) :percentage="
" percentageChange(dataStatistic.carStandardsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="format" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>审查通过率</span>
<div>
{{
percentageChange(dataStatistic.carStandardsPass)
}}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -407,16 +443,23 @@ ...@@ -407,16 +443,23 @@
<el-row class="prograss-title"> 用例维度 </el-row> <el-row class="prograss-title"> 用例维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.testDetailsPass) :percentage="
" percentageChange(dataStatistic.testDetailsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="formatTest" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>测试通过率</span>
<div>
{{ percentageChange(dataStatistic.testDetailsPass) }}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -480,16 +523,25 @@ ...@@ -480,16 +523,25 @@
<el-row class="prograss-title"> 合规维度 </el-row> <el-row class="prograss-title"> 合规维度 </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-progress <div class="circleBox">
type="circle" <el-progress
:percentage=" type="circle"
percentageChange(dataStatistic.testStandardsPass) :percentage="
" percentageChange(dataStatistic.testStandardsPass)
color="#13BE24" "
:width="130" color="#13BE24"
:stroke-width="16" :width="140"
:format="format" :stroke-width="16"
></el-progress> />
<div class="circleCenter">
<span>测试通过率</span>
<div>
{{
percentageChange(dataStatistic.testStandardsPass)
}}%
</div>
</div>
</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="prograss-laout" style="text-align: end"> <div class="prograss-laout" style="text-align: end">
...@@ -784,7 +836,7 @@ import { selectDataStatistics, selectTaskInfo } from '@/api/system/sample' ...@@ -784,7 +836,7 @@ import { selectDataStatistics, selectTaskInfo } from '@/api/system/sample'
import dict from '@/utils/dict' import dict from '@/utils/dict'
export default { export default {
dicts: ['system_task_status', 'confidentiality_level'], dicts: ['system_task_status', 'confidentiality_level', 'inspection_item'],
data() { data() {
return { return {
taskList: [], taskList: [],
...@@ -803,6 +855,15 @@ export default { ...@@ -803,6 +855,15 @@ export default {
}, },
methods: { methods: {
dict, dict,
dictValueReturn(item) {
if (item === 'sraifv') {
return '汽车信息安全管理体系要求'
} else if (item === 'grfis') {
return '汽车信息安全一般要求'
} else {
return '汽车信息安全技术要求'
}
},
getDataStatistics() { getDataStatistics() {
selectDataStatistics({ id: this.taskId }).then(res => { selectDataStatistics({ id: this.taskId }).then(res => {
this.dataStatistic = res.data this.dataStatistic = res.data
...@@ -814,6 +875,9 @@ export default { ...@@ -814,6 +875,9 @@ export default {
this.taskForm = res.data this.taskForm = res.data
if (res.data.taskList) { if (res.data.taskList) {
this.taskList = this.taskForm.taskList.split(',') this.taskList = this.taskForm.taskList.split(',')
this.taskList.forEach((item, index) => {
this.taskList[index] = this.dictValueReturn(item)
})
} }
console.log('任务详情', res) console.log('任务详情', res)
}) })
...@@ -822,12 +886,6 @@ export default { ...@@ -822,12 +886,6 @@ export default {
return data.split(',') return data.split(',')
}, },
tabClick() {}, tabClick() {},
formatTest(percentage) {
return (percentage = `测试通过率\n\n ${percentage}%`)
},
format(percentage) {
return (percentage = `审查通过率\n\n ${percentage}%`)
},
progressLine(percentage) { progressLine(percentage) {
return (percentage = `${percentage}`) return (percentage = `${percentage}`)
}, },
...@@ -842,6 +900,28 @@ export default { ...@@ -842,6 +900,28 @@ export default {
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.circleBox {
position: relative;
text-align: center;
width: 140px;
.circleCenter {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
div {
margin-top: 10px;
font-size: 16px;
font-weight: 700;
color: #303133;
}
span {
font-size: 14px;
font-weight: 400;
color: #606266;
}
}
}
.detailsCard { .detailsCard {
background: #ffffff; background: #ffffff;
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
...@@ -1011,5 +1091,12 @@ export default { ...@@ -1011,5 +1091,12 @@ export default {
} }
::v-deep .el-progress__text { ::v-deep .el-progress__text {
white-space: pre; white-space: pre;
display: none;
}
::v-deep .el-progress-bar__outer {
border-radius: 0px !important;
}
::v-deep .el-progress-bar__inner {
border-radius: 0px !important;
} }
</style> </style>
src/views/task/edit/index.vue
View file @ c98a7cad
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
<div class="tip-navigation"> <div class="tip-navigation">
<div class="tip"></div> <div class="tip"></div>
<div class="tip-title">任务信息</div> <div class="tip-title">任务信息</div>
<div class="left-back" @click="backPage">
<icon-park type="left" size="14" fill="#1a6fd7" />
<span class="return-button">取消</span>
</div>
</div> </div>
<div class="global-left-margin"> <div class="global-left-margin">
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -998,6 +1002,9 @@ export default { ...@@ -998,6 +1002,9 @@ export default {
// 去掉一个数组最后一个对象 // 去掉一个数组最后一个对象
this.tableData.pop() this.tableData.pop()
}, },
backPage() {
this.$router.go(-1)
},
/** /**
* 添加小组成员点击按钮 * 添加小组成员点击按钮
*/ */
...@@ -1232,6 +1239,17 @@ export default { ...@@ -1232,6 +1239,17 @@ export default {
font-weight: 700; font-weight: 700;
color: #1a6fd7; color: #1a6fd7;
} }
.left-back {
position: absolute;
right: 2%;
display: flex;
color: #1a6fd7;
cursor: pointer;
.return-button {
padding-left: 7px;
}
}
} }
.sortable-handle { .sortable-handle {
......
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