Merge remote-tracking branch 'origin/V20220415' into fix-1852

models/cloudbrain.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"code.gitea.io/gitea/modules/util"
 	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	"code.gitea.io/gitea/modules/util"
+
 	"xorm.io/builder"
 	"xorm.io/xorm"
 
@@ -1587,3 +1588,64 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) {
 
 	return nil
 }
+func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) {
+	sess := x.NewSession()
+	defer sess.Close()
+	var cond = builder.NewCond()
+	if (opts.Type) >= 0 {
+		cond = cond.And(
+			builder.Eq{"cloudbrain.type": opts.Type},
+		)
+	}
+
+	var count int64
+	var err error
+	condition := "cloudbrain.user_id = `user`.id"
+	if len(opts.Keyword) == 0 {
+		count, err = sess.Where(cond).Count(new(Cloudbrain))
+	} else {
+		lowerKeyWord := strings.ToLower(opts.Keyword)
+
+		cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord}))
+		count, err = sess.Table(&Cloudbrain{}).Where(cond).
+			Join("left", "`user`", condition).Count(new(CloudbrainInfo))
+
+	}
+
+	if err != nil {
+		return nil, 0, fmt.Errorf("Count: %v", err)
+	}
+
+	if opts.Page >= 0 && opts.PageSize > 0 {
+		var start int
+		if opts.Page == 0 {
+			start = 0
+		} else {
+			start = (opts.Page - 1) * opts.PageSize
+		}
+		sess.Limit(opts.PageSize, start)
+	}
+
+	sess.OrderBy("cloudbrain.created_unix DESC")
+	cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum)
+	if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
+		Join("left", "`user`", condition).
+		Find(&cloudbrains); err != nil {
+		return nil, 0, fmt.Errorf("Find: %v", err)
+	}
+	if opts.NeedRepoInfo {
+		var ids []int64
+		for _, task := range cloudbrains {
+			ids = append(ids, task.RepoID)
+		}
+		repositoryMap, err := GetRepositoriesMapByIDs(ids)
+		if err == nil {
+			for _, task := range cloudbrains {
+				task.Repo = repositoryMap[task.RepoID]
+			}
+		}
+
+	}
+
+	return cloudbrains, count, nil
+}

models/org.go

@@ -193,22 +193,22 @@ func (org *User) getOrgStatistics() (int, error) {
 }
 
 func FindTopNStarsOrgs(n int) ([]*OrgScore, error) {
-	sql := "select a.id,sum(b.num_stars) score  from \"user\" a ,repository b where a.id=b.owner_id and a.type=1 group by a.id order by score desc  limit " + strconv.Itoa(n)
+	sql := "select a.id,sum(b.num_stars) score  from \"user\" a ,repository b where a.id=b.owner_id and a.type=1 and a.visibility=0 group by a.id order by score desc  limit " + strconv.Itoa(n)
 
 	return findTopNOrgs(sql)
 }
 func FindTopNMembersOrgs(n int) ([]*OrgScore, error) {
 	sql := "select id, count(user_id) score from" +
-		" (select org_id as id, uid as user_id from org_user " +
+		" (select org_id as id, uid as user_id from org_user o, \"user\" u where o.org_id=u.id and u.visibility=0 " +
 		"union select a.id,b.user_id from \"user\" a,collaboration b,repository c " +
-		"where a.type=1 and a.id=c.owner_id and b.repo_id=c.id) d " +
+		"where a.type=1 and a.visibility=0 and a.id=c.owner_id and b.repo_id=c.id) d " +
 		"group by id order by score desc limit " + strconv.Itoa(n)
 
 	return findTopNOrgs(sql)
 }
 
 func FindTopNOpenIOrgs(n int) ([]*OrgScore, error) {
-	sql := "select org_id id,num_score score from org_statistic order by num_score desc  limit 10" + strconv.Itoa(n)
+	sql := "select org_id id,num_score score from org_statistic a, \"user\" b where a.org_id=b.id and b.visibility=0 order by num_score desc  limit " + strconv.Itoa(n)
 
 	return findTopNOrgs(sql)
 }

options/locale/locale_zh-CN.ini

@@ -1015,7 +1015,9 @@ modelarts.train_job.basic_info=基本信息
 modelarts.train_job.job_status=任务状态
 modelarts.train_job.job_name=任务名称
 modelarts.train_job.version=任务版本
-modelarts.train_job.start_time=开始时间
+modelarts.train_job.start_time=开始运行时间
+modelarts.train_job.end_time=运行结束时间
+modelarts.train_job.wait_time=等待时间
 modelarts.train_job.dura_time=运行时长
 modelarts.train_job.description=任务描述
 modelarts.train_job.parameter_setting=参数设置

routers/api/v1/api.go

@@ -557,6 +557,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_user_last_month", operationReq, repo_ext.QueryUserStaticLastMonth)
 		m.Get("/query_user_yesterday", operationReq, repo_ext.QueryUserStaticYesterday)
 		m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll)
+		//cloudbrain board
+		m.Group("/cloudbrainboard", func() {
+			m.Get("/downloadAll", repo.DownloadCloudBrainBoard)
+		}, operationReq)
 		// Users
 		m.Group("/users", func() {
 			m.Get("/search", user.Search)

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -0,0 +1,135 @@
+package repo
+
+import (
+	"net/http"
+	"net/url"
+	"time"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"github.com/360EntSecGroup-Skylar/excelize/v2"
+)
+
+func DownloadCloudBrainBoard(ctx *context.Context) {
+
+	page := 1
+
+	pageSize := 300
+
+	var cloudBrain = ctx.Tr("repo.cloudbrain")
+	fileName := getCloudbrainFileName(cloudBrain)
+
+	_, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+		ListOptions: models.ListOptions{
+			Page:     page,
+			PageSize: 1,
+		},
+		Type:         models.TypeCloudBrainAll,
+		NeedRepoInfo: false,
+	})
+
+	if err != nil {
+		log.Warn("Can not get cloud brain info", err)
+		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.cloudbrain_query_fail"))
+		return
+	}
+
+	totalPage := getTotalPage(total, pageSize)
+
+	f := excelize.NewFile()
+
+	index := f.NewSheet(cloudBrain)
+	f.DeleteSheet("Sheet1")
+
+	for k, v := range allCloudbrainHeader(ctx) {
+		f.SetCellValue(cloudBrain, k, v)
+	}
+
+	var row = 2
+	for i := 0; i < totalPage; i++ {
+
+		pageRecords, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
+			ListOptions: models.ListOptions{
+				Page:     page,
+				PageSize: pageSize,
+			},
+			Type:         models.TypeCloudBrainAll,
+			NeedRepoInfo: true,
+		})
+		if err != nil {
+			log.Warn("Can not get cloud brain info", err)
+			continue
+		}
+		for _, record := range pageRecords {
+
+			for k, v := range allCloudbrainValues(row, record, ctx) {
+				f.SetCellValue(cloudBrain, k, v)
+			}
+			row++
+
+		}
+
+		page++
+	}
+	f.SetActiveSheet(index)
+
+	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName))
+	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+
+	f.WriteTo(ctx.Resp)
+}
+func getCloudbrainFileName(baseName string) string {
+	return baseName + "_" + time.Now().Format(EXCEL_DATE_FORMAT) + ".xlsx"
+
+}
+func allCloudbrainHeader(ctx *context.Context) map[string]string {
+
+	return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"),
+		"D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.wait_time"), "F1": ctx.Tr("repo.modelarts.train_job.dura_time"),
+		"G1": ctx.Tr("repo.modelarts.train_job.start_time"),
+		"H1": ctx.Tr("repo.modelarts.train_job.end_time"), "I1": ctx.Tr("repo.modelarts.computing_resources"),
+		"J1": ctx.Tr("repo.cloudbrain_creator"), "K1": ctx.Tr("repo.repo_name"), "L1": ctx.Tr("repo.cloudbrain_task_name")}
+
+}
+func allCloudbrainValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string {
+	return map[string]string{getCellName("A", row): rs.DisplayJobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status,
+		getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getBrainWaitTime(rs),
+		getCellName("F", row): rs.TrainJobDuration, getCellName("G", row): getBrainStartTime(rs),
+		getCellName("H", row): getBrainEndTime(rs),
+		getCellName("I", row): rs.ComputeResource, getCellName("J", row): rs.Name, getCellName("K", row): getBrainRepo(rs),
+		getCellName("L", row): rs.JobName,
+	}
+}
+func getBrainRepo(rs *models.CloudbrainInfo) string {
+	if rs.Repo != nil {
+		return rs.Repo.OwnerName + "/" + rs.Repo.Alias
+	}
+	return ""
+}
+func getBrainStartTime(rs *models.CloudbrainInfo) string {
+	timeString := time.Unix(int64(rs.Cloudbrain.StartTime), 0).Format(CREATE_TIME_FORMAT)
+	if timeString != "1970/01/01 08:00:00" {
+		return timeString
+	} else {
+		return "0"
+	}
+
+}
+func getBrainEndTime(rs *models.CloudbrainInfo) string {
+	timeString := time.Unix(int64(rs.Cloudbrain.EndTime), 0).Format(CREATE_TIME_FORMAT)
+	if timeString != "1970/01/01 08:00:00" {
+		return timeString
+	} else {
+		return "0"
+	}
+
+}
+func getBrainWaitTime(rs *models.CloudbrainInfo) string {
+	waitTime := rs.Cloudbrain.StartTime - rs.Cloudbrain.CreatedUnix
+	if waitTime <= 0 {
+		return "0"
+	} else {
+		return models.ConvertDurationToStr(int64(waitTime))
+	}
+}

routers/repo/cloudbrain.go

@@ -435,15 +435,29 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName, jobType models.Jo
 		return
 	}
 
-	if cloudbrain.ResourceSpecs == nil {
-		json.Unmarshal([]byte(setting.ResourceSpecs), &cloudbrain.ResourceSpecs)
-	}
-	for _, tmp := range cloudbrain.ResourceSpecs.ResourceSpec {
-		if tmp.Id == task.ResourceSpecId {
-			ctx.Data["GpuNum"] = tmp.GpuNum
-			ctx.Data["CpuNum"] = tmp.CpuNum
-			ctx.Data["MemMiB"] = tmp.MemMiB
-			ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
+	if task.JobType == string(models.JobTypeTrain) {
+		if cloudbrain.TrainResourceSpecs == nil {
+			json.Unmarshal([]byte(setting.TrainResourceSpecs), &cloudbrain.TrainResourceSpecs)
+		}
+		for _, tmp := range cloudbrain.TrainResourceSpecs.ResourceSpec {
+			if tmp.Id == task.ResourceSpecId {
+				ctx.Data["GpuNum"] = tmp.GpuNum
+				ctx.Data["CpuNum"] = tmp.CpuNum
+				ctx.Data["MemMiB"] = tmp.MemMiB
+				ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
+			}
+		}
+	} else {
+		if cloudbrain.ResourceSpecs == nil {
+			json.Unmarshal([]byte(setting.ResourceSpecs), &cloudbrain.ResourceSpecs)
+		}
+		for _, tmp := range cloudbrain.ResourceSpecs.ResourceSpec {
+			if tmp.Id == task.ResourceSpecId {
+				ctx.Data["GpuNum"] = tmp.GpuNum
+				ctx.Data["CpuNum"] = tmp.CpuNum
+				ctx.Data["MemMiB"] = tmp.MemMiB
+				ctx.Data["ShareMemMiB"] = tmp.ShareMemMiB
+			}
 		}
 	}
 

templates/base/head_notice.tmpl

@@ -1,7 +1,7 @@
 {{if not .IsCourse}}
     {{ if .notices}}
         <div  class="notic_content" id ="notic_content"  style="display: block; position: relative">
-            <diV class="ui container">
+            <div class="ui container">
                 <marquee behavior="scroll" direction="left">
                         {{ $firstTag := true }}
                         {{range .notices.Notices}}
@@ -25,7 +25,7 @@
                 <div class="item right" style="position:absolute;right: 1px;top:0px;">
                     <i class="ri-close-fill x_icon" onclick="closeNoice()"></i>
                 </div>
-            </diV>
+            </div>
             
         </div>
     {{end}}

templates/explore/organizations.tmpl

@@ -83,35 +83,43 @@
 			<div class="ui three doubling cards">
 				<div class="card_list" >
 					<div class="list_title star_title">
-						<p class="p_text"> <i class="ri-star-line"> </i>{{$.i18n.Tr "org.star"}}</p>
+						<p class="p_text"> <i   class="ri-star-line title_icon"> </i> {{$.i18n.Tr "org.star"}} </p>
 					</div>
 					<li style="list-style:none">
 						{{ range $i,$user :=.StarOrgs}}
-							<ul class="orgs" style="display: flex;">
+							<ul class="orgs" style="display: flex;position: relative;">
 								{{if eq $i 0}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 1}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 2}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else }}
-									<div class="org_icon org_icon_num" >
-										{{Add $i 1}} 
-									</div>
+									<li class="wi">
+										<div class="org_icon" >
+											{{Add $i 1}} 
+										</div>
+									</li>
 								{{end}}
 								<li class="li_avatar">	
 									<img class="ui avatar image" src="{{$user.RelAvatarLink}}" >
 								</li>
 								<li class="li_name">	
-									<p class="org_line_hight">{{$user.Name}}</p>
+									<a class="org_line_hight re_style nowrap" href="{{$user.HomeLink}}">{{$user.Name}}</a>
 								</li>
-								<ul>
+								<ul class = 'score'>
 									<li class="li_score" >	
 										<i class="ri-star-line org_line_hight org_icon_color"></i> &nbsp;<p class="p_score">{{$user.Score}}</p>
 									</li>
@@ -122,36 +130,44 @@
 					</li>
 				</div>
 				<div class="card_list" >
-					<div class="list_title star_title">
-						<p class="p_text"> <i class="ri-user-2-line"> </i>{{$.i18n.Tr "org.member"}}</p>
+					<div class="list_title memb_title">
+						<p class="p_text"> <i class="ri-user-2-line title_icon"> </i> {{$.i18n.Tr "org.member"}} </p>
 					</div>
 					<li style="list-style:none">
-						{{ range $i,$user :=.StarOrgs}}
-							<ul class="orgs" style="display: flex;">
+						{{ range $i,$user :=.MemberOrgs}}
+							<ul class="orgs" style="display: flex;;position: relative;">
 								{{if eq $i 0}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 1}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 2}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else }}
-									<div class="org_icon org_icon_num" >
-										{{Add $i 1}} 
-									</div>
+									<li class="wi">
+										<div class="org_icon" >
+											{{Add $i 1}} 
+										</div>
+									</li>
 								{{end}}
 								<li class="li_avatar">	
 									<img class="ui avatar image" src="{{$user.RelAvatarLink}}" >
 								</li>
 								<li class="li_name">	
-									<p class="org_line_hight">{{$user.Name}}</p>
+									<a class="org_line_hight re_style nowrap"  href="{{$user.HomeLink}}">{{$user.Name}}</a>
 								</li>
-								<ul>
+								<ul class = 'score'>
 									<li class="li_score">	
 										<i class="ri-user-2-line org_line_hight org_icon_color"></i> &nbsp;<p class="p_score">{{$user.Score}}</p>
 									</li>
@@ -162,34 +178,43 @@
 					</li>
 				</div>
 				<div class="card_list" >
-					<div class="list_title star_title">
-						<p class="p_text"> <i class="ri-blaze-fill"> </i>{{$.i18n.Tr "org.active"}}</p>
+					<div class="list_title act_title">
+						<p class="p_text"> <i class="ri-blaze-fill title_icon"> </i> {{$.i18n.Tr "org.active"}} </p>
 					</div>
 					<li style="list-style:none">
-						{{ range $i,$user :=.StarOrgs}}
-							<ul class="orgs" style="display: flex;">
+						{{ range $i,$user :=.ActiveOrgs }}
+							<ul class="orgs" style="display: flex;position: relative;">
 								{{if eq $i 0}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><defs><path id="rank1_svg__a" d="M13.69 20V9.616h-1.598l-3.139 2.61 1.027 1.218 1.95-1.804V20z"></path></defs><g fill="none" fill-rule="evenodd"><path d="M0 0h32v32H0z"></path><g transform="translate(4 2.667)"><path fill="#D16C11" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#F7C049" cx="12" cy="14.667" r="12"></circle><circle fill="#FEE6AD" cx="12" cy="14.667" r="9.333"></circle><g fill-rule="nonzero"><use fill="#FFF" xlink:href="#rank1_svg__a"></use><use fill="#D74D03" xlink:href="#rank1_svg__a"></use></g></g></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 1}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#305269" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#BDD8F0" cx="12" cy="14.667" r="12"></circle><circle fill="#E1E9FC" cx="12" cy="14.667" r="9.333"></circle><path d="M15.817 20v-1.584h-4.81l3.212-2.977c.469-.43.853-.883 1.151-1.357.298-.474.447-1.039.447-1.694 0-.499-.088-.934-.264-1.305a2.525 2.525 0 00-.718-.917 3.169 3.169 0 00-1.064-.543 4.531 4.531 0 00-1.312-.183c-.47 0-.905.064-1.306.19-.4.128-.753.314-1.056.558-.303.244-.55.55-.74.917-.191.366-.306.79-.345 1.268l1.848.147c.059-.43.23-.772.513-1.027.284-.254.646-.381 1.086-.381.205 0 .398.032.579.095.18.064.34.154.477.272a1.262 1.262 0 01.455.997c0 .176-.035.345-.103.506a2.52 2.52 0 01-.257.462 3.476 3.476 0 01-.345.418c-.127.132-.249.257-.366.374l-4.034 3.901V20h6.952z" fill="#305269" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else if eq $i 2}}
-									<div class="org_icon">	
-										<svg width="1em" height="1em" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
-									</div>
+									<li class="wi">
+										<div class="org_icon">	
+											<svg width="24px" height="24px" viewBox="0 0 32 32" class="contribution-item-img__2-fih"><g transform="translate(4 2.667)" fill="none" fill-rule="evenodd"><path fill="#865B45" d="M0 0h6.976l5.49 7.642L17.063 0H24L12 16z"></path><circle fill="#E7C5AC" cx="12" cy="14.667" r="12"></circle><circle fill="#FEDDC7" cx="12" cy="14.667" r="9.333"></circle><path d="M12.239 20.176c.46 0 .902-.066 1.327-.198.425-.132.8-.328 1.122-.587.323-.259.58-.579.77-.96.19-.382.286-.822.286-1.32 0-.646-.171-1.203-.513-1.672-.343-.47-.846-.753-1.511-.851v-.03c.557-.136.992-.422 1.305-.857.313-.435.47-.932.47-1.489 0-.46-.09-.863-.272-1.21a2.547 2.547 0 00-.726-.865 3.232 3.232 0 00-1.056-.521 4.521 4.521 0 00-1.276-.176 4.52 4.52 0 00-1.1.132 3.404 3.404 0 00-.968.403 2.79 2.79 0 00-.762.697 3.181 3.181 0 00-.499.997l1.863.499c.127-.362.33-.643.608-.843.279-.2.594-.301.946-.301.44 0 .797.127 1.071.381.274.255.41.582.41.983 0 .313-.058.562-.175.748a1.17 1.17 0 01-.462.425 1.903 1.903 0 01-.646.191 6.09 6.09 0 01-.74.044h-.455v1.584h.425c.264 0 .533.02.807.059.274.039.52.115.74.227.22.112.402.274.543.484.142.21.213.482.213.814a1.533 1.533 0 01-.52 1.18 1.772 1.772 0 01-.558.33 1.88 1.88 0 01-.667.118c-.47 0-.841-.117-1.115-.352s-.464-.567-.572-.997l-1.877.498c.117.43.288.8.513 1.108.225.308.491.56.8.755.307.196.652.34 1.033.433a5.13 5.13 0 001.218.139z" fill="#865B45" fill-rule="nonzero"></path></g></svg>
+										</div>
+									</li>
 								{{else }}
-									<div class="org_icon org_icon_num" >
-										{{Add $i 1}} 
-									</div>
+									<li class="wi">
+										<div class="org_icon ">
+											{{Add $i 1}} 
+										</div>
+										
+									</li>
 								{{end}}
 								<li class="li_avatar">	
 									<img class="ui avatar image" src="{{$user.RelAvatarLink}}" >
 								</li>
 								<li class="li_name">	
-									<p class="org_line_hight">{{$user.Name}}</p>
+									<a class="org_line_hight re_style nowrap" href="{{$user.HomeLink}}">{{$user.Name}}</a>
 								</li>
 
 							</ul>
@@ -249,3 +274,6 @@ window.onload = function() {
 }
 
 </script>
+<style>
+
+</style>

templates/org/member/members.tmpl

@@ -4,18 +4,19 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 		{{template "org/navber" .}}
-		<div class="ui stackable grid">
-		
+		<div class="ui stackable grid">		
 			
 			<div class="ui sixteen wide computer column list">
 				{{ range .Members}}
 					<div class="item ui grid">
-						<div class="ui two wide column">
+						<div class="three wide mobile two wide tablet two wide computer column">
 							<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
-						</div><div class="ui three wide column">
+						</div>
+						<div class="seven wide mobile three wide tablet three wide computer column">
 							<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
 							<div class="meta">{{.FullName}}</div>
-						</div><div class="ui four wide column center">
+						</div>
+						<div class="ui four wide column center tablet only computer only">
 							<div class="meta">
 								{{$.i18n.Tr "org.members.membership_visibility"}}
 							</div>
@@ -29,14 +30,16 @@
 									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}}
 								{{end}}
 							</div>
-						</div><div class="ui three wide column center">
+						</div>
+						<div class="five wide mobile three wide tablet three wide computer column">
 							<div class="meta">
 								{{$.i18n.Tr "org.members.member_role"}}
 							</div>
 							<div class="meta">
 								<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
 							</div>
-						</div><div class="ui one wide column center">
+						</div>
+						<div class="ui one wide column center tablet only computer only">
 							<div class="meta">
 								2FA
 							</div>
@@ -49,7 +52,8 @@
 									{{end}}
 								</strong>
 							</div>
-						</div><div class="ui three wide column">
+						</div>
+						<div class="ui three wide column tablet only computer only">
 							<div class="text right">
 								{{if eq $.SignedUser.ID .ID}}
 									<form method="post" action="{{$.OrgLink}}/members/action/leave">

templates/org/team/teams.tmpl

@@ -9,7 +9,7 @@
 		
 			
 			<div class="ui sixteen wide computer column list">
-				<div class="ui two column grid">
+				<div class="ui stackable two column grid">
 			{{range .Teams}}
 					<div class="column">
 						<div class="ui top attached header">

templates/repo/cloudbrain/show.tmpl

@@ -300,38 +300,32 @@ td, th {
                                                             </div>
                                                         </td>
                                                 </tr>
-                                                    <tr class="ti-no-ng-animate">
+                                                   <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                         {{$.i18n.Tr "repo.cloudbrain.time.starttime"}}
+                                                         {{$.i18n.Tr "repo.modelarts.createtime"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-startTime">
-                                                                {{if not (eq .StartTime 0)}}
-																 {{TimeSinceUnix1 .StartTime}}
-																{{else}}
-                                                                 --
-																{{end}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-createtime">
+																 {{TimeSinceUnix1 .CreatedUnix}}
                                                             </div>
                                                         </td>
                                                     </tr>
-                                                    
+
                                                      <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                         {{$.i18n.Tr "repo.cloudbrain.time.endtime"}}
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-EndTime">
-                                                                {{if not (eq .EndTime 0)}}
-																 {{TimeSinceUnix1 .EndTime}}
-																{{else}}
-                                                                    --
-																{{end}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-duration">
+                                                                {{$.duration}}
                                                             </div>
                                                         </td>
                                                     </tr>
 
+                                                    
+
                                             </tbody>
                                         </table>
                                     </div>
@@ -405,18 +399,38 @@ td, th {
                                                             </div>
                                                         </td>
                                                     </tr>
-
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}
+                                                         {{$.i18n.Tr "repo.cloudbrain.time.starttime"}}
                                                         </td>
 
                                                         <td class="ti-text-form-content">
-                                                            <div class="text-span text-span-w" id="{{.VersionName}}-duration">
-                                                                {{$.duration}}
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-startTime">
+                                                                {{if not (eq .StartTime 0)}}
+																 {{TimeSinceUnix1 .StartTime}}
+																{{else}}
+                                                                 --
+																{{end}}
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    
+                                                     <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                         {{$.i18n.Tr "repo.cloudbrain.time.endtime"}}
+                                                        </td>
+
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-EndTime">
+                                                                {{if not (eq .EndTime 0)}}
+																 {{TimeSinceUnix1 .EndTime}}
+																{{else}}
+                                                                    --
+																{{end}}
                                                             </div>
                                                         </td>
                                                     </tr>
+                                                   
                                                
                                                 </tbody>
                                             </table>

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -286,7 +286,7 @@ td, th {
         
                                                     <td class="ti-text-form-content">
                                                         <div class="text-span text-span-w">
-                                                            {{$.resource_spec}}
+                                                            {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
                                                         </div>
                                                     </td>
                                                 </tr>                                
@@ -299,7 +299,7 @@ td, th {
                                                 <tbody class="ti-text-form">
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            镜像 
+                                                            {{$.i18n.Tr "cloudbrain.mirror"}}
                                                         </td>
             
                                                         <td class="ti-text-form-content">

templates/repo/modelarts/notebook/show.tmpl

@@ -207,7 +207,7 @@ td, th {
             <div class="active title padding0">
                 <div class="according-panel-heading">
                     <div class="accordion-panel-title">
-                        <i class="dropdown icon"></i>
+                       <!-- <i class="dropdown icon"></i> -->
                         <span class="accordion-panel-title-content">
                             <span>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
@@ -285,7 +285,17 @@ td, th {
                                                             </div>
                                                         </td>
                                                 </tr>
-                                               
+                                                <tr class="ti-no-ng-animate">
+                                                        <td class="ti-no-ng-animate ti-text-form-label text-width80">
+                                                         {{$.i18n.Tr "repo.modelarts.createtime"}}
+                                                        </td>
+
+                                                        <td class="ti-text-form-content">
+                                                            <div class="text-span text-span-w" id="{{.VersionName}}-createtime">
+																 {{TimeSinceUnix1 .CreatedUnix}}
+                                                            </div>
+                                                        </td>
+                                                </tr>
 
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
@@ -369,7 +379,7 @@ td, th {
                                                     </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        {{$.i18n.Tr "repo.modelarts.train_job.start_time"}}
+                                                        {{$.i18n.Tr "repo.cloudbrain.time.starttime"}}
                                                     </td>
 
                                                     <td class="ti-text-form-content">

web_src/js/components/BrainAnalysis.vue

@@ -0,0 +1,86 @@
+<template>
+    <div style="width: 100%;">
+        <div id = "pro_main">
+            <div style="margin-top: 10px;">
+                <b  class="pro_item">云脑分析</b>  <span class="update_time">数据更新时间：</span>  <span style="font-size: 12px;">{{lastUpdatedTime}}&nbsp/&nbsp从有记录起开始统计</span>   
+            </div>
+    
+            <bar-label :width="'95%'" :height="'500px'"></bar-label>
+            <div style="margin-top: 20px;">
+                <span  class="sta_iterm">统计周期：</span> 
+                <button type="button" class='btnLast' id = "all"  v-bind:class="{colorChange:7==dynamic}" @click="resetPage(),getAllProList('all',7)">所有</button>
+                <span style="float:right; margin-right: 20px;">
+                    <div style="display:inline-block;margin-left: 40px; ">
+                        <a class="el-icon-download" v-if="tableData!=''" :href= "'../api/v1/cloudbrainboard/downloadAll'"></a>
+                        <i class="el-icon-download" v-else="tableData=''" href="#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'></i>
+                        <!-- <span ><a id = "download_file" :href= "'../api/v1/projectboard/downloadAll'"   >下载报告</a> </span> -->
+                        <span >
+                            <a id = "download_file"  v-if="tableData!=''" :href= "'../api/v1/cloudbrainboard/downloadAll'">下载报告</a>
+                            <a id = "download_file"  v-else="tableData=''"  href= "#" style="color:rgba(187, 187, 187, 100);" @click='popMark()'>下载报告</a> 
+                        </span>
+                    </div>  
+                </span>
+            </div>
+                    
+        </div>
+        
+    </div>
+    </template>
+    
+    <script>
+        // import barLabel from './basic/barLabel.vue';
+        const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
+
+        import { export2Excel } from '../excel/util.js'
+        export default{
+            name:'ProAnalysis',
+            components: {
+                // barLabel,
+            },
+            methods: {
+                popMark(){
+                    alert("数据为空时，不能下载！")
+                },
+                exportData(){
+                    
+                    // this.getOneProList(this.pro_id,'all',true,7)
+                    // this.getOneProList(this.pro_id,'all',false,7)
+                    // this.fileName()
+                    if (this.tableDataID!=''){
+                        this.currentPage=1
+                        var saveFileName = this.getFileName()
+                        export2Excel(this.columns,this.tableDataID,saveFileName)
+                    }else{
+                        alert("数据为空时，不能下载！")
+                    }
+               
+                },
+            },
+        }
+    </script>
+    
+    <style scoped>
+        .pro_item{
+            font-size: 16px;
+            color:  rgba(16, 16, 16, 100);
+            font-family: SourceHanSansSC-bold;
+        }
+        .update_time{
+            line-height: 17px;
+            font-size: 12px;
+            color:rgba(187, 187, 187, 100);
+            margin-left: 10px;
+        }
+        .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;
+        }
+
+    </style>

web_src/js/components/DataAnalysis.vue

@@ -26,6 +26,14 @@
                 </span>
                 <UserAnalysis ref='UserAnalysis'  v-if="isRouterAlive1" id ="usr"></UserAnalysis>
             </el-tab-pane>
+            <el-tab-pane name="four" id='four' > 
+                <BrainAnalysis  ref='BrainAnalysis'id="brain" v-if="isRouterAlive"></BrainAnalysis>
+                <span slot="label"> 
+                    <el-image style="width: 13px; height: 13px" src="/img/pro_rgb.svg">
+                    </el-image>
+                    云脑分析 
+                </span> 
+            </el-tab-pane>
       </el-tabs>
       </div>
     </template>
@@ -33,12 +41,14 @@
     <script>
         import ProAnalysis from './ProAnalysis.vue'
         import UserAnalysis from './UserAnalysis.vue'
+        import BrainAnalysis from './BrainAnalysis.vue'
 
         export default {
 
             components:{
                 'ProAnalysis':ProAnalysis,
                 'UserAnalysis':UserAnalysis,
+                'BrainAnalysis':BrainAnalysis,
             },
             data() {
                 return {

web_src/js/index.js

@@ -2768,8 +2768,13 @@ $(document).ready(async () => {
   const $dropzone = $('#dropzone');
   if ($dropzone.length > 0) {
     const filenameDict = {};
-    let maxFileTooltips=$dropzone.data('max-file-tooltips').format($dropzone.data('max-file'),$dropzone.data('max-size'))
-    let maxSizeTooltips=$dropzone.data('max-size-tooltips').format($dropzone.data('max-file'))
+    let maxFileTooltips
+    let maxSizeTooltips
+    if($dropzone.data('max-file-tooltips')&&$dropzone.data('max-size-tooltips')){
+      maxFileTooltips=$dropzone.data('max-file-tooltips').format($dropzone.data('max-file'),$dropzone.data('max-size'))
+      maxSizeTooltips=$dropzone.data('max-size-tooltips').format($dropzone.data('max-file'))
+    }
+    
     await createDropzone('#dropzone', {
       url: $dropzone.data('upload-url'),
       headers: {'X-Csrf-Token': csrf},
@@ -2804,17 +2809,23 @@ $(document).ready(async () => {
         this.on('addedfile',(file)=>{
           if(file.size/(1000*1000)>$dropzone.data('max-size')){
             this.removeFile(file)
-            $('.maxfilesize.ui.red.message').text(maxFileTooltips)
-            $('.maxfilesize.ui.red.message').css('display','block')
+            if(maxFileTooltips){
+              $('.maxfilesize.ui.red.message').text(maxFileTooltips)
+              $('.maxfilesize.ui.red.message').css('display','block')
+            }
           }else{
-            $('.maxfilesize.ui.red.message').css('display','none')
+            if(maxFileTooltips){
+              $('.maxfilesize.ui.red.message').css('display','none')
+            }
           }
           
         });
         this.on('maxfilesexceeded',(file)=>{
           this.removeFile(file)
-          $('.maxfilesize.ui.red.message').text(maxSizeTooltips)
-          $('.maxfilesize.ui.red.message').css('display','block')
+          if(maxSizeTooltips){
+            $('.maxfilesize.ui.red.message').text(maxSizeTooltips)
+            $('.maxfilesize.ui.red.message').css('display','block')
+          }
         })
 
       }

web_src/less/openi.less

@@ -717,7 +717,7 @@ display: block;
     #repo-files-table .age,
     #repo-files-table .ui.sha.label,
     #repo-files-table .commit-button,
-    .members
+    .repository .members
 	{
 		display: none !important;
 	}
@@ -761,7 +761,7 @@ display: block;
         padding-top: 0;
         padding-bottom: 0;
     }
-    .ui.attached:not(.message)+.ui.attached.segment:not(.top){
+    .repository .ui.attached:not(.message)+.ui.attached.segment:not(.top){
         border: none;
     }
     .markdown:not(code).file-view{
@@ -830,6 +830,7 @@ display: block;
 	font-size: 14px;
 	text-align: center;
 	font-family: SourceHanSansSC-light;
+	font-weight: normal !important;
 }
 .title_re{
    margin-top: 50px !important;
@@ -881,13 +882,16 @@ display: block;
 	line-height: 28px;
 }
 .org_icon{
-	margin-top: 10px;
+	margin-top: 2px;
 	margin-right: 10px;
 	padding-left: 15px;
+	width: 100% ;
+	text-align: center ;
 }
-.org_icon_num{
-	margin-left: 2px;
-	margin-right: 13px;
+.re_style{
+	color: rgba(3, 102, 214, 100) !important; 
+	font-family:SourceHanSansSC-medium;
+	font-weight: 700;
 }
 .org_icon_color{
 	color: #FA8C16;
@@ -904,6 +908,26 @@ display: block;
 	list-style:none;
 	margin-left: 2px;
 }
+.score{
+	position:absolute;
+	width: 50px;
+	right:50px;
+	text-align: center;
+}
+.wi{
+	width: 15%;
+	line-height: 20px;
+}
+
+.title_icon{
+	vertical-align: sub;
+	font-size: 24px;
+}
+.title_word{
+	vertical-align: middle;
+	font-size: 18px;
+	margin-top:1px;
+}
 /**seach**/
 /**搜索导航条适配窄屏**/
 .seachnav{