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

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

Browse Source
This commit is contained in:
zhangyu
2023-10-12 15:58:13 +08:00
parent 33524c80da b2f3a816cb
commit 9f0bb4a738
1 changed files with 69 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,7 @@
<div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;"> <div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;">
<button id="dashboard-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" v-has="'main_add'" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{$t("overall.addDashboard")}}</button> <button id="dashboard-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" v-has="'main_add'" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{$t("overall.addDashboard")}}</button>
</div> </div>
<template v-if="panelData.length"> <div v-if="panelData.length" class="top-tool-left" style="cursor: pointer;">
<div class="top-tool-left" style="cursor: pointer;">
<select-dashboard <select-dashboard
ref="selectDashboard" ref="selectDashboard"
:panel-data="panelData" :panel-data="panelData"
@@ -47,7 +46,7 @@
</select-dashboard> </select-dashboard>
</div> </div>
<div class="top-tool-right"> <div v-if="panelData.length" class="top-tool-right">
<!-- 仪表盘轮播 --> <!-- 仪表盘轮播 -->
<playlist v-if="playListControls" :playlistObj="playlistObj" :panelData="panelData" @stopPlaylist="stopPlaylist" @changePlay="panelChange"></playlist> <playlist v-if="playListControls" :playlistObj="playlistObj" :panelData="panelData" @stopPlaylist="stopPlaylist" @changePlay="panelChange"></playlist>
@@ -95,7 +94,6 @@
</top-tool-more-options> </top-tool-more-options>
</template> </template>
</div> </div>
</template>
</div> </div>
<div id="tableList" class="table-list" style='overflow-y: unset'> <div id="tableList" class="table-list" style='overflow-y: unset'>
<div class="table-list-box"> <div class="table-list-box">