Merge pull request '多卡任务下的资源占用显示效果' (#2290) from show-npu-metric into V20220616

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2290
Reviewed-by: liuzx <liuzx@pcl.ac.cn>

modules/modelarts/resty.go

@@ -1131,7 +1131,7 @@ sendjob:
 	res, err := client.R().
 		SetAuthToken(TOKEN).
 		SetResult(&result).
-		Get(HOST + "/v1/" + setting.ProjectID + urlTrainJob + "/" + jobID + "/versions/" + versionID + "/pod/" + podName + "/metric-statistic")
+		Get(HOST + "/v1/" + setting.ProjectID + urlTrainJob + "/" + jobID + "/versions/" + versionID + "/pod/" + podName + "/metric-statistic?statistic_type=each")
 
 	if err != nil {
 		return nil, fmt.Errorf("resty GetTrainJobMetricStatistic: %v", err)

web_src/js/index.js

@@ -5093,8 +5093,9 @@ function initChartsNpu() {
       data: []
     },
     grid: {
-      top: '30%',
+      top: '35%',
       bottom: '2%',
+      x: '2%',
       containLabel: true
     },
     tooltip: {
@@ -5130,14 +5131,16 @@ function initChartsNpu() {
 
     series: []
   };
+  const sortBy = (arr, k) => arr.concat().sort((a, b) => (a[k] > b[k] ? 1 : a[k] < b[k] ? -1 : 0));
   $('.metric_chart').click(function (e) {
     let versionName = $(this).data('version')
     let myCharts = echarts.init(document.getElementById(`metric-${versionName}`))
-    $.get(`${window.config.AppSubUrl}/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/metric_statistics?version_name=${versionName}&statistic_type=each`, (res) => {
+    $.get(`${window.config.AppSubUrl}/api/v1/repos/${userName}/${repoPath}/modelarts/train-job/${jobID}/metric_statistics?version_name=${versionName}&statistic_type=each&metrics=`, (res) => {
       let filterDta = res.MetricsInfo.filter((item) => {
 
         return !(['recvBytesRate', 'diskWriteRate', 'sendBytesRate', 'diskReadRate'].includes(item.metric))
       })
+      filterDta = sortBy(filterDta, "metric")
       let legenData = filterDta.map((item) => {
         return item.metric
       })