From e8532a8a09aa2ba51d618d517b3b4ffa5abab0a1 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 18 Feb 2022 11:43:14 +0800
Subject: [PATCH] =?UTF-8?q?fix-1399=20=E6=95=B0=E5=AD=97=E5=8C=96=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E5=B1=95=E7=A4=BA=E4=B8=AD=E6=96=87=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/js/components/ProAnalysis.vue | 39 +++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index 074f8e326..88ea67d94 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/web_src/js/components/ProAnalysis.vue
@@ -59,14 +59,21 @@
                         >
                     </el-table-column>
                     <el-table-column
+                        label="项目名称中文"
+                        align="left"
+                        prop="name"
+                        v-if='0'
+                        >
+                    </el-table-column>
+                    <el-table-column
                         label="项目名称"
                         width="125px"
                         align="left"
-                        prop="name"
+                        prop="alias"
                         style="color:#0366D6;font-family: Roboto"
                         >
                         <template slot-scope="scope">
-                            <a @click=goToDetailPage(scope.row.repo_id,scope.row.name,scope.row.ownerName)>{{scope.row.name}} </a>
+                            <a @click=goToDetailPage(scope.row.repo_id,scope.row.name,scope.row.ownerName,scope.row.alias)>{{scope.row.alias}} </a>
                         </template>
                     </el-table-column>
                         <el-table-column
@@ -160,7 +167,7 @@
         </div>
         <div id ="pro_detail" style="display:none;width: 100%;">
             <div style="margin-top: 10px;">
-                <a  class="pro_item" :href="'../../../'+this.ownerName+'/'+this.pro_name">{{this.ownerName}}&nbsp/&nbsp{{this.pro_name}}</a>  <span class="update_time">数据更新时间：</span><span style="font-size: 12px;">{{tableDataIDTotal.lastUpdatedTime}}&nbsp/&nbsp从{{tableDataIDTotal.recordBeginTime}}开始统计</span>   
+                <a  class="pro_item" :href="'../../../'+this.ownerName+'/'+this.pro_name">{{this.ownerName}}&nbsp/&nbsp{{this.alias}}</a>  <span class="update_time">数据更新时间：</span><span style="font-size: 12px;">{{tableDataIDTotal.lastUpdatedTime}}&nbsp/&nbsp从{{tableDataIDTotal.recordBeginTime}}开始统计</span>   
             </div>
             <div style="margin-top: 10px;">
                 项目描述：{{tableDataIDTotal.description | discriptionFun}}
@@ -388,6 +395,7 @@
                     create_time_pro: '',
                     dynamic_pro:7,
                     pro_name:'',
+                    alias:'',
                     pro_id:'',
                     ownerName:'',
                     radarOpenI:'',
@@ -445,7 +453,7 @@
                         startDate = this.comparedate(tmp,this.recordBeginTime)
 
                         console.log("comparedate:"+startDate)
-                        saveFileName = this.pro_name+"_"+startDate+'_'+endDate
+                        saveFileName = this.alias+"_"+startDate+'_'+endDate
                     }else{
                         switch(this.paramsID.type){
                             case "yesterday":{
@@ -453,7 +461,7 @@
                                 startDate = this.comparedate(yesterday_tmp,this.recordBeginTime)
                                 endDate = startDate
 
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "current_week":{
@@ -465,7 +473,7 @@
         
 
                                 endDate = yesterday
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "current_month":{
@@ -475,7 +483,7 @@
 
                                 endDate = yesterday
                                 
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "last_month":{
@@ -495,7 +503,7 @@
                                 var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
 
                                 endDate=this.saveFormatDate(lastYear, lastMonth+1, days);  //月份从0开始，所以+1保存月份 
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "monthly":{
@@ -504,7 +512,7 @@
                                 startDate = this.comparedate(startDate,this.recordBeginTime)
 
                                 endDate = yesterday
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "current_year":{
@@ -512,14 +520,14 @@
                                 startDate = this.comparedate(startDate,this.recordBeginTime)
 
                                 endDate = yesterday
-                                saveFileName = this.pro_name+"_"+startDate+'_'+ endDate
+                                saveFileName = this.alias+"_"+startDate+'_'+ endDate
                                 break
                             }
                             case "all":{
                                 console.log("e:"+today)
                                 startDate = 'all'
                                 endDate = yesterday
-                                saveFileName = this.pro_name+'_所有'
+                                saveFileName = this.alias+'_所有'
                                 break
                             }
                         }
@@ -641,7 +649,7 @@
                     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)
+                    // console.log("this.totalPage:"+this.totalPage)
     
                     })
                 },
@@ -652,13 +660,14 @@
                     this.getAllProList(this.params.type, this.dynamic)
                 },
     
-                goToDetailPage(pro_id,pro_name,ownerName){
+                goToDetailPage(pro_id,pro_name,ownerName,alias){
                     this.currentPage=1
                     document.getElementById("pro_main").style.display="none";
                     document.getElementById("pro_detail").style.display="block";
-                    console.log(pro_id)
-                    console.log(pro_name)
+                    // console.log(pro_id)
+                    // console.log(pro_name)
                     this.pro_name=pro_name;
+                    this.alias=alias;
                     this.pro_id=pro_id;
                     this.ownerName=ownerName
                     this.getOneProData(pro_id);