From 97a5f18f244832aa9a2a8de222b92c32855efae6 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 29 Apr 2022 18:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E6=9E=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/js/components/ProAnalysis.vue |   3 +-
 web_src/js/components/ProTend.vue     | 232 +++++++++++++++++++++-----
 2 files changed, 194 insertions(+), 41 deletions(-)

diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 016da4abc..7c5d26b28 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -404,8 +404,7 @@
                     value_time: '',
                     search:'',
                     dynamic:7,
-                    download_a:"",
-                    downLoadSrc:'',
+
 
     
                     //单个项目参数
diff --git a/web_src/js/components/ProTend.vue b/web_src/js/components/ProTend.vue
index 2780fcf6f..7167f56dc 100644
--- a/web_src/js/components/ProTend.vue
+++ b/web_src/js/components/ProTend.vue
@@ -21,7 +21,7 @@
                         <el-row class="item_title_h">
                         项目
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                             234
                         </el-row>
                         <el-row class="item_h">
@@ -32,7 +32,7 @@
                         <el-row class ='item_list_p item_title_h'>
                         公开
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                             34567
                         </el-row >
                         <el-row class="item_h">
@@ -44,7 +44,7 @@
                         <el-row class="item_title_h"> 
                         私有
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                             234556
                         </el-row>
                         <el-row class="item_h"> 
@@ -55,7 +55,7 @@
                         <el-row class ='item_list_p item_title_h'>
                         自建
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                         89087
                         </el-row >
                         <el-row class="item_h">
@@ -67,7 +67,7 @@
                         <el-row class ='item_list_p item_title_h'>
                         派生
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                             234556
                         </el-row >
                         <el-row class="item_h"> 
@@ -78,7 +78,7 @@
                         <el-row class="item_title_h">
                         镜像
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                         89087
                         </el-row>
                         <el-row class="item_h">
@@ -90,7 +90,7 @@
                         <el-row class ='item_list_p item_title_h'>
                         组织
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                             234556
                         </el-row>
                         <el-row class="item_h">
@@ -101,7 +101,7 @@
                         <el-row class="item_title_h"> 
                         个人
                         </el-row>
-                        <el-row class="item_h">
+                        <el-row class="item_h num_color">
                         89087
                         </el-row>
                         <el-row class="item_h">
@@ -145,6 +145,70 @@
                 </div>  
             </span>
         </div>
+        <div style="margin-top: 30px;"> 
+            <el-table
+                :data="tableData"
+                style="width: 100%"
+                :header-cell-style="tableHeaderStyle"
+                :cell-style='cellStyle'>
+                <el-table-column
+                    label="日期"
+                    align="left"
+                    prop="creatTime"
+                    >
+                </el-table-column>
+                <el-table-column
+                    label="新增项目"
+                    align="left"
+                    prop="numReposAdd"
+                    >
+                </el-table-column>
+                    <el-table-column
+                    label="累计项目"
+                    align="center"
+                    prop="numRepos"
+                    >
+                </el-table-column>
+                <el-table-column
+                    prop="numRepoPublicAdd" 
+                    label="新增公开项目"
+                    align="center">
+                </el-table-column>
+                <el-table-column
+                    prop="numRepoPrivateAdd"
+                    label="新增私有项目"
+                    align="center">
+                </el-table-column>
+                <el-table-column
+                    prop="numRepoSelfAdd"
+                    label="新增自建项目"
+                    align="center">
+               </el-table-column>
+               <el-table-column
+                    prop="numRepoForkAdd"
+                    label="新增派生项目"
+                    align="center">
+                </el-table-column>
+                <el-table-column
+                    prop="numRepoMirrorAdd"
+                    label="新增镜像项目"
+                    align="center">
+                </el-table-column>
+                              
+            </el-table>
+        </div>
+        <div style="margin-top:50px;text-align:center">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="page"
+            :page-size="pageSize" 
+            :page-sizes="[5,10,20]"
+            layout="total, sizes,prev, pager, next,jumper"
+            :total="totalNum">
+            </el-pagination>
+        </div>
     </div>
 </template>
 
@@ -166,6 +230,7 @@
                 pageSize:10,
                 params:{type:'all',page:1,pagesize:10,beginTime:'',endTime:''},
                 tableData: [],
+                tableDataIDTotal: [],
                 totalPage:0,
                 totalNum:0,
                 pickerOptions: {
@@ -175,29 +240,6 @@
                 dynamic:7,
                 download_a:"",
                 downLoadSrc:'',
-
-
-                //单个项目参数
-                columns: [{title: '日期',key: 'date'},{title: '浏览量',key: 'view'},{title: '下载量',key: 'download'},{title: 'commit',key: 'commit'}],
-                currentPage:1,
-                pageSize1:10,
-                paramsID:{type:'all' ,beginTime:'',endTime:'',openi:'false'},
-                tableDataIDTotal: [],
-                tableDataID: [],
-                tableDataIDOpenI:[],  
-                tableDataContTop10:[],
-                create_time_pro: '',
-                dynamic_pro:7,
-                pro_name:'',
-                alias:'',
-                pro_id:'',
-                ownerName:'',
-                radarOpenI:'',
-                echartsOITd:'',
-                echartsSelectData:'',
-                option:'',
-
-
             };
          },
         methods: {
@@ -437,13 +479,12 @@
                 this.$axios.get('../api/v1/projectboard/summary/period',{
                     params:this.params
                 }).then((res)=>{
-            
-                // this.recordBeginTime=res.data.recordBeginTime
-                // this.lastUpdatedTime=res.data.lastUpdatedTime
-                // this.tableData = res.data.pageRecords
-                // this.totalPage=res.data.totalPage
-                // this.totalNum = res.data.totalCount//this.totalPage*this.params.pagesize
-                console.log("this.totalPage:"+this.totalPage)
+                    this.recordBeginTime=res.data.recordBeginTime
+                    this.lastUpdatedTime=res.data.creatTime
+                    this.tableData = res.data.pageRecords
+                    this.totalPage=res.data.totalPage
+                    this.totalNum = res.data.totalCount//this.totalPage*this.params.pagesize
+                    console.log("res.data:"+res.data)
 
                 })
             },
@@ -977,7 +1018,8 @@
         }
     }
 </script>
-<style>
+
+<style scoped>
     .item_list_first{
         border-right: 1px solid rgba(219,219,219,100);
         padding-right: 10px;
@@ -993,8 +1035,120 @@
     }
     .item_h{
         line-height: 40px;
+        text-align: center;
     }
     .item_title_h{
         line-height: 28px;
+        text-align: center;
+    }
+    .num_color{
+        color: #0366D6;
+    }
+
+    .pro_item{
+        font-size: 16px;
+        color:  rgba(16, 16, 16, 100);
+        font-family: SourceHanSansSC-bold;
+    }
+    .sta_item{
+        font-size: 14px;
+        color: rgb(0 0 0);
+        font-family: SourceHanSansSC-bold;
+    }
+    .update_time{
+        line-height: 17px;
+        font-size: 12px;
+        color:rgba(187, 187, 187, 100);
+        margin-left: 10px;
+    }
+    .btnFirst{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border:  1px solid rgba(22, 132, 252, 100);
+        border-right: none;
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+        border-radius:4px 0px 0px 4px;
+    }
+    .btn{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border:  1px solid rgba(22, 132, 252, 100);
+        border-right: none;
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+    }
+    .btnLast{ 
+        line-height: 1.5;
+        margin: -3.5px;
+        border: 1px solid rgba(22, 132, 252, 100);
+        /* border-right: none; */
+        background: #FFFF;
+        color: #1684FC;
+        width: 60px;
+        height: 30px;
+        border-radius:0px 4px 4px 0px;
+    }
+    .btnFirst, .btn, .btnLast {
+        cursor: pointer;
+    }
+
+
+/*     
+    .btn:focus,
+    .btn:active{
+        background-color:#409effd6 ;
+    } */
+    /* /deep/ .el-date-picker {
+        width: 250px;
+    } */
+    /deep/ .el-table tbody tr:hover>td { 
+        background-color:#D3D3D3!important;
+        opacity:1
+    }
+    /deep/ .el-table {
+        font-size: 12px;
+    }
+ 
+    /deep/ .el-range-separator{
+        width: 20% !important;
+    }
+
+    .colorChange {
+        background-color: #1684FC;
+        color: #FFFF;
+        cursor: default;
+    }
+    .items{
+        text-align: center;
+        border-right:1px solid rgba(219, 219, 219, 100);
+    }  
+    .item_l{
+        margin-right: 5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 370px;
+        width: 100%;
+    }
+    .item_r{
+        margin-right:5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 370px;
+        overflow:auto
+    }
+    .item_echart{
+        margin-top: 10px;
+        margin-right: 5px;
+        border:1px solid rgba(219, 219, 219, 100);
+        height: 350px;
+        width: 100%;
+    }
+    .item_content{
+        color:#0366D6;
+        margin-top: 10px;
+        font-weight:bold;
     }
 </style>
\ No newline at end of file