Commit 9477fc87 authored by 张俊's avatar 张俊

应用调试列表显示

parent 0535e684
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<sparklineCurve :refLineStyles="spRefLineStyles3" :refLineType="false" :data="scope.row[item.prop]" :limit="scope.row[item.prop].length" :styles="item.prop=='cpu'?spCurveStyles2:spCurveStyles3" /> <sparklineCurve :refLineStyles="spRefLineStyles3" :refLineType="false" :data="scope.row[item.prop]" :limit="scope.row[item.prop].length" :styles="item.prop=='cpu'?spCurveStyles2:spCurveStyles3" />
</sparkline> </sparkline>
<span class="use" v-if="item.prop=='cpu'">{{scope.row['cpu_use']}}.00mm</span> <span class="use" v-if="item.prop=='cpu'">{{scope.row['cpu_use']}}.00mm</span>
<span class="use" v-if="item.prop=='mermoy'">{{scope.row['memory_use']}}.00Mi</span> <span class="use" v-if="item.prop=='mermoy'">{{scope.row['memory_use']}}Mi</span>
</div> </div>
<div v-else-if="item.type === 'image'" class="img_content"> <div v-else-if="item.type === 'image'" class="img_content">
<img <img
...@@ -129,11 +129,13 @@ export default { ...@@ -129,11 +129,13 @@ export default {
tag_flag_arr:[], tag_flag_arr:[],
spCurveStyles2: { spCurveStyles2: {
stroke: '#515fe7', stroke: '#515fe7',
fill: '#d2d6f8' fill: '#515fe7'
// fill: '#d2d6f8'
}, },
spCurveStyles3: { spCurveStyles3: {
stroke: '#37c299', stroke: '#37c299',
fill: '#c8ebe4' fill: '#37c299'
// fill: '#c8ebe4'
}, },
// 指示器样式 // 指示器样式
spIndicatorStyles1: false, spIndicatorStyles1: false,
......
...@@ -65,9 +65,9 @@ export default { ...@@ -65,9 +65,9 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
borderWidth: 5, borderWidth: 5,
shadowBlur: 20, // shadowBlur: 20,
borderColor: color[i], borderColor: color[i],
shadowColor: color[i], // shadowColor: color[i],
}, },
}, },
}, },
......
...@@ -1083,6 +1083,9 @@ export default { ...@@ -1083,6 +1083,9 @@ export default {
if (e.create_date) { if (e.create_date) {
e.create_date = e.create_date.split(".")[0].replace("T", " "); e.create_date = e.create_date.split(".")[0].replace("T", " ");
} }
if (e.time) {
e.time = e.time.split(".")[0].replace("T", " ");
}
}); });
this.listTotal1 = response.data.total; this.listTotal1 = response.data.total;
} }
...@@ -1467,9 +1470,9 @@ export default { ...@@ -1467,9 +1470,9 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
borderWidth: 5, borderWidth: 5,
shadowBlur: 20, // shadowBlur: 20,
borderColor: color[i], borderColor: color[i],
shadowColor: color[i] // shadowColor: color[i]
} }
} }
}, },
......
...@@ -264,10 +264,10 @@ export default { ...@@ -264,10 +264,10 @@ export default {
node:e.nodeName, node:e.nodeName,
state:e.podStatus.status, state:e.podStatus.status,
times:e.restartCount, times:e.restartCount,
cpu:this.cpu_deal(e.metrics.cpuUsageHistory), cpu:e.metrics&&e.metrics.cpuUsageHistory?this.cpu_deal(e.metrics.cpuUsageHistory):'',
cpu_use:e.metrics.cpuUsage, cpu_use:e.metrics.cpuUsage&&e.metrics?e.metrics.cpuUsage:'',
mermoy:this.cpu_deal(e.metrics.memoryUsageHistory), mermoy:e.metrics.memoryUsageHistory&&e.metrics?this.cpu_deal(e.metrics.memoryUsageHistory):'',
memory_use:e.metrics.memoryUsage, memory_use:e.metrics.memoryUsage&&e.metrics?e.metrics.memoryUsage:'',
time:temp_time, time:temp_time,
namespace:this.formInline.area namespace:this.formInline.area
}) })
......
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
namespace: "", namespace: "",
name: "", name: "",
}, },
select_volumn:'', select_volumn:[],
app_set: {}, app_set: {},
app_set_info: {}, app_set_info: {},
area_options: [ area_options: [
...@@ -370,10 +370,10 @@ export default { ...@@ -370,10 +370,10 @@ export default {
e["cpu"] = parseInt(cpu); e["cpu"] = parseInt(cpu);
// this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu]) // this.deal_key_value(this.app_set_info,e.name,'resource',[memory,cpu])
} else if(e.type == "volume") { } else if(e.type == "volume") {
this.select_volumn='' this.select_volumn=[]
e['check_type'] = 0 e['check_type'] = 0
console.log(this.pvc_list); console.log(this.pvc_list);
e['value'] = this.pvc_list[0].disk_serial_number e['value'] = this.pvc_list[0].disk_serial_number+';'+this.pvc_list[0].id
// this.deal_key_value(this.app_set_info,e.name,e.type,e.value) // this.deal_key_value(this.app_set_info,e.name,e.type,e.value)
}else{ }else{
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
temp[e] = { temp[e] = {
claimName:value[0].split(';')[0] claimName:value[0].split(';')[0]
} }
this.select_volumn = value[0].split(';')[1] this.select_volumn.push(value[0].split(';')[1])
} }
}else{ }else{
temp[e] = value; temp[e] = value;
...@@ -466,6 +466,13 @@ export default { ...@@ -466,6 +466,13 @@ export default {
} }
this.senior_flag = false; this.senior_flag = false;
}, },
parseInt_arr(arr){
var temp = []
arr.forEach(e => {
temp.push(parseInt(e))
});
return temp
},
change_form_aploy(n) { change_form_aploy(n) {
this.is_loading = true; this.is_loading = true;
if (n == 1) { if (n == 1) {
...@@ -478,7 +485,7 @@ export default { ...@@ -478,7 +485,7 @@ export default {
uu: this.evtUuid, uu: this.evtUuid,
values: this.app_set_info, values: this.app_set_info,
source: this.$route.query.source == "apply" ? "apply" : "", source: this.$route.query.source == "apply" ? "apply" : "",
pvc_id: parseInt(this.select_volumn) pvc_id: this.parseInt_arr(this.select_volumn)
}; };
} else { } else {
//编辑提交 //编辑提交
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment