gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改panel 使用expression模板闪退的问题 ，以及修改前端给模板字符的取值问题

Browse Source
This commit is contained in:
zhangyu
2021-03-16 18:16:10 +08:00
parent a900833a92
commit 1ca749dfda
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/js/tools.js
View File

@@ -298,13 +298,13 @@ export function calcDurationByStringTime(startTime, endTime) {
export function calcDurationByStringTimeB(startTime, endTime) { export function calcDurationByStringTimeB(startTime, endTime) {
let durationSecond = stringTimeParseToUnix(endTime)-stringTimeParseToUnix(startTime); let durationSecond = stringTimeParseToUnix(endTime)-stringTimeParseToUnix(startTime);
let result = `${durationSecond%60}s`; let result = `${durationSecond%60}s`;
if(durationSecond > 60*60 *24){ if(durationSecond >= 60*60 *24){
result = `${(Math.floor(durationSecond/3600))%24}h` result = `${(Math.floor(durationSecond/3600))%24}h`
result = `${Math.floor(durationSecond/(60*60*24))}d ${result}`; result = `${Math.floor(durationSecond/(60*60*24))}d ${result}`;
} else if (durationSecond > 60*60) { } else if (durationSecond >= 60*60) {
result = `${(Math.floor(durationSecond/60))%60}m` result = `${(Math.floor(durationSecond/60))%60}m`
result = `${Math.floor(durationSecond/(60*60))}h ${result}`; result = `${Math.floor(durationSecond/(60*60))}h ${result}`;
}else if(durationSecond > 60) { }else if(durationSecond >= 60) {
result = `${(Math.floor(durationSecond/60))%60}m ${result}`; result = `${(Math.floor(durationSecond/60))%60}m ${result}`;
} }

11
nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
View File

@@ -105,12 +105,12 @@
<span class="temp-form-box-title">Variable</span> <span class="temp-form-box-title">Variable</span>
<el-form-item v-for="(item,index) in tempBox.vars" :prop="item" :key="index"> <el-form-item v-for="(item,index) in tempBox.vars" :prop="item" :key="index">
<el-row> <el-row>
<el-col :span="5" class="temp-form-box-col"> <el-col :span="6" class="temp-form-box-col">
<el-input v-model="tempBox.vars[index]" :id="'tempBox'+index" size="small" :disabled="true"></el-input> <el-input v-model="tempBox.vars[index]" :id="'tempBox'+index" size="small" :disabled="true"></el-input>
</el-col> </el-col>
<el-col :span="17" v-if="format(item).key"> <el-col :span="17" v-if="format(item).key">
<!--<el-input v-model="tempBox[item]" :id="'tempBox'+item" size="small"></el-input>--> <!--<el-input v-model="tempBox[item]" :id="'tempBox'+item" size="small"></el-input>-->
<el-select v-model="tempBox[item]" size="small" style="width: 100%"> <el-select v-model="tempBox[item]" size="small" style="width: 100%" :popper-class="'nz-temp-box'">
<el-option v-for="(item1,index) in format(item).arr" :key="index" :label="item1[format(item).value]" :value="item1[format(item).value]"> <el-option v-for="(item1,index) in format(item).arr" :key="index" :label="item1[format(item).value]" :value="item1[format(item).value]">
</el-option> </el-option>
</el-select> </el-select>
@@ -374,11 +374,6 @@
format(str){ format(str){
let arr=str.split('.') let arr=str.split('.')
let keyword=arr[0].toLowerCase(); let keyword=arr[0].toLowerCase();
if(arr.length!==1&&arr.length!==2){
return {
key:false
}
}
switch(keyword){ switch(keyword){
case 'asset': case 'asset':
case 'module': case 'module':
@@ -388,7 +383,7 @@
return { return {
arr:this[keyword+'Option'], arr:this[keyword+'Option'],
key:keyword, key:keyword,
value:arr[1]?arr[1]:((keyword=='module'||keyword=='project'||keyword=='datacenter')?'name':'host') value:((keyword=='module'||keyword=='project'||keyword=='datacenter')?'name':'host')
}; };
default: default:
return { return {