Commit ca4cddfe authored by 晓彤's avatar 晓彤

修改分页,报告前置条件展示问题,按钮显示问题

parent cba75be1
......@@ -132,7 +132,7 @@
<el-button type="success" plain @click="AddAssertionListRow()" style="mragin-top:10px" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item>
</el-collapse>
<div style="margin-left:700px;margin-top:20px">
<div style="margin-left:800px;margin-top:20px">
<el-button @click="cancelCaseFrom">取 消</el-button>
<el-button type="primary" @click="addCaseFrom">确 定</el-button>
</div>
......@@ -205,7 +205,6 @@ export default {
assertionList: [],
headersList: [],
requestParamsList: [],
// paramsList: [],
responseList: [],
selectAssertionList: [
{
......
......@@ -141,7 +141,7 @@
</el-collapse-item>
</el-collapse>
</el-form>
<div style="margin-left:700px;margin-top:20px">
<div style="margin-left:800px;margin-top:20px">
<el-button @click="cancelInterfaceFrom">取 消</el-button>
<el-button type="primary" @click="addInterfaceFrom">确 定</el-button>
</div>
......@@ -238,7 +238,11 @@ export default {
id: 'form',
name: 'form'
}
]
],
moduleInfo: {
pageNum: 1,
pageSize: 100
}
}
},
created() {
......@@ -274,7 +278,7 @@ export default {
getParamsMes() {},
// 模块列表
getModelList() {
getModulList(this.queryModuleInfo).then((resp) => {
getModulList(this.moduleInfo).then((resp) => {
this.modelList = resp.data.data.list
})
},
......
......@@ -11,12 +11,15 @@
<el-button type="primary" style="margin-left:10px" icon="el-icon-circle-plus" @click="addPage">新增</el-button>
</div>
<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">
<template slot-scope="scope">
<span>{{ (queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="用例名称" width="250px"></el-table-column>
<el-table-column prop="interfaceName" label="接口名称" width="250px"></el-table-column>
<el-table-column prop="moduleName" label="模块名称" width="200px"></el-table-column>
<el-table-column prop="createTime" label="创建日期" width="200px"></el-table-column>
<!-- <el-table-column prop="updateTime" label="修改日期" width="200px"></el-table-column> -->
<el-table-column label="操作">
<slot slot-scope="scope">
<el-button type="success" icon="el-icon-link" @click="executeCaseFrom(scope.row)">执行</el-button>
......@@ -48,13 +51,12 @@ import {
executeCase
// delCase
} from '@/api/getAutoCase'
// import bus from '@/utils/bus'
export default {
data() {
return {
queryModuleInfo: {
pageNum: 1,
pageSize: 20,
pageSize: 10,
moduleId: '',
testcaseName: ''
},
......
......@@ -15,7 +15,6 @@
</el-form-item>
</el-col>
</el-row>
<el-collapse style="margin-left:20px">
<el-collapse-item title="全局参数">
<el-form-item>
......@@ -48,10 +47,8 @@
</el-col>
</el-row>
</el-form-item>
</el-collapse-item>
</el-collapse>
<el-form-item>
<!-- 列表展示 -->
<el-table :data="sceneTestcaseList" border style="width: 100%;margin-top:20px;cursor:pointer" row-key="sequence">
......@@ -104,12 +101,10 @@
<!-- 编辑场景用例 -->
<el-dialog title="编辑场景用例" :visible.sync="editDialogVisible" width="60%">
<!-- <el-card> -->
<el-form>
<el-form-item label="用例名称:" style="width:300px">
<el-input v-model="sceneCaseForm.name"></el-input>
</el-form-item>
<el-collapse v-model="activeNames">
<!-- 前置条件 -->
<el-collapse-item name="1" title="前置条件">
......@@ -257,13 +252,11 @@
<el-button type="success" plain @click="AddAssertionListRow()" class="el-icon-circle-plus">添加行</el-button>
</el-collapse-item>
</el-collapse>
<div style="margin-top:20px;margin-left:600px">
<el-button @click="cancelCaseFrom">取 消</el-button>
<el-button type="primary" @click="addCaseFrom">确 定</el-button>
</div>
</el-form>
<!-- </el-card> -->
</el-dialog>
</div>
</template>
......@@ -510,7 +503,7 @@ export default {
sceneId: this.sceneCaseInfo.sceneId,
sequence: this.sceneTestcaseList.length + 1
})
console.log('save----', this.sceneTestcaseList)
// console.log('save----', this.sceneTestcaseList)
this.DialogVisible = false
this.sceneCaseForm.moduleFrom = ''
this.sceneCaseForm.interfaceFrom = ''
......@@ -586,7 +579,7 @@ export default {
this.newSceneForm.sceneId = this.sceneCaseInfo.sceneId
this.newSceneForm.sceneTestcaseList = this.sceneTestcaseList
console.log('保存传递的参数值', this.newSceneForm)
// console.log('保存传递的参数值', this.newSceneForm)
this.$refs.sceneFormRef.validate((valid) => {
if (!valid) {
return false
......
......@@ -15,7 +15,11 @@
<el-button type="primary" style="margin-left:10px" icon="el-icon-circle-plus" @click="addPage">新增</el-button>
</div>
<el-table :data="interfaceList" border style="width: 100%;margin-top:20px">
<el-table-column type='index' width="50px"></el-table-column>
<el-table-column type='index' width="50px">
<template slot-scope="scope">
<span>{{ (queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="接口名称" width="250px"></el-table-column>
<el-table-column prop="url" label="接口路径" width="350px"></el-table-column>
<el-table-column prop="moduleName" label="所属模块" width="150px"></el-table-column>
......@@ -51,7 +55,7 @@ export default {
return {
queryModuleInfo: {
pageNum: 1,
pageSize: 20,
pageSize: 10,
projectId: '',
moduleId: '',
interfaceName: ''
......
......@@ -5,14 +5,16 @@
<el-button type="primary" icon="el-icon-circle-plus" @click="addModelBtn">新增</el-button>
</div>
<el-table :data="modelList" border style="width: 100%;margin-top:20px">
<!-- <el-table-column prop="id" label="序号" width="80px"></el-table-column> -->
<el-table-column type='index' width="50px"></el-table-column>
<el-table-column type='index' width="50px">
<template slot-scope="scope">
<span>{{ (queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="模块名称" width="150px"></el-table-column>
<el-table-column prop="projectName" label="所属项目" width="150px"></el-table-column>
<el-table-column prop="domain" label="域名" width="350px"></el-table-column>
<el-table-column prop="description" label="描述" width="200px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200px"></el-table-column>
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作">
<slot slot-scope="scope">
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
......
......@@ -6,15 +6,17 @@
<el-button type="primary" icon="el-icon-search" @click="searchMockList">查询</el-button> -->
<!-- <el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button> -->
<el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button>
<el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button>
</div>
<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 type='index' width="50px"></el-table-column>
<el-table-column type='index' width="50px">
<template slot-scope="scope">
<span>{{ (queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="名称" width="200px"></el-table-column>
<el-table-column prop="description" label="描述" width="300px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200px"></el-table-column>
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作">
<slot slot-scope="scope">
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)">编辑</el-button>
......
......@@ -46,13 +46,11 @@
</el-row>
</div>
</el-col>
<el-col :span="14">
<div class="divStyle">{{sceneName}}用例执行结果</div>
<div id="chartPie" style="width:900px ;height:250px;margin-top:10px"></div>
</el-col>
</el-row>
</el-card>
<el-card>
<el-table :data="reportDetailList" style="width: 100%" :header-cell-style="{background:'#FFE4C4',color:'#606266'}">
......@@ -119,10 +117,7 @@ export default {
opinionData: [],
reportDetailList: [],
sceneName: '',
validateList: [
{ check: 'name', comparator: 'eq', expect: 'zhansan' },
{ check: 'age', comparator: 'eq', expect: '18' }
],
validateList: [],
isShowTable: false,
totalElapsedTime: '',
totalPass: '',
......@@ -132,7 +127,6 @@ export default {
},
created() {
this.$bus.$off('reportDetail').$on('reportDetail', (row) => {
// console.log('参数信息', row)
this.queryReportDetail.namespace = row.namespace
this.queryReportDetail.batch = row.batch
this.sceneName = row.sceneName
......@@ -204,8 +198,7 @@ export default {
item['response'] = item['response']
item['elapsedTime'] = item['elapsedTime'] / 1000
if (item['validate'] !== '[]') {
console.log('666', item['validate'].length)
this.validateList = item['validate']
this.validateList = JSON.parse(item['validate'])
this.isShowTable = true
}
})
......
......@@ -14,7 +14,11 @@
<el-button type="primary" style="margin-left:10px" icon="el-icon-search" @click="queryData">查询</el-button>
</div>
<el-table :data="reportList" border style="width: 100%;margin-top:20px">
<el-table-column type='index' width="50px"></el-table-column>
<el-table-column type='index' width="50px">
<template slot-scope="scope">
<span>{{ (queryReportInfo.pageNum -1 ) * queryReportInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="sceneName" label="场景名称" width="200px"></el-table-column>
<el-table-column prop="projectName" label="项目名称" width="150px"></el-table-column>
<el-table-column prop="namespace" label="运行环境" width="150px"></el-table-column>
......@@ -68,7 +72,6 @@ export default {
this.getProjectList()
this.getReportList()
this.$bus.$off('reportmsg').$on('reportmsg', (row) => {
// console.log('参数信息', row)
// 下拉框赋值
this.projectId = row.projectName
this.sceneId = row.name
......@@ -111,7 +114,6 @@ export default {
queryReportList() {
this.queryReportInfo.projectId = this.projectId
this.queryReportInfo.sceneId = this.sceneId
// console.log('参数信息6666', this.queryReportInfo)
this.queryReportInfo.namespace = window.sessionStorage.getItem('env')
getReportList(this.queryReportInfo).then((resp) => {
this.reportList = resp.data.data.list
......
......@@ -42,8 +42,6 @@ export default {
data() {
return {
sceneCaseForm: {
// moduleFrom: '',
// interfaceFrom: '',
caseDetail: []
},
moduleFrom: {},
......@@ -78,12 +76,10 @@ export default {
getModelList() {
getModulList(this.moduleInfo).then((resp) => {
this.modelList = resp.data.data.list
console.log('列表信息', this.modelList)
})
},
// 模块下拉框改变事件
selectChangeModel() {
console.log('下拉款信息', this.sceneCaseForm.moduleFrom)
this.interfaceInfo.moduleId = this.moduleFrom.id
this.sceneCaseForm.moduleId = this.moduleFrom.id
interfaceDetailList(this.interfaceInfo).then((resp) => {
......
......@@ -8,11 +8,14 @@
<el-button type="primary" style="margin-left:10px" icon="el-icon-circle-plus" @click="DialogVisible = true">新增</el-button>
</div>
<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">
<template slot-scope="scope">
<span>{{ (queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="场景名称" width="200px"></el-table-column>
<el-table-column prop="projectName" label="项目名称" width="200px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200px"></el-table-column>
<!-- <el-table-column prop="updateTime" label="修改时间" width="200px"></el-table-column> -->
<el-table-column label="操作">
<slot slot-scope="scope">
<el-button type="success" size="medium" icon="el-icon-link" @click="executeSceneFrom(scope.row)" style="width:80px;margin-left:1px">执行</el-button>
......@@ -87,12 +90,12 @@ export default {
return {
queryModuleInfo: {
pageNum: 1,
pageSize: 20,
pageSize: 10,
sceneName: ''
},
queryProjectList: {
pageNum: 1,
pageSize: 20
pageSize: 100
},
sceneList: [],
totalNum: 0,
......
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