Commit eba2913d authored by jiaxu.yan's avatar jiaxu.yan

feat: 对接检验内容车型试验

parent c1aee432
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<% } %> --> <% } %> -->
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>collapseMenuLogo.png">
<!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> --> <!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_86.9b2d26764ccec5f05296d7ffca18aa56.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_86.9b2d26764ccec5f05296d7ffca18aa56.js"></script>
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
......
...@@ -12,7 +12,7 @@ export function listTestScenar(data) { ...@@ -12,7 +12,7 @@ export function listTestScenar(data) {
// 获取场景类型 // 获取场景类型
export function listTestType(data) { export function listTestType(data) {
return request({ return request({
url: '/system/type/getList', url: '/system/scenario/getScenarioList',
method: 'post', method: 'post',
data: data data: data
}) })
......
import request from '@/utils/request' import request from '@/utils/request'
export function selectQuantityStatistics(data){ export function selectQuantityStatistics(data) {
return request({ return request({
url: '/home/statistics/quantityStatistics', url: '/home/statistics/quantityStatistics',
method: 'post', method: 'post',
...@@ -8,31 +8,30 @@ export function selectQuantityStatistics(data){ ...@@ -8,31 +8,30 @@ export function selectQuantityStatistics(data){
}) })
} }
export function selectStandardCategoryStatistics(){ export function selectStandardCategoryStatistics() {
return request({ return request({
url: '/home/statistics/standardCategory', url: '/home/statistics/standardCategory',
method: 'post' method: 'post'
}) })
} }
export function selectConfidentialityLevelStatistics(){ export function selectConfidentialityLevelStatistics() {
return request({ return request({
url: '/home/statistics/confidentialityLevel', url: '/home/statistics/confidentialityLevel',
method: 'post' method: 'post'
}) })
} }
export function selectAverageInspectionRate(){ export function selectAverageInspectionRate() {
return request({ return request({
url: '/home/statistics/averageInspectionRate', url: '/home/statistics/averageInspectionRate',
method: 'post' method: 'post'
}) })
} }
export function selectTaskParticipationStatistics(){ export function selectTaskParticipationStatistics() {
return request({ return request({
url: '/home/statistics/taskParticipation', url: '/home/statistics/taskParticipation',
method: 'post' method: 'post'
}) })
} }
...@@ -48,28 +48,27 @@ export function selectMaterial(data) { ...@@ -48,28 +48,27 @@ export function selectMaterial(data) {
}) })
} }
// 查看任务概览任务详情 // 查看任务概览任务详情
export function selectTaskInfo(data){ export function selectTaskInfo(data) {
return request({ return request({
url:'/task/getById', url: '/task/getById',
method:'post', method: 'post',
data: data data: data
}) })
} }
// 查看任务概览数据统计 // 查看任务概览数据统计
export function selectDataStatistics(data){ export function selectDataStatistics(data) {
return request({ return request({
url:'/task/dataStatistics', url: '/task/dataStatistics',
method: 'post', method: 'post',
data: data data: data
}) })
} }
export function componentSelect(data){ export function componentSelect(data) {
return request({ return request({
url:'/system/enterprise/list', url: '/system/enterprise/list',
method: 'post', method: 'post',
data: data data: data
}) })
......
...@@ -199,7 +199,7 @@ export function getBySubtaskId(data) { ...@@ -199,7 +199,7 @@ export function getBySubtaskId(data) {
} }
/** /**
* 下载pdf * 下载pdf
*/ */
export function pdfDownload(data) { export function pdfDownload(data) {
return request({ return request({
url: '/pdf/download', url: '/pdf/download',
...@@ -209,7 +209,7 @@ export function pdfDownload(data) { ...@@ -209,7 +209,7 @@ export function pdfDownload(data) {
} }
/** /**
*获取车型实验任务下的测试用例 *获取车型实验任务下的测试用例
*/ */
export function geTaskCase(data) { export function geTaskCase(data) {
return request({ return request({
url: '/system/testCase/getCaseIdList', url: '/system/testCase/getCaseIdList',
...@@ -218,7 +218,6 @@ export function geTaskCase(data) { ...@@ -218,7 +218,6 @@ export function geTaskCase(data) {
}) })
} }
/** /**
*提交确认表单 *提交确认表单
*/ */
...@@ -230,7 +229,6 @@ export function taskImageSubmit(data) { ...@@ -230,7 +229,6 @@ export function taskImageSubmit(data) {
}) })
} }
/** /**
* 获取试验场景 * 获取试验场景
* @param {*} data * @param {*} data
......
...@@ -392,6 +392,6 @@ aside { ...@@ -392,6 +392,6 @@ aside {
.el-input__inner { .el-input__inner {
font-family: 微软雅黑; font-family: 微软雅黑;
} }
.el-tabs__item{ .el-tabs__item {
font-size: 16px; font-size: 16px;
} }
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
color: #f9a221; color: #f9a221;
} }
.taskLeader { .taskLeader {
width:120px; width: 120px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
......
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
.el-collapse-item__header { .el-collapse-item__header {
background-color: #f2f2f2 !important; background-color: #f2f2f2 !important;
height: auto; height: auto;
padding-left:13px; padding-left: 13px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
padding: 10px; padding: 10px;
......
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
<template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template> <template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template>
</div> </div>
<el-dialog :visible.sync="dialogVisible" width="800" append-to-body :close-on-click-modal="false"> <el-dialog
:visible.sync="dialogVisible"
width="800"
append-to-body
:close-on-click-modal="false"
>
<img <img
:src="dialogImageUrl" :src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto" style="display: block; max-width: 100%; margin: 0 auto"
...@@ -146,7 +151,7 @@ export default { ...@@ -146,7 +151,7 @@ export default {
if (file.name.lastIndexOf('.') > -1) { if (file.name.lastIndexOf('.') > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1) fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
console.log('21212',fileExtension) console.log('21212', fileExtension)
} }
isImg = this.fileType.some(type => { isImg = this.fileType.some(type => {
// if (file.type.indexOf(type) > -1) return true // if (file.type.indexOf(type) > -1) return true
...@@ -185,7 +190,7 @@ export default { ...@@ -185,7 +190,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
// const Image = process.env.VUE_APP_IMAGE_API + res.url // const Image = process.env.VUE_APP_IMAGE_API + res.url
this.uploadList.push({ name: res.originalFilename, url: res.url }) this.uploadList.push({ name: res.originalFilename, url: res.url })
console.log(this.uploadList); console.log(this.uploadList)
this.uploadedSuccessfully() this.uploadedSuccessfully()
} else { } else {
this.number-- this.number--
......
...@@ -10,7 +10,12 @@ empty ...@@ -10,7 +10,12 @@ empty
placeholder="输入标准关键词" placeholder="输入标准关键词"
@keyup.enter.native="search()" @keyup.enter.native="search()"
> >
<i class="el-icon-search el-input__icon" @click="search()" slot="suffix"> </i> <i
class="el-icon-search el-input__icon"
@click="search()"
slot="suffix"
>
</i>
</el-input> </el-input>
<ul class="select-list"> <ul class="select-list">
<template v-for="item in standardList"> <template v-for="item in standardList">
...@@ -72,7 +77,7 @@ export default { ...@@ -72,7 +77,7 @@ export default {
methods: { methods: {
search() { search() {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.$store.dispatch('standard/setStandardList',this.queryParams.name) this.$store.dispatch('standard/setStandardList', this.queryParams.name)
}, },
selectStandard(value) { selectStandard(value) {
this.$store.dispatch('standard/setStandard', value) this.$store.dispatch('standard/setStandard', value)
......
...@@ -63,11 +63,10 @@ export default { ...@@ -63,11 +63,10 @@ export default {
// MessageWaring // MessageWaring
}, },
data() { data() {
return { return {}
}
}, },
computed: { computed: {
...mapGetters(['sidebar', 'device', 'name','avatar']), ...mapGetters(['sidebar', 'device', 'name', 'avatar']),
setting: { setting: {
get() { get() {
return this.$store.state.settings.showSettings return this.$store.state.settings.showSettings
......
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
}" }"
> >
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar :class="settings.sideTheme" style="padding-bottom: 30px;" wrap-class="scrollbar-wrapper"> <el-scrollbar
:class="settings.sideTheme"
style="padding-bottom: 30px"
wrap-class="scrollbar-wrapper"
>
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
:collapse="isCollapse" :collapse="isCollapse"
......
import {getTestScenario} from "@/api/scenario/scenario"; import { getTestScenario } from '@/api/scenario/scenario'
const testScenario = { const testScenario = {
namespaced: true, namespaced: true,
...@@ -16,14 +16,12 @@ const testScenario = { ...@@ -16,14 +16,12 @@ const testScenario = {
setTestScenarioList({ commit }) { setTestScenarioList({ commit }) {
getTestScenario({}).then(res => { getTestScenario({}).then(res => {
if (res.code === 200) { if (res.code === 200) {
const obj = res.data.map( const obj = res.data.map(({ id, testScenario, ...rest }) => ({
({ id, testScenario, ...rest }) => ({
label: testScenario, label: testScenario,
value: parseInt(id), value: parseInt(id),
check: false, check: false,
...rest ...rest
}) }))
)
console.log('测试场景', obj) console.log('测试场景', obj)
commit('SET_TEST_SCENARIO_LIST', obj) commit('SET_TEST_SCENARIO_LIST', obj)
} }
......
import Vue from 'vue' import Vue from 'vue'
import ElementUI from 'element-ui'; import ElementUI from 'element-ui'
Vue.component('el-input', { Vue.component('el-input', {
extends: ElementUI.Input, extends: ElementUI.Input,
created() { created() {
this.$on('change', (value) => { this.$on('change', value => {
this.$emit('input', value.replace(/\s+/g,"")) this.$emit('input', value.replace(/\s+/g, ''))
}) })
} }
}) })
<!-- 查看检验内容 -->
<template> <template>
<page-standard-option> <page-standard-option>
<div slot="tab"> <div slot="tab">
<el-tabs v-model="queryParams.type" @tab-click="loadData"> <el-tabs v-model="queryParams.type" @tab-click="handleTab">
<el-tab-pane <el-tab-pane
v-for="(dict, key) in reviewTypeList" v-for="(dict, key) in reviewTypeList"
:key="key" :key="key"
...@@ -15,6 +14,72 @@ ...@@ -15,6 +14,72 @@
<div class="container"> <div class="container">
<div> <div>
<el-form <el-form
v-if="queryParams.type == 'test'"
v-show="showSearch"
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
>
<el-form-item prop="status">
<el-input
v-model="queryParamsTest.searchFields.serialNumber"
placeholder="请输入标准章节"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item prop="status">
<el-input
v-model="queryParamsTest.searchFields.requirements"
placeholder="请输入标准要求"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item v-if="queryParams.type == 'test'" prop="status">
<el-input
v-model="queryParamsTest.searchFields.testMethod"
placeholder="请输入标准测试方法"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item v-if="queryParams.type == 'test'">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="loadTestData"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetTest"
>重置</el-button
>
</el-form-item>
<el-form-item v-else>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="reset"
>重置</el-button
>
</el-form-item>
</el-form>
<el-form
v-else
v-show="showSearch" v-show="showSearch"
ref="queryForm" ref="queryForm"
:model="queryParams" :model="queryParams"
...@@ -45,7 +110,23 @@ ...@@ -45,7 +110,23 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item v-if="queryParams.type == 'test'">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="loadTestData"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetTest"
>重置</el-button
>
</el-form-item>
<el-form-item v-else>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -70,6 +151,61 @@ ...@@ -70,6 +151,61 @@
<!-- ></right-toolbar>--> <!-- ></right-toolbar>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
<template v-if="queryParams.type == 'test'">
<el-table
v-loading="loading"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'serialNumber', order: 'descending' }"
:data="tableTestData"
@sort-change="sort_change"
>
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
prop="serialNumber"
label="标准章节"
sortable
width="110"
align="center"
>
</el-table-column>
<el-table-column prop="requirements" label="标准要求" align="left">
</el-table-column>
<el-table-column prop="testMethod" label="标准测试方法" align="left">
</el-table-column>
<el-table-column
label="操作"
align="center"
width="240"
class-name="fixed-width"
>
<template slot-scope="scope">
<div class="button-bar">
<page-button
v-hasPermi="['setting:standardTerms:content']"
icon="doc-search"
title="检验内容"
@click.native="handleUpdate(scope.row)"
></page-button>
</div>
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalTest > 0"
:total="totalTest"
:background="false"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="queryTestParams"
>
</pagination>
</template>
<template v-else>
<el-table <el-table
v-loading="loading" v-loading="loading"
border border
...@@ -101,8 +237,8 @@ ...@@ -101,8 +237,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="240"
align="center" align="center"
width="240"
class-name="fixed-width" class-name="fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -126,6 +262,7 @@ ...@@ -126,6 +262,7 @@
@pagination="loadData" @pagination="loadData"
> >
</pagination> </pagination>
</template>
<vehiclemodel-dialog <vehiclemodel-dialog
ref="vehicleModelDialog" ref="vehicleModelDialog"
:dialog-manger="vehicleModelDialogManger" :dialog-manger="vehicleModelDialogManger"
...@@ -142,10 +279,9 @@ ...@@ -142,10 +279,9 @@
</template> </template>
<script> <script>
import page from '@/mixins/page' import page from '@/mixins/page'
import { mapGetters } from 'vuex'
import vehicleModelDialog from './components/vehicleModelDialog' import vehicleModelDialog from './components/vehicleModelDialog'
import documentReviewDialog from './components/documentReviewDialog' import documentReviewDialog from './components/documentReviewDialog'
import request from '../../../utils/request' import request from '@/utils/request'
export default { export default {
components: { components: {
'vehiclemodel-dialog': vehicleModelDialog, 'vehiclemodel-dialog': vehicleModelDialog,
...@@ -156,6 +292,9 @@ export default { ...@@ -156,6 +292,9 @@ export default {
data() { data() {
return { return {
listUrl: '/review/standard/list', listUrl: '/review/standard/list',
totalTest: 0,
queryTestParams: {},
tableTestData: [],
reviewTypeList: [ reviewTypeList: [
{ {
label: '体系审查', label: '体系审查',
...@@ -178,6 +317,23 @@ export default { ...@@ -178,6 +317,23 @@ export default {
standardId: this.$store.getters.standard, standardId: this.$store.getters.standard,
type: 'system' type: 'system'
}, },
queryParamsTest: {
offset: {
offset: 0,
limit: 10
},
pageSize: 10,
pageNum: 1,
orderBy: {
field: 'serialNumber',
order: 'DESC'
},
searchFields: {
serialNumber: '',
requirements: '',
testMethod: ''
}
},
vehicleModelDialogManger: { vehicleModelDialogManger: {
dialogVisible: false, dialogVisible: false,
refreshList: false, refreshList: false,
...@@ -215,31 +371,12 @@ export default { ...@@ -215,31 +371,12 @@ export default {
} }
}, },
methods: { methods: {
loadData() { handleTab(v) {
if (this.queryParams.standardId !== '') { if (v.index === '2') {
this.loading = true console.log(v.index)
request({ this.loadTestData()
url: this.listUrl, } else {
method: 'post', this.loadData()
data: this.queryParams
})
.then(res => {
if (res.code === 200) {
console.log(res.rows)
// res.rows[0].carReviewStatus = 'FINISH'
// res.rows[0].reviewStatus = 'SIGNED'
// res.rows[0].carReviewStatus = 'FINISH'
this.tableData = res.rows
this.total = res.total
}
this.loading = false
})
.catch(error => {
if (error.msg) {
this.$message.error(error.msg)
}
this.loading = false
})
} }
}, },
reset() { reset() {
...@@ -259,6 +396,65 @@ export default { ...@@ -259,6 +396,65 @@ export default {
this.$refs.vehicleModelDialog.init() this.$refs.vehicleModelDialog.init()
} }
// console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId) // console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId)
},
sort_change(column, prop, order) {
this.queryParamsTest.pageNum = 1 // 排序后返回第一页
if (column.order) {
this.queryParamsTest.orderBy.order =
column.order === 'ascending' ? 'ASC' : 'DEAC'
this.queryParamsTest.orderBy.field = column.prop
this.loadTestData()
}
},
resetTest() {
this.queryParamsTest = {
offset: {
offset: 0,
limit: 10
},
pageSize: 10,
pageNum: 1,
orderBy: {
field: 'serialNumber',
order: 'DESC'
},
searchFields: {
serialNumber: '',
requirements: '',
testMethod: ''
}
}
this.loadTestData()
},
loadTestData() {
this.queryParamsTest.offset.offset =
this.queryParamsTest.pageSize * (this.queryParamsTest.pageNum - 1)
this.queryParamsTest.offset.limit = this.queryParamsTest.pageSize
const params = {
offset: this.queryParamsTest.offset,
searchFields: this.queryParamsTest.searchFields,
orderBy: this.queryParamsTest.orderBy,
name: '汽车整车信息安全技术要求'
}
this.loading = true
request({
url: '/review/standard/getList',
method: 'post',
data: params
})
.then(res => {
if (res.code === 200) {
this.tableTestData = res.data.inspectionContent
this.totalTest = res.data.totalCount
}
this.loading = false
})
.catch(error => {
if (error.msg) {
this.$message.error(error.msg)
}
this.loading = false
})
} }
} }
} }
......
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
}, },
methods: { methods: {
getTestScenar() { getTestScenar() {
listTestScenar({ pageNum: 1, pageSize: 999 }).then(res => { listTestScenar().then(res => {
this.testScenarList = res.rows this.testScenarList = res.rows
}) })
}, },
......
<template> <template>
<page-standard-option> <page-standard-option>
<div slot="tab"> <div slot="tab">
<el-tabs v-model="queryParams.type" @tab-click="loadData"> <el-tabs v-model="queryParams.type" @tab-click="handleTab">
<el-tab-pane <el-tab-pane
v-for="(dict, key) in reviewTypeList" v-for="(dict, key) in reviewTypeList"
:key="key" :key="key"
...@@ -14,6 +14,72 @@ ...@@ -14,6 +14,72 @@
<div class="container"> <div class="container">
<div> <div>
<el-form <el-form
v-if="queryParams.type == 'test'"
v-show="showSearch"
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
>
<el-form-item prop="status">
<el-input
v-model="queryParamsTest.searchFields.serialNumber"
placeholder="请输入标准章节"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item prop="status">
<el-input
v-model="queryParamsTest.searchFields.requirements"
placeholder="请输入标准要求"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item v-if="queryParams.type == 'test'" prop="status">
<el-input
v-model="queryParamsTest.searchFields.testMethod"
placeholder="请输入标准测试方法"
clearable
@keyup.enter.native="loadTestData"
/>
</el-form-item>
<el-form-item v-if="queryParams.type == 'test'">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="loadTestData"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetTest"
>重置</el-button
>
</el-form-item>
<el-form-item v-else>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="reset"
>重置</el-button
>
</el-form-item>
</el-form>
<el-form
v-else
v-show="showSearch" v-show="showSearch"
ref="queryForm" ref="queryForm"
:model="queryParams" :model="queryParams"
...@@ -44,7 +110,23 @@ ...@@ -44,7 +110,23 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item v-if="queryParams.type == 'test'">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="loadTestData"
>查询</el-button
>
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetTest"
>重置</el-button
>
</el-form-item>
<el-form-item v-else>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
...@@ -69,6 +151,61 @@ ...@@ -69,6 +151,61 @@
<!-- ></right-toolbar>--> <!-- ></right-toolbar>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
<template v-if="queryParams.type == 'test'">
<el-table
v-loading="loading"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'serialNumber', order: 'descending' }"
:data="tableTestData"
@sort-change="sort_change"
>
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
prop="serialNumber"
label="标准章节"
sortable
width="110"
align="center"
>
</el-table-column>
<el-table-column prop="requirements" label="标准要求" align="left">
</el-table-column>
<el-table-column prop="testMethod" label="标准测试方法" align="left">
</el-table-column>
<el-table-column
label="操作"
align="center"
width="240"
class-name="fixed-width"
>
<template slot-scope="scope">
<div class="button-bar">
<page-button
v-hasPermi="['setting:standardTerms:content']"
icon="doc-search"
title="检验内容"
@click.native="handleUpdate(scope.row)"
></page-button>
</div>
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalTest > 0"
:total="totalTest"
:background="false"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="queryTestParams"
>
</pagination>
</template>
<template v-else>
<el-table <el-table
v-loading="loading" v-loading="loading"
border border
...@@ -125,6 +262,7 @@ ...@@ -125,6 +262,7 @@
@pagination="loadData" @pagination="loadData"
> >
</pagination> </pagination>
</template>
<vehiclemodel-dialog <vehiclemodel-dialog
ref="vehicleModelDialog" ref="vehicleModelDialog"
:dialog-manger="vehicleModelDialogManger" :dialog-manger="vehicleModelDialogManger"
...@@ -141,10 +279,9 @@ ...@@ -141,10 +279,9 @@
</template> </template>
<script> <script>
import page from '@/mixins/page' import page from '@/mixins/page'
import { mapGetters } from 'vuex'
import vehicleModelDialog from './components/vehicleModelDialog' import vehicleModelDialog from './components/vehicleModelDialog'
import documentReviewDialog from './components/documentReviewDialog' import documentReviewDialog from './components/documentReviewDialog'
import request from '../../../utils/request' import request from '@/utils/request'
export default { export default {
components: { components: {
'vehiclemodel-dialog': vehicleModelDialog, 'vehiclemodel-dialog': vehicleModelDialog,
...@@ -155,6 +292,9 @@ export default { ...@@ -155,6 +292,9 @@ export default {
data() { data() {
return { return {
listUrl: '/review/standard/list', listUrl: '/review/standard/list',
totalTest: 0,
queryTestParams: {},
tableTestData: [],
reviewTypeList: [ reviewTypeList: [
{ {
label: '体系审查', label: '体系审查',
...@@ -177,6 +317,23 @@ export default { ...@@ -177,6 +317,23 @@ export default {
standardId: this.$store.getters.standard, standardId: this.$store.getters.standard,
type: 'system' type: 'system'
}, },
queryParamsTest: {
offset: {
offset: 0,
limit: 10
},
pageSize: 10,
pageNum: 1,
orderBy: {
field: 'serialNumber',
order: 'DESC'
},
searchFields: {
serialNumber: '',
requirements: '',
testMethod: ''
}
},
vehicleModelDialogManger: { vehicleModelDialogManger: {
dialogVisible: false, dialogVisible: false,
refreshList: false, refreshList: false,
...@@ -214,31 +371,12 @@ export default { ...@@ -214,31 +371,12 @@ export default {
} }
}, },
methods: { methods: {
loadData() { handleTab(v) {
if (this.queryParams.standardId !== '') { if (v.index === '2') {
this.loading = true console.log(v.index)
request({ this.loadTestData()
url: this.listUrl, } else {
method: 'post', this.loadData()
data: this.queryParams
})
.then(res => {
if (res.code === 200) {
console.log(res.rows)
// res.rows[0].carReviewStatus = 'FINISH'
// res.rows[0].reviewStatus = 'SIGNED'
// res.rows[0].carReviewStatus = 'FINISH'
this.tableData = res.rows
this.total = res.total
}
this.loading = false
})
.catch(error => {
if (error.msg) {
this.$message.error(error.msg)
}
this.loading = false
})
} }
}, },
reset() { reset() {
...@@ -258,6 +396,65 @@ export default { ...@@ -258,6 +396,65 @@ export default {
this.$refs.vehicleModelDialog.init() this.$refs.vehicleModelDialog.init()
} }
// console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId) // console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId)
},
sort_change(column, prop, order) {
this.queryParamsTest.pageNum = 1 // 排序后返回第一页
if (column.order) {
this.queryParamsTest.orderBy.order =
column.order === 'ascending' ? 'ASC' : 'DEAC'
this.queryParamsTest.orderBy.field = column.prop
this.loadTestData()
}
},
resetTest() {
this.queryParamsTest = {
offset: {
offset: 0,
limit: 10
},
pageSize: 10,
pageNum: 1,
orderBy: {
field: 'serialNumber',
order: 'DESC'
},
searchFields: {
serialNumber: '',
requirements: '',
testMethod: ''
}
}
this.loadTestData()
},
loadTestData() {
this.queryParamsTest.offset.offset =
this.queryParamsTest.pageSize * (this.queryParamsTest.pageNum - 1)
this.queryParamsTest.offset.limit = this.queryParamsTest.pageSize
const params = {
offset: this.queryParamsTest.offset,
searchFields: this.queryParamsTest.searchFields,
orderBy: this.queryParamsTest.orderBy,
name: '汽车整车信息安全技术要求'
}
this.loading = true
request({
url: '/review/standard/getList',
method: 'post',
data: params
})
.then(res => {
if (res.code === 200) {
this.tableTestData = res.data.inspectionContent
this.totalTest = res.data.totalCount
}
this.loading = false
})
.catch(error => {
if (error.msg) {
this.$message.error(error.msg)
}
this.loading = false
})
} }
} }
} }
......
...@@ -528,7 +528,7 @@ export default { ...@@ -528,7 +528,7 @@ export default {
handleStatusChange(row) { handleStatusChange(row) {
const text = row.status === '0' ? '启用' : '停用' const text = row.status === '0' ? '启用' : '停用'
this.$modal this.$modal
.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?' ,{ .confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', {
type: 'warning', type: 'warning',
title: text, title: text,
closeOnClickModal: false closeOnClickModal: 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