Merge pull request '增加拥有者列 openi趋势图不联动 commit整数显示 表格灰度图颜色加深' (#864) from wangjr_pro into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/864
Reviewed-by: zhoupzh <zhoupzh@pcl.ac.cn>

web_src/js/components/ProAnalysis.vue

@@ -53,16 +53,6 @@
                         stripe
                         >
                     </el-table-column>
-
-                    <el-table-column
-                        label="拥有者"
-                        align="center"
-                        prop="ownerName"
-                        stripe
-                        v-if='0'
-                        >
-                    </el-table-column>
-
                     <el-table-column
                         label="项目名称"
                         width="125px"
@@ -74,6 +64,13 @@
                             <a @click=goToDetailPage(scope.row.repo_id,scope.row.name,scope.row.ownerName)>{{scope.row.name}} </a>
                         </template>
                     </el-table-column>
+                        <el-table-column
+                        label="拥有者"
+                        align="center"
+                        prop="ownerName"
+                        stripe
+                        >
+                    </el-table-column>
                     <el-table-column
                         prop="isPrivate" 
                         label="私有"
@@ -185,7 +182,7 @@
                     </el-col>
                     <el-col :span='4' style="text-align: center;"> 
                         <el-row>任务完成比例</el-row>
-                        <el-row class="item_content">{{tableDataIDTotal.issueClosedRatio * 100}}%</el-row>
+                        <el-row class="item_content">{{(tableDataIDTotal.issueClosedRatio * 100) | rounding}}%</el-row>
                     </el-col>
                 </el-row>           
             </div>
@@ -248,18 +245,18 @@
             </div>
             <div style="margin-top: 20px;">
                 <span  class="sta_iterm">统计周期：</span> 
-                <button type="button" class='btn' id ="yesterday_pro" v-bind:class="{colorChange:1==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'yesterday',true,1),getOneProList(pro_id,'yesterday',false,1)">昨天</button>
-                <button type="button" class='btn' id = "current_week_pro" v-bind:class="{colorChange:2==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'current_week',true,2),getOneProList(pro_id,'current_week',false,2)">本周</button>
-                <button type="button" class='btn' id = "current_month_pro" v-bind:class="{colorChange:3==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'current_month',true,3),getOneProList(pro_id,'current_month',false,3)">本月</button>
-                <button type="button" class='btn' id = "last_month_pro" v-bind:class="{colorChange:4==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'last_month',true,4),getOneProList(pro_id,'last_month',false,4)">上月</button>
-                <button type="button" class='btn' id = "monthly_pro" v-bind:class="{colorChange:5==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'monthly',true,5),getOneProList(pro_id,'monthly',false,5)">近30天</button>
-                <button type="button" class='btn' id = "current_year_pro" v-bind:class="{colorChange:6==dynamic}" @click="resetCurrentPage(),getOneProList(pro_id,'current_year',true,6),getOneProList(pro_id,'current_year',false,6)">今年</button>
-                <button type="button" class='btn' id = "all_pro"  v-bind:class="{colorChange:7==dynamic_pro}" @click="resetCurrentPage(),getOneProList(pro_id,'all',true,7),getOneProList(pro_id,'all',false,7)">所有</button>
+                <button type="button" class='btn' id ="yesterday_pro" v-bind:class="{colorChange:1==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'yesterday',false,1)">昨天</button>
+                <button type="button" class='btn' id = "current_week_pro" v-bind:class="{colorChange:2==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'current_week',false,2)">本周</button>
+                <button type="button" class='btn' id = "current_month_pro" v-bind:class="{colorChange:3==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'current_month',false,3)">本月</button>
+                <button type="button" class='btn' id = "last_month_pro" v-bind:class="{colorChange:4==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'last_month',false,4)">上月</button>
+                <button type="button" class='btn' id = "monthly_pro" v-bind:class="{colorChange:5==dynamic_pro}"  @click="resetCurrentPage(),getOneProList(pro_id,'monthly',false,5)">近30天</button>
+                <button type="button" class='btn' id = "current_year_pro" v-bind:class="{colorChange:6==dynamic_pro}" @click="resetCurrentPage(),getOneProList(pro_id,'current_year',false,6)">今年</button>
+                <button type="button" class='btn' id = "all_pro"  v-bind:class="{colorChange:7==dynamic_pro}" @click="resetCurrentPage(),getOneProList(pro_id,'all',false,7)">所有</button>
                 <span style="margin-left: 20px;">
                     <el-date-picker
                         v-model="create_time_pro"
                         prefix-icon="el-icon-time"
-                        @change="resetCurrentPage(),getOneProList(pro_id,'',true,0),getOneProList(pro_id,'',false,0),clickCheckBox"
+                        @change="resetCurrentPage(),getOneProList(pro_id,'',false,0),clickCheckBox"
                         type="daterange"
                         size='small'
                         range-separator="至"
@@ -604,7 +601,7 @@
                     this.pro_id=pro_id;
                     this.ownerName=ownerName
                     this.getOneProData(pro_id);
-                    this.getOneProList(pro_id,"monthly",true,5);
+                    this.getOneProList(pro_id,"current_year",true,0);
                     this.getOneProList(pro_id,"monthly",false,5);
                 },
                 tableHeaderStyle({row,column,rowIndex,columnIndex}){
@@ -665,7 +662,7 @@
                 },
                 drawRadarOpenI(){
                     
-                    var ydata = [this.roundingF(this.tableDataIDTotal.impact),this.roundingF(this.tableDataIDTotal.completeness),this.roundingF(this.tableDataIDTotal.liveness),this.tableDataIDTotal.projectHealth,this.roundingF(this.tableDataIDTotal.teamHealth),this.roundingF(this.tableDataIDTotal.growth)]
+                    var ydata = [this.roundingF(this.tableDataIDTotal.impact),this.roundingF(this.tableDataIDTotal.completeness),this.roundingF(this.tableDataIDTotal.liveness),this.roundingF(this.tableDataIDTotal.projectHealth),this.roundingF(this.tableDataIDTotal.teamHealth),this.roundingF(this.tableDataIDTotal.growth)]
                     console.log("ydata:",ydata)
                     var i = -1;
                     var option = {
@@ -840,9 +837,9 @@
                     // if ()
                     for(var i =0;i<this.tableDataID.length;i++){
                         xdata.push(this.tableDataID[this.tableDataID.length-1-i].date);
-                        ydata_view.push(this.roundingF(this.tableDataID[this.tableDataID.length-1-i].view))
-                        ydata_download.push(this.roundingF(this.tableDataID[this.tableDataID.length-1-i].download))
-                        ydata_commit.push(this.roundingF(this.tableDataID[this.tableDataID.length-1-i].commit))
+                        ydata_view.push(this.tableDataID[this.tableDataID.length-1-i].view)
+                        ydata_download.push(this.tableDataID[this.tableDataID.length-1-i].download)
+                        ydata_commit.push(this.tableDataID[this.tableDataID.length-1-i].commit)
                     }
                     console.log("ydata_openI:"+ydata_download)
                     console.log(xdata)
@@ -1077,6 +1074,10 @@
         /deep/ .el-date-picker {
             width: 200px;
         }
+        /deep/ .el-table tbody tr:hover>td { 
+            background-color:#D3D3D3!important;
+            opacity:1
+        }
         .colorChange {
             background-color: #409effd6;
             color: #FFFF;

web_src/js/components/UserAnalysis.vue

@@ -432,6 +432,10 @@
     /deep/ .el-table {
     font-size: 12px;
     }
+    /deep/ .el-table tbody tr:hover>td { 
+            background-color:#D3D3D3!important;
+            opacity:1
+        }
 
     .colorChange {
     background-color: #409effd6;