Commit c09289af authored by 晓彤's avatar 晓彤

修改提测说明样式

parent a933f37a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<el-card> <el-card>
<div class="top"> <div class="top">
JIRA项目: JIRA项目:
<el-select v-model="queryInfo.jiraProjectKey" placeholder="请选择JIRA项目" clearable> <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-option v-for="item in jiraProjectList" :key="item.key" :label="item.name" :value="item.key"></el-option>
</el-select> </el-select>
...@@ -44,24 +44,24 @@ ...@@ -44,24 +44,24 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dingRobot.creator" label="创建人" width="80px"></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.jiraProjectName" label="JIRA项目" width="100px"></el-table-column>
<el-table-column prop="dingRobot.createTime" label="创建时间" width="170px"></el-table-column> <el-table-column prop="dingRobot.createTime" label="创建时间" width="170px"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<slot slot-scope="scope"> <slot slot-scope="scope">
<el-button type="primary" size="small" @click="openEditDialog(scope.row)" <el-button type="primary" size="small" @click="openEditDialog(scope.row)"
v-permission="('qa:process:edit')">编辑</el-button> v-permission="('qa:process:edit')">编辑</el-button>
<el-button type="warning" size="small" @click="openSendSmokingDialog(scope.row)" <el-button type="warning" size="small" @click="openSendSmokingDialog(scope.row)"
v-permission="('qa:process:smoke')">冒烟测试</el-button> v-permission="('qa:process:smoke')" style="margin-left:1px">冒烟测试</el-button>
<el-button type="success" size="small" @click="openSendDialog(scope.row)" <el-button type="success" size="small" @click="openSendDialog(scope.row)"
v-permission="('qa:process:schedule')">发送进度</el-button> v-permission="('qa:process:schedule')" style="margin-left:1px">发送进度</el-button>
<!-- 完成按钮 --> <!-- 完成按钮 -->
<el-button v-if="scope.row.dingRobot.status===1||scope.row.dingRobot.status===3" type="success" size="small" <el-button v-if="scope.row.dingRobot.status===1||scope.row.dingRobot.status===3" type="success" size="small"
@click="finishDialog(scope.row)" v-permission="('qa:process:finish')">完成</el-button> @click="finishDialog(scope.row)" v-permission="('qa:process:finish')" style="margin-left:1px">完成</el-button>
<!-- 添加刮起按钮 --> <!-- 添加刮起按钮 -->
<el-button v-if="scope.row.dingRobot.status===1" type="info" size="small" <el-button v-if="scope.row.dingRobot.status===1" type="info" size="small"
@click="HangDialog(scope.row.dingRobot.id)">挂起 @click="HangDialog(scope.row.dingRobot.id)" style="margin-left:1px">挂起
</el-button> </el-button>
<el-button v-if="scope.row.dingRobot.status===3" type="info" size="small" @click="EnableDialog(scope.row)"> <el-button v-if="scope.row.dingRobot.status===3" type="info" size="small" @click="EnableDialog(scope.row)">
启用 启用
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</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="150px"></el-table-column>
<el-table-column label="服务->分支->负责人" width="270px"> <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> ->
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</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">
<div slot="reference" style="color:#409EFF">{{item.db}}</div> <div slot="reference" style="color:#409EFF">{{item.db}}</div>
</el-popover> </el-popover>
...@@ -46,15 +46,15 @@ ...@@ -46,15 +46,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="jiraProjectName" label="Jira项目" width="90px"></el-table-column> <el-table-column prop="jiraProjectName" label="Jira项目" width="95px"></el-table-column>
<el-table-column prop="createTime" label="创建时间" width="155px"></el-table-column> <el-table-column prop="createTime" label="创建时间" width="155px"></el-table-column>
<el-table-column label="操作"> <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" @click="openPreviewDialog(scope.row)">预览</el-button>
<el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)" <el-button type="warning" icon="el-icon-edit" @click="openEditDialog(scope.row)"
v-permission="('qa:testDescription:edit')">编辑</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" @click="delTestDescription(scope.row)"
v-permission="('qa:testDescription:del')">删除</el-button> v-permission="('qa:testDescription:del')" style="margin-left:1px">删除</el-button>
</slot> </slot>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
</el-card> </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="90px"> <el-form ref="addTestDescriptionRef" :rules="rules" :model="addTestDescriptionForm" label-width="88px"
style="margin-left:25px">
<el-form-item label="Jira项目:" prop="jiraProjectKey"> <el-form-item label="Jira项目:" prop="jiraProjectKey">
<el-select v-model="addTestDescriptionForm.jiraProjectKey" placeholder="请选择Jira项目" filterable clearable> <el-select v-model="addTestDescriptionForm.jiraProjectKey" placeholder="请选择Jira项目" filterable clearable>
<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">
...@@ -77,8 +78,43 @@ ...@@ -77,8 +78,43 @@
<el-input v-model="addTestDescriptionForm.projectName" placeholder="请输入项目名称"></el-input> <el-input v-model="addTestDescriptionForm.projectName" placeholder="请输入项目名称"></el-input>
</el-form-item> </el-form-item>
<!-- 服务及分支 --> <!-- 服务及分支 -->
<el-form-item label="服务及分支:" style="width:95%"> <el-form-item label="服务及分支:">
<el-row> <el-table :data="serviceAndBranchList" border style="width:90%;margin-top:5px;">
<el-table-column label="服务" width="310">
<template slot-scope="scope">
<el-select v-model="scope.row.serviceName" filterable placeholder="请选择服务"
@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>
</el-select>
</template>
</el-table-column>
<el-table-column label="分支" width="310">
<template slot-scope="scope">
<el-select v-model="scope.row.branch" filterable placeholder="请选择分支" clearable
@focus="focusevent(scope.row.serviceName)" style="width:280px">
<el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
:value="item2.name"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="开发负责人" width="190">
<template slot-scope="scope">
<el-input v-model="scope.row.developer"></el-input>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="danger" size="mini" icon="el-icon-delete"
@click="serviceAndBranchDelete(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-button type="primary" size="mini" plain class="el-icon-circle-plus" style="margin-top:10px"
@click="addServiceAndBranchRow()">添加行</el-button>
<!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<div style="margin-left:100px"> <div style="margin-left:100px">
服务 服务
...@@ -99,9 +135,9 @@ ...@@ -99,9 +135,9 @@
操作 操作
</div> </div>
</el-col> </el-col>
</el-row> </el-row> -->
<!-- 操作数据 --> <!-- 操作数据 -->
<el-row v-for="(item, index) in serviceAndBranchList" :key="index" :gutter="20"> <!-- <el-row v-for="(item, index) in serviceAndBranchList" :key="index" :gutter="20">
<el-col :span="8"> <el-col :span="8">
<div> <div>
<el-select v-model="item.serviceName" filterable placeholder="请选择服务" <el-select v-model="item.serviceName" filterable placeholder="请选择服务"
...@@ -133,28 +169,27 @@ ...@@ -133,28 +169,27 @@
</el-col> </el-col>
</el-row> </el-row>
<el-button type="primary" size="mini" plain icon="el-icon-circle-plus-outline" <el-button type="primary" size="mini" plain icon="el-icon-circle-plus-outline"
@click="addServiceAndBranchRow()" class="btn-style">添加</el-button> @click="addServiceAndBranchRow()" class="btn-style">添加</el-button> -->
</el-form-item> </el-form-item>
<!-- apollo变更 --> <!-- apollo变更 -->
<el-form-item label="apollo变更:"> <el-form-item label="apollo变更:">
<el-table :data="apolloList" border style="width:90%;margin-top:5px;"> <el-table :data="apolloList" border style="width:90%;margin-top:5px;">
<el-table-column label="项目名称" width="230"> <el-table-column label="项目名称" width="230">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-input v-model="scope.row.projectName">
</el-input> -->
<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" :value="item.projectName"> <el-option v-for="item in projectNameList" :key="item.projectName" :label="item.projectName"
:value="item.projectName">
</el-option> </el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="apollo Key" width="300"> <el-table-column label="apollo Key" width="290">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.key"> <el-input v-model="scope.row.key">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="apollo value" width="300"> <el-table-column label="apollo value" width="290">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.value"> <el-input v-model="scope.row.value">
</el-input> </el-input>
...@@ -173,7 +208,7 @@ ...@@ -173,7 +208,7 @@
<!-- 数据库变更 --> <!-- 数据库变更 -->
<el-form-item label="数据库变更:"> <el-form-item label="数据库变更:">
<el-table :data="databaseList" border style="width:90%;margin-top:5px;"> <el-table :data="databaseList" border style="width:90%;margin-top:5px;">
<el-table-column label="数据库名称" width="200"> <el-table-column label="数据库名称" width="210">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.db" placeholder="请选择" filterable clearable> <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 v-for="item in queryDataBaseList" :key="item" :label="item" :value="item">
...@@ -181,7 +216,7 @@ ...@@ -181,7 +216,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="sql" width="630px"> <el-table-column label="sql" width="600px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.trim="scope.row.sql" type="textarea" autosize> <el-input v-model.trim="scope.row.sql" type="textarea" autosize>
</el-input> </el-input>
...@@ -279,13 +314,7 @@ export default { ...@@ -279,13 +314,7 @@ export default {
serviceList: [], serviceList: [],
serviceBranchList: [], serviceBranchList: [],
queryDataBaseList: [], queryDataBaseList: [],
serviceAndBranchList: [ serviceAndBranchList: [],
// {
// serviceName: '',
// branch: '',
// developer: this.getUserName
// }
],
apolloList: [], apolloList: [],
databaseList: [], databaseList: [],
projectNameList: [] projectNameList: []
......
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