Merge pull request !560 from 冯学峰/myMaster03tags/0.7.0-beta
| @@ -404,7 +404,6 @@ | |||||
| "availableTip": "Is chip available(for reference only)", | "availableTip": "Is chip available(for reference only)", | ||||
| "healthTip": "Chip health status", | "healthTip": "Chip health status", | ||||
| "ipTip": "Chip IP address", | "ipTip": "Chip IP address", | ||||
| "aicoreTip": "Chip utilization", | |||||
| "hbmTip": "Chip HBM usage", | "hbmTip": "Chip HBM usage", | ||||
| "powerTip": "Chip real-time power", | "powerTip": "Chip real-time power", | ||||
| "temperatureTip": "Chip real-time temperature", | "temperatureTip": "Chip real-time temperature", | ||||
| @@ -429,13 +428,11 @@ | |||||
| "availableFree": "The chip is available.", | "availableFree": "The chip is available.", | ||||
| "availableBusy": "The chip is occupied or unavailable.", | "availableBusy": "The chip is occupied or unavailable.", | ||||
| "failQueryChip": "An error occurs during chip information query.", | "failQueryChip": "An error occurs during chip information query.", | ||||
| "faliQuery": "Query error", | |||||
| "name": "Name", | "name": "Name", | ||||
| "npu": "ID", | "npu": "ID", | ||||
| "available": "Available", | "available": "Available", | ||||
| "health": "Health", | "health": "Health", | ||||
| "ipAddress": "IP Address", | "ipAddress": "IP Address", | ||||
| "aiCore": "AI Core(%)", | |||||
| "hbmUsage": "HBM-Usage(MB)", | "hbmUsage": "HBM-Usage(MB)", | ||||
| "power": "Power(W)", | "power": "Power(W)", | ||||
| "temp": "Temp(℃)" | "temp": "Temp(℃)" | ||||
| @@ -403,7 +403,6 @@ | |||||
| "availableTip": "芯片是否空闲(仅供参考)", | "availableTip": "芯片是否空闲(仅供参考)", | ||||
| "healthTip": "芯片健康状态", | "healthTip": "芯片健康状态", | ||||
| "ipTip": "芯片IP地址", | "ipTip": "芯片IP地址", | ||||
| "aicoreTip": "芯片AI Core利用率", | |||||
| "hbmTip": "芯片已用HBM内存", | "hbmTip": "芯片已用HBM内存", | ||||
| "powerTip": "芯片实时功率", | "powerTip": "芯片实时功率", | ||||
| "temperatureTip": "芯片实时温度", | "temperatureTip": "芯片实时温度", | ||||
| @@ -428,13 +427,11 @@ | |||||
| "availableFree": "芯片空闲", | "availableFree": "芯片空闲", | ||||
| "availableBusy": "芯片已被占用或不可用", | "availableBusy": "芯片已被占用或不可用", | ||||
| "failQueryChip": "芯片信息查询有误", | "failQueryChip": "芯片信息查询有误", | ||||
| "faliQuery": "查询有误", | |||||
| "name":"名称", | "name":"名称", | ||||
| "npu":"编号", | "npu":"编号", | ||||
| "available":"是否空闲", | "available":"是否空闲", | ||||
| "health":"健康状态", | "health":"健康状态", | ||||
| "ipAddress":"IP 地址", | "ipAddress":"IP 地址", | ||||
| "aiCore":"AI Core利用率(%)", | |||||
| "hbmUsage":"已用HBM内存(MB)", | "hbmUsage":"已用HBM内存(MB)", | ||||
| "power":"功率(W)", | "power":"功率(W)", | ||||
| "temp":"温度(℃)" | "temp":"温度(℃)" | ||||
| @@ -134,24 +134,6 @@ limitations under the License. | |||||
| <span class="cl-text-center">{{ scope.row.ip_address }}</span> | <span class="cl-text-center">{{ scope.row.ip_address }}</span> | ||||
| </template> | </template> | ||||
| </el-table-column> | </el-table-column> | ||||
| <el-table-column prop="aicore"> | |||||
| <template slot="header"> | |||||
| {{ $t('hardwareVisual.aiCore') }} | |||||
| <el-tooltip class="item" | |||||
| effect="light" | |||||
| :content="$t('hardwareVisual.aicoreTip')" | |||||
| placement="top-start"> | |||||
| <i class="el-icon-info"></i> | |||||
| </el-tooltip> | |||||
| </template> | |||||
| <template slot-scope="scope"> | |||||
| <div class="core-wrap"> | |||||
| <el-progress :percentage="scope.row.aicore_rate===-1?0:scope.row.aicore_rate" | |||||
| :format="format(scope.row.aicore_rate)"></el-progress> | |||||
| </div> | |||||
| </template> | |||||
| </el-table-column> | |||||
| <el-table-column prop="hbm_usage" | <el-table-column prop="hbm_usage" | ||||
| min-width="100"> | min-width="100"> | ||||
| <template slot="header"> | <template slot="header"> | ||||
| @@ -617,13 +599,6 @@ export default { | |||||
| } | } | ||||
| return `${n}`; | return `${n}`; | ||||
| }, | }, | ||||
| format(percentage, item) { | |||||
| return () => { | |||||
| return percentage === -1 | |||||
| ? this.$t('hardwareVisual.faliQuery') | |||||
| : `${percentage}`; | |||||
| }; | |||||
| }, | |||||
| formatHbm(hbmInfo) { | formatHbm(hbmInfo) { | ||||
| return function() { | return function() { | ||||
| return `${hbmInfo.memory_usage}/${hbmInfo.memory_size}`; | return `${hbmInfo.memory_usage}/${hbmInfo.memory_size}`; | ||||