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

NEZ-1739 feat: 补充loading 动画

Browse Source
This commit is contained in:
@changcode
2022-03-25 15:40:05 +08:00
parent c5aab4ae7f
commit b1e4745909
71 changed files with 130 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
View File

@@ -168,8 +168,11 @@
.bottom-box .sub-container{ .bottom-box .sub-container{
height: calc(100% - 64px); height: calc(100% - 64px);
} }
.bottom-box .sub-container .nz-table2{ .bottom-box .sub-container .nz-table2 {
height: calc(100% - 20px); height: calc(100% - 20px);
.bottom-box__top .my-loading-box {
height: calc(100% + 20px) !important;
}
} }
.asset-detail .sub-container .nz-table2 { .asset-detail .sub-container .nz-table2 {
height: 100%; height: 100%;

2
nezha-fronted/src/components/chart/chart/chartAutotopology.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div v-loading="topologyLoading" class="overview"> <div v-my-loading="topologyLoading" class="overview">
<transition name = "el-zoom-in-center"> <transition name = "el-zoom-in-center">
<div v-if="allProject&&allProject.length>0" style="width: 100%;height: 100%;position: relative"> <div v-if="allProject&&allProject.length>0" style="width: 100%;height: 100%;position: relative">
<el-carousel :interval="5000" :trigger="'click'" arrow="hover"> <el-carousel :interval="5000" :trigger="'click'" arrow="hover">

4
nezha-fronted/src/components/chart/chart/chartHexagon.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div style="width: 100%;height: 100%" v-loading="loading"> <div style="width: 100%;height: 100%" v-my-loading="loading">
<hexagonBox <hexagonBox
ref="hexagonBox" ref="hexagonBox"
:hexData="hexData" :hexData="hexData"
@@ -20,7 +20,7 @@
/> />
<alertLabel <alertLabel
v-if="showTooltip&&assetData.show" v-if="showTooltip&&assetData.show"
v-loading="assetData.loading" v-my-loading="assetData.loading"
ref="alertLabel" ref="alertLabel"
:id="assetData.id" :id="assetData.id"
:that="assetData" :that="assetData"

2
nezha-fronted/src/components/chart/panelChart.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<!-- chart外层箱子 --> <!-- chart外层箱子 -->
<div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)" v-loading="loading"> <div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)" v-my-loading="loading">
<!-- title和工具栏，支持浮动 --> <!-- title和工具栏，支持浮动 -->
<chart-header <chart-header
v-if="!isFullscreen&&showHeader" v-if="!isFullscreen&&showHeader"

2
nezha-fronted/src/components/charts/chart-alert-list.vue
View File

@@ -133,7 +133,7 @@
<pick-time :refresh-data-func="queryDate" :use-refresh="true" :use-chart-unit="false" v-model="searchTimeDialog" style="height: 28px;" id="alert-sub-chart"></pick-time> <pick-time :refresh-data-func="queryDate" :use-refresh="true" :use-chart-unit="false" v-model="searchTimeDialog" style="height: 28px;" id="alert-sub-chart"></pick-time>
</div> </div>
</div> </div>
<div style="width: 100%;height: 100%" v-loading="chartLoading"> <div style="width: 100%;height: 100%" v-my-loading="chartLoading">
<chart v-if="resultType === 'matrix'" ref="messageChart" :unit="chartUnit" name="alertMessageChart"></chart> <chart v-if="resultType === 'matrix'" ref="messageChart" :unit="chartUnit" name="alertMessageChart"></chart>
<log-tab v-if="resultType === 'streamsFormat'" ref="logDetailScreen" :log-data="logData" :showSwitch="false" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData"></log-tab> <log-tab v-if="resultType === 'streamsFormat'" ref="logDetailScreen" :log-data="logData" :showSwitch="false" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>
</div> </div>

4
nezha-fronted/src/components/cli/webSSH.vue
View File

@@ -155,7 +155,7 @@
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px"> <el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="assetShow" @close="closeAssetCustom" class="nz-dialog" width="620px">
<div slot="title">{{$t('webshell.connect')}}</div> <div slot="title">{{$t('webshell.connect')}}</div>
<div > <div >
<el-form label-width="120px" size="small" :model="assetContent" label-position = "top" :rules="rules" ref="assetConnect" v-loading="assetLoading" > <el-form label-width="120px" size="small" :model="assetContent" label-position = "top" :rules="rules" ref="assetConnect" v-my-loading="assetLoading" >
<el-form-item :label='$t("overall.asset")' prop="assetId" class="flex"> <el-form-item :label='$t("overall.asset")' prop="assetId" class="flex">
<el-dropdown trigger="click" class="header-el-dropdown"> <el-dropdown trigger="click" class="header-el-dropdown">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@@ -192,7 +192,7 @@
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px"destroy-on-close > <el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px"destroy-on-close >
<div slot="title">{{$t('webshell.connect')}}</div> <div slot="title">{{$t('webshell.connect')}}</div>
<div > <div >
<el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules=" customConnect.authProtocol ===2 ? rulesCustom2: rulesCustom" ref="customConnect" v-loading="assetLoading" class="custom"> <el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules=" customConnect.authProtocol ===2 ? rulesCustom2: rulesCustom" ref="customConnect" v-my-loading="assetLoading" class="custom">
<el-form-item :label='$t("webshell.protocol")' prop="authProtocol"> <el-form-item :label='$t("webshell.protocol")' prop="authProtocol">
<el-select @change="protocolChange" value-key="id" popper-class="config-dropdown w260 right-box-select-top right-public-box-dropdown-top" v-model="customConnect.authProtocol" placeholder="" size="small" id="webshell-box-input-protocol"> <el-select @change="protocolChange" value-key="id" popper-class="config-dropdown w260 right-box-select-top right-public-box-dropdown-top" v-model="customConnect.authProtocol" placeholder="" size="small" id="webshell-box-input-protocol">
<el-option v-for="item in authProtocol" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option> <el-option v-for="item in authProtocol" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option>

4
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -3,7 +3,7 @@
@import "../project/L5/css/props.css"; @import "../project/L5/css/props.css";
</style> </style>
<template> <template>
<div class="project-box list-page" v-loading="topologyLoading"> <div class="project-box list-page" v-my-loading="topologyLoading">
<div class="main-list" style="overflow: hidden"> <div class="main-list" style="overflow: hidden">
<div class="main-container" :class="fromOverView?'from-overview':'from-project'" style="background: #fff"> <div class="main-container" :class="fromOverView?'from-overview':'from-project'" style="background: #fff">
<div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block"> <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 20px);display: inline-block">
@@ -13,7 +13,7 @@
<span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i <span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i
class="nz-icon nz-icon-arrow-down"></i></span> class="nz-icon nz-icon-arrow-down"></i></span>
<el-dropdown-menu slot="dropdown" @click="dropdownClick"> <el-dropdown-menu slot="dropdown" @click="dropdownClick">
<div style="height: 450px" v-loading="imgageLoading"> <div style="height: 450px" v-my-loading="imgageLoading">
<el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto" <el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto"
class="project-topology-add-node"> class="project-topology-add-node">
<!--<div class="drag-header">——</div>--> <!--<div class="drag-header">——</div>-->

10
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div :class="calcHeight(that.position,that)" :style="calcPosition(that.position,that)" class="alert-label__border" ref="alertLabels"> <div :class="calcHeight(that.position,that)" :style="calcPosition(that.position,that)" class="alert-label__border" ref="alertLabels">
<div class="alert-label-info" v-if="type==='asset'" v-loading="loading"> <div class="alert-label-info" v-if="type==='asset'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='module'" v-loading="loading"> <div class="alert-label-info" v-if="type==='module'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -118,7 +118,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='project'" v-loading="loading"> <div class="alert-label-info" v-if="type==='project'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData ? alertLabelData.id : '--'}}</div>
@@ -170,7 +170,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='endpoint'" v-loading="loading"> <div class="alert-label-info" v-if="type==='endpoint'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -245,7 +245,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='dc'" v-loading="loading"> <div class="alert-label-info" v-if="type==='dc'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>

10
nezha-fronted/src/components/common/alert/alertLabel2.vue
View File

@@ -7,7 +7,7 @@
right:that.position.right ? (that.position.right + 'px') : 'unset', right:that.position.right ? (that.position.right + 'px') : 'unset',
'--mt': that.position.mt+'px' '--mt': that.position.mt+'px'
}"> }">
<div class="alert-label-info" v-if="type==='asset'" v-loading="loading"> <div class="alert-label-info" v-if="type==='asset'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='module'" v-loading="loading"> <div class="alert-label-info" v-if="type==='module'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -125,7 +125,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='project'" v-loading="loading"> <div class="alert-label-info" v-if="type==='project'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData ? alertLabelData.id : '--'}}</div>
@@ -176,7 +176,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='endpoint'" v-loading="loading"> <div class="alert-label-info" v-if="type==='endpoint'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>
@@ -251,7 +251,7 @@
</div> </div>
</div> </div>
<div class="alert-label-info" v-if="type==='dc'" v-loading="loading"> <div class="alert-label-info" v-if="type==='dc'" v-my-loading="loading">
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">ID</div> <div class="alert-label-title">ID</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div> <div class="alert-label-value">{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}</div>

2
nezha-fronted/src/components/common/alert/alertRuleInfo.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div :style="calcPosition(that.position,that)" class="alert-label__border alert-label" v-loading="loading" ref="alertLabels"> <div :style="calcPosition(that.position,that)" class="alert-label__border alert-label" v-my-loading="loading" ref="alertLabels">
<div class="alert-rule-info" > <div class="alert-rule-info" >
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">ID</div> <div class="alert-rule-title">ID</div>

2
nezha-fronted/src/components/common/alert/selectAlertSilence.vue
View File

@@ -14,7 +14,7 @@
check-strictly check-strictly
highlight-current highlight-current
node-key="id" node-key="id"
v-loading="typeContentLoading" v-my-loading="typeContentLoading"
ref="panelTree"> ref="panelTree">
<div slot-scope="{ node }" class="tree--node"> <div slot-scope="{ node }" class="tree--node">
<span>{{ node.label }}</span> <span>{{ node.label }}</span>

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

@@ -48,7 +48,7 @@
ref="dataTable" ref="dataTable"
:api="url" :api="url"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="subTableHeight" :height="subTableHeight"

5
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -12,7 +12,6 @@
@changeTab="changeTab" @changeTab="changeTab"
@search="search" @search="search"
class="full-width-height" class="full-width-height"
v-loading="tools.loading"
> >
<template v-slot:title><span :title="obj.name">{{obj.name}}</span></template> <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
@@ -26,6 +25,7 @@
ref="dataTable" ref="dataTable"
:api="url" :api="url"
:orderByFa="orderBy" :orderByFa="orderBy"
v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="subTableHeight" :height="subTableHeight"
@@ -33,6 +33,7 @@
:table-data="tableData" :table-data="tableData"
:alertMessageTabNew="true" :alertMessageTabNew="true"
@del="del" @del="del"
class="bottom-box__top"
@showText="showText" @showText="showText"
@edit="edit" @edit="edit"
@orderBy="tableDataSort" @orderBy="tableDataSort"
@@ -74,7 +75,7 @@
<!-- <pick-time v-model="searchTime" :refresh-data-func="queryDate" :use-chart-unit="false" :use-refresh="false" style="height: 28px;"></pick-time>--> <!-- <pick-time v-model="searchTime" :refresh-data-func="queryDate" :use-chart-unit="false" :use-refresh="false" style="height: 28px;"></pick-time>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div style="width: 100%;height: 100%" v-loading="chartLoading">--> <!-- <div style="width: 100%;height: 100%" v-my-loading="chartLoading">-->
<!-- <chart v-if="resultType === 'matrix'" ref="messageChart" :unit="chartUnit" name="alertMessageChart"></chart>--> <!-- <chart v-if="resultType === 'matrix'" ref="messageChart" :unit="chartUnit" name="alertMessageChart"></chart>-->
<!-- <log-tab v-if="resultType === 'streamsFormat'" ref="logDetailScreen" :log-data="logData" :showSwitch="false" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>--> <!-- <log-tab v-if="resultType === 'streamsFormat'" ref="logDetailScreen" :log-data="logData" :showSwitch="false" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>-->
<!-- </div>--> <!-- </div>-->

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

@@ -17,7 +17,7 @@
<alertRuleEvalLogTable <alertRuleEvalLogTable
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

3
nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
View File

@@ -19,12 +19,13 @@
ref="dataTable" ref="dataTable"
:api="url" :api="url"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="subTableHeight" :height="subTableHeight"
:table-data="tableData" :table-data="tableData"
:assetTab="true" :assetTab="true"
class="bottom-box__top"
@del="del" @del="del"
@edit="edit" @edit="edit"
@cli="cli" @cli="cli"

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

@@ -19,7 +19,7 @@
ref="dataTable" ref="dataTable"
:api="url" :api="url"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
:height="subTableHeight" :height="subTableHeight"

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

@@ -19,7 +19,7 @@
<cabinet-table <cabinet-table
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -65,7 +65,7 @@
</div> </div>
<div class="table-header-inner" @click="clearSelectedMetrics"><span><i style="font-size: 12px;margin-left: 2px;" class="nz-icon nz-icon-close " :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i></span></div> <div class="table-header-inner" @click="clearSelectedMetrics"><span><i style="font-size: 12px;margin-left: 2px;" class="nz-icon nz-icon-close " :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i></span></div>
<pl-table :row-height="28" use-virtual :datas="tableData" border :empty-text="$t('config.mib.noData')" :header-cell-class-name="cellClass" :style="{height: $tableHeight.noPagination}" <pl-table :row-height="28" use-virtual :datas="tableData" border :empty-text="$t('config.mib.noData')" :header-cell-class-name="cellClass" :style="{height: $tableHeight.noPagination}"
:pagination-show="false" class="nz-table endpoint-query-table" ref="endpointQueryTable" style="width: 100%;" v-loading="loading" :pagination-show="false" class="nz-table endpoint-query-table" ref="endpointQueryTable" style="width: 100%;" v-my-loading="loading"
v-if="tableShow && plTableSHow" id="endpoint-list-table" :tooltip-effect="'light'" @selection-change="selectChange"> v-if="tableShow && plTableSHow" id="endpoint-list-table" :tooltip-effect="'light'" @selection-change="selectChange">
<pl-table-column <pl-table-column
type="selection" type="selection"

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

@@ -51,7 +51,7 @@
id="endpoint-sub-list-table" id="endpoint-sub-list-table"
:data="tableData" :data="tableData"
border border
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
class="nz-table endpoint-table" class="nz-table endpoint-table"
:height="$tableHeight.noPagination" :height="$tableHeight.noPagination"

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

@@ -18,7 +18,7 @@
<endpoint-table <endpoint-table
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

4
nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
View File

@@ -32,8 +32,8 @@
</pick-time> </pick-time>
</template> </template>
<template v-slot> <template v-slot>
<log-tab ref="logDetail" v-loading="loading" :loading-bottom="endpointLoading" :log-data="logData" :tab-index="9" @exportLog="exportLog" @limitChange="queryLogData"></log-tab> <log-tab ref="logDetail" v-my-loading="loading" :loading-bottom="endpointLoading" :log-data="logData" :tab-index="9" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>
<!-- <div v-loading="loading" v-if="!logData" style="height: 300px; width: 100%; display: flex; justify-content: center; align-items: center; color: #999;">No Data</div>--> <!-- <div v-my-loading="loading" v-if="!logData" style="height: 300px; width: 100%; display: flex; justify-content: center; align-items: center; color: #999;">No Data</div>-->
</template> </template>
</nz-bottom-data-list> </nz-bottom-data-list>
</template> </template>

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

@@ -16,7 +16,7 @@
<operation-log-table <operation-log-table
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="full-width-height chart-list panel-tab-new asset-detail" v-loading="panelTabLoading"> <div class="full-width-height chart-list panel-tab-new asset-detail" v-my-loading="panelTabLoading">
<nz-bottom-data-list <nz-bottom-data-list
:showTitle='showTitle' :showTitle='showTitle'
:obj='obj' :obj='obj'
@@ -88,7 +88,7 @@
<!--图表--> <!--图表-->
<div id="tableList" class="table-list" style="padding-top: 0;overflow: hidden"> <div id="tableList" class="table-list" style="padding-top: 0;overflow: hidden">
<div id="dashboardScrollbar" class="table-list-box"> <div id="dashboardScrollbar" class="table-list-box">
<div class="box-content" ref="dashboardScrollbar" v-loading="chartListLoading" style="overflow-y: auto"> <div class="box-content" ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: auto">
<chart-list <chart-list
ref="chartList" ref="chartList"
name="panel" name="panel"
@@ -114,7 +114,7 @@
<!-- <chart-box v-if="rightBox.chart.show" ref="addChartModal" :chart="chart" :from="from" :panel-data="panelData" :show-panel="showPanel" @close="closeRightBox" @delete-chart="delChart" @on-create-success="createSuccess" @on-delete-success="delChartOk"></chart-box>--> <!-- <chart-box v-if="rightBox.chart.show" ref="addChartModal" :chart="chart" :from="from" :panel-data="panelData" :show-panel="showPanel" @close="closeRightBox" @delete-chart="delChart" @on-create-success="createSuccess" @on-delete-success="delChartOk"></chart-box>-->
<chart-right-box <chart-right-box
v-if="chartRightBoxShow" v-if="chartRightBoxShow"
v-loading="rightBox.loading" v-my-loading="rightBox.loading"
ref="addChartModal" ref="addChartModal"
:chart="chart" :chart="chart"
:from="from" :from="from"

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

@@ -25,7 +25,7 @@
<scrape-endpoint-table <scrape-endpoint-table
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -16,7 +16,7 @@
<terminal-log-table <terminal-log-table
ref="dataTable" ref="dataTable"
:orderByFa="'id'" :orderByFa="'id'"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

6
nezha-fronted/src/components/common/globalSearch/globalSearch.vue
View File

@@ -2,7 +2,7 @@
<div class="global-search-bac" v-if="globalShow" @click.self="close"> <div class="global-search-bac" v-if="globalShow" @click.self="close">
<div class="global-search-box" :class="firstShow? '' : 'search-after'" @click.self="close"> <div class="global-search-box" :class="firstShow? '' : 'search-after'" @click.self="close">
<div class="global-search-input" :class="firstShow? '' : 'search-after'"> <div class="global-search-input" :class="firstShow? '' : 'search-after'">
<i class="nz-icon nz-icon-search" v-loading="loading"></i> <i class="nz-icon nz-icon-search" v-my-loading="loading"></i>
<el-input v-model="searchStr" @input="searchAll" ref="searchStr" :placeholder="$t('globalSearch.placeholder')" @keydown.native="inputKeydown" clearable></el-input> <el-input v-model="searchStr" @input="searchAll" ref="searchStr" :placeholder="$t('globalSearch.placeholder')" @keydown.native="inputKeydown" clearable></el-input>
<div @click="close" class="global-search-cancel"> <div @click="close" class="global-search-cancel">
{{$t('overall.cancel')}} {{$t('overall.cancel')}}
@@ -52,11 +52,11 @@
<div class="list-item-sub" v-if="item.sub"> <div class="list-item-sub" v-if="item.sub">
{{ item.sub }} {{ item.sub }}
</div> </div>
<div class="is-jump" v-loading="jumpLoading"> <div class="is-jump" v-my-loading="jumpLoading">
<i class="nz-icon nz-icon-huiche"></i> <i class="nz-icon nz-icon-huiche"></i>
</div> </div>
</li> </li>
<li class="list-item" v-if="nextLoading" v-loading="nextLoading"></li> <li class="list-item" v-if="nextLoading" v-my-loading="nextLoading"></li>
<!-- <li class="list-item" v-if="noMore&&!nextLoading">没有更多了</li>--> <!-- <li class="list-item" v-if="noMore&&!nextLoading">没有更多了</li>-->
</ul> </ul>
</template> </template>

6
nezha-fronted/src/components/common/login.vue
View File

@@ -23,8 +23,8 @@
{{$t('login.verifyContent')}} {{$t('login.verifyContent')}}
</div> </div>
<div class="login-foot"> <div class="login-foot">
<button v-if="!verifyShow" id="login" v-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="login">Login</button> <button v-if="!verifyShow" id="login" v-my-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="login">Login</button>
<button v-if="verifyShow" id="verify" v-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="verify">{{$t("login.verify")}}</button> <button v-if="verifyShow" id="verify" v-my-loading="loading" :class="{'nz-btn-disabled': !license.valid}" class="login-btn" @click="verify">{{$t("login.verify")}}</button>
</div> </div>
<div class="license-warn" v-if="license.warnInfo">{{license.warnInfo}}</div> <div class="license-warn" v-if="license.warnInfo">{{license.warnInfo}}</div>
<div class="login-license"> <div class="login-license">
@@ -54,7 +54,7 @@
<el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false' <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
:show-close="true" width="620px" class="nz-dialog" > :show-close="true" width="620px" class="nz-dialog" >
<div v-loading="dialogLoading"> <div v-my-loading="dialogLoading">
<div class="login-dialog-title"> <div class="login-dialog-title">
1 Download your preferred authenticator app to your phone (any will work). If you don't 1 Download your preferred authenticator app to your phone (any will work). If you don't
have a preferred app, we recommend using <span @click="jumpDlw" class="verify-link">Google Authenticator.</span> have a preferred app, we recommend using <span @click="jumpDlw" class="verify-link">Google Authenticator.</span>

2
nezha-fronted/src/components/common/nzTransfer.vue
View File

@@ -14,7 +14,7 @@
</div> </div>
<div class="box__table"> <div class="box__table">
<el-table <el-table
v-loading="loading" v-my-loading="loading"
:data="selectableData" :data="selectableData"
:row-class-name="setRowShow" :row-class-name="setRowShow"
height="100%" height="100%"

4
nezha-fronted/src/components/common/overView/messageAsset.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div style="width: 100%;height: 100%" v-loading="loading"> <div style="width: 100%;height: 100%" v-my-loading="loading">
<hexagonBox <hexagonBox
ref="hexagonBox" ref="hexagonBox"
:hexData="data" :hexData="data"
@@ -20,7 +20,7 @@
/> />
<alertLabel <alertLabel
v-if="showTooltip&&assetData.show" v-if="showTooltip&&assetData.show"
v-loading="assetData.loading" v-my-loading="assetData.loading"
ref="alertLabel" ref="alertLabel"
:id="assetData.id" :id="assetData.id"
:that="assetData" :that="assetData"

2
nezha-fronted/src/components/common/project/popData/Info.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="info-content pop-data-info-content" v-if="showInfo"> <div class="info-content pop-data-info-content" v-if="showInfo">
<div class="info-box" v-loading="loading"> <div class="info-box" v-my-loading="loading">
<div class="info-box-title">Module info</div> <div class="info-box-title">Module info</div>
<div class="info-box-content"> <div class="info-box-content">
<div class="content-box"> <div class="content-box">

2
nezha-fronted/src/components/common/project/popData/alertTable.vue
View File

@@ -10,7 +10,7 @@
:layout="['searchInput', 'pagination']" :layout="['searchInput', 'pagination']"
:search-msg="searchMsg" :search-msg="searchMsg"
@search="search" @search="search"
v-loading="tools.loading" v-my-loading="tools.loading"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<el-select v-model="state" size="small" value-key="value" popper-class="right-box-select-top right-public-box-dropdown-top" @change="getTableData"> <el-select v-model="state" size="small" value-key="value" popper-class="right-box-select-top right-public-box-dropdown-top" @change="getTableData">

2
nezha-fronted/src/components/common/project/popData/assetTable.vue
View File

@@ -16,7 +16,7 @@
<asset-table <asset-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tableTitle" :custom-table-title="tableTitle"

2
nezha-fronted/src/components/common/project/popData/endpointTable.vue
View File

@@ -17,7 +17,7 @@
style="height: calc(100% - 200px)" style="height: calc(100% - 200px)"
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tableTitle" :custom-table-title="tableTitle"

4
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -3,7 +3,7 @@
@import "./L5/css/props.css"; @import "./L5/css/props.css";
</style> </style>
<template> <template>
<div class="project-box list-page" v-loading="topologyLoading"> <div class="project-box list-page" v-my-loading="topologyLoading">
<div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}"> <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">
<div class="main-container" :class="fromOverView?'from-overview':'from-project'"> <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
<div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 40px);display: inline-block"> <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 40px);display: inline-block">
@@ -13,7 +13,7 @@
<span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i <span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i
class="nz-icon nz-icon-arrow-down"></i></span> class="nz-icon nz-icon-arrow-down"></i></span>
<el-dropdown-menu slot="dropdown" @click="dropdownClick" class="right-box-select-top right-public-box-dropdown-top"> <el-dropdown-menu slot="dropdown" @click="dropdownClick" class="right-box-select-top right-public-box-dropdown-top">
<div style="height: 450px" v-loading="imgageLoading"> <div style="height: 450px" v-my-loading="imgageLoading">
<el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto" <el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto"
class="project-topology-add-node"> class="project-topology-add-node">
<!--<div class="drag-header">——</div>--> <!--<div class="drag-header">——</div>-->

2
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -8,7 +8,7 @@
label-width="120px" label-width="120px"
> >
<div v-loading="loading" v-for="(item, index) in chartConfig.param.datasource " :key="index" class="chart-system-top-box"> <div v-my-loading="loading" v-for="(item, index) in chartConfig.param.datasource " :key="index" class="chart-system-top-box">
<div class="chart-title chart-title-config"> <div class="chart-title chart-title-config">
<span class="chart-title-content el-form-item" :class="{ <span class="chart-title-content el-form-item" :class="{
'is-error' : systemNameShow[0].error, 'is-error' : systemNameShow[0].error,

4
nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
View File

@@ -4,7 +4,7 @@
id="endpointTable" id="endpointTable"
ref="dataTable" ref="dataTable"
:data="currentTableData" :data="currentTableData"
v-loading="loading" v-my-loading="loading"
:height="'calc(100% - 48px)'" :height="'calc(100% - 48px)'"
border border
@header-dragend="dragend" @header-dragend="dragend"
@@ -108,7 +108,7 @@
<!-- ></chart-box>--> <!-- ></chart-box>-->
<chart-right-box <chart-right-box
v-if="chartRightBoxShow" v-if="chartRightBoxShow"
v-loading="rightBox.loading" v-my-loading="rightBox.loading"
ref="addChartModal" ref="addChartModal"
:chart="chart" :chart="chart"
:showPanel="{}" :showPanel="{}"

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -9,7 +9,7 @@
:layout="dataListLayout" :layout="dataListLayout"
:search-msg="searchMsg" :search-msg="searchMsg"
@search="search" @search="search"
v-loading="tools.loading" v-my-loading="tools.loading"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px"> <el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">

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

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -41,7 +41,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
@@ -110,7 +110,7 @@
<alert-rule-table <alert-rule-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/alert/alertSilence.vue
View File

@@ -20,7 +20,7 @@
<alert-silence-table <alert-silence-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/agent.vue
View File

@@ -23,7 +23,7 @@
<agent-table <agent-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/assetMeta.vue
View File

@@ -41,7 +41,7 @@
<asset-meta-table <asset-meta-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/assetState.vue
View File

@@ -21,7 +21,7 @@
<el-table <el-table
id="role-list-table" id="role-list-table"
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:data="tableData" :data="tableData"
:height="mainTableHeight" :height="mainTableHeight"

2
nezha-fronted/src/components/page/config/assetType.vue
View File

@@ -20,7 +20,7 @@
<asset-type-table <asset-type-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/credentials.vue
View File

@@ -19,7 +19,7 @@
<credentials-table <credentials-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -44,7 +44,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
:table-data="tableData" :table-data="tableData"
@@ -116,7 +116,7 @@
<dc-table <dc-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/globalization.vue
View File

@@ -20,7 +20,7 @@
<globalization-table <globalization-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/ipam.vue
View File

@@ -42,7 +42,7 @@
<ipam-table <ipam-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/menus.vue
View File

@@ -17,7 +17,7 @@
<template v-slot="slotProps"> <template v-slot="slotProps">
<menu-table <menu-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/mib.vue
View File

@@ -19,7 +19,7 @@
<mib-table <mib-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

4
nezha-fronted/src/components/page/config/mibBrowser.vue
View File

@@ -57,7 +57,7 @@
<div ref="treeScrollbar" class="mib-browser-tree"> <div ref="treeScrollbar" class="mib-browser-tree">
<el-tree <el-tree
ref="walkTree" ref="walkTree"
v-loading="treeLoading" v-my-loading="treeLoading"
:data="walkData" :data="walkData"
:expand-on-click-node="false" :expand-on-click-node="false"
:props="{label: 'name', children: 'subTree'}" :props="{label: 'name', children: 'subTree'}"
@@ -129,7 +129,7 @@
<span id="mib-browser-clear" :title="$t('overall.clear')" class="mib-browser-table-op" @click="clearResult"><i class="nz-icon nz-icon-close"></i></span> <span id="mib-browser-clear" :title="$t('overall.clear')" class="mib-browser-table-op" @click="clearResult"><i class="nz-icon nz-icon-close"></i></span>
</span> </span>
</div> </div>
<pl-table v-if="showTable" ref="resultTable" v-loading="loading" :datas="resultData" :empty-text="$t('config.mib.noData')" :pagination-show="false" :row-height="28" <pl-table v-if="showTable" ref="resultTable" v-my-loading="loading" :datas="resultData" :empty-text="$t('config.mib.noData')" :pagination-show="false" :row-height="28"
border class="mib-browser-table" size="small" style="width: 100%; height: 100%" use-virtual> border class="mib-browser-table" size="small" style="width: 100%; height: 100%" use-virtual>
<pl-table-column v-slot="{row}" label="Name/OID"> <pl-table-column v-slot="{row}" label="Name/OID">
<div class="too-long-split" @click="searchParam.oid = row.oid">{{row.name ? row.name : row.oid}}</div> <div class="too-long-split" @click="searchParam.oid = row.oid">{{row.name ? row.name : row.oid}}</div>

2
nezha-fronted/src/components/page/config/model.vue
View File

@@ -42,7 +42,7 @@
<model-table <model-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/operationLog.vue
View File

@@ -12,7 +12,7 @@
<operation-log-table <operation-log-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/operationRecord.vue
View File

@@ -20,7 +20,7 @@
v-if="profileShow" v-if="profileShow"
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/profile.vue
View File

@@ -75,7 +75,7 @@
<el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false' <el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
:show-close="true" width="620px" class="nz-dialog" @closed="closeDialog"> :show-close="true" width="620px" class="nz-dialog" @closed="closeDialog">
<div v-loading="dialogLoading"> <div v-my-loading="dialogLoading">
<div class="login-dialog-title"> <div class="login-dialog-title">
1 Download your preferred authenticator app to your phone (any will work). If you don't 1 Download your preferred authenticator app to your phone (any will work). If you don't
have a preferred app, we recommend using <span @click="jumpDlw" class="verify-link">Google Authenticator.</span> have a preferred app, we recommend using <span @click="jumpDlw" class="verify-link">Google Authenticator.</span>

2
nezha-fronted/src/components/page/config/roles.vue
View File

@@ -20,7 +20,7 @@
<role-table <role-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

2
nezha-fronted/src/components/page/config/system/apiKeyTab.vue
View File

@@ -19,7 +19,7 @@
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<api-key-table <api-key-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:table-id="tableId" :table-id="tableId"
:api="url" :api="url"

2
nezha-fronted/src/components/page/config/system/license.vue
View File

@@ -66,7 +66,7 @@
<div class="license-right-header-title">{{$t('license.devices')}}&nbsp;({{tableData ? tableData.length : 0}})</div> <div class="license-right-header-title">{{$t('license.devices')}}&nbsp;({{tableData ? tableData.length : 0}})</div>
</div> </div>
<div class="license-right-table"> <div class="license-right-table">
<el-table :data="tableData" v-loading="loading"> <el-table :data="tableData" v-my-loading="loading">
<el-table-column v-for="(item, index) in tableTitle" :key="index"> <el-table-column v-for="(item, index) in tableTitle" :key="index">
<template slot="header"> <template slot="header">
<span class="data-column__span">{{item.label}} <i class="nz-icon nz-icon-label" v-if="item.type==='label'"/></span> <span class="data-column__span">{{item.label}} <i class="nz-icon nz-icon-label" v-if="item.type==='label'"/></span>

2
nezha-fronted/src/components/page/config/system/linkTab.vue
View File

@@ -19,7 +19,7 @@
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<link-table <link-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:table-id="tableId" :table-id="tableId"
:api="url" :api="url"

2
nezha-fronted/src/components/page/config/system/notifyMethodTab.vue
View File

@@ -20,7 +20,7 @@
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<notify-method-table <notify-method-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:table-id="tableId" :table-id="tableId"
:api="url" :api="url"

4
nezha-fronted/src/components/page/config/template/chartTemp.vue
View File

@@ -47,7 +47,7 @@
<chartTmplTable <chartTmplTable
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"
@@ -82,7 +82,7 @@
<!-- v-if="rightBox.show"></chart-box>--> <!-- v-if="rightBox.show"></chart-box>-->
<chart-right-box <chart-right-box
v-if="rightBox.show" v-if="rightBox.show"
v-loading="rightBox.loading" v-my-loading="rightBox.loading"
ref="addChartModal" ref="addChartModal"
:chart="object" :chart="object"
:from="'chartTemp'" :from="'chartTemp'"

2
nezha-fronted/src/components/page/config/template/exprTemp.vue
View File

@@ -39,7 +39,7 @@
<expr-tmpl-table <expr-tmpl-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -24,7 +24,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
@@ -68,7 +68,7 @@
<terminal-log-table <terminal-log-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -24,7 +24,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
:table-data="tableData" :table-data="tableData"
@@ -74,7 +74,7 @@
<user-table <user-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"

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

@@ -117,7 +117,7 @@
<!-- 自定义table列 --> <!-- 自定义table列 -->
<div class="nz-table2 explore-table"> <div class="nz-table2 explore-table">
<el-table ref="exploreTable" <el-table ref="exploreTable"
v-loading="tools.loading" v-my-loading="tools.loading"
class="metric-table" class="metric-table"
:data="tableData" :data="tableData"
border border
@@ -158,11 +158,11 @@
<template v-else> <template v-else>
<el-collapse-item v-if="showTab.indexOf('1') > -1" name="1" title="Graph" class="el-collapse-item__height"> <el-collapse-item v-if="showTab.indexOf('1') > -1" name="1" title="Graph" class="el-collapse-item__height">
<div class="chart-room"> <div class="chart-room">
<chart ref="logChart" :unit="chartUnit" v-loading="chartLoading"></chart> <chart ref="logChart" :unit="chartUnit" v-my-loading="chartLoading"></chart>
</div> </div>
</el-collapse-item> </el-collapse-item>
<el-collapse-item v-if="showTab.indexOf('2') > -1" name="2" title="Logs"> <el-collapse-item v-if="showTab.indexOf('2') > -1" name="2" title="Logs">
<log-tab ref="logDetail" :log-data="logData" :explore-log-table="logTabNoData" :explore-item="true" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData" v-loading="chartLoading"></log-tab> <log-tab ref="logDetail" :log-data="logData" :explore-log-table="logTabNoData" :explore-item="true" :tab-index="tabIndex" @exportLog="exportLog" @limitChange="queryLogData" v-my-loading="chartLoading"></log-tab>
</el-collapse-item> </el-collapse-item>
</template> </template>
</el-collapse> </el-collapse>

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

@@ -9,7 +9,7 @@
<button class="top-tool-btn top-tool-btn--text" type="button" @click="toggleDropdown">{{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }} <button class="top-tool-btn top-tool-btn--text" type="button" @click="toggleDropdown">{{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }}
<i class="nz-icon nz-icon-arrow-down" style="font-size: 12px"></i></button> <i class="nz-icon nz-icon-arrow-down" style="font-size: 12px"></i></button>
<el-cascader-panel v-show="dropDownVisible" ref="metricSelector" slot="dropdown" v-model="cascaderValue" <el-cascader-panel v-show="dropDownVisible" ref="metricSelector" slot="dropdown" v-model="cascaderValue"
v-clickoutside="closeDropdown" v-loading="tempBoxShowLoading" :loading="loading" :options="metricOptions" v-clickoutside="closeDropdown" v-my-loading="tempBoxShowLoading" :loading="loading" :options="metricOptions"
v-if="type !== 'log'" :props="cascaderProps" @change="metricChangeNew" style="margin-top: 5px"> v-if="type !== 'log'" :props="cascaderProps" @change="metricChangeNew" style="margin-top: 5px">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
@@ -21,7 +21,7 @@
</template> </template>
</el-cascader-panel> </el-cascader-panel>
<el-cascader-panel v-else v-show="dropDownVisible" ref="metricSelector" slot="dropdown" <el-cascader-panel v-else v-show="dropDownVisible" ref="metricSelector" slot="dropdown"
v-model="cascaderValue" v-clickoutside="closeDropdown" v-loading="tempBoxShowLoading" v-model="cascaderValue" v-clickoutside="closeDropdown" v-my-loading="tempBoxShowLoading"
:loading="loading" :props="cascaderProps" @change="logLabelChange" style="margin-top: 5px;"> :loading="loading" :props="cascaderProps" @change="logLabelChange" style="margin-top: 5px;">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<div :title="data.label" class="nz-cascade"> <div :title="data.label" class="nz-cascade">
@@ -58,7 +58,7 @@
<span :class="{'expr-title':projectRightBox}" style="cursor: pointer;" @click="toggleDropdown">{{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }}<i <span :class="{'expr-title':projectRightBox}" style="cursor: pointer;" @click="toggleDropdown">{{type === 'log' ? $t("overall.logLabels") : $t("overall.metric") }}<i
class="nz-icon nz-icon-arrow-down" class="nz-icon nz-icon-arrow-down"
style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i></span> style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i></span>
<el-cascader-panel v-loading="tempBoxShowLoading" v-show="dropDownVisible" v-clickoutside="closeDropdown" v-model="cascaderValue" <el-cascader-panel v-my-loading="tempBoxShowLoading" v-show="dropDownVisible" v-clickoutside="closeDropdown" v-model="cascaderValue"
style="text-align: left;margin-top: 5px" slot="dropdown" ref="metricSelector" style="text-align: left;margin-top: 5px" slot="dropdown" ref="metricSelector"
v-if="type !== 'log'" :props="{emitPath:false}" :options="metricOptions" @change="metricChangeNew"> v-if="type !== 'log'" :props="{emitPath:false}" :options="metricOptions" @change="metricChangeNew">
@@ -72,7 +72,7 @@
</el-cascader-panel> </el-cascader-panel>
<el-cascader-panel v-else v-show="dropDownVisible" ref="metricSelector" slot="dropdown" <el-cascader-panel v-else v-show="dropDownVisible" ref="metricSelector" slot="dropdown"
v-model="cascaderValue" v-clickoutside="closeDropdown" v-loading="tempBoxShowLoading" v-model="cascaderValue" v-clickoutside="closeDropdown" v-my-loading="tempBoxShowLoading"
:loading="loading" :props="cascaderProps" @change="logLabelChange"> :loading="loading" :props="cascaderProps" @change="logLabelChange">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<div :title="data.label" class="nz-cascade"> <div :title="data.label" class="nz-cascade">

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

@@ -23,7 +23,7 @@
<!--第一行--> <!--第一行-->
<div class="content-row-box"> <div class="content-row-box">
<div class="content-col-box"> <div class="content-col-box">
<div id="overview-to-asset" v-loading="assetLoading" class="content-col-content clickable" @click="jumpTo('asset')"> <div id="overview-to-asset" v-my-loading="assetLoading" class="content-col-content clickable" @click="jumpTo('asset')">
<div class="content-col-content-icon overview-to-asset__background"><i class="nz-icon nz-icon-overview-project"></i></div> <div class="content-col-content-icon overview-to-asset__background"><i class="nz-icon nz-icon-overview-project"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="`${assetData}`" class="item" effect="light" placement="top"> <el-tooltip :content="`${assetData}`" class="item" effect="light" placement="top">
@@ -39,7 +39,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div v-loading="projectLoading" class="content-col-content clickable" @click="jumpTo('project')"> <div v-my-loading="projectLoading" class="content-col-content clickable" @click="jumpTo('project')">
<div class="content-col-content-icon overview-to-project__background"><i class="nz-icon nz-icon-project"></i></div> <div class="content-col-content-icon overview-to-project__background"><i class="nz-icon nz-icon-project"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="`${projectData.total}`" class="item" effect="light" placement="top"> <el-tooltip :content="`${projectData.total}`" class="item" effect="light" placement="top">
@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div v-loading="moduleLoading" class="content-col-content clickable" @click="jumpTo('module')"> <div v-my-loading="moduleLoading" class="content-col-content clickable" @click="jumpTo('module')">
<div class="content-col-content-icon overview-to-module__background"><i class="nz-icon nz-icon-overview-module"></i></div> <div class="content-col-content-icon overview-to-module__background"><i class="nz-icon nz-icon-overview-module"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="`${moduleData.total}`" class="item" effect="light" placement="top"> <el-tooltip :content="`${moduleData.total}`" class="item" effect="light" placement="top">
@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div v-loading="endpointLoading" class="content-col-content clickable" @click="jumpTo('endpoint')"> <div v-my-loading="endpointLoading" class="content-col-content clickable" @click="jumpTo('endpoint')">
<div class="content-col-content-icon overview-to-endpoint__background"><i class="nz-icon nz-icon-overview-endpoint"></i></div> <div class="content-col-content-icon overview-to-endpoint__background"><i class="nz-icon nz-icon-overview-endpoint"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="`${endpointData.num}`" class="item" effect="light" placement="top"> <el-tooltip :content="`${endpointData.num}`" class="item" effect="light" placement="top">
@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div id="overview-to-alertlist" v-loading="alertMessageLoading" class="content-col-content clickable" @click="jumpTo('alertList')"> <div id="overview-to-alertlist" v-my-loading="alertMessageLoading" class="content-col-content clickable" @click="jumpTo('alertList')">
<div class="content-col-content-icon overview-to-alert__background"><i class="nz-icon nz-icon-overview-alert"></i></div> <div class="content-col-content-icon overview-to-alert__background"><i class="nz-icon nz-icon-overview-alert"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="`${alertMessageData.num}`" class="item" effect="light" placement="top"> <el-tooltip :content="`${alertMessageData.num}`" class="item" effect="light" placement="top">
@@ -106,7 +106,7 @@
<div class="content-col-title"> <div class="content-col-title">
<span>{{$t("dashboard.overview.projectTopoLogy")}}</span> <span>{{$t("dashboard.overview.projectTopoLogy")}}</span>
</div> </div>
<div v-loading="topologyLoading" class="content-col-content"> <div v-my-loading="topologyLoading" class="content-col-content">
<transition name = "el-zoom-in-center"> <transition name = "el-zoom-in-center">
<div v-if="allProject&&allProject.length>0" style="width: 100%;height: 100%;position: relative"> <div v-if="allProject&&allProject.length>0" style="width: 100%;height: 100%;position: relative">
<el-carousel :interval="5000" :trigger="'click'" arrow="hover"> <el-carousel :interval="5000" :trigger="'click'" arrow="hover">

12
nezha-fronted/src/components/page/dashboard/overview/overview2.vue
View File

@@ -23,7 +23,7 @@
<!--第一行--> <!--第一行-->
<div class="content-row-box"> <div class="content-row-box">
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content clickable" v-loading="assetLoading" @click="jumpTo('asset')" id="overview-to-asset"> <div class="content-col-content clickable" v-my-loading="assetLoading" @click="jumpTo('asset')" id="overview-to-asset">
<div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-project"></i></div> <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-project"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="assetData ? assetData.totalStat.total + '' : ''" class="item" effect="light" placement="top"> <el-tooltip :content="assetData ? assetData.totalStat.total + '' : ''" class="item" effect="light" placement="top">
@@ -39,7 +39,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content" v-loading="projectLoading"> <div class="content-col-content" v-my-loading="projectLoading">
<div class="content-col-content-icon"><i class="nz-icon nz-icon-project"></i></div> <div class="content-col-content-icon"><i class="nz-icon nz-icon-project"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="projectData ? projectData.projectStat.length + '' : ''" class="item" effect="light" placement="top"> <el-tooltip :content="projectData ? projectData.projectStat.length + '' : ''" class="item" effect="light" placement="top">
@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content" v-loading="moduleLoading"> <div class="content-col-content" v-my-loading="moduleLoading">
<div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-module"></i></div> <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-module"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="moduleData ? moduleData.moduleStat.length + '' : ''" class="item" effect="light" placement="top"> <el-tooltip :content="moduleData ? moduleData.moduleStat.length + '' : ''" class="item" effect="light" placement="top">
@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content" v-loading="endpointLoading"> <div class="content-col-content" v-my-loading="endpointLoading">
<div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-endpoint"></i></div> <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-endpoint"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="endpointData ? endpointData.total + '' : ''" class="item" effect="light" placement="top"> <el-tooltip :content="endpointData ? endpointData.total + '' : ''" class="item" effect="light" placement="top">
@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="content-col-box"> <div class="content-col-box">
<div class="content-col-content clickable" v-loading="alertMessageLoading" @click="jumpTo('alertList')" id="overview-to-alertlist" > <div class="content-col-content clickable" v-my-loading="alertMessageLoading" @click="jumpTo('alertList')" id="overview-to-alertlist" >
<div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-alert"></i></div> <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-alert"></i></div>
<div class="content-num-box"> <div class="content-num-box">
<el-tooltip :content="alertMessageData ? alertMessageData.alertMessageTotal + '' : ''" class="item" effect="light" placement="top"> <el-tooltip :content="alertMessageData ? alertMessageData.alertMessageTotal + '' : ''" class="item" effect="light" placement="top">
@@ -124,7 +124,7 @@
<!--</span>--> <!--</span>-->
<!--</span>--> <!--</span>-->
</div> </div>
<div class="content-col-content" v-loading="topologyLoading"> <div class="content-col-content" v-my-loading="topologyLoading">
<transition name = "el-zoom-in-center"> <transition name = "el-zoom-in-center">
<div style="width: 100%;height: 100%;position: relative" v-if="allProject&&allProject.length>0"> <div style="width: 100%;height: 100%;position: relative" v-if="allProject&&allProject.length>0">
<el-carousel :interval="5000" arrow="hover" :trigger="'click'"> <el-carousel :interval="5000" arrow="hover" :trigger="'click'">

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

@@ -1,5 +1,5 @@
<template> <template>
<div class="panel list-page" v-loading="panelTabLoading"> <div class="panel list-page" v-my-loading="panelTabLoading">
<div class="main-list"> <div class="main-list">
<div> <div>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
@@ -81,7 +81,7 @@
</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">
<div id="dashboardScrollbar" class="box-content" v-loading="chartListLoading" ref="dashboardScrollbar" style='overflow-y: auto'> <div id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading" ref="dashboardScrollbar" style='overflow-y: auto'>
<chart-list <chart-list
ref="chartList" ref="chartList"
name="panel" name="panel"
@@ -123,7 +123,7 @@
<!-- ></chart-box>--> <!-- ></chart-box>-->
<chart-right-box <chart-right-box
v-if="chartRightBoxShow" v-if="chartRightBoxShow"
v-loading="rightBox.loading" v-my-loading="rightBox.loading"
ref="addChartModal" ref="addChartModal"
:chart="chart" :chart="chart"
:from="fromRoute.panel" :from="fromRoute.panel"

8
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -41,7 +41,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
:table-data="tableData" :table-data="tableData"
@@ -68,7 +68,7 @@
</template> </template>
</nzDetailView> </nzDetailView>
<nz-data-list <nz-data-list
v-loading="detailViewLoading" v-my-loading="detailViewLoading"
ref="dataList" ref="dataList"
v-if="detailType === 'list'" v-if="detailType === 'list'"
:api="url" :api="url"
@@ -126,7 +126,7 @@
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<endpoint-table <endpoint-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:orderByFa="orderBy" :orderByFa="orderBy"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"

6
nezha-fronted/src/components/page/monitor/module/moduleList.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="module-list"> <div class="module-list">
<nzDetailView <nzDetailView
v-loading="detailViewLoading || tools.loading" v-my-loading="detailViewLoading || tools.loading"
v-if="detailType !== 'list'" v-if="detailType !== 'list'"
:api="url" :api="url"
ref="detailList" ref="detailList"
@@ -41,7 +41,7 @@
class="data-detail" class="data-detail"
ref="dataDetail" ref="dataDetail"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:detailViewRightObj="detailViewRightObj" :detailViewRightObj="detailViewRightObj"
:api="url" :api="url"
:table-data="tableData" :table-data="tableData"
@@ -111,7 +111,7 @@
<template v-slot="slotProps"> <template v-slot="slotProps">
<module-table <module-table
ref="dataTable" ref="dataTable"
v-loading="tools.loading" v-my-loading="tools.loading"
:orderByFa="orderBy" :orderByFa="orderBy"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"

2
nezha-fronted/src/components/page/monitor/project/projectList.vue
View File

@@ -21,7 +21,7 @@
<project-table <project-table
ref="dataTable" ref="dataTable"
:orderByFa="orderBy" :orderByFa="orderBy"
v-loading="tools.loading" v-my-loading="tools.loading"
:loading="tools.loading" :loading="tools.loading"
:api="url" :api="url"
:custom-table-title="tools.customTableTitle" :custom-table-title="tools.customTableTitle"