Skip to content

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

Merge branch 'develop' into developer/yanjiaxu

parents eef9e6fc f1e1b2ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 486 deletions
README.md
View file @ 2e7835f7
......@@ -63,7 +63,7 @@ fn1(3)
```
上面的两次变换过程，就是函数柯里化
### 函数复用
若是项目的组件中有多处地方采用同一种方式进行处理，例如处理如期格式化，校验规则，文件上传之类
若是项目的组件中有多处地方采用同一种方式进行处理，例如处理如期格式化，校验规则，文件上传之类我们可以将这些复用较高的代码进行抽象
### 具体实现
我们可以在 src/utils 文件夹下收集这种可以重复使用的函数。根据其性质或者功能点进行归类，总结出自己的工具库
这是对后续项目大有帮助的
......@@ -145,4 +145,10 @@ this.model.fetch( // 根据id获取单条数据
(err) => { //失败回调
}
)
// 根据id删除数据
this.model.uuid = id
this.model.destroy(() => { //成功回调
this.refreshList = true
this.$message.success('删除成功')
})
```
\ No newline at end of file
mock/setting.js
View file @ 2e7835f7
......@@ -9,21 +9,21 @@ module.exports = [
if (query.type === '1') {
temp = [
{
category: '体系审查',
section: '5.1',
category: '网络安全',
section: 'GB/T 40857—2021',
request:
'车辆制造商应具备车辆全生命周期的汽车信息安全管理体系。注：车辆全生命周期包括车辆的开发阶段、生产阶段及后生产阶段。',
resultYes: '车辆制造商具备车辆全生命周期的汽车信息安全管理体系',
resultNO: '车辆制造商不具备车辆全生命周期的汽车信息安全管理体系',
'汽车网关信息安全技术要求及试验方法',
resultYes: '汽车网关信息安全技术要求及试验方法.pdf',
resultNO: '现行',
createTime: '@datetime'
},
{
category: '体系审查',
section: '5.3',
category: '软件升级',
section: 'GB/T 40857—2021',
request:
'汽车信息安全管理体系应包括以下内容。建立企业内部管理汽车信息安全的过程',
resultYes: '汽车信息安全管理体系包括以下内容',
resultNO: '汽车信息安全管理体系不包括以下所有内容。',
'车载信息交互系统信息安全技术要求及试验方法',
resultYes: '车载信息交互系统信息安全技术要求及试验方法.pdf',
resultNO: '报批中',
createTime: '@datetime'
}
]
......
src/views/setting/rules/index.vue
View file @ 2e7835f7
<template>
<page-standard>
<div slot="tab">
<el-radio-group v-model="queryParams.type" @input="loadData">
<el-radio-button
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio-button>
</el-radio-group>
<!-- <el-radio-group v-model="queryParams.type" @input="loadData">-->
<!-- <el-radio-button-->
<!-- v-for="dict in dict.type.sys_scene_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >-->
<!-- {{ dict.label }}-->
<!-- </el-radio-button>-->
<!-- </el-radio-group>-->
<el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
<el-form-item>
<el-select
v-model="queryParams.ask"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="queryParams.type"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:value="dict.value"
>{{
dict.value === '1'
? '体系审查'
: dict.value === '2'
? '车型审查'
: '文档审查'
}}</el-option
>
</el-select>
</el-form-item>
</el-form>
</div>
<el-form
v-show="showSearch"
......@@ -275,7 +313,10 @@ export default {
children: 'children',
label: 'label'
},
queryParams: { type: '1' },
queryParams: {
ask: '2',
type: '1'
},
dialogManger: {
dialogVisible: false,
parentId: 0,
......
src/views/setting/scene/index.vue
View file @ 2e7835f7
<template>
<page-standard>
<div slot="tab">
<el-form ref="queryForm" :model="form" size="small" :inline="true">
<el-form-item>
<el-select v-model="form.ask" clearable style="width: 100%">
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<el-form
v-show="showSearch"
ref="queryForm"
......@@ -8,21 +22,33 @@
:inline="true"
>
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="校验场景编号"
<el-select
v-model="queryParams.ask"
placeholder="所属标准"
clearable
@keyup.enter.native="handleQuery"
/>
style="width: 100%"
@change="loadData"
>
</el-select>
</el-form-item>
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="校验场景名称"
placeholder="测试场景"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="queryParams.ask"
placeholder="请选择测试类型"
clearable
style="width: 100%"
@change="loadData"
>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
......@@ -73,15 +99,7 @@
</template>
</el-table-column>
<el-table-column
label="检验场景编号"
min-width="200"
prop="code"
sortable
align="left"
>
</el-table-column>
<el-table-column
label="场景类型"
label="所属标准"
prop="type"
min-width="200"
sortable
......@@ -89,7 +107,7 @@
>
</el-table-column>
<el-table-column
label="检验场景内容"
label="测试场景"
prop="content"
min-width="200"
sortable
......@@ -185,6 +203,9 @@ export default {
dialogVisible: false,
refreshList: false,
source: {}
},
form: {
ask: '1'
}
}
},
......
src/views/setting/standard/components/Chexingdialog.vue
View file @ 2e7835f7
......@@ -96,7 +96,7 @@ export default {
},
computed: {
modelTitle() {
return this.dialogManger.source.id ? '编辑' : '新增' + '标准'
return this.dialogManger.source.id ? '编辑标准' : '新增标准'
}
},
methods: {
......@@ -107,6 +107,7 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
console.log(valid)
console.log('车型审查')
}
})
}
......
src/views/setting/standard/components/Jianyandialog.vue
View file @ 2e7835f7
......@@ -135,7 +135,7 @@ export default {
},
computed: {
modelTitle() {
return this.dialogManger.source.id ? '编辑' : '新增' + '标准'
return this.dialogManger.source.id ? '编辑标准' : '新增标准'
}
},
methods: {
......@@ -149,6 +149,7 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
console.log(valid)
console.log('检验测试')
}
})
}
......
src/views/setting/standard/components/Tixidialog.vue
View file @ 2e7835f7
......@@ -96,7 +96,7 @@ export default {
},
computed: {
modelTitle() {
return this.dialogManger.source.id ? '编辑' : '新增' + '标准'
return this.dialogManger.source.id ? '编辑标准' : '新增标准'
}
},
methods: {
......@@ -107,6 +107,7 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
console.log(valid)
console.log('体系审查')
}
})
}
......
src/views/setting/standard/components/Wendangdialog.vue
View file @ 2e7835f7
......@@ -107,7 +107,7 @@ export default {
},
computed: {
modelTitle() {
return this.dialogManger.source.id ? '编辑' : '新增' + '标准'
return this.dialogManger.source.id ? '编辑标准' : '新增标准'
}
},
methods: {
......@@ -118,6 +118,7 @@ export default {
this.$refs['form'].validate(valid => {
if (valid) {
console.log(valid)
console.log('文档审查')
}
})
}
......
src/views/setting/standard/index.vue
View file @ 2e7835f7
This diff is collapsed.
src/views/setting/standardTerms/index.vue 0 → 100644
View file @ 2e7835f7
<template>
<page-standard>
<div slot="tab">
<!-- <el-radio-group v-model="queryParams.type" @input="loadData">-->
<!-- <el-radio-button-->
<!-- v-for="dict in dict.type.sys_scene_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >-->
<!-- {{ dict.label }}-->
<!-- </el-radio-button>-->
<!-- </el-radio-group>-->
<el-form ref="queryForm" :model="queryParams" size="small" :inline="true">
<el-form-item>
<el-select
v-model="queryParams.ask"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
key="1"
value="1"
label="汽车整车信息安全技术要求"
></el-option>
<el-option key="2" value="2" label="xxxxx软件升级要求"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="queryParams.type"
clearable
style="width: 100%"
@change="loadData"
>
<el-option
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:value="dict.value"
>{{
dict.value === '1'
? '体系审查'
: dict.value === '2'
? '车型审查'
: '文档审查'
}}</el-option
>
</el-select>
</el-form-item>
</el-form>
</div>
<el-form
v-show="showSearch"
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
>
<!-- <el-form-item prop="status">-->
<!-- <el-select-->
<!-- v-model="queryParams.version"-->
<!-- clearable-->
<!-- placeholder="当前版本"-->
<!-- style="width: 100%"-->
<!-- >-->
<!-- <el-option v-for="item in 10" :key="item" :value="item">{{-->
<!-- item-->
<!-- }}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="请输入标准章节"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="请输入标准要求"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item prop="status">-->
<!-- <el-input-->
<!-- v-model="queryParams.deptName"-->
<!-- placeholder="请输入审查要点"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="status">-->
<!-- <el-input-->
<!-- v-model="queryParams.deptName"-->
<!-- placeholder="请输入审查细则"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<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="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb10">
<right-toolbar
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
<div v-if="refreshTable && Number(queryParams.type) === 1">
{{ '体系审查' }}
</div>
<div v-if="refreshTable && Number(queryParams.type) === 2">
{{ '车型审查' }}
</div>
<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 type="index" width="60" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
prop="section"
label="标准章节"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="require"
label="标准要求"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="test"
label="检验结果描述（符合）"
min-width="200"
align="center"
>
</el-table-column>
<el-table-column
prop="check"
label="检验结果描述（不符合）"
min-width="200"
align="left"
>
</el-table-column>
<el-table-column
prop="resultNO"
label="更新时间"
min-width="200"
align="left"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</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(scope.row)"
>修改</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-if="queryParams.type > 1"
v-show="total > 0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.size"
@pagination="loadData"
>
</pagination>
</page-standard>
</template>
<script>
import page from '@/mixins/page'
export default {
components: {},
dicts: ['sys_scene_type'],
mixins: [page],
data() {
return {
listUrl: '/rules-list',
showSearch: true,
tableData: [],
defaultProps: {
children: 'children',
label: 'label'
},
queryParams: {
ask: '2',
type: '3'
},
refreshList: false
}
},
watch: {
refreshList(val) {
if (val) {
this.loadData()
this.refreshList = false
}
}
},
methods: {
handlePointUpdate() {},
handleUpdate() {}
}
}
</script>
<style scoped lang="scss">
.item-box {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
.title-item {
width: 500px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.buttons-list {
margin-left: 20px;
}
}
</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