models/cloudbrain.go

@@ -396,6 +396,14 @@ func (task *Cloudbrain) ToShow() *CloudbrainShow {
 	return c
 }
 
+func (task *Cloudbrain) IsRestartTask() bool {
+	n, _ := x.Where("display_job_name = ?", task.DisplayJobName).Unscoped().Count(&Cloudbrain{})
+	if n > 1 {
+		return true
+	}
+	return false
+}
+
 func (task *Cloudbrain) HasUseModel(modelId string) bool {
 	modelIDArray := task.GetModelIdArray()
 	if modelIDArray == nil || len(modelIDArray) == 0 {

models/reward_operate_record.go

@@ -524,7 +524,14 @@ func GetRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowList,
 		return nil, 0, err
 	}
 	RewardRecordShowList(r).loadAttribute(false)
-	return r, count, nil
+	newShowList := make([]*RewardOperateRecordShow, 0)
+	for i := 0; i < len(r); i++ {
+		if r[i].SourceType == SourceTypeAccomplishTask.Name() && r[i].Action == nil {
+			continue
+		}
+		newShowList = append(newShowList, r[i])
+	}
+	return newShowList, count, nil
 }
 
 func GetAdminRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowList, int64, error) {
@@ -559,6 +566,14 @@ func GetAdminRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowL
 		return nil, 0, err
 	}
 	RewardRecordShowList(r).loadAttribute(true)
+	newShowList := make([]*RewardOperateRecordShow, 0)
+	for i := 0; i < len(r); i++ {
+		if r[i].SourceType == SourceTypeAccomplishTask.Name() && r[i].Action == nil {
+			continue
+		}
+		newShowList = append(newShowList, r[i])
+	}
+	return newShowList, count, nil
 	return r, count, nil
 }
 

services/ai_task_service/cluster/cloudbrain_two.go

@@ -254,13 +254,20 @@ func (c CloudbrainTwoClusterAdapter) QueryNoteBook(opts entity.JobIdAndVersionId
 		log.Error("GetNotebook(%s) from cloudbrain 2 failed:result is empty", task.DisplayJobName)
 		return nil, errors.New("result is empty")
 	}
-	return convertCloudbrainTwo2QueryRes(result), nil
+	return convertCloudbrainTwo2QueryRes(result, task), nil
 }
 
-func convertCloudbrainTwo2QueryRes(res *models.GetNotebook2Result) *entity.QueryTaskResponse {
+func convertCloudbrainTwo2QueryRes(res *models.GetNotebook2Result, task *models.Cloudbrain) *entity.QueryTaskResponse {
 	startedAt := timeutil.TimeStamp(0)
-	if res.Lease.CreateTime > 0 {
-		startedAt = timeutil.TimeStamp(res.Lease.CreateTime / 1000)
+
+	if task.IsRestartTask() {
+		if res.Lease.UpdateTime > 0 {
+			startedAt = timeutil.TimeStamp(res.Lease.UpdateTime / 1000)
+		}
+	} else {
+		if res.Lease.CreateTime > 0 {
+			startedAt = timeutil.TimeStamp(res.Lease.CreateTime / 1000)
+		}
 	}
 	completedAt := timeutil.TimeStamp(0)
 	if models.IsCloudbrainTerminalStatus(res.Status) {

services/ai_task_service/task/task_service.go

@@ -287,7 +287,7 @@ func UpdateByQueryResponse(res *entity.QueryTaskResponse, task *models.Cloudbrai
 	if res.DetailedStatus == "" || res.DetailedStatus == res.Status {
 		task.DetailedStatus = DEFAULT_DETAILED_STATUS
 	}
-	if res.StartedAt > 0 {
+	if res.StartedAt > 0 && task.StartTime == 0 {
 		task.StartTime = res.StartedAt
 	}
 	if res.StartedAt > 0 && res.CompletedAt > 0 {

templates/reward/point/rule.tmpl

@@ -111,6 +111,12 @@
             <td class="t-center"><span class="typ">累计</span>积分获取上限<span class="limit"> - </span></td>
             <td>邀请好友获得积分。</td>
         </tr>
+        <tr key="TaskInviteFriendRegister">
+            <td class="t-center">邀请好友</td>
+            <td class="t-center point">-</td>
+            <td class="t-center"><span class="typ">累计</span>积分获取上限<span class="limit"> - </span></td>
+            <td>邀请好友获得积分。</td>
+        </tr>
     </table>
 </div>
 

web_src/js/index.js

@@ -96,7 +96,7 @@ $.fn.tab.settings.silent = true;
     const viewHeight = window.innerHeight || document.documentElement.clientHeight || ''
     const {top,right,bottom,left} = element.getBoundingClientRect()
     return (top>=0 && left>=0 && right<viewWidth && bottom<=viewHeight)
-  }  
+  }
   function clickHandler() {
     if(!this.parentElement.classList.contains('hidden')) {
       this.parentElement.classList.add('hidden')
@@ -126,7 +126,7 @@ $.fn.tab.settings.silent = true;
     }, 50)
   }
   window.initMarkdownCatalog = function() {
-    if ($('.file-view.markdown').length && $('.file-view.markdown').length > 0) {     
+    if ($('.file-view.markdown').length && $('.file-view.markdown').length > 0) {
       const navList = document.querySelectorAll('.markdown_toc .catalog-li')
       const toggleIcon = document.getElementsByClassName('toggle-container')
       toggleIcon[0].removeEventListener('click', clickHandler)
@@ -5285,7 +5285,7 @@ function initChartsNpu() {
       url,
       (res) => {
         loadingEl && loadingEl.hide();
-        if (res.MetricsInfo) { 
+        if (res.MetricsInfo) {
           let filterDta = res.MetricsInfo.filter((item) => {
             return ![
               "recvBytesRate",
@@ -5345,11 +5345,11 @@ function initChartsNpu() {
     }
     const repoPath = $(this).data('path')
     const versionName = $(this).data("version");
-    const chartEl = document.getElementById(`metric-${versionName}`);    
+    const chartEl = document.getElementById(`metric-${versionName}`);
     const multipleNode = $(chartEl).data('multiplenode');
     const loadingEl = $(chartEl).siblings('.ui.dimmer');
-    const workServerNumber = $(chartEl).data('workservernumber');    
-    const url = `${window.config.AppSubUrl}/api/v1/repos/${repoPath}`;    
+    const workServerNumber = $(chartEl).data('workservernumber');
+    const url = `${window.config.AppSubUrl}/api/v1/repos/${repoPath}`;
     const myCharts = echarts.init(chartEl);
     if (multipleNode) {
       const multipleNodeEl = $(chartEl).siblings('.node-select').show();
@@ -5452,7 +5452,7 @@ function initAddUsageAgreement() {
       onHide:function(){
       },
       onApprove: async function ($element) {
-        try { 
+        try {
           const res = await postSaveProtocolInfo(userName)
           if (res?.data?.result_code === "0") {
             window.globalModalInit && window.globalModalInit()

web_src/vuepages/langs/config/zh-CN.js

@@ -78,7 +78,7 @@ const zh = {
   createdPullRequest: "创建了合并请求",
   commentedOnIssue: "评论了任务",
   uploadDataset: "上传了数据集文件",
-  createdNewModel: "导入了新模型",  
+  createdNewModel: "导入了新模型",
   invitedFriend: "邀请了好友",
   firstBindingWechatRewards: "首次绑定微信奖励",
   created: "创建了",

web_src/vuepages/pages/computingpower/domestic/index.vue

@@ -204,7 +204,7 @@ export default {
         useExample: {
           title: '在启智AI协作平台使用案例：',
           list: [
-            'https://openi.pcl.ac.cn/Enflame/GCU_Pytorch1.10.0_Example',
+            'https://openi.pcl.ac.cn/Enflame/GCU_Pytorch',
             'https://openi.pcl.ac.cn/Enflame/GCU_PaddlePaddle_Example'
           ]
         },

web_src/vuepages/pages/model/mind/index.vue

@@ -1374,4 +1374,4 @@ export default {
     }
   }
 }
-</style>
+</style>