|
@@ -1,14 +1,9 @@
|
|
|
<template>
|
|
<template>
|
|
|
<div>
|
|
<div>
|
|
|
-<!-- <el-row-->
|
|
|
|
|
-<!-- style="display: flex;flex-direction: row;align-items: center;margin-bottom: 10px;color: #333333">-->
|
|
|
|
|
-<!-- <el-button plain icon="el-icon-arrow-left" @click="goBack">上一页</el-button>-->
|
|
|
|
|
-<!-- </el-row>-->
|
|
|
|
|
<el-button type="text" size="small" @click="goBack">
|
|
<el-button type="text" size="small" @click="goBack">
|
|
|
<i class="el-icon-back">返回上一页</i>
|
|
<i class="el-icon-back">返回上一页</i>
|
|
|
</el-button>
|
|
</el-button>
|
|
|
<el-card shadow="never" class="description-card">
|
|
<el-card shadow="never" class="description-card">
|
|
|
- <!-- <el-button plain icon="el-icon-arrow-left" @click="goBack" style="margin-right: 20px">返回</el-button> -->
|
|
|
|
|
<el-link
|
|
<el-link
|
|
|
target="_blank"
|
|
target="_blank"
|
|
|
class="commit-id description-card-text"
|
|
class="commit-id description-card-text"
|
|
@@ -17,12 +12,14 @@
|
|
|
<span>{{ commitId }}</span>
|
|
<span>{{ commitId }}</span>
|
|
|
<i class="el-icon-document-copy"></i>
|
|
<i class="el-icon-document-copy"></i>
|
|
|
</el-link>
|
|
</el-link>
|
|
|
- <div class="description-card-text">
|
|
|
|
|
- <el-row style="height: 25px; line-height: 25px">
|
|
|
|
|
- <el-col :span="2">
|
|
|
|
|
- <b>类型:</b>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="22">
|
|
|
|
|
|
|
+ <el-row :gutter="20">
|
|
|
|
|
+ <el-col :span="commitInfo.checkResult === 'none' ? 24:16">
|
|
|
|
|
+ <div class="description-card-text">
|
|
|
|
|
+ <el-row style="height: 25px; line-height: 25px">
|
|
|
|
|
+ <el-col :span="2">
|
|
|
|
|
+ <b>类型:</b>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="22">
|
|
|
<span v-if="!typeEditMode">
|
|
<span v-if="!typeEditMode">
|
|
|
<el-tag v-if="commitInfo.relatedType === 'bug_id'" class="type-line type-tag" color="chocolate" size="medium">缺陷</el-tag>
|
|
<el-tag v-if="commitInfo.relatedType === 'bug_id'" class="type-line type-tag" color="chocolate" size="medium">缺陷</el-tag>
|
|
|
<el-tag v-else-if="commitInfo.relatedType === 'none'" class="type-line type-tag" color="#ccc" size="medium">无类型</el-tag>
|
|
<el-tag v-else-if="commitInfo.relatedType === 'none'" class="type-line type-tag" color="#ccc" size="medium">无类型</el-tag>
|
|
@@ -30,7 +27,7 @@
|
|
|
<span v-if="commitInfo.relatedType !== 'none'" class="type-line">关联节点ID: {{commitInfo.relatedId}}</span>
|
|
<span v-if="commitInfo.relatedType !== 'none'" class="type-line">关联节点ID: {{commitInfo.relatedId}}</span>
|
|
|
<el-button type="primary" size="mini" class="type-line" @click="typeEditMode = true">修改关联</el-button>
|
|
<el-button type="primary" size="mini" class="type-line" @click="typeEditMode = true">修改关联</el-button>
|
|
|
</span>
|
|
</span>
|
|
|
- <span v-if="typeEditMode">
|
|
|
|
|
|
|
+ <span v-if="typeEditMode">
|
|
|
<el-radio v-model="relatedTypeEdit" label="TREE_ID" size="large">需求</el-radio>
|
|
<el-radio v-model="relatedTypeEdit" label="TREE_ID" size="large">需求</el-radio>
|
|
|
<el-radio v-model="relatedTypeEdit" label="BUG_ID" size="large">缺陷</el-radio>
|
|
<el-radio v-model="relatedTypeEdit" label="BUG_ID" size="large">缺陷</el-radio>
|
|
|
<el-radio v-model="relatedTypeEdit" label="NONE" size="large">空</el-radio>
|
|
<el-radio v-model="relatedTypeEdit" label="NONE" size="large">空</el-radio>
|
|
@@ -45,52 +42,58 @@
|
|
|
<el-button type="info" size="mini" class="type-line" @click="typeEditMode = false">取消</el-button>
|
|
<el-button type="info" size="mini" class="type-line" @click="typeEditMode = false">取消</el-button>
|
|
|
<el-button type="primary" size="mini" class="type-line" @click="saveRelated">保存</el-button>
|
|
<el-button type="primary" size="mini" class="type-line" @click="saveRelated">保存</el-button>
|
|
|
</span>
|
|
</span>
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div class="description-card-text">
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="2">
|
|
|
|
|
- <b>信息:</b>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="22">
|
|
|
|
|
- <span>{{ commitInfo.message }}</span>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div class="description-card-text">
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="2">
|
|
|
|
|
- <b>时间:</b>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="22">
|
|
|
|
|
- <span>{{ commitInfo.timestamp }}</span>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div class="description-card-text">
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="2">
|
|
|
|
|
- <b>提交人:</b>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="22">
|
|
|
|
|
- <span>{{ commitInfo.gitlabUsername }}</span>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- </div>
|
|
|
|
|
- <div class="description-card-text">
|
|
|
|
|
- <el-row style="height: 35px; line-height: 35px">
|
|
|
|
|
- <el-col :span="2">
|
|
|
|
|
- <b>parent:</b>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="22">
|
|
|
|
|
- <el-tag v-for="(parent, index) in commitInfo.parents"
|
|
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="description-card-text">
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="2">
|
|
|
|
|
+ <b>信息:</b>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="22">
|
|
|
|
|
+ <span>{{ commitInfo.message }}</span>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="description-card-text">
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="2">
|
|
|
|
|
+ <b>时间:</b>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="22">
|
|
|
|
|
+ <span>{{ commitInfo.timestamp }}</span>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="description-card-text">
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="2">
|
|
|
|
|
+ <b>提交人:</b>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="22">
|
|
|
|
|
+ <span>{{ commitInfo.gitlabUsername }}</span>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="description-card-text">
|
|
|
|
|
+ <el-row style="height: 35px; line-height: 35px">
|
|
|
|
|
+ <el-col :span="2">
|
|
|
|
|
+ <b>parent:</b>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="22">
|
|
|
|
|
+ <el-tag v-for="(parent, index) in commitInfo.parents"
|
|
|
:key="index"
|
|
:key="index"
|
|
|
@click="onParentTagClick(parent)"
|
|
@click="onParentTagClick(parent)"
|
|
|
- >{{parent}}</el-tag>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ >{{parent}}</el-tag>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col v-if="commitInfo.checkResult !== 'none'" :span="8" class="left-line">
|
|
|
|
|
+ <i v-if="commitInfo.checkResult === 'pass'" class="el-icon-circle-check check-pass">质量检查通过</i>
|
|
|
|
|
+ <i v-else-if="commitInfo.checkResult === 'fail'" class="el-icon-circle-close check-fail">质量检查失败</i>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
</el-card>
|
|
</el-card>
|
|
|
<el-divider content-position="left">
|
|
<el-divider content-position="left">
|
|
|
变更详情
|
|
变更详情
|
|
@@ -316,6 +319,16 @@ export default {
|
|
|
.requirement {
|
|
.requirement {
|
|
|
background-color: #42b983;
|
|
background-color: #42b983;
|
|
|
}
|
|
}
|
|
|
|
|
+.check-pass {
|
|
|
|
|
+ color: green;
|
|
|
|
|
+}
|
|
|
|
|
+.check-fail {
|
|
|
|
|
+ color: red;
|
|
|
|
|
+}
|
|
|
|
|
+.left-line {
|
|
|
|
|
+ border-left-style: solid;
|
|
|
|
|
+ border-left-color: lightgrey;
|
|
|
|
|
+}
|
|
|
.type-line{
|
|
.type-line{
|
|
|
margin: 0;
|
|
margin: 0;
|
|
|
margin-right: 20px;
|
|
margin-right: 20px;
|