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

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

Browse Source
This commit is contained in:
Xiao Bai
2022-11-30 15:50:34 +08:00
parent acc0279517 c04c735ad5
commit 202d06b227
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
View File

@@ -38,12 +38,12 @@
@panelLockChange="panelLockChange" @panelLockChange="panelLockChange"
> >
<template v-slot:after> <template v-slot:after>
<el-dropdown-item v-has="'main_add'"> <!-- <el-dropdown-item v-has="'main_add'">
<div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div> <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-has="'main_edit'"> <el-dropdown-item v-has="'main_edit'">
<div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div> <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
</el-dropdown-item> </el-dropdown-item> -->
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'panel_view'">
<div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div> <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
</el-dropdown-item> </el-dropdown-item>
@@ -75,12 +75,12 @@
@panelLockChange="panelLockChange" @panelLockChange="panelLockChange"
> >
<template v-slot:after> <template v-slot:after>
<el-dropdown-item v-has="'main_add'"> <!-- <el-dropdown-item v-has="'main_add'">
<div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div> <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{ $t('overall.AddByTemplate') }}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-has="'main_edit'"> <el-dropdown-item v-has="'main_edit'">
<div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div> <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
</el-dropdown-item> </el-dropdown-item> -->
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'panel_view'">
<div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div> <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
</el-dropdown-item> </el-dropdown-item>

2
nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
View File

@@ -20,7 +20,7 @@
<li <li
v-for="(item,index) in tableData" v-for="(item,index) in tableData"
:key="index" :key="index"
class="detail-row" class="detail-row"
:id="'globalSearch' + item.id" :id="'globalSearch' + item.id"
:class="item.id === detailViewRightObj.id ? 'selected' : ''" :class="item.id === detailViewRightObj.id ? 'selected' : ''"
@click="detailViewRightShow(item)" @click="detailViewRightShow(item)"

1
nezha-fronted/src/components/common/mixin/detailViewMixin.js
View File

@@ -35,6 +35,7 @@ export default {
const query = { ...this.$route.query, detailType: flag } const query = { ...this.$route.query, detailType: flag }
if (this.detailType == 'view') { if (this.detailType == 'view') {
delete query.bottomBox delete query.bottomBox
delete query.selectObj
} }
this.$router.replace({ query: query }).catch(err => {}) this.$router.replace({ query: query }).catch(err => {})
}, 100) }, 100)

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

@@ -46,6 +46,7 @@
<i class="nz-icon nz-icon-moshiqiehuan"></i> <i class="nz-icon nz-icon-moshiqiehuan"></i>
</button> </button>
<!-- 新增图表 -->
<button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" type="button" @click="addChartBefore"> <button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10" type="button" @click="addChartBefore">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
@@ -74,12 +75,12 @@
</el-dropdown-item> </el-dropdown-item>
</template> </template>
<template v-slot:after> <template v-slot:after>
<el-dropdown-item v-has="'main_add'"> <!-- <el-dropdown-item v-has="'main_add'">
<div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{$t('overall.AddByTemplate')}}</div> <div id="chart-temp-add" @click="addChartByTemp"><i class="nz-icon nz-icon-add"></i>{{$t('overall.AddByTemplate')}}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'panel_view'">
<div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div> <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
</el-dropdown-item> </el-dropdown-item> -->
<el-dropdown-item v-has="'panel_view'"> <el-dropdown-item v-has="'panel_view'">
<div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div> <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
</el-dropdown-item> </el-dropdown-item>