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

2022-03-28 14:24:34 +08:00
parent ef4e9cf2fc f7aa7983a9
commit b2ec953c95
19 changed files with 31 additions and 25 deletions
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
@@ -64,6 +64,11 @@
  }
 }
 .explore {
+  .el-collapse-item__height{
+    .el-collapse-item__wrap{
+      overflow: unset;
+    }
+  }
  .chart-view__switch {
    margin-top: 20px;
    border: 1px solid $--border-color-light;
--- a/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss
@@ -468,10 +468,10 @@
        margin-bottom: 5px;
      }
      .progress-title{
-        width: 64px;
+        min-width: 64px;
      }
      .progress-content{
-        width: 20px;
+        min-width: 20px;
      }
      .progress-box{
        width: 56px;
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -19,7 +19,7 @@
       :close-delay=10
       trigger="hover"
       popper-class="chart-warring-popper">
-          <div class="moreTitle">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div>
+          <div class="moreTitle" @click="loadMore">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div>
          <span slot="reference" class="panel-info-corner panel-info-corner--error"  @click="loadMore">
            <i class="nz-icon nz-icon-warning fa"></i>
            <span class="panel-info-corner-inner"></span>
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -182,7 +182,7 @@ export default {
          <div class="tooltip--row">
            <div class="legend-value legend-value-asset">
             <div class="map-asset">
-                <div class="progress-title">Asset ok</div>
+                <div class="progress-title">${self.$t('panel.assetOk')}</div>
                <div class="success-progress progress-box">
                    <div class="top-progress" style="width: ${(dcStat.asset.ok / dcStat.asset.total) * 100}%"></div>
                    <div style="width: 100%" class="bottom-progress"></div>
@@ -190,7 +190,7 @@ export default {
                <div class="success-progress progress-content">${dcStat.asset.ok}</div>
              </div>
             <div class="map-asset">
-                <div class="progress-title">Asset alarm</div>
+                <div class="progress-title">${self.$t('panel.assetAlarm')}</div>
                <div class="error-progress progress-box">
                    <div class="top-progress" style="width: ${(dcStat.asset.alarm / dcStat.asset.total) * 100}%"></div>
                    <div style="width: 100%" class="bottom-progress"></div>
@@ -201,7 +201,7 @@ export default {
            <div class="partition"></div>
            <div class="legend-value legend-value-agent">
            <div class="map-asset">
-                <div class="progress-title">agent up</div>
+                <div class="progress-title">${self.$t('guide.agent')} ${self.$t('overall.normal')}</div>
                <div class="success-progress progress-box">
                    <div class="top-progress" style="width: ${(dcStat.agent.up / (dcStat.agent.up + dcStat.agent.down)) * 100}%"></div>
                    <div style="width: 100%" class="bottom-progress"></div>
@@ -209,7 +209,7 @@ export default {
                <div class="success-progress progress-content">${dcStat.agent.up}</div>
             </div>
             <div class="map-asset">
-                <div class="progress-title">agent down</div>
+                <div class="progress-title">${self.$t('guide.agent')} ${self.$t('overall.unusual')}</div>
                <div class="error-progress progress-box">
                    <div class="top-progress" style="width: ${(dcStat.agent.down / (dcStat.agent.up + dcStat.agent.down)) * 100}%"></div>
                    <div style="width: 100%" class="bottom-progress"></div>
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -19,7 +19,7 @@
       :close-delay=10
       trigger="hover"
       popper-class="chart-warring-popper">
-          <div class="moreTitle">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div>
+          <div class="moreTitle" @click="loadMore">{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}</div>
          <span slot="reference" class="panel-info-corner panel-info-corner--error"  @click="loadMore">
            <i class="nz-icon nz-icon-warning fa"></i>
            <span class="panel-info-corner-inner"></span>
--- a/nezha-fronted/src/components/common/alert/alertDaysInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertDaysInfo.vue
@@ -47,18 +47,17 @@ export default {
  methods: {
    showPriority (daysData) {
      let style = {}
-      // let sum = 0
+      let sum = 0
      this.severityDataWeight.forEach(item => {
-        // sum += Number(daysData[item.name])
+        sum += Number(daysData[item.name])
        if (daysData[item.name] && !style.background) {
          style = {
            background: item.color
          }
        }
      })
-      // const height = sum > 0 ? (sum < 10 ? 20 : 24) : 16
-      // console.log(sum, height)
-      // style.height = (height + 'px')
+      const height = sum > 0 ? (sum <= 10 ? 12 : 14) : 10
+      style.height = (height + 'px')
      return style
    },
    tooltipHover (item, flag, e) {
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -249,7 +249,7 @@ export default {
          label: this.$t('project.endpoint.alerts'),
          prop: 'alerts',
          show: true,
-          width: 150
+          width: 180
        },
        /* {
            label: this.$t("project.endpoint.lastUpdate"),
--- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
@@ -134,7 +134,7 @@ export default {
          label: this.$t('alert.alert'),
          prop: 'alertNum',
          show: true,
-          width: 150,
+          width: 120,
          sortable: 'custom'
        }, {
          label: this.$t('alert.config.receiver'),
--- a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
@@ -119,7 +119,7 @@ export default {
          label: this.$t('asset.alertNum'),
          prop: 'alertNum',
          show: true,
-          minWidth: 140,
+          width: 120,
          sortable: 'custom'
        }, {
          label: this.$t('asset.endpointNum2'),
--- a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
@@ -91,6 +91,7 @@ export default {
        }, {
          label: this.$t('config.dc.alert'),
          prop: 'alertNum',
+          width: 120,
          show: true
        }, {
          label: this.$t('asset.tel'),
--- a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
@@ -101,7 +101,7 @@ export default {
          label: this.$t('project.endpoint.alerts'),
          prop: 'alerts',
          show: true,
-          minWidth: 150,
+          minWidth: 180,
          sortable: 'custom'
        },
        {
--- a/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
@@ -89,7 +89,7 @@ export default {
          label: this.$t('project.module.alerts'),
          prop: 'alertNum',
          show: true,
-          width: 200,
+          width: 120,
          sortable: 'custom'
        },
        {
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -114,7 +114,7 @@ export default {
          label: this.$t('asset.alertNum'),
          prop: 'alertNum',
          show: true,
-          width: 140
+          width: 120,
        }, {
          label: this.$t('asset.endpointNum2'),
          prop: 'endpointNum',
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -228,7 +228,7 @@ export default {
          label: this.$t('alert.alert'),
          prop: 'alertNum',
          show: true,
-          width: 150,
+          width: 120,
          sortable: 'custom'
        }, {
          label: this.$t('alert.config.receiver'),
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -48,7 +48,7 @@
            <span style="cursor: pointer" @click="$emit('showBottomBox', 'alertMessageTab', scope.row)">
            <i :class="scope.row.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover(scope.row,true, $event)" @mouseleave="tooltipHover(scope.row,false, $event)"></i>
            <div v-if="scope.row.alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: scope.row.left + 'px',top:scope.row.top + 'px'}">
-              <div class="tooltip-title">Alert message (active)</div>
+              <div class="tooltip-title">{{$t('project.topology.alert')}}({{$t('asset.pingActive')}})</div>
              <div class="severity-info" style='justify-content: space-between'>
                <div class="severity-name">{{$t('overall.result.total')}}</div>
                <div class="severity-value">{{scope.row.alertNum}}</div>
@@ -254,7 +254,7 @@ export default {
          label: this.$t('asset.alertNum'),
          prop: 'alertNum',
          show: true,
-          minWidth: 140,
+          width: 120,
          sortable: 'custom'
        }, {
          label: this.$t('asset.endpointNum2'),
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -174,6 +174,7 @@ export default {
        }, {
          label: this.$t('config.dc.alert'),
          prop: 'alertNum',
+          width: 120,
          show: true
        }, {
          label: this.$t('asset.tel'),
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -262,7 +262,7 @@ export default {
          label: this.$t('project.endpoint.alerts'),
          prop: 'alerts',
          show: true,
-          minWidth: 150,
+          minWidth: 180,
          sortable: 'custom'
        },
        {
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -148,7 +148,7 @@ export default {
          label: this.$t('project.module.alerts'),
          prop: 'alertNum',
          show: true,
-          width: 200,
+          width: 120,
          sortable: 'custom'
        },
        {
--- a/nezha-fronted/src/components/page/monitor/project/project.vue
+++ b/nezha-fronted/src/components/page/monitor/project/project.vue
@@ -137,7 +137,7 @@ export default {
          label: this.$t('project.endpoint.alerts'),
          prop: 'alerts',
          show: true,
-          width: 150
+          width: 180
        },
        // {
        //   label: this.$t("project.endpoint.lastUpdate"),