Commit 6bffc0e6 authored by 王晓铜's avatar 王晓铜

样式更新

parent e3e24e00
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
</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">
<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-card> </el-card>
...@@ -491,6 +492,11 @@ export default { ...@@ -491,6 +492,11 @@ export default {
} }
}) })
}, },
// 取消按钮
cancelCaseFrom() {
// 返回列表页
this.$router.push('CaseList')
},
// 刷新列表 // 刷新列表
sendResh() { sendResh() {
......
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
</el-collapse> </el-collapse>
</el-form> </el-form>
<div style="margin-left:700px;margin-top:20px"> <div style="margin-left:700px;margin-top:20px">
<el-button @click="cancelInterfaceFrom">取 消</el-button>
<el-button type="primary" @click="addInterfaceFrom">确 定</el-button> <el-button type="primary" @click="addInterfaceFrom">确 定</el-button>
</div> </div>
...@@ -403,6 +404,11 @@ export default { ...@@ -403,6 +404,11 @@ export default {
} }
} }
}) })
},
// 取消按钮
cancelInterfaceFrom() {
// 返回列表页
this.$router.push('InterfaceList')
} }
} }
} }
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,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="warning" 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="success" 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>
......
...@@ -11,38 +11,33 @@ ...@@ -11,38 +11,33 @@
</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-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" row-key="sequence">
<!-- <el-table-column prop='sequence' width="50px"></el-table-column> -->
<!-- <el-table-column type='index' width="50px"></el-table-column> -->
<!-- <el-table-column prop="moduleName" label="模块名称" width="200px"></el-table-column>
<el-table-column prop="interfaceName" label="接口名称" width="200px"></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">
<el-button type="success" 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="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>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div style="margin-top:20px;float:right;margin-right:500px"> <div style="margin-top:20px;float:right;margin-right:300px">
<el-button @click="cancelSceneCaseFrom">取 消</el-button>
<el-button type="primary" @click="addSceneCaseFrom">确 定</el-button> <el-button type="primary" @click="addSceneCaseFrom">确 定</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 添加场景用例 --> <!-- 添加场景用例 -->
<el-dialog title="新增场景用例" :visible.sync="DialogVisible" width="50%" @close="closeAddSceneDialog"> <el-dialog title="新增场景用例" :visible.sync="DialogVisible" width="50%">
<el-form :model="sceneCaseFormRef" label-width="90px"> <el-form ref="sceneCaseFormRef" :rules="rules" :model="sceneCaseForm" label-width="90px">
<el-form-item label="模块名称:" style="width:300px"> <el-form-item label="模块名称:" prop="moduleName" 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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="接口名称:" style="width:500px"> <el-form-item label="接口名称:" prop="interfaceName" style="width:500px">
<el-select v-model="sceneCaseForm.interfaceFrom" value-key="id" placeholder="请选择接口" @change="selectChangeInterface" clearable> <el-select v-model="sceneCaseForm.interfaceFrom" value-key="id" placeholder="请选择接口" @change="selectChangeInterface" clearable>
<el-option v-for="item in interfaceList" :key="item.id" :label="item.name" :value="item"></el-option> <el-option v-for="item in interfaceList" :key="item.id" :label="item.name" :value="item"></el-option>
</el-select> </el-select>
...@@ -57,7 +52,7 @@ ...@@ -57,7 +52,7 @@
</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="canceSceneFrom">取 消</el-button>
<el-button type="primary" @click="addSceneFrom">确 定</el-button> <el-button type="primary" @click="addSceneFrom">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -292,6 +287,27 @@ export default { ...@@ -292,6 +287,27 @@ export default {
message: '项目名称不能为空!', message: '项目名称不能为空!',
trigger: 'blur' trigger: 'blur'
} }
],
moduleName: [
{
required: true,
message: '模块名称不能为空!',
trigger: 'blur'
}
],
interfaceName: [
{
required: true,
message: '接口名称不能为空!',
trigger: 'blur'
}
],
caseName: [
{
required: true,
message: '用例名称不能为空!',
trigger: 'blur'
}
] ]
}, },
sceneCaseForm: { sceneCaseForm: {
...@@ -451,10 +467,14 @@ export default { ...@@ -451,10 +467,14 @@ export default {
this.sceneCaseForm.interfaceFrom = '' this.sceneCaseForm.interfaceFrom = ''
this.sceneCaseForm.caseList = [] this.sceneCaseForm.caseList = []
}, },
// 关闭清空内容 // 取消按钮
closeAddSceneDialog() { canceSceneFrom() {
this.$refs.sceneCaseFormRef.resetFields() this.DialogVisible = false
this.sceneCaseForm.moduleFrom = ''
this.sceneCaseForm.interfaceFrom = ''
this.sceneCaseForm.caseList = []
}, },
// 编辑场景用例 // 编辑场景用例
editeSceneFrom(row) { editeSceneFrom(row) {
console.log('11', row) console.log('11', row)
...@@ -529,6 +549,11 @@ export default { ...@@ -529,6 +549,11 @@ export default {
} }
}) })
}, },
// 取消按钮事件
cancelSceneCaseFrom() {
// 返回列表页
this.$router.push({ path: 'SceneList' })
},
// 刷新列表 // 刷新列表
sendResh() { sendResh() {
// bus使用 // bus使用
...@@ -663,10 +688,8 @@ export default { ...@@ -663,10 +688,8 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
// .el-select { div-style {
// width: 260px; margin: 20px, 0, 0, 0;
// } float: right;
// .el-input { }
// width: 260px
// }
</style> </style>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- <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" 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>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- <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" 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>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- <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" 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>
......
...@@ -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="warning" 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="success" 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="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>
......
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