From 533566982f3a9b7a442d847a16db154dd8c1cf88 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 16 Nov 2021 14:57:55 +0800
Subject: [PATCH 1/6] modify code

---
 templates/base/head_navbar.tmpl        |  7 +++-
 templates/base/head_navbar_home.tmpl   |  7 +++-
 web_src/js/components/ProAnalysis.vue  | 66 ++++++++++++++++++++++++----------
 web_src/js/components/UserAnalysis.vue |  2 +-
 4 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 67d8fc1b7..49b3181e7 100755
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -37,7 +37,9 @@
 				<a class="item" href="{{AppSubUrl}}/explore/users">{{.i18n.Tr "explore.users"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "explore.organizations"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/images">{{.i18n.Tr "explore.images"}}</a>
-				<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{if .IsAdmin}}
+					<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{end}}				
 			</div>
 		</div>
 	{{else if .IsLandingPageHome}}
@@ -53,6 +55,9 @@
 				<a class="item" href="{{AppSubUrl}}/explore/users">{{.i18n.Tr "explore.users"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "explore.organizations"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/images">{{.i18n.Tr "explore.images"}}</a>
+				{{if .IsAdmin}}
+					<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{end}}
 			</div>
 		</div>
 	{{else if .IsLandingPageExplore}}
diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl
index e334efba8..c94ff269f 100644
--- a/templates/base/head_navbar_home.tmpl
+++ b/templates/base/head_navbar_home.tmpl
@@ -29,7 +29,9 @@
 				<a class="item" href="{{AppSubUrl}}/explore/users">{{.i18n.Tr "explore.users"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "explore.organizations"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/images">{{.i18n.Tr "explore.images"}}</a>
-				<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{if .IsAdmin}}
+					<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{end}}			
 			</div>
 		</div>
 	{{else if .IsLandingPageHome}}
@@ -45,6 +47,9 @@
 				<a class="item" href="{{AppSubUrl}}/explore/users">{{.i18n.Tr "explore.users"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "explore.organizations"}}</a>
 				<a class="item" href="{{AppSubUrl}}/explore/images">{{.i18n.Tr "explore.images"}}</a>
+				{{if .IsAdmin}}
+					<a class="item" href="{{AppSubUrl}}/explore/data_analysis">{{.i18n.Tr "explore.data_analysis"}}</a>
+				{{end}}
 			</div>
 		</div>
 	{{else if .IsLandingPageExplore}}
diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 8d4f25084..abe6f5904 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -8,18 +8,18 @@
             <bar-label :width="'95%'" :height="'500px'"></bar-label>
             <div style="margin-top: 20px;">
                 <span  class="sta_iterm">统计周期：</span> 
-                <button type="button" class='btn' id ="yesterday" v-bind:class="{colorChange:1==dynamic}"  @click="getAllProList('yesterday',1)">昨天</button>
-                <button type="button" class='btn' id = "current_week" v-bind:class="{colorChange:2==dynamic}"  @click="getAllProList('current_week',2)">本周</button>
-                <button type="button" class='btn' id = "current_month" v-bind:class="{colorChange:3==dynamic}"  @click="getAllProList('current_month',3)">本月</button>
-                <button type="button" class='btn' id = "last_month" v-bind:class="{colorChange:4==dynamic}"  @click="getAllProList('last_month',4)">上月</button>
-                <button type="button" class='btn' id = "monthly" v-bind:class="{colorChange:5==dynamic}"  @click="getAllProList('monthly',5)">近30天</button>
-                <button type="button" class='btn' id = "current_year" v-bind:class="{colorChange:6==dynamic}" @click="getAllProList('current_year',6)">今年</button>
-                <button type="button" class='btn' id = "all"  v-bind:class="{colorChange:7==dynamic}" @click="getAllProList('all',7)">所有</button>
+                <button type="button" class='btn' id ="yesterday" v-bind:class="{colorChange:1==dynamic}"  @click="resetPage(),getAllProList('yesterday',1)">昨天</button>
+                <button type="button" class='btn' id = "current_week" v-bind:class="{colorChange:2==dynamic}"  @click="resetPage(),getAllProList('current_week',2)">本周</button>
+                <button type="button" class='btn' id = "current_month" v-bind:class="{colorChange:3==dynamic}"  @click="resetPage(),getAllProList('current_month',3)">本月</button>
+                <button type="button" class='btn' id = "last_month" v-bind:class="{colorChange:4==dynamic}"  @click="resetPage(),getAllProList('last_month',4)">上月</button>
+                <button type="button" class='btn' id = "monthly" v-bind:class="{colorChange:5==dynamic}"  @click="resetPage(),getAllProList('monthly',5)">近30天</button>
+                <button type="button" class='btn' id = "current_year" v-bind:class="{colorChange:6==dynamic}" @click="resetPage(),getAllProList('current_year',6)">今年</button>
+                <button type="button" class='btn' id = "all"  v-bind:class="{colorChange:7==dynamic}" @click="resetPage(),getAllProList('all',7)">所有</button>
                 <span style="margin-left: 20px;">
                     <el-date-picker
                         v-model="value_time"
                         prefix-icon="el-icon-time"
-                        @change="getAllProList('',0)"
+                        @change="resetPage(),getAllProList('',0)"
                         type="daterange"
                         size='small'
                         range-separator="至"
@@ -146,7 +146,7 @@
         </div>
         <div id ="pro_detail" style="display:none;width: 100%;">
             <div style="margin-top: 10px;">
-                <b  class="pro_item">OpenI / {{this.pro_name}}</b>  <span class="update_time">数据更新时间：{{tableDataIDTotal.lastUpdatedTime}}/{{tableDataIDTotal.recordBeginTime}}</span>   
+                <b  class="pro_item">{{this.pro_name}}</b>  <span class="update_time">数据更新时间：{{tableDataIDTotal.lastUpdatedTime}}/{{tableDataIDTotal.recordBeginTime}}</span>   
             </div>
             <div style="margin-top: 10px;">
                 项目描述：{{tableDataIDTotal.description | discriptionFun}}
@@ -205,7 +205,13 @@
                                         label="用户名"
                                         align="center"
                                         prop="user">
+                                        <template slot-scope="scope">
+                                            <a v-if="scope.row.mode!=-1" :href="AppSubUrl +'../../../'+ scope.row.user"><img class="ui avatar s16 image js-popover-card" :src="scope.row.relAvatarLink">{{scope.row.user}} </a>
+                                            <a v-else :href="'mailto:'+ scope.row.email "> <img class="ui avatar s16 image js-popover-card" :avatar="scope.row.email"> {{scope.row.user}}</a>  
+                                        </template>  
+
                                     </el-table-column>
+
                                     <el-table-column
                                         label="身份"
                                         align="center"
@@ -233,18 +239,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="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="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="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="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="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="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="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',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>
                 <span style="margin-left: 20px;">
                     <el-date-picker
                         v-model="create_time_pro"
                         prefix-icon="el-icon-time"
-                        @change="getOneProList(pro_id,'',true,0),getOneProList(pro_id,'',false,0),clickCheckBox"
+                        @change="resetCurrentPage(),getOneProList(pro_id,'',true,0),getOneProList(pro_id,'',false,0),clickCheckBox"
                         type="daterange"
                         size='small'
                         range-separator="至"
@@ -321,6 +327,8 @@
     
     <script>
         // import barLabel from './basic/barLabel.vue';
+        const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
+
         import { export2Excel } from '../excel/util.js'
         export default{
             name:'ProAnalysis',
@@ -375,6 +383,7 @@
                     // this.getOneProList(this.pro_id,'all',true,7)
                     // this.getOneProList(this.pro_id,'all',false,7)
                     // this.fileName()
+                    this.currentPage=1
                     var saveFileName = this.getFileName()
                     export2Excel(this.columns,this.tableDataID,saveFileName)
                 },
@@ -458,9 +467,17 @@
                     return saveFileName
 
                 },
+                resetPage(){
+                    this.page=1
+                    this.params.page = 1
+                },
+                resetCurrentPage(){
+                    this.currentPage=1
+                },
                 handleCurrentChange(val){
                     console.log(val)
                     this.params.page = val
+                    this.page = val
                     switch(this.params.type){
                         case "yesterday":{
                                 this.value_time=''
@@ -563,11 +580,12 @@
                 searchName(){
                         this.params.q = this.search
                         this.params.page = 1
+                        this.page=1
                         this.getAllProList("all",7)
                 },
     
                 goToDetailPage(pro_id,pro_name){
-                   
+                    this.currentPage=1
                     document.getElementById("pro_main").style.display="none";
                     document.getElementById("pro_detail").style.display="block";
                     console.log(pro_id)
@@ -908,6 +926,7 @@
                     //     option.legend.selected = obj;
                     //     this.echartsSelectData.setOption(option);
                     // });
+                    
 
 
                 },
@@ -961,7 +980,16 @@
                     }else{
                          return "未定义"
                     }
-                }
+                },
+                showContext(value){
+                    if (value.mode!=-1){
+                       return  " <img class=\"ui avatar image\" src= \" "+ value.RelAvatarLink+ " \" > "+" <a href= \" " + AppSubUrl+"/"+value.user+ "\">"+value.user+" </a>"
+                    }
+                    else{
+                        return " <a href=\" mailto:" + value.email + "class=\"circular ui button\">"  +value.user+ "</a>"
+                    }			
+                    
+                },
             },
     
     
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index c8f169887..3c07a8807 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -252,7 +252,7 @@
                             var tmp = new Date(now.setTime(now.getTime()-24*60*60*1000));
                             var yesterday = this.formatDate(tmp.getFullYear(),tmp.getMonth()+1,tmp.getDate());
                             this.params.startDate = yesterday
-                            this.params.endDate = today
+                            this.params.endDate = yesterday
                             this.value_time=[]
                             // document.getElementById("yesterday_usr").style.backgroundColor="409effd6"
                             // document.getElementById("current_week_usr")

From b7178dc66f46557a5b92a5a3a5a74c555e9b4951 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 16 Nov 2021 16:06:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?Sheet1=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/repo_dashbord.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go
index 127587ddb..2ecb39b9f 100644
--- a/routers/api/v1/repo/repo_dashbord.go
+++ b/routers/api/v1/repo/repo_dashbord.go
@@ -205,6 +205,7 @@ func ServeAllProjectsPeriodStatisticsFile(ctx *context.Context) {
 
 	}
 	f.SetActiveSheet(index)
+	f.DeleteSheet("Sheet1")
 
 	if err := f.SaveAs(fileName); err != nil {
 		log.Error("Can not generate file.", err)

From 6d5af298f184a7ddb1adf1af40727209576c4886 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 16 Nov 2021 16:45:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/repo_dashbord.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go
index 2ecb39b9f..3a8e2a4ff 100644
--- a/routers/api/v1/repo/repo_dashbord.go
+++ b/routers/api/v1/repo/repo_dashbord.go
@@ -388,7 +388,7 @@ func GetProjectPeriodStatistics(ctx *context.Context) {
 func generateRadarSql(beginTime time.Time, endTime time.Time, repoId int64) string {
 	sql := "SELECT date, impact, completeness, liveness, project_health, team_health, growth, radar_total FROM repo_statistic" +
 		" where repo_id=" + strconv.FormatInt(repoId, 10) + " and created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
-		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10)
+		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " order by created_unix"
 
 	return sql
 }
@@ -396,7 +396,7 @@ func generateRadarSql(beginTime time.Time, endTime time.Time, repoId int64) stri
 func generateTargetSql(beginTime time.Time, endTime time.Time, repoId int64) string {
 	sql := "SELECT date, num_visits,num_downloads,num_commits FROM repo_statistic" +
 		" where repo_id=" + strconv.FormatInt(repoId, 10) + " and created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
-		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10)
+		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " order by created_unix"
 
 	return sql
 }

From 8ca1db9751f60a37b608ca861b24b65ed8118c18 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 16 Nov 2021 17:03:31 +0800
Subject: [PATCH 4/6] modify code

---
 web_src/js/components/ProAnalysis.vue | 52 +++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index abe6f5904..a8b0abe5a 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -35,7 +35,7 @@
 
 
                     <span style="display:inline-block;margin-left: 20px; ">
-                        <el-input size="small" placeholder="输入项目关键字搜索" v-model="search" class="input-with-select" @keyup.enter.native="searchName() "><i slot="suffix" class="el-input__icon el-icon-search"></i>
+                        <el-input size="small" placeholder="输入项目关键字搜索" v-model="search" class="input-with-select" @keyup.enter.native="searchName() "><i slot="suffix" class="el-input__icon el-icon-search"   @click="searchName() "></i>
                         </el-input>
                     </span>
                 </span>
@@ -53,6 +53,16 @@
                         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"
@@ -61,7 +71,7 @@
                         style="color:#0366D6 100%;"
                         >
                         <template slot-scope="scope">
-                            <a @click=goToDetailPage(scope.row.repo_id,scope.row.name)>{{scope.row.name}} </a>
+                            <a @click=goToDetailPage(scope.row.repo_id,scope.row.name,scope.row.ownerName)>{{scope.row.name}} </a>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -146,7 +156,7 @@
         </div>
         <div id ="pro_detail" style="display:none;width: 100%;">
             <div style="margin-top: 10px;">
-                <b  class="pro_item">{{this.pro_name}}</b>  <span class="update_time">数据更新时间：{{tableDataIDTotal.lastUpdatedTime}}/{{tableDataIDTotal.recordBeginTime}}</span>   
+                <b  class="pro_item">{{this.ownerName}}/{{this.pro_name}}</b>  <span class="update_time">数据更新时间：{{tableDataIDTotal.lastUpdatedTime}}/{{tableDataIDTotal.recordBeginTime}}</span>   
             </div>
             <div style="margin-top: 10px;">
                 项目描述：{{tableDataIDTotal.description | discriptionFun}}
@@ -209,16 +219,15 @@
                                             <a v-if="scope.row.mode!=-1" :href="AppSubUrl +'../../../'+ scope.row.user"><img class="ui avatar s16 image js-popover-card" :src="scope.row.relAvatarLink">{{scope.row.user}} </a>
                                             <a v-else :href="'mailto:'+ scope.row.email "> <img class="ui avatar s16 image js-popover-card" :avatar="scope.row.email"> {{scope.row.user}}</a>  
                                         </template>  
-
                                     </el-table-column>
-
                                     <el-table-column
                                         label="身份"
                                         align="center"
-                                        prop="mode">
-                                    <template slot-scope="scope">
-                                        {{scope.row.mode | showMode}}
-                                    </template>    
+                                        prop="mode"
+                                        v-if='0'>
+                                        <template slot-scope="scope">
+                                            {{scope.row.mode | showMode}}
+                                        </template>    
                                     </el-table-column>
                                     <el-table-column
                                         prop="pr"
@@ -366,6 +375,7 @@
                     dynamic_pro:7,
                     pro_name:'',
                     pro_id:'',
+                    ownerName:'',
                     radarOpenI:'',
                     echartsOITd:'',
                     echartsSelectData:'',
@@ -578,13 +588,13 @@
                     })
                 },
                 searchName(){
-                        this.params.q = this.search
-                        this.params.page = 1
-                        this.page=1
-                        this.getAllProList("all",7)
+                    this.params.q = this.search
+                    this.params.page = 1
+                    this.page=1
+                    this.getAllProList(this.params.type, this.dynamic)
                 },
     
-                goToDetailPage(pro_id,pro_name){
+                goToDetailPage(pro_id,pro_name,ownerName){
                     this.currentPage=1
                     document.getElementById("pro_main").style.display="none";
                     document.getElementById("pro_detail").style.display="block";
@@ -592,6 +602,7 @@
                     console.log(pro_name)
                     this.pro_name=pro_name;
                     this.pro_id=pro_id;
+                    this.ownerName=ownerName
                     this.getOneProData(pro_id);
                     this.getOneProList(pro_id,"monthly",true,5);
                     this.getOneProList(pro_id,"monthly",false,5);
@@ -1012,6 +1023,19 @@
                 // }
                 // console.log("this.radarOpenI:"+this.radarOpenI)
             },
+
+            watch:{
+                search(val){
+                    if(!val){
+                        this.params.q = this.search
+                        this.params.page = 1
+                        this.page=1
+                        this.getAllProList(this.params.type, this.dynamic)
+                    } 
+                }
+
+            },
+
             created() {
                 // this.download_a=document.getElementById("download_file")
             }

From 5f5d249a53b3000fd6997cada300cd664f1c6772 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 16 Nov 2021 17:18:10 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/repo_dashbord.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go
index 3a8e2a4ff..2becdd59f 100644
--- a/routers/api/v1/repo/repo_dashbord.go
+++ b/routers/api/v1/repo/repo_dashbord.go
@@ -396,7 +396,7 @@ func generateRadarSql(beginTime time.Time, endTime time.Time, repoId int64) stri
 func generateTargetSql(beginTime time.Time, endTime time.Time, repoId int64) string {
 	sql := "SELECT date, num_visits,num_downloads,num_commits FROM repo_statistic" +
 		" where repo_id=" + strconv.FormatInt(repoId, 10) + " and created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
-		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " order by created_unix"
+		" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " order by created_unix desc"
 
 	return sql
 }

From af2bf1f99d6f9b5273ac2b344da3726a7b4381bf Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 16 Nov 2021 17:30:04 +0800
Subject: [PATCH 6/6] modify ProAnalysis

---
 web_src/js/components/ProAnalysis.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index a8b0abe5a..dfc09aad4 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -185,7 +185,7 @@
                     </el-col>
                     <el-col :span='4' style="text-align: center;"> 
                         <el-row>任务完成比例</el-row>
-                        <el-row class="item_content">{{tableDataIDTotal.issueClosedRatio}}</el-row>
+                        <el-row class="item_content">{{tableDataIDTotal.issueClosedRatio * 100}}%</el-row>
                     </el-col>
                 </el-row>           
             </div>
@@ -752,7 +752,7 @@
                     var ydata_openI=[]
                     for(var i =0;i<this.tableDataIDOpenI.length;i++){
                         xdata_openI.push(this.tableDataIDOpenI[i].date);
-                        ydata_openI.push(this.roundingF(this.tableDataIDOpenI[this.tableDataIDOpenI.length-1-i].openi))
+                        ydata_openI.push(this.roundingF(this.tableDataIDOpenI[i].openi))
                     }
                     console.log("ydata_openI:"+ydata_openI)
                     console.log(xdata_openI)
@@ -839,7 +839,7 @@
                     var ydata_commit=[]
                     // if ()
                     for(var i =0;i<this.tableDataID.length;i++){
-                        xdata.push(this.tableDataID[i].date);
+                        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))