Skip to content

Q
qa-platform-ui
Commit 5e3476c3 authored by 王晓铜's avatar 王晓铜
Browse files
Options

更新样式

parent e9a3ab8f
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 210 deletions
src/router/index.js
View file @ 5e3476c3
...@@ -15,8 +15,8 @@ import kdspDecrypt from '../views/effect/KdspDecrypt' ...@@ -15,8 +15,8 @@ import kdspDecrypt from '../views/effect/KdspDecrypt'
import JenkinsBuildInfo from '../views/effect/JenkinsBuildInfo' import JenkinsBuildInfo from '../views/effect/JenkinsBuildInfo'
import LoginWhiteList from '../views/effect/LoginWhiteList' import LoginWhiteList from '../views/effect/LoginWhiteList'
// 2021-040-09新添加 // 2021-040-09新添加
import ProjectList from '../views/auto/Project' import ProjectList from '../views/auto/ProjectList'
import ModelList from '../views/auto/Model' import ModelList from '../views/auto/ModelList'
import InterfaceList from '../views/auto/InterfaceList' import InterfaceList from '../views/auto/InterfaceList'
import JiraNotify from '../views/jira/Notify' import JiraNotify from '../views/jira/Notify'
import RiskControl from '../views/vcc/RiskControl' import RiskControl from '../views/vcc/RiskControl'
...@@ -102,12 +102,12 @@ const router = new Router({ ...@@ -102,12 +102,12 @@ const router = new Router({
}, },
// 2021-4-08新添加项目管理页面 // 2021-4-08新添加项目管理页面
{ {
path: '/auto/Project', path: '/auto/ProjectList',
name: ProjectList, name: ProjectList,
component: ProjectList component: ProjectList
}, },
{ {
path: '/auto/Model', path: '/auto/ModelList',
name: ModelList, name: ModelList,
component: ModelList component: ModelList
}, },
......
src/views/auto/AddCase.vue
View file @ 5e3476c3
<template> <template>
<div> <div>
<el-form ref="caseForm" :rules="rules" :model="caseForm" label-width="90px"> <el-form ref="caseFormRef" :rules="rules" :model="caseForm" label-width="90px">
<el-form-item label="模块名称:" prop="moduleId"> <el-form-item label="模块名称:" prop="moduleId">
<el-select v-model="caseForm.moduleId" placeholder="请选择模块" @change="selectChangeModel" clearable> <el-select v-model="caseForm.moduleId" placeholder="请选择模块" @change="selectChangeModel" clearable>
<el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="advanceDelss(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="advanceDelss(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -72,14 +72,14 @@ ...@@ -72,14 +72,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="requestParamsDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="requestParamsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -93,10 +93,10 @@ ...@@ -93,10 +93,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -106,14 +106,14 @@ ...@@ -106,14 +106,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="paramsDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="paramsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -125,29 +125,29 @@ ...@@ -125,29 +125,29 @@
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">变量名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">json路径表达式</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-for="(item,index) in responseList" :key="index"> <el-row v-for="(item,index) in responseList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div>
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入变量名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入表达式"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="responeDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -157,13 +157,13 @@ ...@@ -157,13 +157,13 @@
<el-collapse-item name="5" title="结果断言"> <el-collapse-item name="5" title="结果断言">
<el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button> <el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-table :data="assertionList" border style="width:100%;margin-top: 15px;"> <el-table :data="assertionList" border style="width:100%;margin-top: 15px;">
<el-table-column label="参数名称" width="150"> <el-table-column label="参数名称" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsName"> <el-input v-model="scope.row.paramsName">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数值" width="150"> <el-table-column label="参数值" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsValue"> <el-input v-model="scope.row.paramsValue">
</el-input> </el-input>
...@@ -174,19 +174,19 @@ ...@@ -174,19 +174,19 @@
<el-switch v-model="scope.row.isRequired" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" @change="changeState()"></el-switch> <el-switch v-model="scope.row.isRequired" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" @change="changeState()"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="示例" width="300"> <!-- <el-table-column label="示例" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.examples"></el-input> <el-input v-model="scope.row.examples"></el-input>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="备注" width="300"> <el-table-column label="备注" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remarks"></el-input> <el-input v-model="scope.row.remarks"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="danger" @click="AssertionDelete(scope.$index)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="AssertionDelete(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -457,32 +457,39 @@ export default { ...@@ -457,32 +457,39 @@ export default {
this.caseForm.extract = JSON.stringify(responseObj) this.caseForm.extract = JSON.stringify(responseObj)
// 断言 // 断言
this.caseForm.validate = JSON.stringify(this.assertionList) this.caseForm.validate = JSON.stringify(this.assertionList)
if (this.caseForm.id) { // 输入框验证
// 编辑接口 this.$refs.caseFormRef.validate((valid) => {
editCase(this.caseForm).then((resp) => { if (!valid) {
if (resp.data.data === true) { return false
this.$message.success('修改成功！') } else {
this.$router.push('CaseList') if (this.caseForm.id) {
// 刷新列表页 // 编辑接口
this.sendResh() editCase(this.caseForm).then((resp) => {
} else { if (resp.data.data === true) {
this.$message.error(resp.data.msg) this.$message.success('修改成功！')
} this.$router.push('CaseList')
}) // 刷新列表页
} else { this.sendResh()
// 添加接口 } else {
addCase(this.caseForm).then((resp) => { this.$message.error(resp.data.msg)
if (resp.data.data === true) { }
this.$message.success('添加成功！') })
// 返回列表页
this.$router.push('CaseList')
// 刷新列表页
this.sendResh()
} else { } else {
this.$message.error(resp.data.msg) // 添加接口
addCase(this.caseForm).then((resp) => {
if (resp.data.data === true) {
this.$message.success('添加成功！')
// 返回列表页
this.$router.push('CaseList')
// 刷新列表页
this.sendResh()
} else {
this.$message.error(resp.data.msg)
}
})
} }
}) }
} })
}, },
// 刷新列表 // 刷新列表
......
src/views/auto/AddInterface.vue
View file @ 5e3476c3
<template> <template>
<div> <div>
<el-form ref="interfaceForm" :rules="rules" :model="interfaceForm"> <el-form ref="interfaceFormRef" :rules="rules" :model="interfaceForm">
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item name="1" title="基本信息"> <el-collapse-item name="1" title="基本信息">
<el-row> <el-row>
...@@ -364,40 +364,45 @@ export default { ...@@ -364,40 +364,45 @@ export default {
this.interfaceForm.headers = JSON.stringify(this.headersList) this.interfaceForm.headers = JSON.stringify(this.headersList)
this.interfaceForm.paramTemplate = JSON.stringify(this.paramList) this.interfaceForm.paramTemplate = JSON.stringify(this.paramList)
this.interfaceForm.responseTemplate = JSON.stringify(this.responseList) this.interfaceForm.responseTemplate = JSON.stringify(this.responseList)
this.$refs.interfaceFormRef.validate((valid) => {
if (this.interfaceForm.id) { if (!valid) {
// 编辑接口 return false
editInterface(this.interfaceForm).then((resp) => { } else {
if (resp.data.data === true) { if (this.interfaceForm.id) {
this.$message.success('修改成功！') // 编辑接口
this.$router.push('InterfaceList') editInterface(this.interfaceForm).then((resp) => {
// 刷新列表页 if (resp.data.data === true) {
this.sendResh() this.$message.success('修改成功！')
} else { this.$router.push('InterfaceList')
this.$message.error(resp.data.msg) // 刷新列表页
} this.sendResh()
}) } else {
} else { this.$message.error(resp.data.msg)
addInterface(this.interfaceForm).then((resp) => { }
if (resp.data.data === true) { })
this.$message.success('添加成功！')
// 返回列表页
this.$router.push('InterfaceList')
// 刷新列表页
this.sendResh()
this.interfaceForm.name = ''
this.interfaceForm.moduleId = ''
this.interfaceForm.method = ''
this.interfaceForm.url = ''
this.interfaceForm.paramType = ''
this.interfaceForm.headers = ''
this.interfaceForm.paramTemplate = ''
this.interfaceForm.responseTemplate = ''
} else { } else {
this.$message.error(resp.data.msg) addInterface(this.interfaceForm).then((resp) => {
if (resp.data.data === true) {
this.$message.success('添加成功！')
// 返回列表页
this.$router.push('InterfaceList')
// 刷新列表页
this.sendResh()
this.interfaceForm.name = ''
this.interfaceForm.moduleId = ''
this.interfaceForm.method = ''
this.interfaceForm.url = ''
this.interfaceForm.paramType = ''
this.interfaceForm.headers = ''
this.interfaceForm.paramTemplate = ''
this.interfaceForm.responseTemplate = ''
} else {
this.$message.error(resp.data.msg)
}
})
} }
}) }
} })
} }
} }
} }
......
src/views/auto/CaseList.vue
View file @ 5e3476c3
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
<el-input v-model="queryModuleInfo.testcaseName" clearable placeholder="请输入用例名称" style="width: 300px;"></el-input> <el-input v-model="queryModuleInfo.testcaseName" clearable placeholder="请输入用例名称" style="width: 300px;"></el-input>
<el-button type="primary" style="margin-left:20px" @click="queryData">查询</el-button> <el-button type="primary" style="margin-left:20px" icon="el-icon-search" @click="queryData">查询</el-button>
<el-button type="primary" style="margin-left:20px" @click="addPage">新增</el-button> <el-button type="primary" style="margin-left:20px" icon="el-icon-circle-plus" @click="addPage">新增</el-button>
</div> </div>
<el-table :data="singleCaseList" border style="width: 100%;margin-top:20px"> <el-table :data="singleCaseList" border style="width: 100%;margin-top:20px">
<el-table-column type='index' width="50px"></el-table-column> <el-table-column type='index' width="50px"></el-table-column>
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<!-- <el-table-column prop="updateTime" label="修改日期" width="200px"></el-table-column> --> <!-- <el-table-column prop="updateTime" label="修改日期" width="200px"></el-table-column> -->
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="warning" @click="executeCaseFrom(scope.row)">执行</el-button> <el-button type="warning" icon="el-icon-link" @click="executeCaseFrom(scope.row)">执行</el-button>
<el-button type="success" @click="editCaseFrom(scope.row)">编辑</el-button> <el-button type="success" icon="el-icon-edit" @click="editCaseFrom(scope.row)">编辑</el-button>
<el-button type="danger" @click="delCaseFrom(scope.row)">删除</el-button> <el-button type="danger" icon="el-icon-delete" @click="delCaseFrom(scope.row)">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -180,7 +180,4 @@ export default { ...@@ -180,7 +180,4 @@ export default {
.el-select { .el-select {
margin: 0 10px 0 5px; margin: 0 10px 0 5px;
} }
// .el-select {
// margin-right: 10px;
// }
</style> </style>
src/views/auto/EditScene.vue
View file @ 5e3476c3
<template> <template>
<div> <div>
<el-form ref="sceneForm" :rules="rules" :model="sceneForm" label-width="90px"> <el-form ref="sceneFormRef" :rules="rules" :model="sceneForm" label-width="90px">
<el-form-item label="场景名称:" prop="name" style="width:300px"> <el-form-item label="场景名称:" prop="name" style="width:320px">
<el-input v-model="sceneForm.name"></el-input> <el-input v-model="sceneForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectId"> <el-form-item label="项目名称:" prop="projectId">
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="success" @click="editeSceneFrom(scope.row)">编辑</el-button> <el-button type="success" icon="el-icon-edit" @click="editeSceneFrom(scope.row)">编辑</el-button>
<el-button type="danger" @click="deleSceneFrom(scope.row)">删除</el-button> <el-button type="danger" icon="el-icon-delete" @click="deleSceneFrom(scope.row)">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</el-form> </el-form>
<!-- 添加场景用例 --> <!-- 添加场景用例 -->
<el-dialog title="新增场景用例" :visible.sync="DialogVisible" width="50%"> <el-dialog title="新增场景用例" :visible.sync="DialogVisible" width="50%" @close="closeAddSceneDialog">
<el-form :model="sceneCaseForm" label-width="90px"> <el-form :model="sceneCaseFormRef" label-width="90px">
<el-form-item label="模块名称:" style="width:300px"> <el-form-item label="模块名称:" style="width:300px">
<el-select v-model="sceneCaseForm.moduleFrom" value-key="id" placeholder="请选择模块" @change="selectChangeModel" clearable> <el-select v-model="sceneCaseForm.moduleFrom" value-key="id" placeholder="请选择模块" @change="selectChangeModel" clearable>
<el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item"></el-option> <el-option v-for="item in modelList" :key="item.id" :label="item.name" :value="item"></el-option>
...@@ -77,10 +77,10 @@ ...@@ -77,10 +77,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -90,14 +90,14 @@ ...@@ -90,14 +90,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="advanceDelss(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="advanceDelss(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -111,10 +111,10 @@ ...@@ -111,10 +111,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -124,14 +124,14 @@ ...@@ -124,14 +124,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="requestParamsDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="requestParamsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">参数名称</div> <div class="grid-content" style="margin-left:15px">参数名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">参数值</div> <div class="grid-content" style="margin-left:15px">参数值</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -158,14 +158,14 @@ ...@@ -158,14 +158,14 @@
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="2">
<div> <div>
<el-button size="mini" type="danger" @click="paramsDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="paramsDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -179,27 +179,27 @@ ...@@ -179,27 +179,27 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content" style="margin-left:15px">变量名称</div> <div class="grid-content" style="margin-left:15px">变量名称</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div class="grid-content" style="margin-left:15px">json路径表达式</div> <div class="grid-content" style="margin-left:15px">json路径表达式</div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<div class="grid-content" style="margin-left:25px">操作</div> <div class="grid-content" style="margin-left:25px">操作</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-for="(item,index) in responseList" :key="index"> <el-row v-for="(item,index) in responseList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div>
<el-input v-model.trim="item.paramsName" placeholder="请输入参数名称"></el-input> <el-input v-model.trim="item.paramsName" placeholder="请输入变量名称"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="10">
<div> <div>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入表达式"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<div> <div>
<el-button size="mini" type="danger" @click="responeDel(index)" style="height:40px;margin-left:20px">删除</el-button> <el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -209,13 +209,13 @@ ...@@ -209,13 +209,13 @@
<el-collapse-item name="5" title="结果断言"> <el-collapse-item name="5" title="结果断言">
<el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button> <el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-table :data="assertionList" border style="width:100%;margin-top: 15px;"> <el-table :data="assertionList" border style="width:100%;margin-top: 15px;">
<el-table-column label="参数名称" width="150"> <el-table-column label="参数名称" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsName"> <el-input v-model="scope.row.paramsName">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数值" width="150"> <el-table-column label="参数值" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsValue"> <el-input v-model="scope.row.paramsValue">
</el-input> </el-input>
...@@ -226,26 +226,26 @@ ...@@ -226,26 +226,26 @@
<el-switch v-model="scope.row.isRequired" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" @change="changeState()"></el-switch> <el-switch v-model="scope.row.isRequired" active-color="#13ce66" inactive-color="#A9A9A9" active-text="是" inactive-text="否" @change="changeState()"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="示例" width="300"> <!-- <el-table-column label="示例" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.examples"></el-input> <el-input v-model="scope.row.examples"></el-input>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="备注" width="300"> <el-table-column label="备注" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remarks"></el-input> <el-input v-model="scope.row.remarks"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="danger" @click="AssertionDelete(scope.$index)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="AssertionDelete(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div style="margin-top:20px;margin-left:400px"> <div style="margin-top:20px;margin-left:400px">
<el-button @click="cancelCaseFrom">取 消</el-button> <el-button @click="cancelCaseFrom">取 消</el-button>
<el-button type="primary" @click="addCaseFrom">确 定</el-button> <el-button type="primary" @click="addCaseFrom">确 定</el-button>
</div> </div>
</el-form> </el-form>
...@@ -388,8 +388,6 @@ export default { ...@@ -388,8 +388,6 @@ export default {
Sortable.create(tbody, { Sortable.create(tbody, {
draggable: '.el-table__row', draggable: '.el-table__row',
onEnd({ newIndex, oldIndex }) { onEnd({ newIndex, oldIndex }) {
// console.log('索引新', newIndex)
// console.log('索引旧', oldIndex)
const currRow = _this.sceneTestcaseList.splice(oldIndex, 1)[0] const currRow = _this.sceneTestcaseList.splice(oldIndex, 1)[0]
_this.sceneTestcaseList.splice(newIndex, 0, currRow) _this.sceneTestcaseList.splice(newIndex, 0, currRow)
} }
...@@ -453,6 +451,10 @@ export default { ...@@ -453,6 +451,10 @@ export default {
this.sceneCaseForm.interfaceFrom = '' this.sceneCaseForm.interfaceFrom = ''
this.sceneCaseForm.caseList = [] this.sceneCaseForm.caseList = []
}, },
// 关闭清空内容
closeAddSceneDialog() {
this.$refs.sceneCaseFormRef.resetFields()
},
// 编辑场景用例 // 编辑场景用例
editeSceneFrom(row) { editeSceneFrom(row) {
console.log('11', row) console.log('11', row)
...@@ -509,15 +511,21 @@ export default { ...@@ -509,15 +511,21 @@ export default {
}) })
this.newSceneForm.sceneId = this.sceneCaseInfo.sceneId this.newSceneForm.sceneId = this.sceneCaseInfo.sceneId
this.newSceneForm.sceneTestcaseList = this.sceneTestcaseList this.newSceneForm.sceneTestcaseList = this.sceneTestcaseList
addSceneCase(this.newSceneForm).then((resp) => { this.$refs.sceneFormRef.validate((valid) => {
if (resp.data.data === true) { if (!valid) {
this.$message.success('保存成功！') return false
// 返回列表页
this.$router.push({ path: 'SceneList' })
// 刷新列表页
this.sendResh()
} else { } else {
this.$message.error(resp.data.msg) addSceneCase(this.newSceneForm).then((resp) => {
if (resp.data.data === true) {
this.$message.success('保存成功！')
// 返回列表页
this.$router.push({ path: 'SceneList' })
// 刷新列表页
this.sendResh()
} else {
this.$message.error(resp.data.msg)
}
})
} }
}) })
}, },
...@@ -625,15 +633,6 @@ export default { ...@@ -625,15 +633,6 @@ export default {
// 断言 // 断言
this.sceneCaseForm.validate = JSON.stringify(this.assertionList) this.sceneCaseForm.validate = JSON.stringify(this.assertionList)
// 循环数组并删除对应的数组下标的整条数据信息 // 循环数组并删除对应的数组下标的整条数据信息
// for (var i = 0; i < this.sceneTestcaseList.length; i++) {
// if (
// this.sceneTestcaseList[i].sequence === this.sceneCaseForm.sequence
// ) {
// var moduleName = this.sceneTestcaseList[i].moduleName
// var interfaceName = this.sceneTestcaseList[i].interfaceName
// this.sceneTestcaseList.splice(i, 1)
// }
// }
for (var i = 0; i < this.sceneTestcaseList.length; i++) { for (var i = 0; i < this.sceneTestcaseList.length; i++) {
if ( if (
this.sceneTestcaseList[i].sequence === this.sceneCaseForm.sequence this.sceneTestcaseList[i].sequence === this.sceneCaseForm.sequence
......
src/views/auto/InterfaceList.vue
View file @ 5e3476c3
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> --> <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="success" @click="editInterfaceFrom(scope.row)">编辑</el-button> <el-button type="success" icon="el-icon-edit" @click="editInterfaceFrom(scope.row)">编辑</el-button>
<el-button type="danger" @click="delInterfaceFrom(scope.row)">删除</el-button> <el-button type="danger" icon="el-icon-delete" @click="delInterfaceFrom(scope.row)">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -174,7 +174,6 @@ export default { ...@@ -174,7 +174,6 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.el-select { .el-select {
margin-right: 10px; margin: 0 10px 0 5px;
margin-left: 5px;
} }
</style> </style>
src/views/auto/Model.vue → src/views/auto/ModelList.vue
View file @ 5e3476c3
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> --> <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="success" @click="openEditDialog(scope.row)">编辑</el-button> <el-button type="success" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
<el-button type="danger" @click="delModelFrom(scope.row)">删除</el-button> <el-button type="danger" icon="el-icon-delete" @click="delModelFrom(scope.row)">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/auto/Project.vue → src/views/auto/ProjectList.vue
View file @ 5e3476c3
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
</el-pagination> </el-pagination>
</el-card> </el-card>
<!-- 新增页面 /编辑页面--> <!-- 新增页面 /编辑页面-->
<el-dialog title="新增项目" :visible.sync="DialogVisible" width="30%"> <el-dialog title="新增项目" :visible.sync="DialogVisible" @close="closeAddDialog" width="30%">
<el-form ref="projectForm" :rules="rules" :model="projectForm" label-width="90px"> <el-form ref="projectFormRef" :rules="rules" :model="projectForm" label-width="90px">
<el-form-item label="项目名称:" prop="name" style="width:400px"> <el-form-item label="项目名称:" prop="name" style="width:400px">
<el-input v-model="projectForm.name"></el-input> <el-input v-model="projectForm.name"></el-input>
</el-form-item> </el-form-item>
...@@ -99,41 +99,49 @@ export default { ...@@ -99,41 +99,49 @@ export default {
searchMockList() {}, searchMockList() {},
// 新增确定按钮 // 新增确定按钮
addPojectFrom() { addPojectFrom() {
if (this.projectForm.id) { this.$refs.projectFormRef.validate((valid) => {
// 编辑接口 if (!valid) {
editProject(this.projectForm) return false
.then((resp) => { } else {
if (resp.data.data === true) { if (this.projectForm.id) {
this.DialogVisible = false // 编辑接口
this.$message.success('修改成功！') editProject(this.projectForm)
this.getProjectList() .then((resp) => {
} else if (resp.data.data === false) { if (resp.data.data === true) {
this.$message.error(resp.data.msg) this.DialogVisible = false
} this.$message.success('修改成功！')
}) this.getProjectList()
.catch((error) => { } else if (resp.data.data === false) {
this.$message({ type: 'error', message: error }) this.$message.error(resp.data.msg)
}) }
} else { })
// 添加接口 .catch((error) => {
addProject(this.projectForm) this.$message({ type: 'error', message: error })
.then((resp) => { })
if (resp.data.data === true) { } else {
this.DialogVisible = false // 添加接口
this.$message.success('新增成功！') addProject(this.projectForm)
this.projectForm.name = '' .then((resp) => {
this.projectForm.description = '' if (resp.data.data === true) {
this.getProjectList() this.DialogVisible = false
} else { this.$message.success('新增成功！')
this.$message.error(resp.data.msg) this.projectForm.name = ''
this.projectForm.name = '' this.projectForm.description = ''
this.projectForm.description = '' this.getProjectList()
} } else {
}) this.$message.error(resp.data.msg)
.catch((error) => { }
this.$message({ type: 'error', message: error }) })
}) .catch((error) => {
} this.$message({ type: 'error', message: error })
})
}
}
})
},
// 对话框关闭后清空文本框数据
closeAddDialog() {
this.$refs.projectFormRef.resetFields()
}, },
// 编辑信息回显 // 编辑信息回显
openEditDialog(row) { openEditDialog(row) {
......
src/views/auto/SceneList.vue
View file @ 5e3476c3
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<div> <div>
场景名称： 场景名称：
<el-input v-model="queryModuleInfo.sceneName" clearable placeholder="请输入场景名称" style="width: 300px;"></el-input> <el-input v-model="queryModuleInfo.sceneName" clearable placeholder="请输入场景名称" style="width: 300px;"></el-input>
<el-button type="primary" style="margin-left:20px" @click="queryData">查询</el-button> <el-button type="primary" style="margin-left:20px" icon="el-icon-search" @click="queryData">查询</el-button>
<el-button type="primary" style="margin-left:20px" @click="DialogVisible = true">新增</el-button> <el-button type="primary" style="margin-left:20px" icon="el-icon-circle-plus" @click="DialogVisible = true">新增</el-button>
</div> </div>
<el-table :data="sceneList" border style="width: 100%;margin-top:20px"> <el-table :data="sceneList" border style="width: 100%;margin-top:20px">
<el-table-column type='index' width="50px"></el-table-column> <el-table-column type='index' width="50px"></el-table-column>
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> --> <!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="warning" @click="executeSceneFrom(scope.row)">执行</el-button> <el-button type="warning" icon="el-icon-link" @click="executeSceneFrom(scope.row)">执行</el-button>
<el-button type="success" @click="editeSceneFrom(scope.row)">编辑</el-button> <el-button type="success" icon="el-icon-edit" @click="editeSceneFrom(scope.row)">编辑</el-button>
<el-button type="danger" @click="deleSceneFrom(scope.row)">删除</el-button> <el-button type="danger" icon="el-icon-delete" @click="deleSceneFrom(scope.row)">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</div> </div>
</el-card> </el-card>
<!-- 新增页面 /编辑页面--> <!-- 新增页面 /编辑页面-->
<el-dialog title="新增场景" :visible.sync="DialogVisible" width="50%"> <el-dialog title="新增场景" :visible.sync="DialogVisible" width="50%" @close="closeAddDialog">
<el-form ref="sceneForm" :rules="rules" :model="sceneForm" label-width="90px"> <el-form ref="sceneFormAddRef" :rules="rules" :model="sceneForm" label-width="90px">
<el-form-item label="场景名称:" prop="name" style="width:400px"> <el-form-item label="场景名称:" prop="name" style="width:400px">
<el-input v-model="sceneForm.name"></el-input> <el-input v-model="sceneForm.name"></el-input>
</el-form-item> </el-form-item>
...@@ -141,7 +141,6 @@ export default { ...@@ -141,7 +141,6 @@ export default {
this.executeScene.namespace = window.sessionStorage.getItem('env') this.executeScene.namespace = window.sessionStorage.getItem('env')
this.isShow = true this.isShow = true
executeScene(this.executeScene).then((resp) => { executeScene(this.executeScene).then((resp) => {
console.log('接口返回结果', resp)
this.requestData = resp.data.data this.requestData = resp.data.data
}) })
}, },
...@@ -149,7 +148,6 @@ export default { ...@@ -149,7 +148,6 @@ export default {
editeSceneFrom(row) { editeSceneFrom(row) {
window.sessionStorage.setItem('curScene', JSON.stringify(row)) window.sessionStorage.setItem('curScene', JSON.stringify(row))
this.$router.push({ path: 'EditScene' }) this.$router.push({ path: 'EditScene' })
// this.$router.push({ path: 'tese' })
// bus使用 // bus使用
this.$nextTick(function () { this.$nextTick(function () {
// DOM 现在更新了 // DOM 现在更新了
...@@ -202,13 +200,15 @@ export default { ...@@ -202,13 +200,15 @@ export default {
if (resp.data.data === true) { if (resp.data.data === true) {
this.DialogVisible = false this.DialogVisible = false
this.$message.success('新增成功！') this.$message.success('新增成功！')
this.sceneForm.name = ''
this.sceneForm.projectId = ''
this.getSecneList() this.getSecneList()
} else { } else {
this.$message.error(resp.data.msg) this.$message.error(resp.data.msg)
} }
}) })
},
// 关闭清空数据
closeAddDialog() {
this.$refs.sceneFormAddRef.resetFields()
} }
} }
} }
......
src/views/layout/leftAside/menu.json
View file @ 5e3476c3
...@@ -109,13 +109,13 @@ ...@@ -109,13 +109,13 @@
"id": 1, "id": 1,
"title": "项目管理", "title": "项目管理",
"icon": "el-icon-bicycle", "icon": "el-icon-bicycle",
"path": "/auto/Project" "path": "/auto/ProjectList"
}, },
{ {
"id": 2, "id": 2,
"title": "模块管理", "title": "模块管理",
"icon": "el-icon-wallet", "icon": "el-icon-wallet",
"path": "/auto/Model" "path": "/auto/ModelList"
}, },
{ {
"id": 3, "id": 3,
......
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