#55 #12,#35;

Merged
yangxzh1 merged 1 commits from denglei/octopus:master into master 2 years ago
  1. +10
    -2
      admin-portal/src/views/traningManager/components/index.vue
  2. +52
    -0
      admin-portal/src/views/traningManager/components/taskInfo.vue

+ 10
- 2
admin-portal/src/views/traningManager/components/index.vue View File

@@ -12,6 +12,9 @@
<el-tab-pane label="任务负载" name="menu3">
<taskLoad :row="data" v-if="tabRefresh.menu3"></taskLoad>
</el-tab-pane>
<el-tab-pane label="运行信息" name="menu4">
<taskInfo :row="data" v-if="tabRefresh.menu4"></taskInfo>
</el-tab-pane>
</el-tabs>
</el-dialog>
</div>
@@ -20,6 +23,7 @@
import taskLoad from './taskLoad.vue'
import taskLog from './taskLog.vue'
import taskProfile from './taskProfile.vue'
import taskInfo from './taskInfo.vue'
export default {
name: "detailDialog",
props: {
@@ -29,7 +33,7 @@
}

},
components: { taskLoad, taskLog, taskProfile },
components: { taskLoad, taskLog, taskProfile, taskInfo },
data() {
return {
CreateFormVisible: true,
@@ -38,7 +42,8 @@
tabRefresh: {
menu1: true,
menu2: false,
menu3: false
menu3: false,
menu4: false
}
}
},
@@ -65,6 +70,9 @@
case 'menu3':
this.switchTab('menu3')
break
case 'menu4':
this.switchTab('menu4')
break
}
},
switchTab(tab) {


+ 52
- 0
admin-portal/src/views/traningManager/components/taskInfo.vue View File

@@ -0,0 +1,52 @@
<template>
<div>
<div v-html="this.initInfo"></div>
</div>
</template>

<script>
export default {
name: "taskInfo",
props: {
row: {
type: Object,
default: () => { }
},
},
data() {
return {
initInfo: "",
}
},
created() {
let taskInfoString = this.row.initInfo ? this.row.initInfo.replace(/\n/g, "<br>") : ''
let taskInfoData = JSON.parse(taskInfoString)
for(let pid in taskInfoData['podEvents']){
const eventList = taskInfoData['podEvents'][pid]
const roleName = taskInfoData['podRoleName'][pid]
if (roleName == "") {
continue
}
let message = ""
for (let key in eventList) {
let event = eventList[key]
if (event['reason'] == "" && event['message'] == "") {
continue
}
message += "[" + event['reason'] + "]" + "<br>"
message += event['message'] + "<br><br>"
}
for (let key in taskInfoData['extras']) {
let event = taskInfoData['extras'][key]
if (event['reason'] == "" && event['message'] == "") {
continue
}
message += "[" + event['reason'] + "]" + "<br>"
message += event['message'] + "<br><br>"
}
message += "<br>"
this.initInfo = message
}
}
}
</script>

Loading…
Cancel
Save