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

fix:修复save chart没有panel选项的问题

Browse Source
This commit is contained in:
wangwenrui
2020-08-06 17:15:00 +08:00
parent 0900012b9f
commit 7a3e6a8214
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@
<!-- begin--表单--> <!-- begin--表单-->
<el-scrollbar class="right-box-form-box" ref="scrollbar"> <el-scrollbar class="right-box-form-box" ref="scrollbar">
<el-form class="right-box-form right-box-form-left" :model="editChart" label-width="120px" label-position="right" :rules="rules" ref="chartForm"> <el-form class="right-box-form right-box-form-left" :model="editChart" label-width="120px" label-position="right" :rules="rules" ref="chartForm">
<el-form-item :label="$t('dashboard.panel.title')" prop="panelName" v-if="showPanel.type == 'dashboard'"> <el-form-item :label="$t('dashboard.panel.title')" prop="panelName" v-if="showPanel.type != 'dashboard'">
<el-autocomplete <el-autocomplete
:fetch-suggestions="panelSuggestion" :fetch-suggestions="panelSuggestion"
v-model.trim="editChart.panelName" v-model.trim="editChart.panelName"
@@ -394,6 +394,7 @@
this.promqlCount++; this.promqlCount++;
}, },
removeExpression(index) { removeExpression(index) {
console.log(this.promqlCount)
if (this.promqlCount > 0) { if (this.promqlCount > 0) {
this.expressions.splice(index, 1); this.expressions.splice(index, 1);
this.legends.splice(index, 1); this.legends.splice(index, 1);
@@ -1117,7 +1118,6 @@
}, },
//preview--end //preview--end
initElements() { initElements() {
console.log('statisticsList',this.statisticsList)
if (!this.editChart.elements || this.editChart.elements.length == 0) { if (!this.editChart.elements || this.editChart.elements.length == 0) {
this.editChart.elements = [{expression: "", legend: "", type: "expert", id: ""}]; this.editChart.elements = [{expression: "", legend: "", type: "expert", id: ""}];
} }

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

@@ -196,7 +196,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
</div> </div>
<transition name="right-box"> <transition name="right-box">
<chart-box v-if="rightBox.show" :chart="chart" ref="addChartModal" @close="handleBox(false)" :panel-data="panelData" @on-create-success="createSuccess" :show-panel="{id: -1, name: '', type: 'dashboard'}"></chart-box> <chart-box v-if="rightBox.show" :chart="chart" ref="addChartModal" @close="handleBox(false)" :panel-data="panelData" @on-create-success="createSuccess" :show-panel="{id: -1, name: '', type: 'explore'}"></chart-box>
</transition> </transition>
</div> </div>
</template> </template>

6
nezha-fronted/src/router/index.js
View File

@@ -48,10 +48,10 @@ export default new Router({
path: '/overview', path: '/overview',
component: resolve => require(['../components/page/dashboard/overview/overview2.vue'],resolve) component: resolve => require(['../components/page/dashboard/overview/overview2.vue'],resolve)
}, },
{ /*{
path: '/test', path: '/test',
component: resolve => require(['../components/charts/d3-line-chart2'],resolve) component: resolve => require(['../components/charts/d3/d3-line-chart2'],resolve)
}, },*/
{ {
path: '/project', path: '/project',
component: resolve => require(['../components/page/project/project.vue'], resolve), component: resolve => require(['../components/page/project/project.vue'], resolve),