Skip to content

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

更新下拉搜索

parents 38a62f3a f1e7c381
Show whitespace changes
Inline Side-by-side
Showing with 248 additions and 239 deletions
src/views/qa/DetailTestDescription.vue
View file @ 58d5e689
<template> <template>
<div> <div>
<el-card> <div class="header">
<div style="font-size:18px;color:303133">提测说明详情</div> <span>【{{this.projectName}}】提测说明</span>
<el-button type="primary" size="medium" icon="el-icon-edit" @click="editDetail">编辑</el-button>
<el-button type="primary" size="medium" icon="el-icon-edit" style="margin-left:1250px;font-size:15px;" </div>
@click="editDetail">编辑</el-button>
<!-- 详情页面展示 --> <!-- 详情页面展示 -->
<div v-show='isShowDetail' class="divStyle"> <div v-show='isShowDetail' class="divStyle">
<el-form label-width="90px"> <el-form label-position="right">
<el-form-item label="Jira项目:" style="width:300px"> <el-form-item label="项目名称:">
<el-input v-model="jiraProjectName" :disabled="true"></el-input> <span>{{projectName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" style="width:300px"> <el-form-item label="所属项目:">
<el-input v-model="projectName" :disabled="true"></el-input> <span>{{jiraProjectName}}</span>
</el-form-item> </el-form-item>
<el-form-item label="服务及分支:"> <el-form-item label="服务与分支:">
<el-table :data="serviceAndBranch" border style="width:95%"> <el-table :data="serviceAndBranch" border style="width:80%">
<el-table-column label="服务名称" prop="serviceName" width="200px"></el-table-column> <el-table-column label="服务名称" prop="serviceName" width="200px"></el-table-column>
<el-table-column label="服务分支" prop="branch"></el-table-column> <el-table-column label="服务分支" prop="branch"></el-table-column>
<el-table-column label="开发负责人" prop="developer" width="120px"></el-table-column> <el-table-column label="开发负责人" prop="developer" width="120px"></el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
<el-form-item label="apollo变更:"> <el-form-item label="apollo变更:">
<el-table :data="apollo" border style="width:95%"> <el-table :data="apollo" border style="width:80%">
<el-table-column label="项目名称" prop="projectName"></el-table-column> <el-table-column label="项目名称" prop="projectName"></el-table-column>
<el-table-column label="apollo Key" prop="key"></el-table-column> <el-table-column label="apollo Key" prop="key"></el-table-column>
<el-table-column label="apollo value" prop="value"> <el-table-column label="apollo value" prop="value">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
<el-form-item label="数据库变更:" style="width:95%"> <el-form-item label="数据库变更:">
<el-table :data="database" border> <el-table :data="database" style="width:80%" border>
<el-table-column label="数据库名称" prop="db" width="200"></el-table-column> <el-table-column label="数据库名称" prop="db" width="200"></el-table-column>
<el-table-column label="sql"> <el-table-column label="sql">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -41,14 +40,14 @@ ...@@ -41,14 +40,14 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
<el-form-item label="需求地址:"> <el-form-item label="需求地址:" style="width:80%">
<a :href="requirement">{{requirement}}</a> <a :href="requirement">{{requirement}}</a>
</el-form-item> </el-form-item>
<el-form-item label="接口地址:"> <el-form-item label="接口地址:" style="width:80%">
<a :href="api">{{api}}</a> <a :href="api">{{api}}</a>
</el-form-item> </el-form-item>
<el-form-item label="备注:"> <el-form-item label="备 注:">
<el-input type="textarea" v-model="scope" style="width:95%" autosize :disabled="true"></el-input> <el-input type="textarea" v-model="scope" style="width:83%" autosize :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -67,10 +66,10 @@ ...@@ -67,10 +66,10 @@
</el-form-item> </el-form-item>
<!-- 服务及分支 --> <!-- 服务及分支 -->
<el-form-item label="服务及分支:"> <el-form-item label="服务及分支:">
<el-table :data="serviceAndBranchList" border class="table-style" style="width:95%"> <el-table :data="serviceAndBranchList" border style="width:95%">
<el-table-column label="服务名称" width="250"> <el-table-column label="服务名称" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.serviceName" filterable placeholder="请选择服务" <el-select v-model="scope.row.serviceName" filterable allow-create placeholder="请选择服务"
@change="selectServiceModel(scope.row.serviceName)" clearable style="width:220px"> @change="selectServiceModel(scope.row.serviceName)" clearable style="width:220px">
<el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name"> <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
</el-option> </el-option>
...@@ -79,7 +78,7 @@ ...@@ -79,7 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column label="分支名称"> <el-table-column label="分支名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.branch" filterable placeholder="请选择分支" clearable <el-select v-model="scope.row.branch" filterable allow-create placeholder="请选择分支" clearable
@focus="focusevent(scope.row.serviceName)" style="width:650px"> @focus="focusevent(scope.row.serviceName)" style="width:650px">
<el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name" <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
:value="item2.name"></el-option> :value="item2.name"></el-option>
...@@ -102,8 +101,8 @@ ...@@ -102,8 +101,8 @@
</el-form-item> </el-form-item>
<!-- apollo变更 --> <!-- apollo变更 -->
<el-form-item label="apollo变更:"> <el-form-item label="apollo变更:">
<el-table :data="apolloList" border class="table-style" style="width:95%"> <el-table :data="apolloList" border style="width:95%">
<el-table-column label="项目名称" width="200"> <el-table-column label="项目名称" width="230">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.projectName" placeholder="请选择项目" filterable clearable> <el-select v-model="scope.row.projectName" placeholder="请选择项目" filterable clearable>
<el-option v-for="item in projectNameList" :key="item.projectName" :label="item.projectName" <el-option v-for="item in projectNameList" :key="item.projectName" :label="item.projectName"
...@@ -112,7 +111,7 @@ ...@@ -112,7 +111,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="apollo Key" width="260"> <el-table-column label="apollo Key" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.trim="scope.row.key"> <el-input v-model.trim="scope.row.key">
</el-input> </el-input>
...@@ -135,7 +134,7 @@ ...@@ -135,7 +134,7 @@
</el-form-item> </el-form-item>
<!-- 数据库变更 --> <!-- 数据库变更 -->
<el-form-item label="数据库变更:"> <el-form-item label="数据库变更:">
<el-table :data="databaseList" border class="table-style" style="width:95%"> <el-table :data="databaseList" border style="width:95%">
<el-table-column label="数据库名称" width="210"> <el-table-column label="数据库名称" width="210">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.db" placeholder="请选择" filterable clearable allow-create> <el-select v-model="scope.row.db" placeholder="请选择" filterable clearable allow-create>
...@@ -165,18 +164,16 @@ ...@@ -165,18 +164,16 @@
<el-form-item label="接口地址:" class="input-style" style="width:95%"> <el-form-item label="接口地址:" class="input-style" style="width:95%">
<el-input v-model="addTestDescriptionForm.api"></el-input> <el-input v-model="addTestDescriptionForm.api"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注:" class="input-style" style="width:95%"> <el-form-item label="备 注:" class="input-style" style="width:95%">
<el-input v-model="addTestDescriptionForm.scope" type="textarea" autosize></el-input> <el-input v-model="addTestDescriptionForm.scope" type="textarea" autosize></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<div style="margin-left:1000px">
<el-button @click="cancelBtn">取 消</el-button>
<el-button type="primary" @click="saveTestDescription">确 定</el-button>
</div>
</el-form-item>
</el-form> </el-form>
<div class="footer" v-show="!isShowDetail">
<el-button type="primary" size="small" @click="cancelBtn">取 消</el-button>
<el-button type="primary" size="small" @click="saveTestDescription">确 定</el-button>
</div> </div>
</el-card> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -213,7 +210,6 @@ export default { ...@@ -213,7 +210,6 @@ export default {
serviceAndBranch: [], serviceAndBranch: [],
url: 'https://element.eleme.io', url: 'https://element.eleme.io',
isShowDetail: true, isShowDetail: true,
isEditShow: false,
addTestDescriptionForm: { addTestDescriptionForm: {
id: '', id: '',
jiraProjectKey: '', jiraProjectKey: '',
...@@ -265,6 +261,7 @@ export default { ...@@ -265,6 +261,7 @@ export default {
projectName: this.$route.query.projectName, projectName: this.$route.query.projectName,
jiraProjectKey: this.$route.query.jiraProjectKey jiraProjectKey: this.$route.query.jiraProjectKey
}).then((resp) => { }).then((resp) => {
this.isShowDetail = true
// 将接口信息赋值给详情页面 // 将接口信息赋值给详情页面
var data = resp.data.data var data = resp.data.data
this.projectName = data.projectName this.projectName = data.projectName
...@@ -435,16 +432,29 @@ export default { ...@@ -435,16 +432,29 @@ export default {
} }
} }
</script> </script>
<style lang="sss" scoped> <style lang="less" scoped>
.col-style { .header {
margin-top: 20px; display: flex;
margin-left: 40px; justify-content: space-between;
} align-items: center;
.col2-style { > .el-button {
margin-top: 20px; margin-right: 80px;
margin-left: -55px; }
} }
.divStyle { .divStyle {
margin-left: 20px; margin: 20px 0 0 30px;
}
.footer {
display: flex;
position: fixed;
bottom: 0px;
// width: 80%;
// justify-content: flex-end;
right: 90px;
padding-right: 90px;
// background-color: rgb(111, 8, 8);
// background-color: #f1f3f4;
// left: 0;
box-sizing: border-box;
} }
</style> </style>
src/views/qa/Notify.vue
View file @ 58d5e689
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
<el-dialog title="新增测试流程" :visible.sync="addDialogVisible" width="60%" @close="closeAddDialog"> <el-dialog title="新增测试流程" :visible.sync="addDialogVisible" width="60%" @close="closeAddDialog">
<el-form ref="addRobotFormRef" :rules="formRules" :model="pipelineFrom" label-width="150px"> <el-form ref="addRobotFormRef" :rules="formRules" :model="pipelineFrom" label-width="150px">
<el-form-item label="jira项目" prop="dingRobot.jiraProjectKey"> <el-form-item label="jira项目" prop="dingRobot.jiraProjectKey">
<el-select v-model="pipelineFrom.dingRobot.jiraProjectKey" placeholder="请选择Jira项目" @change="getProjectName"> <el-select v-model="pipelineFrom.dingRobot.jiraProjectKey" filterable clearable placeholder="请选择Jira项目" @change="getProjectName">
<el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"> <el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目名称" prop="dingRobot.projectName"> <el-form-item label="项目名称" prop="dingRobot.projectName">
<el-select v-model="pipelineFrom.dingRobot.projectName" placeholder="请选择项目" @change="getDetail"> <el-select v-model="pipelineFrom.dingRobot.projectName" filterable clearable placeholder="请选择项目" @change="getDetail">
<el-option v-for="item in projectNameList" :key="item.id" :label="item.projectName" <el-option v-for="item in projectNameList" :key="item.id" :label="item.projectName"
:value="item.projectName"> :value="item.projectName">
</el-option> </el-option>
......
src/views/qa/TestDescription.vue
View file @ 58d5e689
<template> <template>
<div style="margin-left:10px">
<div> <div>
<el-card> 所属项目:
<div> <el-select v-model="queryModuleInfo.jiraProjectKey" placeholder="请选择所属项目" filterable clearable>
JIRA项目:
<el-select v-model="queryModuleInfo.jiraProjectKey" placeholder="请选择JIRA项目" filterable clearable>
<el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"></el-option> <el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"></el-option>
</el-select> </el-select>
项目名称: 项目名称:
...@@ -13,22 +12,22 @@ ...@@ -13,22 +12,22 @@
<el-button type="primary" icon="el-icon-circle-plus" @click="addTestDesc" <el-button type="primary" icon="el-icon-circle-plus" @click="addTestDesc"
v-permission="('qa:testDescription:add')">新增</el-button> v-permission="('qa:testDescription:add')">新增</el-button>
</div> </div>
<el-table :data="testDescriptionList" border style="width: 100%;margin-top:20px"> <el-table :data="testDescriptionList" border style="width: 100%;margin-top:20px" cell-style="height:10px">
<el-table-column type='index' width="40px"> <el-table-column type='index' width="40px" label="#">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span> <span>{{(queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" label="项目名" width="150px"></el-table-column> <el-table-column prop="projectName" label="项目名称" width="300px"></el-table-column>
<el-table-column label="服务->分支->负责人"> <el-table-column label="服务->分支">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.serviceAndBranch)" :key="item.serviceName"> <div v-for="item in JSON.parse(scope.row.serviceAndBranch)" :key="item.serviceName">
<b>{{ item.serviceName }}</b> -> <b>{{ item.serviceName }}</b> ->
{{ item.branch }}<b> ->{{ item.developer }}</b> {{ item.branch }}<b></b>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="apollo变更" width="200px"> <!-- <el-table-column label="apollo变更" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.apollo)" :key="item.projectName"> <div v-for="item in JSON.parse(scope.row.apollo)" :key="item.projectName">
<div v-if="item.value.length<=200"> <div v-if="item.value.length<=200">
...@@ -44,8 +43,8 @@ ...@@ -44,8 +43,8 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="数据库变更" width="150px"> <!-- <el-table-column label="数据库变更" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.database)" :key="item.db"> <div v-for="item in JSON.parse(scope.row.database)" :key="item.db">
<el-popover placement="top-start" title="sql" width="250" trigger="hover" :content="item.sql"> <el-popover placement="top-start" title="sql" width="250" trigger="hover" :content="item.sql">
...@@ -53,15 +52,16 @@ ...@@ -53,15 +52,16 @@
</el-popover> </el-popover>
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="jiraProjectName" label="Jira项目" width="95px"></el-table-column> <el-table-column prop="jiraProjectName" label="所属项目" width="300px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="165px"></el-table-column> <el-table-column prop="createTime" label="创建时间" width="200px"></el-table-column>
<el-table-column label="操作" width="300px"> <el-table-column label="操作" width="300px">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="primary" icon="el-icon-view" @click="openPreviewDialog(scope.row)">预览</el-button> <el-button type="primary" icon="el-icon-view" size="small" @click="openPreviewDialog(scope.row)">预览
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)" </el-button>
<el-button type="warning" icon="el-icon-edit" size="small" @click="openEditDialog(scope.row)"
v-permission="('qa:testDescription:edit')" style="margin-left:1px">编辑</el-button> v-permission="('qa:testDescription:edit')" style="margin-left:1px">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" @click="delTestDescription(scope.row)" <el-button type="danger" icon="el-icon-delete" size="small" @click="delTestDescription(scope.row)"
v-permission="('qa:testDescription:del')" style="margin-left:1px">删除</el-button> v-permission="('qa:testDescription:del')" style="margin-left:1px">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
:current-page.sync="queryModuleInfo.pageNum" :page-size="queryModuleInfo.pageSize" :current-page.sync="queryModuleInfo.pageNum" :page-size="queryModuleInfo.pageSize"
layout="total, prev, pager, next" :total="totalNum"> layout="total, prev, pager, next" :total="totalNum">
</el-pagination> </el-pagination>
</el-card>
<!-- 新增页面 --> <!-- 新增页面 -->
<el-dialog title="新增提测文档" :visible.sync="DialogAddVisible" width="70%" @close="closeAddDialog"> <el-dialog title="新增提测文档" :visible.sync="DialogAddVisible" width="70%" @close="closeAddDialog">
<el-form ref="addTestDescriptionRef" :rules="rules" :model="addTestDescriptionForm" label-width="88px" <el-form ref="addTestDescriptionRef" :rules="rules" :model="addTestDescriptionForm" label-width="88px"
...@@ -90,7 +89,7 @@ ...@@ -90,7 +89,7 @@
<el-table :data="serviceAndBranchList" border class="table-style"> <el-table :data="serviceAndBranchList" border class="table-style">
<el-table-column label="服务" width="310"> <el-table-column label="服务" width="310">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.serviceName" filterable placeholder="请选择服务" <el-select v-model="scope.row.serviceName" filterable allow-create placeholder="请选择服务"
@change="selectServiceModel(scope.row.serviceName)" clearable style="width:280px"> @change="selectServiceModel(scope.row.serviceName)" clearable style="width:280px">
<el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name"> <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
</el-option> </el-option>
...@@ -99,7 +98,7 @@ ...@@ -99,7 +98,7 @@
</el-table-column> </el-table-column>
<el-table-column label="分支"> <el-table-column label="分支">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.branch" filterable placeholder="请选择分支" clearable <el-select v-model="scope.row.branch" filterable placeholder="请选择分支" allow-create clearable
@focus="focusevent(scope.row.serviceName)" style="width:400px"> @focus="focusevent(scope.row.serviceName)" style="width:400px">
<el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name" <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
:value="item2.name"></el-option> :value="item2.name"></el-option>
...@@ -185,7 +184,7 @@ ...@@ -185,7 +184,7 @@
<el-form-item label="接口地址:" class="input-style"> <el-form-item label="接口地址:" class="input-style">
<el-input v-model="addTestDescriptionForm.api"></el-input> <el-input v-model="addTestDescriptionForm.api"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注:" class="input-style"> <el-form-item label="备 注:" class="input-style">
<el-input v-model="addTestDescriptionForm.scope" type="textarea" autosize></el-input> <el-input v-model="addTestDescriptionForm.scope" type="textarea" autosize></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
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