Skip to content

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

样式修改

parent 8e2c4828
Hide whitespace changes
Inline Side-by-side
Showing with 509 additions and 320 deletions
src/assets/css/global.css
View file @ d115a73b
...@@ -35,4 +35,23 @@ html, body, #app { ...@@ -35,4 +35,23 @@ html, body, #app {
-webkit-transition: border-bottom-color .3s; -webkit-transition: border-bottom-color .3s;
transition: border-bottom-color .3s; transition: border-bottom-color .3s;
outline: 0; outline: 0;
} }
\ No newline at end of file .el-textarea__inner {
display: block;
resize: vertical;
/* padding: 5px 15px; */
line-height: 2;
-webkit-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
font-size: inherit;
color: #606266;
background-color: #FFF;
background-image: none;
border: 1px solid #DCDFE6;
border-radius: 4px;
-webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
transition: border-color .2s cubic-bezier(.645,.045,.355,1);
margin-top:10px;
height: 40px;
}
src/views/auto/AddCase.vue
View file @ d115a73b
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<!-- Headers --> <!-- Headers -->
<el-collapse-item name="1" title="请求头"> <el-collapse-item name="1" title="请求头">
<el-button type="success" plain @click="AddHeaderListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -34,26 +33,26 @@ ...@@ -34,26 +33,26 @@
</el-row> </el-row>
<el-row v-for="(item,index) in headersList" :key="index"> <el-row v-for="(item,index) in headersList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div style="margin-top:10px">
<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="10"> <el-col :span="10">
<div> <div style="margin-left:5px;">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div style="margin-top:6px">
<el-button size="mini" type="danger" @click="advanceDelss(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddHeaderListRow()" style="margin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 请求参数 --> <!-- 请求参数 -->
<el-collapse-item name="2" title="请求参数"> <el-collapse-item name="2" title="请求参数">
<el-button type="success" plain @click="AddRequestParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -68,26 +67,26 @@ ...@@ -68,26 +67,26 @@
</el-row> </el-row>
<el-row v-for="(item,index) in requestParamsList" :key="index"> <el-row v-for="(item,index) in requestParamsList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div style="margin-top:10px">
<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="10"> <el-col :span="10">
<div> <div style="margin-left:5px">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div style="margin-top:6px">
<el-button size="mini" type="danger" @click="requestParamsDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddRequestParamsListRow()" style="margin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 参数列表 --> <!-- 参数列表 -->
<el-collapse-item name="3" title="参数列表"> <el-collapse-item name="3" title="参数列表">
<el-button type="success" plain @click="AddParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -102,26 +101,26 @@ ...@@ -102,26 +101,26 @@
</el-row> </el-row>
<el-row v-for="(item,index) in paramsList" :key="index"> <el-row v-for="(item,index) in paramsList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div style="margin-top:10px">
<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="10"> <el-col :span="10">
<div> <div style="margin-left:5px">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div style="margin-top:6px">
<el-button size="mini" type="danger" @click="paramsDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddParamsListRow()" style="mragin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 响应解析列表 --> <!-- 响应解析列表 -->
<el-collapse-item name="4" title="响应提取"> <el-collapse-item name="4" title="响应提取">
<el-button type="success" plain @click="AddResponseListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -136,60 +135,68 @@ ...@@ -136,60 +135,68 @@
</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 style="margin-top:10px">
<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="10"> <el-col :span="10">
<div> <div style="margin-left:5px">
<el-input v-model.trim="item.paramsValue" placeholder="请输入表达式"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入表达式" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div style="margin-top:6px">
<el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddResponseListRow()" style="mragin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 断言 --> <!-- 断言 -->
<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-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="200"> <el-table-column label="表达式" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsName"> <el-input v-model="scope.row.check">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数值" width="350"> <el-table-column label="断言" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsValue"> <el-select v-model="scope.row.comparator" placeholder="请选择">
<el-option v-for="item in selectAssertionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="预期结果" width="350">
<template slot-scope="scope">
<el-input v-model="scope.row.expect">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否必填" width="150" style="text-align:center"> <!-- <el-table-column label="是否必填" width="150" style="text-align:center">
<template slot-scope="scope"> <template slot-scope="scope">
<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="250"> <!-- <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" icon="el-icon-delete" @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-button type="success" plain @click="AddAssertionListRow()" style="mragin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<div style="margin-left:700px;margin-top:20px"> <div style="margin-left:700px;margin-top:20px">
...@@ -268,7 +275,25 @@ export default { ...@@ -268,7 +275,25 @@ export default {
headersList: [], headersList: [],
requestParamsList: [], requestParamsList: [],
paramsList: [], paramsList: [],
responseList: [] responseList: [],
selectAssertionList: [
{
id: 'eq',
name: '等于'
},
{
id: 'gt',
name: '大于'
},
{
id: 'lt',
name: '小于'
},
{
id: 'neq',
name: '不等于'
}
]
} }
}, },
created() { created() {
...@@ -410,21 +435,19 @@ export default { ...@@ -410,21 +435,19 @@ export default {
// 添加断言行 // 添加断言行
AddAssertionListRow() { AddAssertionListRow() {
this.assertionList.push({ this.assertionList.push({
paramsName: '', check: '',
paramsValue: '', comparator: '',
isRequired: true, expect: ''
examples: '',
remarks: ''
}) })
}, },
// 断言改变 // 断言改变
changeState(e) { // changeState(e) {
if (e === true) { // if (e === true) {
this.assertionList.isRequired = e // this.assertionList.isRequired = e
} else { // } else {
this.assertionList.isRequired = e // this.assertionList.isRequired = e
} // }
}, // },
// 断言删除 // 断言删除
AssertionDelete(index) { AssertionDelete(index) {
this.assertionList.splice(index, 1) this.assertionList.splice(index, 1)
...@@ -497,7 +520,6 @@ export default { ...@@ -497,7 +520,6 @@ export default {
// 返回列表页 // 返回列表页
this.$router.push('CaseList') this.$router.push('CaseList')
}, },
// 刷新列表 // 刷新列表
sendResh() { sendResh() {
// bus使用 // bus使用
......
src/views/auto/AddInterface.vue
View file @ d115a73b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-collapse-item> </el-collapse-item>
<!-- Headers添加 --> <!-- Headers添加 -->
<el-collapse-item title="请求头" name="2"> <el-collapse-item title="请求头" name="2">
<el-button type="success" plain class="el-icon-circle-plus" @click="AddHeaderListRow()">添加行</el-button> <!-- <el-button type="success" plain class="el-icon-circle-plus" @click="AddHeaderListRow()">添加行</el-button> -->
<!-- Header参数添加 --> <!-- Header参数添加 -->
<el-table :data="headersList" border style="width:100%;margin-top:15px;"> <el-table :data="headersList" border style="width:100%;margin-top:15px;">
<el-table-column label="参数名称" width="200"> <el-table-column label="参数名称" width="200">
...@@ -73,14 +73,15 @@ ...@@ -73,14 +73,15 @@
</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="headerDelete(scope.$index)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="headerDelete(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="success" plain class="el-icon-circle-plus" style="margin-top:10px" @click="AddHeaderListRow()">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 参数添加 --> <!-- 参数添加 -->
<el-collapse-item title="请求参数" name="3"> <el-collapse-item title="请求参数" name="3">
<el-button type="success" plain class="el-icon-circle-plus" @click="AddParamsListRow()">添加行</el-button> <!-- <el-button type="success" plain class="el-icon-circle-plus" @click="AddParamsListRow()">添加行</el-button> -->
<el-table :data="paramList" border style="width:100%;margin-top: 15px;"> <el-table :data="paramList" border style="width:100%;margin-top: 15px;">
<el-table-column label="参数名称" width="200"> <el-table-column label="参数名称" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -111,14 +112,14 @@ ...@@ -111,14 +112,14 @@
</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="paramsDelete(scope.$index)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="paramsDelete(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="success" plain class="el-icon-circle-plus" style="margin-top:10px" @click="AddParamsListRow()">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 响应参数添加 --> <!-- 响应参数添加 -->
<el-collapse-item title="响应参数" name="4"> <el-collapse-item title="响应参数" name="4">
<el-button type="success" plain class="el-icon-circle-plus" @click="AddResponseListRow()">添加行</el-button>
<el-table :data="responseList" border style="width:100%;margin-top: 15px;"> <el-table :data="responseList" border style="width:100%;margin-top: 15px;">
<el-table-column label="参数名称" width="200"> <el-table-column label="参数名称" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -149,10 +150,11 @@ ...@@ -149,10 +150,11 @@
</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="responseDelete(scope.$index)">删除</el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="responseDelete(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="success" plain class="el-icon-circle-plus" style="mragin-top:10px" @click="AddResponseListRow()">添加行</el-button>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</el-form> </el-form>
......
src/views/auto/CaseList.vue
View file @ d115a73b
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="success" icon="el-icon-link" @click="executeCaseFrom(scope.row)">执行</el-button> <el-button type="success" icon="el-icon-link" @click="executeCaseFrom(scope.row)">执行</el-button>
<el-button type="warning" icon="el-icon-edit" @click="editCaseFrom(scope.row)">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="editCaseFrom(scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" @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>
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
</template> </template>
<script> <script>
import { getModulList } from '@/api/getAotoInterface' import { getModulList } from '@/api/getAotoInterface'
import { singleCaseList, delCase, executeCase } from '@/api/getAutoCase' import {
singleCaseList,
executeCase
// delCase
} from '@/api/getAutoCase'
// import bus from '@/utils/bus' // import bus from '@/utils/bus'
export default { export default {
data() { data() {
...@@ -147,23 +151,23 @@ export default { ...@@ -147,23 +151,23 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
// 删除用例 // 删除用例
delCaseFrom(row) { // delCaseFrom(row) {
this.delCase.testcaseId = row.id // this.delCase.testcaseId = row.id
this.openMessage('您确定要删除吗？', '删除', () => { // this.openMessage('您确定要删除吗？', '删除', () => {
delCase(this.delCase) // delCase(this.delCase)
.then((resp) => { // .then((resp) => {
if (resp.data.data === true) { // if (resp.data.data === true) {
this.$message.success('删除成功！') // this.$message.success('删除成功！')
this.getCaseList() // this.getCaseList()
} else if (resp.data.data === false) { // } else if (resp.data.data === false) {
this.$message.error(resp.data.msg) // this.$message.error(resp.data.msg)
} // }
}) // })
.catch((error) => { // .catch((error) => {
this.$message({ type: 'error', message: error }) // this.$message({ type: 'error', message: error })
}) // })
}) // })
}, // },
handleSizeChange(newSize) { handleSizeChange(newSize) {
this.queryModuleInfo.pageSize = newSize this.queryModuleInfo.pageSize = newSize
this.getCaseList() this.getCaseList()
......
src/views/auto/EditScene.vue
View file @ d115a73b
...@@ -2,16 +2,17 @@ ...@@ -2,16 +2,17 @@
<div> <div>
<el-form ref="sceneFormRef" :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:310px"> <el-form-item label="场景名称:" prop="name" style="width:310px">
<el-input v-model="sceneForm.name"></el-input> <el-input v-model="sceneForm.name" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectId"> <el-form-item label="项目名称:" prop="projectId">
<el-select v-model="sceneForm.projectId" placeholder="请选择项目" clearable> <el-select v-model="sceneForm.projectId" disabled>
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="success" plain @click="DialogVisible = true" class="el-icon-circle-plus">添加</el-button> <!-- 列表展示 -->
<el-table :data="sceneTestcaseList" border style="width: 100%;margin-top:20px" row-key="sequence"> <el-table :data="sceneTestcaseList" border style="width: 100%;margin-top:20px;cursor:pointer" row-key="sequence">
<el-table-column prop='sequence' label="序号" width="60px" align="center"></el-table-column>
<el-table-column v-for="(item, index) in col" :key="`col_${index}`" :prop="col[index].prop" :label="item.label" align="center"></el-table-column> <el-table-column v-for="(item, index) in col" :key="`col_${index}`" :prop="col[index].prop" :label="item.label" align="center"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
...@@ -22,7 +23,9 @@ ...@@ -22,7 +23,9 @@
</el-table> </el-table>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="success" plain @click="DialogVisible = true" class="el-icon-circle-plus">添加</el-button>
<div style="margin-top:20px;float:right;margin-right:300px"> <div style="margin-top:20px;float:right;margin-right:300px">
<el-button @click="cancelSceneCaseFrom">取 消</el-button> <el-button @click="cancelSceneCaseFrom">取 消</el-button>
<el-button type="primary" @click="addSceneCaseFrom">确 定</el-button> <el-button type="primary" @click="addSceneCaseFrom">确 定</el-button>
</div> </div>
...@@ -66,7 +69,6 @@ ...@@ -66,7 +69,6 @@
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<!-- Headers --> <!-- Headers -->
<el-collapse-item name="1" title="请求头"> <el-collapse-item name="1" title="请求头">
<el-button type="success" plain @click="AddHeaderListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -81,26 +83,27 @@ ...@@ -81,26 +83,27 @@
</el-row> </el-row>
<el-row v-for="(item,index) in headersList" :key="index"> <el-row v-for="(item,index) in headersList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div class="div-top">
<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="10"> <el-col :span="10">
<div> <div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div class="div-operation">
<el-button size="mini" type="danger" @click="advanceDelss(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddHeaderListRow()" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 请求参数 --> <!-- 请求参数 -->
<el-collapse-item name="2" title="请求参数"> <el-collapse-item name="2" title="请求参数">
<el-button type="success" plain @click="AddRequestParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -115,26 +118,27 @@ ...@@ -115,26 +118,27 @@
</el-row> </el-row>
<el-row v-for="(item,index) in requestParamsList" :key="index"> <el-row v-for="(item,index) in requestParamsList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div class="div-top">
<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="10"> <el-col :span="10">
<div> <div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div class="div-operation">
<el-button size="mini" type="danger" @click="requestParamsDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddRequestParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 参数列表 --> <!-- 参数列表 -->
<el-collapse-item name="3" title="参数变量"> <el-collapse-item name="3" title="参数变量">
<el-button type="success" plain @click="AddParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -149,26 +153,27 @@ ...@@ -149,26 +153,27 @@
</el-row> </el-row>
<el-row v-for="(item,index) in paramsList" :key="index"> <el-row v-for="(item,index) in paramsList" :key="index">
<el-col :span="6"> <el-col :span="6">
<div> <div class="div-top">
<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="10"> <el-col :span="10">
<div> <div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div> <div class="div-operation">
<el-button size="mini" type="danger" @click="paramsDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddParamsListRow()" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 响应解析列表 --> <!-- 响应解析列表 -->
<el-collapse-item name="4" title="响应提取"> <el-collapse-item name="4" title="响应提取">
<el-button type="success" plain @click="AddResponseListRow()" class="el-icon-circle-plus">添加行</el-button>
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -177,67 +182,76 @@ ...@@ -177,67 +182,76 @@
<el-col :span="10"> <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="4"> <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 class="div-top">
<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="10"> <el-col :span="10">
<div> <div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入表达式"></el-input> <el-input v-model.trim="item.paramsValue" placeholder="请输入表达式" type="textarea"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="2">
<div> <div class="div-operation">
<el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" 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>
</el-form-item> </el-form-item>
<el-button type="success" plain @click="AddResponseListRow()" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item> </el-collapse-item>
<!-- 断言 --> <!-- 断言 -->
<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-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="200"> <el-table-column label="表达式" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paramsName"> <el-input v-model="scope.row.check">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数值" width="350"> <el-table-column label="断言" width="250">
<template slot-scope="scope">
<el-select v-model="scope.row.comparator" placeholder="请选择">
<el-option v-for="item in selectAssertionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</template>
</el-table-column>
<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.expect">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否必填" width="150" style="text-align:center"> <!-- <el-table-column label="是否必填" width="150" style="text-align:center">
<template slot-scope="scope"> <template slot-scope="scope">
<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="250"> <!-- <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" icon="el-icon-delete" @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-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button>
</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>
...@@ -261,6 +275,7 @@ export default { ...@@ -261,6 +275,7 @@ export default {
data() { data() {
return { return {
col: [ col: [
// { label: '序号', prop: 'sequence' },
{ label: '接口名称', prop: 'interfaceName' }, { label: '接口名称', prop: 'interfaceName' },
{ label: '模块名称', prop: 'moduleName' } { label: '模块名称', prop: 'moduleName' }
], ],
...@@ -379,7 +394,25 @@ export default { ...@@ -379,7 +394,25 @@ export default {
newSceneForm: { newSceneForm: {
sceneId: '', sceneId: '',
sceneTestcaseList: [] sceneTestcaseList: []
} },
selectAssertionList: [
{
id: 'eq',
name: '等于'
},
{
id: 'gt',
name: '大于'
},
{
id: 'lt',
name: '小于'
},
{
id: 'neq',
name: '不等于'
}
]
} }
}, },
created() { created() {
...@@ -609,21 +642,19 @@ export default { ...@@ -609,21 +642,19 @@ export default {
// 添加断言行 // 添加断言行
AddAssertionListRow() { AddAssertionListRow() {
this.assertionList.push({ this.assertionList.push({
paramsName: '', check: '',
paramsValue: '', comparator: '',
isRequired: true, expect: ''
examples: '',
remarks: ''
}) })
}, },
// 断言改变 // 断言改变
changeState(e) { // changeState(e) {
if (e === true) { // if (e === true) {
this.assertionList.isRequired = e // this.assertionList.isRequired = e
} else { // } else {
this.assertionList.isRequired = e // this.assertionList.isRequired = e
} // }
}, // },
// 删除断言行 // 删除断言行
AssertionDelete(index) { AssertionDelete(index) {
this.assertionList.splice(index, 1) this.assertionList.splice(index, 1)
...@@ -682,6 +713,12 @@ export default { ...@@ -682,6 +713,12 @@ export default {
this.sceneTestcaseList.splice(i, 1) this.sceneTestcaseList.splice(i, 1)
} }
} }
},
cellMouseEnter() {
console.log('鼠标移入事件')
},
cellMouseLeave() {
console.log('鼠标移出事件')
} }
} }
} }
...@@ -689,9 +726,19 @@ export default { ...@@ -689,9 +726,19 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.el-select { .el-select {
width:220px width: 220px;
}
.input {
width: 300px;
}
.div-top {
margin-top: 10px;
}
.div-left {
margin-left: 5px;
// margin-top:10px
} }
.input{ .div-operation {
width:300px; margin-top: 6px;
} }
</style> </style>
src/views/auto/InterfaceList.vue
View file @ d115a73b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="warning" icon="el-icon-edit" @click="editInterfaceFrom(scope.row)">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="editInterfaceFrom(scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" @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>
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
import { import {
getModulList, getModulList,
getProjectList, getProjectList,
interfaceDetailList, interfaceDetailList
delInterface // delInterface
} from '@/api/getAotoInterface' } from '@/api/getAotoInterface'
// 引入组件 // 引入组件
import bus from '@/utils/bus' import bus from '@/utils/bus'
...@@ -149,25 +149,25 @@ export default { ...@@ -149,25 +149,25 @@ export default {
doit() doit()
}) })
.catch(() => {}) .catch(() => {})
},
// 删除接口方法
delInterfaceFrom(row) {
this.delInterfaceParam.interfaceId = row.id
this.openMessage('您确定要删除吗？', '删除', () => {
delInterface(this.delInterfaceParam)
.then((resp) => {
if (resp.data.data === true) {
this.$message.success('删除成功！')
this.getInterfaceDetailList()
} else if (resp.data.data === false) {
this.$message.error(resp.data.msg)
}
})
.catch((error) => {
this.$message({ type: 'error', message: error })
})
})
} }
// 删除接口方法
// delInterfaceFrom(row) {
// this.delInterfaceParam.interfaceId = row.id
// this.openMessage('您确定要删除吗？', '删除', () => {
// delInterface(this.delInterfaceParam)
// .then((resp) => {
// if (resp.data.data === true) {
// this.$message.success('删除成功！')
// this.getInterfaceDetailList()
// } else if (resp.data.data === false) {
// this.$message.error(resp.data.msg)
// }
// })
// .catch((error) => {
// this.$message({ type: 'error', message: error })
// })
// })
// }
} }
} }
</script> </script>
......
src/views/auto/ModelList.vue
View file @ d115a73b
...@@ -16,29 +16,30 @@ ...@@ -16,29 +16,30 @@
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" @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>
<!-- 分页 --> <!-- 分页 -->
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="queryModuleInfo.pageNum" :page-size="queryModuleInfo.pageSize" layout="total, prev, pager, next" :total="totalNum"></el-pagination> <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="queryModuleInfo.pageNum" :page-size="queryModuleInfo.pageSize" layout="total, prev, pager, next"
:total="totalNum"></el-pagination>
</el-card> </el-card>
<!-- 新增模块 --> <!-- 新增模块 -->
<el-dialog title="新增模块" :visible.sync="DialogVisible" @close="closeAddDialog" width="30%"> <el-dialog title="新增模块" :visible.sync="DialogVisible" @close="closeAddDialog" width="30%">
<el-form ref="modelFormRef" :rules="rules" :model="modelForm" label-width="90px"> <el-form ref="addModelFormRef" :rules="rules" :model="addModelForm" 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="modelForm.name"></el-input> <el-input v-model="addModelForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属项目:" prop="projectId"> <el-form-item label="所属项目:" prop="projectId">
<el-select v-model="modelForm.projectId" placeholder="请选择项目" clearable style="width:310px"> <el-select v-model="addModelForm.projectId" placeholder="请选择项目" clearable style="width:310px">
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="模块描述:" prop="description" style="width:400px"> <el-form-item label="模块描述:" prop="description" style="width:400px">
<el-input v-model="modelForm.description"></el-input> <el-input v-model="addModelForm.description"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="域名:" prop="domain" style="width:400px"> <el-form-item label="域名:" prop="domain" style="width:400px">
<el-input v-model="modelForm.domain"></el-input> <el-input v-model="addModelForm.domain"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -46,6 +47,29 @@ ...@@ -46,6 +47,29 @@
<el-button type="primary" @click="addModelFrom">确 定</el-button> <el-button type="primary" @click="addModelFrom">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 编辑模块 -->
<el-dialog title="编辑模块" :visible.sync="DialogEditVisible" width="30%">
<el-form ref="editModelFormRef" :rules="rules" :model="editModelForm" label-width="90px">
<el-form-item label="模块名称:" prop="name" style="width:400px">
<el-input v-model="editModelForm.name"></el-input>
</el-form-item>
<el-form-item label="所属项目:" prop="projectId">
<el-select v-model="editModelForm.projectId" placeholder="请选择项目" clearable style="width:310px">
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="模块描述:" prop="description" style="width:400px">
<el-input v-model="editModelForm.description"></el-input>
</el-form-item>
<el-form-item label="域名:" prop="domain" style="width:400px">
<el-input v-model="editModelForm.domain"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="DialogEditVisible = false">取 消</el-button>
<el-button type="primary" @click="editModelFrom">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -54,8 +78,8 @@ import { ...@@ -54,8 +78,8 @@ import {
getModulList, getModulList,
getProjectList, getProjectList,
addModul, addModul,
editModel, editModel
delModel // delModel
} from '@/api/getAotoInterface' } from '@/api/getAotoInterface'
export default { export default {
data() { data() {
...@@ -67,13 +91,21 @@ export default { ...@@ -67,13 +91,21 @@ export default {
totalNum: 0, totalNum: 0,
modelList: [], modelList: [],
projectList: [], projectList: [],
modelForm: { addModelForm: {
name: '',
projectId: '',
description: '',
domain: ''
},
editModelForm: {
id: '',
name: '', name: '',
projectId: '', projectId: '',
description: '', description: '',
domain: '' domain: ''
}, },
DialogVisible: false, DialogVisible: false,
DialogEditVisible: false,
delModelParam: { delModelParam: {
moduleId: '' moduleId: ''
}, },
...@@ -141,48 +173,58 @@ export default { ...@@ -141,48 +173,58 @@ export default {
// 添加模块按钮 // 添加模块按钮
addModelFrom() { addModelFrom() {
this.$refs.modelFormRef.validate((valid) => { this.$refs.addModelFormRef.validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} else { } else {
if (this.modelForm.id) { // 添加模块
editModel(this.modelForm).then((resp) => { addModul(this.addModelForm)
.then((resp) => {
console.log('保存信息', this.modelForm)
if (resp.data.data === true) { if (resp.data.data === true) {
this.DialogVisible = false this.DialogVisible = false
this.$message.success('修改成功！') this.$message.success('新增成功！')
this.modelList.name = ''
this.modelList.projectName = ''
this.modelList.description = ''
this.modelList.domain = ''
this.getModelList() this.getModelList()
} else { } else {
this.$message.error(resp.data.msg) this.$message.error(resp.data.msg)
} }
}) })
} else { .catch((error) => {
// 添加模块 this.$message({ type: 'error', message: error })
addModul(this.modelForm) })
.then((resp) => { }
console.log('保存信息', this.modelForm) })
if (resp.data.data === true) { },
this.DialogVisible = false // 编辑保存按钮
this.$message.success('新增成功！') editModelFrom() {
this.modelList.name = '' this.$refs.editModelFormRef.validate((valid) => {
this.modelList.projectName = '' if (!valid) {
this.modelList.description = '' return false
this.modelList.domain = '' } else {
this.getModelList() editModel(this.editModelForm).then((resp) => {
} else { if (resp.data.data === true) {
this.$message.error(resp.data.msg) this.DialogEditVisible = false
} this.$message.success('修改成功！')
}) this.getModelList()
.catch((error) => { } else {
this.$message({ type: 'error', message: error }) this.$message.error(resp.data.msg)
}) }
} })
} }
}) })
}, },
// 编辑模块 // 编辑模块
openEditDialog(row) { openEditDialog(row) {
this.DialogVisible = true this.DialogEditVisible = true
this.modelForm = row this.editModelForm.id = row.id
this.editModelForm.name = row.name
this.editModelForm.projectId = row.projectId
this.editModelForm.description = row.description
this.editModelForm.domain = row.domain
}, },
// 对话框方法 // 对话框方法
openMessage(message, confirmText, doit) { openMessage(message, confirmText, doit) {
...@@ -198,26 +240,26 @@ export default { ...@@ -198,26 +240,26 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
closeAddDialog() { closeAddDialog() {
this.$refs.modelFormRef.resetFields() this.$refs.addModelFormRef.resetFields()
},
// 删除模块
delModelFrom(row) {
this.delModelParam.moduleId = row.id
this.openMessage('您确定要删除吗？', '删除', () => {
delModel(this.delModelParam)
.then((resp) => {
if (resp.data.data === true) {
this.$message.success('删除成功！')
this.getModelList()
} else if (resp.data.data === false) {
this.$message.error(resp.data.msg)
}
})
.catch((error) => {
this.$message({ type: 'error', message: error })
})
})
} }
// 删除模块
// delModelFrom(row) {
// this.delModelParam.moduleId = row.id
// this.openMessage('您确定要删除吗？', '删除', () => {
// delModel(this.delModelParam)
// .then((resp) => {
// if (resp.data.data === true) {
// this.$message.success('删除成功！')
// this.getModelList()
// } else if (resp.data.data === false) {
// this.$message.error(resp.data.msg)
// }
// })
// .catch((error) => {
// this.$message({ type: 'error', message: error })
// })
// })
// }
} }
} }
</script> </script>
src/views/auto/ProjectList.vue
View file @ d115a73b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="filter"> <div class="filter">
<!-- <el-input placeholder="请输入项目名称" style="width:15%"></el-input> <!-- <el-input placeholder="请输入项目名称" style="width:15%"></el-input>
<el-button type="primary" icon="el-icon-search" @click="searchMockList">查询</el-button> --> <el-button type="primary" icon="el-icon-search" @click="searchMockList">查询</el-button> -->
<el-button type="primary" icon="el-icon-circle-plus" @click="DialogVisible = true">新增</el-button> <el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button>
</div> </div>
<el-table :data="projectList" border style="width: 100%;margin-top:20px"> <el-table :data="projectList" border style="width: 100%;margin-top:20px">
<!-- <el-table-column prop="id" label="序号" width="80px"></el-table-column> --> <!-- <el-table-column prop="id" label="序号" width="80px"></el-table-column> -->
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button> <el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" @click="delProjectFrom(scope.row)">删除</el-button> <!-- <el-button type="danger" icon="el-icon-delete" @click="delProjectFrom(scope.row)">删除</el-button> -->
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -24,31 +24,41 @@ ...@@ -24,31 +24,41 @@
:total="totalNum"> :total="totalNum">
</el-pagination> </el-pagination>
</el-card> </el-card>
<!-- 新增页面 /编辑页面--> <!-- 新增页面 -->
<el-dialog title="新增项目" :visible.sync="DialogVisible" @close="closeAddDialog" width="30%"> <el-dialog title="新增项目" :visible.sync="DialogAddVisible" @close="closeAddDialog" width="30%">
<el-form ref="projectFormRef" :rules="rules" :model="projectForm" label-width="90px"> <el-form ref="addProjectFormRef" :rules="rules" :model="addProjectForm" 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="addProjectForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目描述:" prop="description" style="width:400px"> <el-form-item label="项目描述:" prop="description" style="width:400px">
<el-input v-model="projectForm.description"></el-input> <el-input v-model="addProjectForm.description"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="DialogVisible = false">取 消</el-button> <el-button @click="DialogAddVisible=false">取 消</el-button>
<el-button type="primary" @click="addPojectFrom">确 定</el-button> <el-button type="primary" @click="addPojectFrom">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!--编辑页面-->
<el-dialog title="编辑项目" :visible.sync="DialogEditVisible" width="30%">
<el-form ref="editProjectFormRef" :rules="rules" :model="editProjectForm" label-width="90px">
<el-form-item label="项目名称:" prop="name" style="width:400px">
<el-input v-model="editProjectForm.name"></el-input>
</el-form-item>
<el-form-item label="项目描述:" prop="description" style="width:400px">
<el-input v-model="editProjectForm.description"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="DialogEditVisible=false">取 消</el-button>
<el-button type="primary" @click="editPojectFrom">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import { getProjectList, addProject, editProject } from '@/api/getAotoInterface'
getProjectList,
addProject,
editProject,
delProject
} from '@/api/getAotoInterface'
export default { export default {
data() { data() {
return { return {
...@@ -58,8 +68,14 @@ export default { ...@@ -58,8 +68,14 @@ export default {
}, },
projectList: [], projectList: [],
totalNum: 0, totalNum: 0,
DialogVisible: false, DialogAddVisible: false,
projectForm: { DialogEditVisible: false,
addProjectForm: {
name: '',
description: ''
},
editProjectForm: {
id: '',
name: '', name: '',
description: '' description: ''
}, },
...@@ -81,7 +97,8 @@ export default { ...@@ -81,7 +97,8 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
] ]
} },
clearMsg: false
} }
}, },
created() { created() {
...@@ -99,54 +116,60 @@ export default { ...@@ -99,54 +116,60 @@ export default {
searchMockList() {}, searchMockList() {},
// 新增确定按钮 // 新增确定按钮
addPojectFrom() { addPojectFrom() {
this.$refs.projectFormRef.validate((valid) => { this.$refs.addProjectFormRef.validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} else { } else {
if (this.projectForm.id) { // 添加接口
// 编辑接口 addProject(this.addProjectForm)
editProject(this.projectForm) .then((resp) => {
.then((resp) => { if (resp.data.data === true) {
if (resp.data.data === true) { this.DialogAddVisible = false
this.DialogVisible = false this.getProjectList()
this.$message.success('修改成功！') this.$message.success('新增成功！')
this.getProjectList() } else {
} else if (resp.data.data === false) { this.$message.error(resp.data.msg)
this.$message.error(resp.data.msg) }
} })
}) .catch((error) => {
.catch((error) => { this.$message({ type: 'error', message: error })
this.$message({ type: 'error', message: error }) })
}) }
} else { })
// 添加接口 },
addProject(this.projectForm) // 编辑确定按钮
.then((resp) => { editPojectFrom() {
if (resp.data.data === true) { // 编辑接口
this.DialogVisible = false this.$refs.editProjectFormRef.validate((valid) => {
this.$message.success('新增成功！') if (!valid) {
this.projectForm.name = '' return false
this.projectForm.description = '' } else {
this.getProjectList() editProject(this.editProjectForm)
} else { .then((resp) => {
this.$message.error(resp.data.msg) if (resp.data.data === true) {
} this.DialogEditVisible = false
}) this.$message.success('修改成功！')
.catch((error) => { this.getProjectList()
this.$message({ type: 'error', message: error }) } else if (resp.data.data === false) {
}) this.$message.error(resp.data.msg)
} }
})
.catch((error) => {
this.$message({ type: 'error', message: error })
})
} }
}) })
}, },
// 对话框关闭后清空文本框数据 // 对话框关闭后清空文本框数据
closeAddDialog() { closeAddDialog() {
this.$refs.projectFormRef.resetFields() this.$refs.addProjectFormRef.resetFields()
}, },
// 编辑信息回显 // 编辑信息回显
openEditDialog(row) { openEditDialog(row) {
this.DialogVisible = true this.DialogEditVisible = true
this.projectForm = row this.editProjectForm.id = row.id
this.editProjectForm.name = row.name
this.editProjectForm.description = row.description
}, },
// 对话框方法 // 对话框方法
openMessage(message, confirmText, doit) { openMessage(message, confirmText, doit) {
...@@ -162,23 +185,23 @@ export default { ...@@ -162,23 +185,23 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
// 删除项目 // 删除项目
delProjectFrom(row) { // delProjectFrom(row) {
this.delProjectParam.projectId = row.id // this.delProjectParam.projectId = row.id
this.openMessage('您确定要删除吗？', '删除', () => { // this.openMessage('您确定要删除吗？', '删除', () => {
delProject(this.delProjectParam) // delProject(this.delProjectParam)
.then((resp) => { // .then((resp) => {
if (resp.data.data === true) { // if (resp.data.data === true) {
this.$message.success('删除成功！') // this.$message.success('删除成功！')
this.getProjectList() // this.getProjectList()
} else if (resp.data.data === false) { // } else if (resp.data.data === false) {
this.$message.error(resp.data.msg) // this.$message.error(resp.data.msg)
} // }
}) // })
.catch((error) => { // .catch((error) => {
this.$message({ type: 'error', message: error }) // this.$message({ type: 'error', message: error })
}) // })
}) // })
}, // },
// 分页展示 // 分页展示
handleSizeChange(newSize) { handleSizeChange(newSize) {
this.queryModuleInfo.pageSize = newSize this.queryModuleInfo.pageSize = newSize
......
src/views/auto/SceneList.vue
View file @ d115a73b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-button type="success" icon="el-icon-link" @click="executeSceneFrom(scope.row)">执行</el-button> <el-button type="success" icon="el-icon-link" @click="executeSceneFrom(scope.row)">执行</el-button>
<el-button type="warning" icon="el-icon-edit" @click="editeSceneFrom(scope.row)">编辑场景</el-button> <el-button type="warning" icon="el-icon-edit" @click="editeSceneFrom(scope.row)">编辑场景</el-button>
<el-button type="warning" icon="el-icon-edit" @click="editeSceneCaseFrom(scope.row)">编辑场景用例</el-button> <el-button type="warning" icon="el-icon-edit" @click="editeSceneCaseFrom(scope.row)">编辑场景用例</el-button>
<el-button type="danger" icon="el-icon-delete" @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,14 +36,14 @@ ...@@ -36,14 +36,14 @@
<json-viewer :expand-depth=3 :value="requestData"></json-viewer> <json-viewer :expand-depth=3 :value="requestData"></json-viewer>
</div> </div>
</el-card> </el-card>
<!-- 新增页面 /编辑页面--> <!-- 新增场景页面-->
<el-dialog title="新增场景" :visible.sync="DialogVisible" width="50%" @close="closeAddDialog"> <el-dialog title="新增场景" :visible.sync="DialogVisible" width="30%" @close="closeAddDialog">
<el-form ref="sceneFormAddRef" :rules="rules" :model="sceneForm" label-width="90px"> <el-form ref="addSceneFormRef" :rules="rules" :model="addSceneForm" 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="addSceneForm.name" placeholder="请输入场景"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectId" style="width:400px"> <el-form-item label="项目名称:" prop="projectId" style="width:400px">
<el-select v-model="sceneForm.projectId" placeholder="请选择项目" clearable> <el-select v-model="addSceneForm.projectId" placeholder="请选择项目" clearable>
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -53,13 +53,30 @@ ...@@ -53,13 +53,30 @@
<el-button type="primary" @click="addSceneFrom">确 定</el-button> <el-button type="primary" @click="addSceneFrom">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 编辑场景页面-->
<el-dialog title="编辑场景" :visible.sync="DialogEditVisible" width="30%">
<el-form ref="editSceneFormRef" :rules="rules" :model="editSceneForm" label-width="90px">
<el-form-item label="场景名称:" prop="name" style="width:400px">
<el-input v-model="editSceneForm.name"></el-input>
</el-form-item>
<el-form-item label="项目名称:" prop="projectId" style="width:400px">
<el-select v-model="editSceneForm.projectId" placeholder="请选择项目" clearable>
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="DialogEditVisible = false">取 消</el-button>
<el-button type="primary" @click="editSceneFrom">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
getSceneList, getSceneList,
addSecene, addSecene,
delSecne, // delSecne,
executeScene, executeScene,
editScene editScene
} from '@/api/getAutoScene' } from '@/api/getAutoScene'
...@@ -78,12 +95,18 @@ export default { ...@@ -78,12 +95,18 @@ export default {
}, },
sceneList: [], sceneList: [],
totalNum: 0, totalNum: 0,
sceneForm: { addSceneForm: {
name: '',
projectId: ''
},
editSceneForm: {
id: '',
name: '', name: '',
projectId: '' projectId: ''
}, },
projectList: [], projectList: [],
DialogVisible: false, DialogVisible: false,
DialogEditVisible: false,
rules: { rules: {
name: [ name: [
{ {
...@@ -148,8 +171,10 @@ export default { ...@@ -148,8 +171,10 @@ export default {
}, },
// 编辑场景 // 编辑场景
editeSceneFrom(row) { editeSceneFrom(row) {
this.DialogVisible = true this.DialogEditVisible = true
this.sceneForm = row this.editSceneForm.id = row.id
this.editSceneForm.name = row.name
this.editSceneForm.projectId = row.projectId
}, },
// 编辑场景用例 // 编辑场景用例
editeSceneCaseFrom(row) { editeSceneCaseFrom(row) {
...@@ -158,7 +183,6 @@ export default { ...@@ -158,7 +183,6 @@ export default {
// bus使用 // bus使用
this.$nextTick(function () { this.$nextTick(function () {
// DOM 现在更新了 // DOM 现在更新了
this.$bus.$emit('scenemsg', row) this.$bus.$emit('scenemsg', row)
}) })
}, },
...@@ -176,23 +200,23 @@ export default { ...@@ -176,23 +200,23 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
// 删除场景 // 删除场景
deleSceneFrom(row) { // deleSceneFrom(row) {
this.delSceneForm.sceneId = row.id // this.delSceneForm.sceneId = row.id
this.openMessage('您确定要删除吗？', '删除', () => { // this.openMessage('您确定要删除吗？', '删除', () => {
delSecne(this.delSceneForm) // delSecne(this.delSceneForm)
.then((resp) => { // .then((resp) => {
if (resp.data.data === true) { // if (resp.data.data === true) {
this.$message.success('删除成功！') // this.$message.success('删除成功！')
this.getSecneList() // this.getSecneList()
} else if (resp.data.data === false) { // } else if (resp.data.data === false) {
this.$message.error(resp.data.msg) // this.$message.error(resp.data.msg)
} // }
}) // })
.catch((error) => { // .catch((error) => {
this.$message({ type: 'error', message: error }) // this.$message({ type: 'error', message: error })
}) // })
}) // })
}, // },
handleSizeChange(newSize) { handleSizeChange(newSize) {
this.queryModuleInfo.pageSize = newSize this.queryModuleInfo.pageSize = newSize
this.getSecneList() this.getSecneList()
...@@ -203,37 +227,43 @@ export default { ...@@ -203,37 +227,43 @@ export default {
}, },
// 添加场景 // 添加场景
addSceneFrom() { addSceneFrom() {
this.$refs.sceneFormAddRef.validate((valid) => { this.$refs.addSceneFormRef.validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} else { } else {
if (this.sceneForm.id) { addSecene(this.addSceneForm).then((resp) => {
editScene(this.sceneForm).then((resp) => { if (resp.data.data === true) {
if (resp.data.data === true) { this.DialogVisible = false
this.DialogVisible = false this.$message.success('新增成功！')
this.$message.success('修改成功！') this.getSecneList()
this.getSecneList() } else {
} else { this.$message.error(resp.data.msg)
this.$message.error(resp.data.msg) }
} })
}) }
} else { })
addSecene(this.sceneForm).then((resp) => { },
if (resp.data.data === true) { // 编辑场景用例按钮
this.DialogVisible = false editSceneFrom() {
this.$message.success('新增成功！') this.$refs.editSceneFormRef.validate((valid) => {
this.getSecneList() if (!valid) {
} else { return false
this.$message.error(resp.data.msg) } else {
} editScene(this.editSceneForm).then((resp) => {
}) if (resp.data.data === true) {
} this.DialogEditVisible = false
this.$message.success('修改成功！')
this.getSecneList()
} else {
this.$message.error(resp.data.msg)
}
})
} }
}) })
}, },
// 关闭清空数据 // 关闭清空数据
closeAddDialog() { closeAddDialog() {
this.$refs.sceneFormAddRef.resetFields() this.$refs.addSceneFormRef.resetFields()
} }
} }
} }
......
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