增加Student分数显示

src/views/DevGroupPage.vue

@@ -358,7 +358,7 @@ export default {
                   user_id: this.$route.params.id,
               }
           });
-          console.log(res1);
+          // console.log(res1);
           if(res1.success){
               this.totalScore = res1.content.totalScore;
               this.commitScore = res1.content.commitScore;

src/views/DevStudentPage.vue

@@ -6,22 +6,35 @@
       <div slot="header" class="clearfix">
         <span>个人信息</span>
       </div>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="姓名">{{
-          user.name
-        }}</el-descriptions-item>
-        <el-descriptions-item label="用户id">{{
-          user.userId
-        }}</el-descriptions-item>
-        <el-descriptions-item label="电子邮箱">{{
-          user.email
-        }}</el-descriptions-item>
-      </el-descriptions>
-      <el-card class="box-innercard">
+        <el-descriptions :column="2">
+            <el-descriptions-item label="个人总得分">{{
+                totalScore
+                }}</el-descriptions-item>
+            <el-descriptions-item label="额外得分bonus">{{
+                bonus
+                }}</el-descriptions-item>
+        </el-descriptions>
+        <el-card class="box-innercard">
+            <div slot="header" class="clearfix">
+                <span>基本信息</span>
+            </div>
+            <el-descriptions :column="2">
+                <el-descriptions-item label="姓名">{{
+                    user.name
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="用户id">{{
+                    user.userId
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="电子邮箱">{{
+                    user.email
+                    }}</el-descriptions-item>
+            </el-descriptions>
+        </el-card>
+      <el-card class="box-innercard" style="margin-top: 20px">
         <div slot="header" class="clearfix">
           <span>项目信息</span>
         </div>
-        <el-descriptions :column="2">
+        <el-descriptions :column="2" style="margin-top: 20px">
           <template v-for="item in productList">
             <el-descriptions-item label="项目id" :key="item.projectId">{{
               item.projectId
@@ -38,22 +51,31 @@
       <div slot="header" class="clearfix">
         <span>commit信息</span>
       </div>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="commit总次数">{{
-          commitMessage.commit_times
-        }}</el-descriptions-item>
-        <el-descriptions-item label="有效commit次数">{{
-          commitMessage.valid_commit_times
-        }}</el-descriptions-item>
-        <el-descriptions-item label="bugList_commit次数">{{
-          commitMessage.buglist_commit
-        }}</el-descriptions-item>
-        <el-descriptions-item label="feature_commit次数">{{
-          commitMessage.feature_commit
-        }}</el-descriptions-item>
-      </el-descriptions>
-
-      <el-card class="box-innercard">
+        <el-descriptions :column="1">
+            <el-descriptions-item label="commit得分">{{
+                commitScore
+                }}</el-descriptions-item>
+        </el-descriptions>
+        <el-card class="box-innercard" >
+            <div slot="header" class="clearfix">
+                <span>commit统计信息</span>
+            </div>
+            <el-descriptions :column="2">
+                <el-descriptions-item label="commit总次数">{{
+                    commitMessage.commit_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="有效commit次数">{{
+                    commitMessage.valid_commit_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="bugList_commit次数">{{
+                    commitMessage.buglist_commit
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="feature_commit次数">{{
+                    commitMessage.feature_commit
+                    }}</el-descriptions-item>
+            </el-descriptions>
+        </el-card>
+      <el-card class="box-innercard" style="margin-top: 20px">
         <div slot="header" class="clearfix">
           <span>commit具体信息（可下滑查看）</span>
         </div>
@@ -97,35 +119,55 @@
       <div slot="header" class="clearfix">
         <span>缺陷信息</span>
       </div>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="缺陷数目">{{
-          bugList.bug_times
-          }}</el-descriptions-item>
-        <el-descriptions-item label="高优先级缺陷数目">{{
-          bugList.high_times
-          }}</el-descriptions-item>
-        <el-descriptions-item label="已经修复的缺陷数目">{{
-          bugList.finished_times
-          }}</el-descriptions-item>
-      </el-descriptions>
-      <el-button type="text" @click="showModel4">缺陷修复率</el-button>
+        <el-descriptions :column="1">
+            <el-descriptions-item label="缺陷得分">{{
+                bugScore
+                }}</el-descriptions-item>
+        </el-descriptions>
+        <el-card class="box-innercard" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+                <span>缺陷统计信息</span>
+            </div>
+            <el-descriptions :column="2">
+                <el-descriptions-item label="缺陷数目">{{
+                    bugList.bug_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="高优先级缺陷数目">{{
+                    bugList.high_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="已经修复的缺陷数目">{{
+                    bugList.finished_times
+                    }}</el-descriptions-item>
+            </el-descriptions>
+        </el-card>
+        <el-button type="text" @click="showModel4">缺陷修复率</el-button>
     </el-card>
     <!-- treeNode信息 -->
     <el-card class="box-card" style="margin-top: 20px">
       <div slot="header" class="clearfix">
         <span>需求树信息</span>
       </div>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="需求节点数目">{{
-          treeNode.treeNode_times
-          }}</el-descriptions-item>
-        <el-descriptions-item label="高优先级需求数目">{{
-          treeNode.high_treeNode_times
-          }}</el-descriptions-item>
-        <el-descriptions-item label="已经完成的需求数目">{{
-          treeNode.finished_treeNode_times
-          }}</el-descriptions-item>
-      </el-descriptions>
+        <el-descriptions :column="1">
+            <el-descriptions-item label="需求得分">{{
+                nodeScore
+                }}</el-descriptions-item>
+        </el-descriptions>
+        <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+                <span>需求统计信息</span>
+            </div>
+            <el-descriptions :column="2">
+                <el-descriptions-item label="需求节点数目">{{
+                    treeNode.treeNode_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="高优先级需求数目">{{
+                    treeNode.high_treeNode_times
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="已经完成的需求数目">{{
+                    treeNode.finished_treeNode_times
+                    }}</el-descriptions-item>
+            </el-descriptions>
+        </el-card>
       <el-button type="text" @click="showModel5">需求完成率</el-button>
     </el-card>
     <!-- 部署信息 -->
@@ -133,17 +175,27 @@
       <div slot="header" class="clearfix">
         <span>流水线部署信息</span>
       </div>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="流水线部署次数">{{
-          pipeline.pipeline_deploy
-        }}</el-descriptions-item>
-        <el-descriptions-item label="流水线部署成功次数">{{
-          pipeline.pipeline_pass
-        }}</el-descriptions-item>
-        <el-descriptions-item label="流水线部署失败次数">{{
-          pipeline.pipline_failure
-        }}</el-descriptions-item>
-      </el-descriptions>
+        <el-descriptions :column="1">
+            <el-descriptions-item label="部署得分">{{
+                pipelineScore
+                }}</el-descriptions-item>
+        </el-descriptions>
+        <el-card class="box-card" style="margin-top: 20px">
+            <div slot="header" class="clearfix">
+                <span>部署统计信息</span>
+            </div>
+            <el-descriptions :column="2">
+                <el-descriptions-item label="流水线部署次数">{{
+                    pipeline.pipeline_deploy
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="流水线部署成功次数">{{
+                    pipeline.pipeline_pass
+                    }}</el-descriptions-item>
+                <el-descriptions-item label="流水线部署失败次数">{{
+                    pipeline.pipline_failure
+                    }}</el-descriptions-item>
+            </el-descriptions>
+        </el-card>
       <el-button type="text" @click="showModel3">部署通过率</el-button>
     </el-card>
     <el-dialog :visible.sync="visible1">
@@ -209,6 +261,7 @@ import * as echarts from "echarts";
 import Layout from "@/components/content/Layout";
 import Title from "@/components/content/Title";
 import { getStudentAnalysis } from "@/network/devcloud/index.js";
+import {getStudentScore} from "../network/devcloud";
 export default {
   components: {
     Layout,
@@ -234,6 +287,13 @@ export default {
       treeNode:{},
       //项目列表
       productList: [],
+
+        totalScore:0.0,
+        commitScore:0.0,
+        bugScore:0.0,
+        nodeScore:0.0,
+        pipelineScore:0.0,
+        bonus:0.0,
     };
   },
   // created() {
@@ -264,6 +324,24 @@ export default {
       } catch (e) {
         this.$message.error(e.message);
       }
+        try{
+            let res1 = await getStudentScore({
+                params: {
+                    user_id: this.$route.params.id,
+                }
+            });
+            console.log(res1);
+            if(res1.success){
+                this.totalScore = res1.content.totalScore;
+                this.commitScore = res1.content.commitScore;
+                this.bugScore = res1.content.bugScore;
+                this.nodeScore = res1.content.nodeScore;
+                this.pipelineScore = res1.content.pipelineScore;
+                this.bonus = res1.content.bonus;
+            }
+        } catch (e) {
+            this.$message.error(e.message);
+        }
     },
     getAnaylysis() {
       //部署信息图表