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

Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

Browse Source
This commit is contained in:
zhangyu
2021-01-25 10:35:01 +08:00
parent c74ea9e355 f449f08e77
commit ec9f838cf5
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
View File

@@ -142,7 +142,7 @@
url:'',
threshold:'',
},
elements:[],
elements:[{expression: "", legend: "", type: "expert", id: ""}],
panel: '',
sync: 0
},

4
nezha-fronted/src/components/common/rightBox/modelBox.vue
View File

@@ -36,7 +36,7 @@
<div class="dropdown-btns" v-show="dropdownHoverItem == 'type' + item.id">
<span :id="'model-type-op-del-' + item.id" @click.stop="delType(item.id)" class="dropdown-btn dropdown-btn-delete" v-has="'model_type_delete'"><i class="nz-icon nz-icon-delete"></i></span>
<span :id="'model-type-op-edit-' + item.id" @click.stop="editType(item)" class="dropdown-btn dropdown-btn-edit" v-has="'model_type_toEdit'" v-if="!item.isEdit"><i class="nz-icon nz-icon-edit"></i></span>
<span :id="'model-type-op-edit-' + item.id" @click.stop="saveType(item)" class="dropdown-btn dropdown-btn-edit" v-else v-has="'model_type_save'"><i class="nz-icon nz-icon-check"></i></span>
<span :id="'model-type-op-edit-' + item.id" @click.stop="saveType(item)" class="dropdown-btn dropdown-btn-edit" v-else><i class="nz-icon nz-icon-check"></i></span>
</div>
</div>
</template>
@@ -59,7 +59,7 @@
<div class="dropdown-btns" v-show="dropdownHoverItem == 'vendor' + item.id">
<span :id="'model-vendor-op-del-' + item.id" @click.stop="delVendor(item.id)" class="dropdown-btn dropdown-btn-delete" v-has="'model_vendor_delete'"><i class="nz-icon nz-icon-delete"></i></span>
<span :id="'model-vendor-op-edit-' + item.id" @click.stop="editVendor(item)" class="dropdown-btn dropdown-btn-edit" v-has="'model_vendor_toEdit'" v-if="!item.isEdit"><i class="nz-icon nz-icon-edit"></i></span>
<span :id="'model-type-op-edit-' + item.id" @click.stop="saveVendor(item)" class="dropdown-btn dropdown-btn-edit" v-else v-has="'model_vendor_save'"><i class="nz-icon nz-icon-check"></i></span>
<span :id="'model-type-op-edit-' + item.id" @click.stop="saveVendor(item)" class="dropdown-btn dropdown-btn-edit" v-else><i class="nz-icon nz-icon-check"></i></span>
</div>
</div>
</template>

14
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -331,7 +331,7 @@
<label >{{$t('dashboard.panel.chartForm.statistics')}}</label>&nbsp;
</el-col>
<el-col style="width: calc(100% - 120px);">
<el-select placeholder="" popper-class="chart-box-dropdown-mini" size="small" v-model="statistics">
<el-select placeholder="" popper-class="chart-box-dropdown-mini" size="small" v-model="editChart.param.statistics">
<el-option :key="item.value" :label="item.label" :value="item.value" v-for="item in statisticsList">
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
</el-option>
@@ -382,6 +382,7 @@
<el-color-picker
:ref="'colorPickerBac'+index"
@active-change="(val)=>colorChange(mapping,showPicker[index].bac,val)"
popper-class="no-style-class"
v-model="showPicker[index].bac?mapping.color.bac:mapping.color.text"
>
</el-color-picker>
@@ -426,6 +427,7 @@
<div class="color-content" ref="color-content">
<el-color-picker
:ref="'colorPickerBac'+index"
popper-class="no-style-class"
@active-change="(val)=>colorChange(mapping,showPicker[index].bac,val)"
v-model="showPicker[index].bac?mapping.color.bac:mapping.color.text"
>
@@ -480,13 +482,13 @@
<button v-cancel="{obj:editChart,func:esc}" id="chart-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="SyncSave" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-Sync" v-has:all="[`${from}_chart_save`, `${from}_chart_sync`]" v-if="showPanel.type && showPanel.type == 'model'">
<button @click="SyncSave" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-Sync" v-has:all="[`${from}_chart_toAdd`, `${from}_chart_sync`]" v-if="showPanel.type && showPanel.type == 'model'">
<span>{{$t('overall.SyncSave')}}</span>
</button>
<button @click="preview" id="chart-box-preview" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" v-else>
<span>{{$t('overall.preview')}}</span>
</button>
<button @click="confirmAdd" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-save" v-has="`${from}_chart_save`" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}" >
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="confirmAdd" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="chart-box-save" v-has="`${from}_chart_toAdd`" >
<span>{{$t('overall.save')}}</span>
</button>
</div>
@@ -937,7 +939,7 @@
sync: this.editChart.sync
};
if(this.editChart.type === 'singleStat'){
params.param.statistics=this.statistics;
// params.param.statistics=this.statistics;
} else {
delete params.param.statistics;
}
@@ -1037,7 +1039,7 @@
return ;
}
if(this.editChart.type == 'singleStat'){
this.$set(this.editChart.param, "statistics", this.statistics);
// this.$set(this.editChart.param, "statistics", this.statistics);
} else {
delete this.editChart.param.statistics;
}
@@ -1436,7 +1438,7 @@
sync: this.editChart.sync
};
if(this.editChart.type === 'singleStat'){
params.param.statistics=this.statistics;
// params.param.statistics=this.statistics;
params.param.valueMapping=this.editChart.param.valueMapping;
} else {
delete params.param.statistics;

4
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -123,7 +123,7 @@
import pickTime from "../../common/pickTime";
import exportXLSX from "../../common/exportXLSX";
import selectPanel from "../../common/popBox/selectPanel";
export default {
name: "panel",
data() {
@@ -159,7 +159,7 @@
url:'',
threshold:'',
},
elements:[],
elements:[{expression: "", legend: "", type: "expert", id: ""}],
panel: '',
sync: 0
},