Merge remote-tracking branch 'origin/V20220228' into zouap_user

templates/repo/debugjob/index.tmpl

@@ -490,11 +490,11 @@
 
 <script>
     // 调试和评分新开窗口
-    console.log({{.Tasks}})
     const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
     let url={{.RepoLink}}
     let getParam=getQueryVariable('debugListType')
-    let dropdownValue = getParam==='all'||getParam==='' ? '全部' : getParam
+    
+    let dropdownValue = ['all','',false].includes(getParam)? '全部' : getParam
     localStorage.setItem('all',location.href)
     function getQueryVariable(variable)
     {

templates/repo/home.tmpl

@@ -255,7 +255,7 @@
 					{{end}}
 				</div>
 				<div class="ui six wide tablet four wide computer column">
-					<div id="repo-desc" data-IsSigned= "{{.IsSigned}}"  >
+					<div id="repo-desc" data-IsAdmin= "{{.Permission.IsAdmin}}"  data-IsArchived="{{.Repository.IsArchived}}" >
 						<h4 id="about-desc"  class="ui header">简介</h4>
 						<input type="hidden" id="edit-alias"  value="{{.Repository.Alias}}">
 						<p>

web_src/js/components/EditAboutInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
       <h4 id="about-desc" class="ui header desc-home">简介
-        <a class="edit-icon" v-if="IsSigned" id ="editBtn" href="javascript:void(0)" @click="editClick" >
+        <a class="edit-icon" v-if="IsPermit" id ="editBtn" href="javascript:void(0)" @click="editClick" >
         <i class="gray edit outline icon" style="margin-right: 0;"></i>
         </a>
     </h4>
@@ -53,7 +53,7 @@ export default {
         index_web: '',
         repo_name_name: '',
         alias:'',
-        IsSigned:false
+        IsPermit:false
       },
     //   rule1:[{min:3,max:5,message:'1',trigger:"blur"}],
       rule: {
@@ -65,14 +65,15 @@ export default {
   },
   methods: {
     getIsSigned(){
-      this.IsSigned = document.getElementById("repo-desc").dataset.issigned;
+      var isadmin= document.getElementById("repo-desc").dataset.isadmin;
+      var isarchived=document.getElementById("repo-desc").dataset.isarchived;
       // console.log("IsSigned:",this.IsSigned)
-      if (this.IsSigned==true || this.IsSigned=="true"){
-        this.IsSigned=true;
+      if ((isadmin==true || isadmin=="true")&& (isarchived==false || isarchived=="false")){
+        this.IsPermit=true;
       }
     },
     editClick() {
-      if (this.IsSigned){
+      if (this.IsPermit){
         this.editDataDialog = true;
       }
     },

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);