Skip to content

W
web
Commit 0313e3eb authored by mzx's avatar mzx
Browse files
Options

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

parents 60b5bbbb 55f6d796
Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 229 deletions
mock/setting.js
View file @ 0313e3eb
......@@ -97,8 +97,9 @@ module.exports = [
url: '/rules-list',
type: 'get',
response: config => {
const query = config.query
let temp = []
if (query.type === '1' || query.type === '2') {
temp = [
{
label:
......@@ -236,7 +237,8 @@ module.exports = [
'1.明确信息安全管理要求融合到现有管理制度流程中，如在现有ISMS制度中增加汽车信息安全管理要求。'
},
{
label: '2.在信息安全管理制度中明确与其它管理流程的接口。'
label:
'2.在信息安全管理制度中明确与其它管理流程的接口。'
}
]
}
......@@ -245,6 +247,26 @@ module.exports = [
]
}
]
} else if (query.type === '3') {
temp = [
{
section: '7.1.2.1',
require: '应对车端具备远程控制功能的系统进行完整性验证。',
test: '测试人员根据车辆生产企业提供的车辆远程控制功能系统完整性校验功能的证明文件，检查车辆是否满足7.1.2.4的要求。',
check: '.审查远程控制系统对应的通信零件关于安全刷写或安全启动的设计方案与测试验证材料，若提供证明文件满足正确性和充分性要求，则测试通过，否则测试不通过。',
createTime: '@datetime'
}
]
for (let index = 1; index < 8; index++) {
temp.push({
section: '7.1.2.' + index,
require: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
test: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
check: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
createTime: '@datetime'
})
}
}
return {
rows: temp,
code: 200,
......@@ -314,7 +336,7 @@ module.exports = [
testType: '非授权安装',
user: 'admin',
createTime: '@datetime'
},
}
]
return {
rows: temp,
......
src/views/setting/rules/index.vue
View file @ 0313e3eb
<template>
<page-standard>
<div slot="tab">
<el-radio-group v-model="queryParams.type">
<el-radio-group v-model="queryParams.type" @input="loadData">
<el-radio-button
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
......@@ -102,7 +102,7 @@
></right-toolbar>
</el-row>
<el-tree
v-if="queryParams.type == 1"
v-if="queryParams.type == 1 || queryParams.type == 2"
:data="tableData"
node-key="id"
default-expand-all
......@@ -166,7 +166,7 @@
</div>
</el-tree>
<el-table
v-if="refreshTable && Number(queryParams.type) === 2"
v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
......@@ -182,21 +182,21 @@
>
</el-table-column>
<el-table-column
prop="request"
prop="require"
label="标准要求"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="way"
prop="test"
label="标准测试方法"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="resultYes"
prop="check"
label="审查方法"
min-width="200"
align="left"
......@@ -207,81 +207,11 @@
label="更新时间"
min-width="200"
align="left"
>
</el-table-column>
<el-table-column
label="操作"
align="left"
min-width="160"
fixed="right"
class-name="fixed-width"
>
<template slot-scope="scope">
<el-button
v-hasPermi="['setting:standard:update']"
plain
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(2, scope.row)"
>修改</el-button
>
<el-button
v-hasPermi="['setting:standard:delete']"
plain
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<el-table
v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column
prop="section"
label="标准章节"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="request"
label="标准要求"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="way"
label="标准测试方法"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="resultYes"
label="审查方法"
min-width="200"
align="left"
>
</el-table-column>
<el-table-column
prop="resultNO"
label="更新时间"
min-width="200"
align="left"
>
</el-table-column>
<el-table-column
label="操作"
align="left"
......
src/views/setting/standard/index.vue
View file @ 0313e3eb
......@@ -101,7 +101,7 @@
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable && Number(queryParams.type) === 1"
v-show="refreshTable && Number(queryParams.type) === 1"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
......@@ -191,7 +191,7 @@
</el-table-column>
</el-table>
<el-table
v-if="refreshTable && Number(queryParams.type) === 2"
v-show="refreshTable && Number(queryParams.type) === 2"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
......@@ -200,6 +200,11 @@
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="标准分类"
min-width="200"
......@@ -276,7 +281,7 @@
</el-table-column>
</el-table>
<el-table
v-if="refreshTable && Number(queryParams.type) === 3"
v-show="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
......@@ -284,7 +289,11 @@
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
><el-table-column type="index" width="60" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="标准分类"
min-width="200"
......@@ -357,7 +366,7 @@
</el-table-column>
</el-table>
<el-table
v-if="refreshTable && Number(queryParams.type) === 4"
v-show="refreshTable && Number(queryParams.type) === 4"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
......@@ -366,6 +375,11 @@
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
>
<el-table-column type="index" width="60" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="标准分类"
min-width="200"
......
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