Skip to content

W
web
Commit 8a04ee00 authored by mzx's avatar mzx
Browse files
Options

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

parents 2fb7f1e7 ee1d41c3
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 284 deletions
src/api/setting/useCaseLibrary.js 0 → 100644
View file @ 8a04ee00
import request from '@/utils/request'
// 获取测试场景
export function listTestScenar(data) {
return request({
url: '/system/scenario/getList',
method: 'post',
data: data
})
}
// 获取场景类型
export function listTestType(data) {
return request({
url: '/system/type/getList',
method: 'post',
data: data
})
}
src/views/setting/template/index.vue
View file @ 8a04ee00
......@@ -60,25 +60,14 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
v-hasPermi="['setting:template:update']"
size="mini"
type="text"
plain
@click="handleUpdate(scope.row)"
>
上传新文件</el-button
>
<!-- <el-button-->
<!-- v-hasPermi="['setting:template:view']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- plain-->
<!-- icon="el-icon-arrow-right"-->
<!-- @click="viewTemplate(scope.row)"-->
<!-- >-->
<!-- 查看模板</el-button-->
<!-- >-->
<div class="button-bar">
<page-button
v-hasPermi="['setting:template:update']"
icon="folder-upload"
title="上传新文件"
@click.native="handleUpdate(scope.row)"
></page-button>
</div>
</template>
</el-table-column>
</el-table>
......
src/views/setting/useCaseLibrary/index.vue
View file @ 8a04ee00
......@@ -8,35 +8,41 @@
:inline="true"
label-width="68px"
>
<!-- <el-form-item prop="postCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.postCode"-->
<!-- placeholder="关联标准条款关键字"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item prop="status">
<el-select
v-model="queryParams.status"
v-model="queryParams.testScenarioId"
placeholder="请选择测试场景"
clearable
>
<el-option :value="1">type</el-option>
<el-option
v-for="item in testScenarList"
:key="item.id"
:label="item.testScenario"
:value="item.id"
>
{{ item.testScenario }}</el-option
>
</el-select>
</el-form-item>
<el-form-item prop="status">
<el-select
v-model="queryParams.status"
v-model="queryParams.testTypeId"
placeholder="请选择测试类型"
clearable
>
<el-option :value="1">type</el-option>
<el-option
v-for="item of testTypeList"
:key="item.id"
:label="item.testType"
:value="item.id"
>
{{ item.testType }}</el-option
>
</el-select>
</el-form-item>
<el-form-item prop="postCode">
<el-input
v-model="queryParams.postCode"
v-model="queryParams.searchKeywords"
placeholder="用例编号或名称关键字"
clearable
@keyup.enter.native="handleQuery"
......@@ -55,200 +61,70 @@
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['setting:useCaseLibrary:add']"-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- >新增</el-button-->
<!-- >-->
<!-- </el-col>-->
<right-toolbar
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="postList">
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <right-toolbar-->
<!-- :show-search.sync="showSearch"-->
<!-- @queryTable="getList"-->
<!-- ></right-toolbar>-->
<!-- </el-row>-->
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:data="tableData"
>
<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 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="code" />
<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="code" />
<el-table-column label="更新人员" align="center" prop="updatePersonnel" />
<el-table-column label="测试场景" align="center" prop="testScenario" />
<el-table-column label="测试类型" align="center" prop="testType" />
<el-table-column label="用例编号" align="center" prop="usecaseNo" />
<el-table-column label="用例名称" align="center" prop="name" />
<el-table-column label="工具" align="center" prop="tools" />
<el-table-column label="对应输入" align="center" prop="input" />
<el-table-column label="用例描述" align="center" prop="description" />
<el-table-column label="更新人员" align="center" prop="updateBy" />
<el-table-column
label="更新时间"
align="center"
prop="createTime"
prop="updateTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="测试场景" align="center" prop="code" />-->
<!-- &lt;!&ndash; <el-table-column label="用例编号" align="center" prop="code" />&ndash;&gt;-->
<!-- <el-table-column label="测试类型" align="center" prop="type" />-->
<!-- <el-table-column label="工具" align="center" prop="tool" />-->
<!-- <el-table-column label="对应输入" align="center" prop="corresponding" />-->
<!-- <el-table-column label="测试用例" align="center" prop="case" />-->
<!-- <el-table-column label="更新人员" align="center" prop="updatePersonnel" />-->
<!-- <el-table-column-->
<!-- label="更新时间"-->
<!-- align="center"-->
<!-- prop="createTime"-->
<!-- width="180"-->
<!-- >-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="操作"-->
<!-- align="center"-->
<!-- class-name="small-padding fixed-width"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-hasPermi="['setting:useCaseLibrary:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button-->
<!-- >-->
<!-- <el-button-->
<!-- v-hasPermi="['setting:useCaseLibrary:delete']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total > 0"
:total="total"
:background="false"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
@pagination="loadData"
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用例编号" prop="code">
<el-input v-model="form.code" placeholder="请输入用例编号" />
</el-form-item>
<el-form-item label="测试类型" prop="type">
<el-select
v-model="form.type"
placeholder="请选择测试类型"
clearable
class="select-width"
>
<el-option value="1" label="type"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工具" prop="tool">
<el-input v-model="form.tool" placeholder="请输入工具" />
</el-form-item>
<el-form-item label="对应输入" prop="corresponding">
<el-input
v-model="form.corresponding"
type="textarea"
placeholder="请输入对应输入"
maxlength="100"
show-word-limit
:rows="4"
/>
</el-form-item>
<el-form-item label="测试用例" prop="case">
<el-input
v-model="form.case"
type="textarea"
placeholder="请输入测试用例"
maxlength="100"
show-word-limit
: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>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</page-standard>
</template>
<script>
import page from '@/mixins/page'
import {
listTestScenar,
listTestType
} from '../../../api/setting/useCaseLibrary'
export default {
name: 'Index',
dicts: [],
mixins: [page],
data() {
return {
// 遮罩层
loading: true,
listUrl: '/system/testCase/getList',
// 显示搜索条件
showSearch: true,
// 总条数
total: 1,
// 表格数据
postList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
postCode: undefined,
postName: undefined,
status: undefined
},
screen: {
ask: '1'
},
// 表单参数
form: {},
tableData: [],
testScenarList: [],
testTypeList: [],
// 表单校验
rules: {
postName: [
......@@ -263,96 +139,20 @@ export default {
}
}
},
created() {
this.getList()
mounted() {
this.getTestScenar()
this.getTestType()
},
methods: {
/** 查询列表 */
getList() {
// this.loading = true
// listPost(this.queryParams).then(response => {
// this.postList = response.rows
// this.total = response.total
this.loading = false
// })
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
postId: undefined,
postCode: undefined,
postName: undefined,
postSort: 0,
status: '0',
remark: undefined
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '新增'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
// const postId = row.postId
// getPost(postId).then(response => {
// this.form = response.data
this.form = row
this.open = true
this.title = '修改'
// })
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
// if (valid) {
// if (this.form.postId !== undefined) {
// updatePost(this.form).then(response => {
// this.$modal.msgSuccess('修改成功')
this.open = false
// this.getList()
// })
// } else {
// addPost(this.form).then(response => {
// this.$modal.msgSuccess('新增成功')
// this.open = false
// this.getList()
// })
// }
// }
getTestScenar() {
listTestScenar({ pageNum: 1, pageSize: 999 }).then(res => {
this.testScenarList = res.rows
})
},
/** 删除按钮操作 */
handleDelete(row) {
// const postIds = row.postId
this.$modal
.confirm('是否确认删除此数据项？')
.then(() => {
// return delPost(postIds)
})
.then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
getTestType() {
listTestType({ pageNum: 1, pageSize: 999 }).then(res => {
this.testTypeList = res.rows
})
}
}
}
......
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