Browse Source

feat: show check result on commit list and commit details

claws 4 years ago
parent
commit
c3ec1c3a31
2 changed files with 83 additions and 58 deletions
  1. 14 2
      src/views/Project/Commit.vue
  2. 69 56
      src/views/Project/CommitDetails.vue

+ 14 - 2
src/views/Project/Commit.vue

@@ -68,7 +68,6 @@
                         body-style="padding: 5px 20px">
                   <h3 class="view-text">{{git.title}}</h3>
                   <div >
-
                     <el-row style="padding: 0;margin: 0; border: 0">
                       <el-col :span="6">
                         <el-link
@@ -80,7 +79,7 @@
                           <i class="el-icon-document-copy"></i>
                         </el-link>
                       </el-col>
-                      <el-col :span="12">
+                      <el-col :span="8">
                         处理人:<span style="font-weight: bold">{{git.gitlabUsername}}</span>
                       </el-col>
                       <el-col :span="6">
@@ -88,6 +87,10 @@
                         <span v-if="git.relatedType === 'bug_id'" class="node bug">缺陷</span>
                         <span v-else-if="git.relatedType === 'none'" class="node none">无类型</span>
                         <span v-else class="node requirement">需求</span></el-col>
+                      <el-col :span="4" style="text-align: right">
+                        <i v-if="git.checkResult === 'pass'" class="el-icon-circle-check check-pass">质量检查通过</i>
+                        <i v-else-if="git.checkResult === 'fail'" class="el-icon-circle-close check-fail">质量检查失败</i>
+                      </el-col>
                     </el-row>
                   </div>
                 </ElCard>
@@ -277,6 +280,15 @@ export default {
 .requirement {
   background-color: #42b983;
 }
+.check-pass {
+  color: green;
+}
+.check-fail {
+  color: red;
+}
+.check-none {
+  color: lightgrey;
+}
 .view-text{
   display: inline-block;
   white-space: nowrap;

+ 69 - 56
src/views/Project/CommitDetails.vue

@@ -1,14 +1,9 @@
 <template>
   <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">
       <i class="el-icon-back">返回上一页</i>
     </el-button>
     <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
         target="_blank"
         class="commit-id description-card-text"
@@ -17,12 +12,14 @@
         <span>{{ commitId }}</span>
         <i class="el-icon-document-copy"></i>
       </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">
               <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>
@@ -30,7 +27,7 @@
               <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>
             </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="BUG_ID" 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="primary" size="mini" class="type-line" @click="saveRelated">保存</el-button>
             </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"
                         @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-divider content-position="left">
       变更详情
@@ -316,6 +319,16 @@ export default {
 .requirement {
   background-color: #42b983;
 }
+.check-pass {
+  color: green;
+}
+.check-fail {
+  color: red;
+}
+.left-line {
+  border-left-style: solid;
+  border-left-color: lightgrey;
+}
 .type-line{
   margin: 0;
   margin-right: 20px;