Skip to content

W
web
Commit 382ef87f authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/car-test/web into developer/gaixiankang

parents 897f64a0 6b87adaa
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 122 deletions
src/mixins/page.js
View file @ 382ef87f
......@@ -3,7 +3,6 @@ export default {
data() {
return {
listUrl: '',
showSearch: true,
queryParams: {
page: 1,
size: 1
......
src/views/processing/processed-review/index.vue
View file @ 382ef87f
......@@ -100,7 +100,9 @@
<div class="card-cell">
<div class="cell-lable"></div>
<div class="cell-value">
<el-button type="success">查看审查问卷</el-button>
<el-button type="success" @click="handleDetail()"
>查看审查问卷</el-button
>
<el-button type="success">查看审查报告</el-button>
<el-button type="success">查看企业留档文件</el-button>
<el-button type="success">查看车企文件库</el-button>
......@@ -144,7 +146,12 @@ export default {
}
},
watch: {},
methods: {}
methods: {
/* 跳转到问卷详情*/
handleDetail() {
this.$router.push({ path: '/processing/review-questionnaire' })
}
}
}
</script>
<style lang="scss" scoped>
......
src/views/review/already/index.vue
View file @ 382ef87f
......@@ -12,14 +12,28 @@
size="small"
:inline="true"
>
<el-form-item prop="deptName">
<el-form-item prop="configType">
<el-select
v-model="queryParams.configType"
placeholder="评审类型"
clearable
>
<el-option
v-for="dict in dict.type.review_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="changjingType">
<el-select
v-model="queryParams.changjingType"
placeholder="场景分类"
clearable
>
<el-option
v-for="dict in dict.type.sys_scene_type"
v-for="dict in dict.type.scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -40,36 +54,19 @@
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-row :gutter="10" class="mb10">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['setting:rules:add']"
>新增
</el-button>
</el-col>
<right-toolbar
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>-->
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData1"
:data="tableData"
>
<el-table-column width="100" label="序号" align="center">
<template slot-scope="scope">
......@@ -149,15 +146,24 @@
<script>
import page from '@/mixins/page'
import dialog from './components/dialog.vue'
import { selectDictLabel } from '@/utils/ruoyi'
export default {
components: {
'yan-dialog': dialog
},
mixins: [page],
dicts: ['sys_scene_type'],
dicts: ['review_type', 'scene_type'],
data() {
return {
queryParams: {
page: 1,
size: 10,
deptName: '',
configType: '',
changjingType: ''
},
tableData: [],
tableData1: [
{
reviewNo: '20231209001',
......@@ -232,12 +238,55 @@ export default {
}
},
methods: {
/* 跳转审查详情*/
handleDetail() {
this.$router.push({ path: '/review/view' })
},
handleCancel() {
this.visible = false
/* 查询*/
handleQuery() {
this.queryParams.page = 1
this.loadData()
},
/* 重置*/
resetQuery() {
this.queryParams.page = 1
this.queryParams.deptName = ''
this.queryParams.configType = ''
this.queryParams.changjingType = ''
this.handleQuery()
},
/* 假数据筛选*/
loadData() {
this.loading = true
setTimeout(() => {
/* 过滤器*/
this.tableData = this.tableData1.filter(item => {
let flag = true
if (this.queryParams.deptName) {
flag &=
item.sceneContent.indexOf(this.queryParams.deptName) > -1 ||
item.reviewNo.indexOf(this.queryParams.deptName) > -1
}
if (this.queryParams.configType) {
flag &=
item.reviewType ===
selectDictLabel(
this.dict.type.review_type,
this.queryParams.configType
)
}
if (this.queryParams.changjingType) {
flag &=
item.sceneCategory ===
selectDictLabel(
this.dict.type.scene_type,
this.queryParams.changjingType
)
}
return flag
})
this.loading = false
}, 1000)
}
}
}
......@@ -261,6 +310,8 @@ export default {
font-weight: bold;
color: #666666;
}
/*最外层的卡片样式去边距*/
::v-deep .el-card__body {
padding: unset !important;
}
......
src/views/review/wait/index.vue
View file @ 382ef87f
......@@ -13,35 +13,35 @@
size="small"
:inline="true"
>
<el-form-item prop="deptName">
<el-form-item prop="configType">
<el-select
v-model="queryParams.configType"
placeholder="评审类型"
clearable
>
<el-option
v-for="dict in dict.type.sys_scene_type"
v-for="dict in dict.type.review_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="deptName">
<el-form-item prop="changjingType">
<el-select
v-model="queryParams.configType"
v-model="queryParams.changjingType"
placeholder="场景分类"
clearable
>
<el-option
v-for="dict in dict.type.sys_scene_type"
v-for="dict in dict.type.scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="status">
<el-form-item prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="输入搜索关键词"
......@@ -55,7 +55,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
>查询
</el-button>
<el-button
type="default"
......@@ -66,29 +66,12 @@
</el-button>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb10">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['setting:rules:add']"
>新增
</el-button>
</el-col>
<right-toolbar
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>-->
<el-table
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData1"
:data="tableData"
>
<el-table-column width="100" label="序号" align="center">
<template slot-scope="scope">
......@@ -146,7 +129,7 @@
size="mini"
type="primary"
plain
@click="handleDetail(scope.row)"
@click="handleReview(scope.row)"
>去评审
</el-button>
<el-button
......@@ -175,21 +158,30 @@
:title="handOverDialog.title"
>
<el-form
ref="handOverForm"
:model="handOverDialog.form"
:rules="handOverDialog.formControl.rules"
>
<el-form-item prop="receivingPersonnel" label="接收人员">
<el-form-item
prop="receivingPersonnel"
label="接收人员"
:rules="handOverDialog.formControl.rules.receivingPersonnel"
>
<el-select
v-model="handOverDialog.form.receivingPersonnel"
clearable
placeholder="请选择接收人员"
>
<el-option label="测试人员1" value="1" />
<el-option label="测试人员2" value="2" />
<el-option label="测试人员3" value="3" />
<el-option label="李岩" value="1" />
<el-option label="盖献康" value="2" />
<el-option label="周翔宇" value="3" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer">
<el-button @click="handleClose()"> 取消</el-button>
<el-button type="primary" @click="handleSave()"> 确定</el-button>
</div>
</el-dialog>
</page-standard>
</div>
......@@ -197,14 +189,24 @@
<script>
import page from '@/mixins/page'
import dialog from './components/dialog.vue'
import { selectDictLabel } from '@/utils/ruoyi'
export default {
components: {
'yan-dialog': dialog
},
mixins: [page],
dicts: ['review_type', 'scene_type'],
data() {
return {
queryParams: {
page: 1,
size: 10,
configType: '',
changjingType: '',
deptName: ''
},
tableData: [],
tableData1: [
{
reviewNo: '20231209001',
......@@ -282,7 +284,6 @@ export default {
}
}
},
dicts: ['sys_scene_type'],
watch: {
'dialogManger.refreshList': function (val) {
if (val) {
......@@ -292,20 +293,87 @@ export default {
}
},
methods: {
/* 关闭移交弹窗-保存*/
handleClose() {
this.handOverDialog.visible = false
},
handleSave() {
this.$refs.handOverForm.validate(valid => {
if (valid) {
// 表单校验通过，弹出二次确认对话框
this.$confirm('是否确认移交此条数据?', '移交', {
confirmButtonText: '确定',
concelButtonText: '取消',
type: 'warning',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
closeOnClickModal: false,
confirmButtonClass: 'queryBtn'
}).then(() => {
/* 二次弹窗确定后*/
this.handOverDialog.visible = false
console.log('关闭人员弹窗')
})
} else {
// 表单校验未通过，显示错误消息
this.$message.error('请选择接收人员')
console.log('请选择接收人员')
}
})
},
/* 去评审按钮页面跳转*/
handleReview() {
this.$router.push({ path: '/review/sceneReview' })
},
/* 打开移交弹窗*/
handleHandOver(row) {
this.handOverDialog.visible = true
},
handleAdd() {
this.dialogManger.dialogVisible = true
this.dialogManger.source = {}
/* 搜索按钮*/
handleQuery() {
this.queryParams.page = 1
this.loadData()
},
/* 重置*/
resetQuery() {
this.queryParams.page = 1
this.queryParams.deptName = ''
this.queryParams.configType = ''
this.queryParams.changjingType = ''
this.handleQuery()
},
handleDelete() {},
handleUpdate(row) {
this.dialogManger.dialogVisible = true
this.dialogManger.source = row
/* 假数据筛选*/
loadData() {
this.loading = true
setTimeout(() => {
/* 过滤器*/
this.tableData = this.tableData1.filter(item => {
let flag = true
if (this.queryParams.deptName) {
flag &=
item.sceneContent.indexOf(this.queryParams.deptName) > -1 ||
item.reviewNo.indexOf(this.queryParams.deptName) > -1
}
if (this.queryParams.configType) {
flag &=
item.reviewType ===
selectDictLabel(
this.dict.type.review_type,
this.queryParams.configType
)
}
if (this.queryParams.changjingType) {
flag &=
item.sceneCategory ===
selectDictLabel(
this.dict.type.scene_type,
this.queryParams.changjingType
)
}
return flag
})
this.loading = false
}, 1000)
}
}
}
......@@ -330,6 +398,7 @@ export default {
color: #666666;
}
/*最晚层的卡片样式去边距*/
::v-deep .el-card__body {
padding: unset !important;
}
......
src/views/setting/template/index.vue
View file @ 382ef87f
......@@ -38,16 +38,18 @@
<el-button
v-hasPermi="['setting:template:update']"
size="mini"
type="text"
type="primary"
icon="el-icon-edit"
plain
@click="handleUpdate(scope.row)"
>
编辑</el-button
修改</el-button
>
<el-button
v-hasPermi="['setting:template:update']"
size="mini"
type="text"
type="primary"
plain
icon="el-icon-arrow-right"
@click="viewTemplate(scope.row)"
>
......
src/views/setting/useCaseLibrary/index.vue
View file @ 382ef87f
......@@ -87,7 +87,8 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="用例编号" align="center" prop="code" />
<el-table-column label="检验场景" align="center" prop="code" />
<!-- <el-table-column label="用例编号" align="center" prop="code" />-->
<el-table-column label="测试类型" align="center" prop="type" />
<el-table-column label="工具" align="center" prop="tool" />
<el-table-column label="对应输入" align="center" prop="corresponding" />
......@@ -107,18 +108,18 @@
>
<template slot-scope="scope">
<el-button
v-hasPermi="['system:post:edit']"
size="mini"
type="text"
type="primary"
icon="el-icon-edit"
plain
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
v-hasPermi="['system:post:remove']"
size="mini"
type="text"
type="danger"
icon="el-icon-delete"
plain
@click="handleDelete(scope.row)"
>删除</el-button
>
......@@ -147,7 +148,7 @@
clearable
class="select-width"
>
<el-option :value="1">type</el-option>
<el-option value="1" label="type"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工具" prop="tool">
......@@ -173,6 +174,29 @@
:rows="4"
/>
</el-form-item>
<el-form-item label="风险等级" prop="level">
<el-select
v-model="form.level"
placeholder="请选择风险等级"
clearable
class="select-width"
>
<el-option value="1" label="无风险"></el-option>
<el-option value="2" label="低风险"></el-option>
<el-option value="3" label="中风险"></el-option>
<el-option value="4" label="高风险"></el-option>
</el-select>
</el-form-item>
<el-form-item label="漏洞危害" prop="hazards">
<el-input
v-model="form.hazards"
type="textarea"
placeholder="请输入漏洞危害"
maxlength="100"
show-word-limit
:rows="4"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -197,7 +221,7 @@ export default {
// 表格数据
postList: [
{
code: '101',
code: 'TBOX-蜂窝以太网接口',
type: '系统服务漏扫',
tool: 'CMW500+白卡、Nessus',
corresponding:
......
src/views/system/config/index.vue
View file @ 382ef87f
......@@ -291,7 +291,8 @@ export default {
pageSize: 10,
configName: undefined,
configKey: undefined,
configType: undefined
configType: undefined,
changjingType: undefined
},
// 表单参数
form: {},
......
src/views/task/edit/index.vue
View file @ 382ef87f
......@@ -163,7 +163,7 @@
<span v-if="row.name !== ''">{{ row.name }}</span>
<el-select
v-else
v-model="row.name"
v-model="name"
placeholder="请选择"
@change="handleNameChange"
>
......@@ -196,7 +196,7 @@
>
<template slot-scope="scope">
<el-button
v-hasPermi="['setting:rules:update']"
v-show="scope.row.name !== ''"
size="mini"
type="primary"
icon="el-icon-edit"
......@@ -206,15 +206,35 @@
修改
</el-button>
<el-button
v-hasPermi="['setting:rules:delete']"
v-show="scope.row.name !== ''"
size="mini"
type="danger"
icon="el-icon-delete"
plain
@click="handleDelete(scope.row, scope.$index)"
@click="handleDelete(scope.row)"
>
删除
</el-button>
<el-button
v-show="scope.row.name === ''"
size="mini"
type="primary"
icon="el-icon-edit"
plain
@click="handleSavePeople()"
>
保存
</el-button>
<el-button
v-show="scope.row.name === ''"
size="mini"
type="danger"
icon="el-icon-delete"
plain
@click="handleCancelPeople()"
>
取消
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -376,6 +396,7 @@ export default {
dicts: ['sys_task_status', 'sys_pro'],
data() {
return {
name: '',
dialogImageUrl: '',
dialogVisible: false,
formType: 1,
......@@ -530,18 +551,51 @@ export default {
console.log('图片啊啊啊', file)
this.dialogVisible = true
},
/**
* 小组信息修改
* @param row 行内信息
*/
handleUpdate(row) {},
handleUpdate(row) {
row.name = ''
},
/**
* 小组信息删除
* @param row 行内信息
* @param index
*/
handleDelete(row, index) {
this.tableData.splice(index, 1)
handleDelete(row) {
this.$confirm('是否确认删除此条数据,删除后不可恢复', '删除', {
confirmButtonText: '确定',
concelButtonText: '取消',
type: 'warning',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
closeOnClickModal: false,
confirmButtonClass: 'queryBtn'
}).then(() => {
this.tableData = this.tableData.filter(item => item.name !== row.name)
})
},
/**
* 保存人员
* @param row
*/
handleSavePeople() {
console.log('name', this.name)
const obj = this.userList.find(item => item.name === this.name)
this.tableData[this.tableData.length - 1].name = this.name
this.tableData[this.tableData.length - 1].dept = obj.dept
this.tableData[this.tableData.length - 1].role = obj.role
this.name = ''
},
/**
* 取消人员
*/
handleCancelPeople() {
this.name = ''
// 去掉一个数组最后一个对象
this.tableData.pop()
},
/**
* 添加小组成员点击按钮
......@@ -560,17 +614,30 @@ export default {
} else {
this.tableData.push({ name: '' })
}
// userList数组减去tableData数组相同的对象
this.userList = this.userList.filter(
itemA => !this.tableData.some(itemB => itemA.name === itemB.name)
)
},
handleNameChange(value) {
const obj = this.userList.find(item => item.name === value)
this.tableData[this.tableData.length - 1].dept = obj.dept
this.tableData[this.tableData.length - 1].role = obj.role
},
// 保存
/* 小组成员姓名*/
handleNameChange(value) {},
/* 点击发布按钮后的操作*/
handleAdd() {
this.$refs.form.validate(valid => {
if (valid) {
console.log('aaaa')
console.log('校验通过了不???', '111')
this.$confirm('是否确认发布此条数据?', '发布', {
confirmButtonText: '确定',
concelButtonText: '取消',
type: 'warning',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
closeOnClickModal: false,
confirmButtonClass: 'queryBtn'
}).then(() => {
/* 二次弹窗确定后*/
console.log('发布啦', '发布111')
})
}
})
},
......@@ -617,10 +684,12 @@ export default {
::v-deep .el-card__body {
padding: unset !important;
}
/*上传以后上传按钮隐藏*/
::v-deep .over-limit-hide .el-upload--picture-card {
display: none;
}
/*上传提示语*/
::v-deep .el-upload__tip {
display: none !important;
......
src/views/task/new/index.vue
View file @ 382ef87f
......@@ -149,7 +149,6 @@
</el-col>
</el-row>
<div class="subtitle">小组信息</div>
<!-- :default-sort="{ prop: 'createTime', order: 'descending' }" -->
<el-table
v-loading="loading"
style="width: 100%"
......
src/views/task/on/index.vue
View file @ 382ef87f
......@@ -122,10 +122,10 @@
>
<template slot-scope="{ row }">
<div class="button-list">
<div class="button-item b1" @click="handleCeshi(row)">
<div class="button-item b1" @click="handleDetail(row)">
<i class="iconfont icon-kaishi"></i>
</div>
<div class="button-item b2">
<div class="button-item b2" @click="handleEdit(row)">
<i class="iconfont icon-fenxiang"></i>
</div>
<div class="button-item b3">
......@@ -166,6 +166,10 @@ export default {
handleDetail() {
this.$router.push({ path: '/task/task-detail' })
},
/* 跳转到任务编辑*/
handleEdit() {
this.$router.push({ path: '/task/edit' })
},
handleAdd() {},
handleDelete() {},
handleUpdate() {},
......
src/views/task/task-detail/index.vue
View file @ 382ef87f
......@@ -189,15 +189,6 @@
</template>
</el-table-column>
</el-table>
<!-- 添加小组成员 -->
<!-- <el-button
class="add-number"
icon="el-icon-circle-plus-outline"
@click="handleAddNumber"
>添加小组成员
</el-button
>-->
<div class="subtitle" style="margin-top: 20px">报告信息</div>
<el-row style="display: flex">
<el-row :gutter="20">
......@@ -323,23 +314,6 @@
</el-col>
</el-row>
</el-form>
<!-- <div style="margin: 2rem 0rem 2rem 0rem;" class="bottom-button">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- size="mini"-->
<!-- style="width: 120px"-->
<!-- @click="handleSave"-->
<!-- >暂存-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- style="width: 120px"-->
<!-- @click="handleAdd"-->
<!-- >发布-->
<!-- </el-button>-->
<!-- </div>-->
</div>
</page-standard>
</template>
......@@ -348,7 +322,7 @@ export default {
dicts: ['sys_task_status', 'sys_pro'],
data() {
return {
image: require('@/assets/images/login-background.jpg'),
image: require('@/assets/images/questionnaire/xizeshu.png'),
formDisabled: true,
formType: 1,
/* 表单对象*/
......
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