Skip to content

Q
qa-platform-ui
Commit e4e74ca0 authored by 晓彤's avatar 晓彤
Browse files
Options

更新提测说明样式修改

parent 2d5643e8
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 124 deletions
src/api/TestDesciption.js
View file @ e4e74ca0
......@@ -46,3 +46,11 @@ export function getTestProjectNameList(queryInfo) {
params: queryInfo
})
}
// 根据jira项目关键字获取项目列表接口
export function getProjectNameList(queryInfo) {
return holmesRequest({
url: 'docker/project/list_for_test_desc',
method: 'get',
params: queryInfo
})
}
src/views/layout/Home.vue
View file @ e4e74ca0
......@@ -12,7 +12,7 @@
<!--页面的展示-->
<transition name="compAnimate" appear>
<keep-alive>
<router-view :style="{marginTop: '55px'}"></router-view>
<router-view :style="{marginTop: '55px'}" :key="key"></router-view>
</keep-alive>
</transition>
</el-main>
......@@ -33,7 +33,10 @@ export default {
getNavs: 'header/Navs',
getAsideTitle: 'header/AsideTitle',
getCount: 'header/Count'
})
}),
key() {
return this.$route.path
}
},
watch: {
$route: function (to) {
......@@ -163,7 +166,7 @@ export default {
}
.el-aside {
background-color: #525E7C;
background-color: #525e7c;
height: 100%;
}
......
src/views/qa/DetailTestDescription.vue
View file @ e4e74ca0
......@@ -2,83 +2,43 @@
<div>
<el-card>
<div style="font-size:18px;color:303133">提测说明详情</div>
<el-row>
<el-col :span="4">
<div class="col-style">jira项目名称:</div>
</el-col>
<el-col :span="6">
<div class="col2-style"> {{jiraProjectName}}</div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">项目名称:</div>
</el-col>
<el-col :span="6">
<div class="col2-style">
{{projectName}}
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">服务及分支:</div>
</el-col>
<el-col :span="18">
<el-table :data="serviceAndBranch" border style="width:90%;margin-top:20px;margin-left:-50px">
<el-table-column label="服务名称" prop="serviceName" width="300"></el-table-column>
<el-table-column label="服务分支" prop="branch" width="300"></el-table-column>
<el-table-column label="开发负责人" prop="developer" width="170"></el-table-column>
<el-form label-width="90px" style="margin-top:20px">
<el-form-item label="Jira项目:" style="width:300px">
<el-input v-model="jiraProjectName"></el-input>
</el-form-item>
<el-form-item label="项目名称:" style="width:300px">
<el-input v-model="projectName"></el-input>
</el-form-item>
<el-form-item label="服务及分支:">
<el-table :data="serviceAndBranch" border>
<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="developer" width="120px"></el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">apollo变更:</div>
</el-col>
<el-col :span="18">
<el-table :data="apollo" border style="width:90%;margin-top:20px;margin-left:-50px">
<el-table-column label="项目名称" prop="projectName" width="300"></el-table-column>
<el-table-column label="apollo Key" prop="key" width="300"></el-table-column>
<el-table-column label="apollo value" prop="value" width="170"></el-table-column>
</el-form-item>
<el-form-item label="apollo变更:">
<el-table :data="apollo" border>
<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 value" prop="value"></el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">数据库变更:</div>
</el-col>
<el-col :span="18">
<el-table :data="database" border style="width:90%;margin-top:20px;margin-left:-50px">
<el-table-column label="数据库名称" prop="db" width="300"></el-table-column>
<el-table-column label="sql" prop="sql" width="470"></el-table-column>
</el-form-item>
<el-form-item label="数据库变更:">
<el-table :data="database" border>
<el-table-column label="数据库名称" prop="db" width="200"></el-table-column>
<el-table-column label="sql" prop="sql"></el-table-column>
</el-table>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">需求地址:</div>
</el-col>
<el-col :span="6">
<div class="col2-style">{{requirement}}</div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">接口地址:</div>
</el-col>
<el-col :span="6">
<div class="col2-style">{{api}}</div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="col-style">其 它:</div>
</el-col>
<el-col :span="6">
<div class="col2-style">{{scope}}</div>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="需求地址:">
<a :href="requirement">{{requirement}}</a>
</el-form-item>
<el-form-item label="接口地址:">
<a :href="api">{{api}}</a>
</el-form-item>
<el-form-item label="其它:">
<el-input v-model="scope"></el-input>
</el-form-item>
</el-form>
</el-card>
</div>
</template>
......@@ -95,18 +55,16 @@ export default {
scope: '',
apollo: [],
database: [],
serviceAndBranch: []
serviceAndBranch: [],
url: 'https://element.eleme.io'
}
},
created() {
// console.log('this.$route.query', this.$route.query)
// 详情接口
activated() {
detailTestDescription({
projectName: this.$route.query.projectName,
jiraProjectKey: this.$route.query.jiraProjectKey
}).then((resp) => {
var data = resp.data.data
console.log('rrr', data)
this.projectName = data.projectName
this.jiraProjectName = data.jiraProjectName
this.requirement = data.requirement
......@@ -116,9 +74,7 @@ export default {
this.apollo = JSON.parse(data.apollo)
this.database = JSON.parse(data.database)
})
},
methods: {}
}
}
</script>
<style lang="sss" scoped>
......@@ -128,6 +84,6 @@ export default {
}
.col2-style {
margin-top: 20px;
margin-left: -50px;
margin-left: -55px;
}
</style>
src/views/qa/Notify.vue
View file @ e4e74ca0
......@@ -2,7 +2,7 @@
<div>
<el-card>
<div class="top">
JIRA项目名称:
JIRA项目名:
<el-select v-model="queryInfo.jiraProjectKey" placeholder="请选择JIRA项目" clearable>
<el-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"></el-option>
</el-select>
......@@ -28,7 +28,6 @@
<span>{{(queryInfo.pageNum -1 ) * queryInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="dingRobot.jiraProjectName" label="JIRA项目名" width="120px"></el-table-column>
<el-table-column prop="dingRobot.projectName" label="项目名" width="120px"></el-table-column>
<el-table-column label="服务->分支" width="250px">
<template slot-scope="scope">
......@@ -45,6 +44,7 @@
</template>
</el-table-column>
<el-table-column prop="dingRobot.creator" label="创建人" width="80px"></el-table-column>
<el-table-column prop="dingRobot.jiraProjectName" label="JIRA项目名" width="120px"></el-table-column>
<el-table-column prop="dingRobot.createTime" label="创建时间" width="170px"></el-table-column>
<el-table-column label="操作">
<slot slot-scope="scope">
......@@ -98,7 +98,7 @@
</el-input>
</el-form-item>
<el-form-item label="环 境" prop="dingRobot.namespace">
<el-select v-model="pipelineFrom.dingRobot.namespace" placeholder="请选择环境">
<el-select v-model="pipelineFrom.dingRobot.namespace" placeholder="请选择环境" filterable clearable>
<el-option v-for="item in namespaceList" :key="item.name" :label="item.name" :value="item.name">
</el-option>
</el-select>
......@@ -194,7 +194,7 @@
</el-form-item>
</el-tooltip>
<el-form-item label="环 境" prop="dingRobot.namespace">
<el-select v-model="editPipelineForm.dingRobot.namespace" placeholder="请选择环境">
<el-select v-model="editPipelineForm.dingRobot.namespace" placeholder="请选择环境" filterable clearable>
<el-option v-for="item in namespaceList" :key="item.name" :label="item.name" :value="item.name">
</el-option>
</el-select>
......
src/views/qa/TestDescription.vue
View file @ e4e74ca0
......@@ -3,9 +3,10 @@
<el-card>
<div>
JIRA项目名称:
<el-select v-model="queryModuleInfo.jiraProjectKey" placeholder="请选择JIRA项目" clearable>
<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-select>
项目名称:
<el-input v-model="queryModuleInfo.projectName" clearable placeholder="请输入项目名称" style="width: 300px;">
</el-input>
<el-button type="primary" style="margin-left:10px" icon="el-icon-search" @click="queryData">查询</el-button>
......@@ -18,13 +19,12 @@
<span>{{(queryModuleInfo.pageNum -1 ) * queryModuleInfo.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="jiraProjectName" label="Jira项目" width="110px"></el-table-column>
<el-table-column prop="projectName" label="项目名" width="150px"></el-table-column>
<el-table-column label="服务->分支->负责人" width="230px">
<el-table-column label="服务->分支->负责人" width="270px">
<template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.serviceAndBranch)" :key="item.serviceName">
<b>{{ item.serviceName }}</b> ->
{{ item.branch }}<b> ->{{ item.developer }};</b>
{{ item.branch }}<b> ->{{ item.developer }}</b>
</div>
</template>
</el-table-column>
......@@ -32,19 +32,21 @@
<template slot-scope="scope">
<div v-for="item in JSON.parse(scope.row.apollo)" :key="item.projectName">
<b>{{ item.projectName }}</b> ->
{{ item.key }}<b> ->{{ item.value }};</b>
{{ item.key }}<b> ->{{ item.value }}</b>
</div>
</template>
</el-table-column>
<el-table-column label="数据库变更" width="150px">
<template slot-scope="scope">
<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">
<div slot="reference" style="color:#409EFF">{{item.db}};</div>
<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">
<div slot="reference" style="color:#409EFF">{{item.db}}</div>
</el-popover>
</div>
</template>
</el-table-column>
<el-table-column prop="jiraProjectName" label="Jira项目" width="90px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="155px"></el-table-column>
<el-table-column label="操作">
<slot slot-scope="scope">
......@@ -103,7 +105,7 @@
<el-col :span="8">
<div>
<el-select v-model="item.serviceName" filterable placeholder="请选择服务"
@change="selectServiceModel(item.serviceName)" clearable style="width:270px">
@change="selectServiceModel(item.serviceName)" clearable style="width:320px;margin-top:10px">
<el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
</el-option>
</el-select>
......@@ -112,7 +114,7 @@
<el-col :span="8">
<div>
<el-select v-model="item.branch" filterable placeholder="请选择分支" clearable
@focus="focusevent(item.serviceName)" style="width:270px">
@focus="focusevent(item.serviceName)" style="width:320px;margin-top:10px">
<el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
:value="item2.name"></el-option>
</el-select>
......@@ -120,12 +122,13 @@
</el-col>
<el-col :span="4">
<div>
<el-input v-model="item.developer" style="width:150px"></el-input>
<el-input v-model="item.developer" style="width:180px;margin-top:10px"></el-input>
</div>
</el-col>
<el-col :span="4">
<div style="margin-left:20px">
<el-button size="small" icon="el-icon-delete" @click="serviceAndBranchDelete(index)">删除</el-button>
<div style="margin-left:20px;margin-top:10px">
<el-button size="small" type="danger" icon="el-icon-delete" @click="serviceAndBranchDelete(index)">删除
</el-button>
</div>
</el-col>
</el-row>
......@@ -135,19 +138,23 @@
<!-- apollo变更 -->
<el-form-item label="apollo变更:">
<el-table :data="apolloList" border style="width:90%;margin-top:5px;">
<el-table-column label="项目名称" width="200">
<el-table-column label="项目名称" width="230">
<template slot-scope="scope">
<el-input v-model="scope.row.projectName">
</el-input>
<!-- <el-input v-model="scope.row.projectName">
</el-input> -->
<el-select v-model="scope.row.projectName" placeholder="请选择项目" filterable clearable>
<el-option v-for="item in projectNameList" :key="item.projectName" :label="item.projectName" :value="item.projectName">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="apollo Key" width="240">
<el-table-column label="apollo Key" width="300">
<template slot-scope="scope">
<el-input v-model="scope.row.key">
</el-input>
</template>
</el-table-column>
<el-table-column label="apollo value" width="240">
<el-table-column label="apollo value" width="300">
<template slot-scope="scope">
<el-input v-model="scope.row.value">
</el-input>
......@@ -168,15 +175,15 @@
<el-table :data="databaseList" border style="width:90%;margin-top:5px;">
<el-table-column label="数据库名称" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.db" placeholder="请选择">
<el-select v-model="scope.row.db" placeholder="请选择" filterable clearable>
<el-option v-for="item in queryDataBaseList" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="sql" width="480">
<el-table-column label="sql" width="630px">
<template slot-scope="scope">
<el-input v-model="scope.row.sql" type="textarea" autosize>
<el-input v-model.trim="scope.row.sql" type="textarea" autosize>
</el-input>
</template>
</el-table-column>
......@@ -217,7 +224,8 @@ import {
getTestDescriptionList,
addTestDescription,
delTestDescription,
editTestDescription
editTestDescription,
getProjectNameList
} from '@/api/TestDesciption'
import { getDataBaseList } from '@/api/effect'
// import bus from '@/utils/bus'
......@@ -272,14 +280,15 @@ export default {
serviceBranchList: [],
queryDataBaseList: [],
serviceAndBranchList: [
{
serviceName: '',
branch: '',
developer: this.getUserName
}
// {
// serviceName: '',
// branch: '',
// developer: this.getUserName
// }
],
apolloList: [],
databaseList: []
databaseList: [],
projectNameList: []
}
},
created() {
......@@ -287,8 +296,16 @@ export default {
this.getTestDescriptionList()
// 获取所有的服务
this.getServiceList()
// 获取所有项目
this.getProjectNameList()
},
methods: {
// 复制模板内容
copyTemplate(id) {
let value = this.baseURL + '/xxx/xxx/xxx/xxx/xxx?authorization=&id=' + id
this.copyToClipboard(value) // 需要复制的文本内容
this.$message.success('复制成功，注意带变量字段内容请自行替换！')
},
// 获取jira项目列表
getJiraProjectList() {
getJiraProjectList().then((resp) => {
......@@ -299,7 +316,6 @@ export default {
getTestDescriptionList() {
getTestDescriptionList(this.queryModuleInfo).then((resp) => {
this.testDescriptionList = resp.data.data.list
console.log('yyy', this.testDescriptionList)
this.totalNum = resp.data.data.total
})
},
......@@ -383,11 +399,11 @@ export default {
this.addTestDescriptionForm.api = ''
this.addTestDescriptionForm.scope = ''
this.serviceAndBranchList = []
this.serviceAndBranchList.push({
serviceName: '',
branch: '',
developer: this.getUserName
})
// this.serviceAndBranchList.push({
// serviceName: '',
// branch: '',
// developer: this.getUserName
// })
this.apolloList = []
this.databaseList = []
},
......@@ -491,6 +507,13 @@ export default {
// 对话框关闭后清空文本框数据
closeAddDialog() {
this.$refs.addTestDescriptionRef.resetFields()
},
// 获取所有项目名称
getProjectNameList() {
getProjectNameList().then((resp) => {
console.log('444', resp)
this.projectNameList = resp.data.data
})
}
}
}
......@@ -499,4 +522,7 @@ export default {
.btn-style {
margin-top: 10px;
}
.el-select {
margin: 0 10px 0 5px;
}
</style>
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