NEZ-3472 fix: chart map 当asset不存在时 数据点不展示

nezha-fronted/src/components/chart/chart/chartMap.vue

@@ -213,9 +213,10 @@ export default {
         const requests = [axios.get('dc?pageSize=-1'), axios.get('/stat/overview/map')]
         axios.all(requests).then(result => {
           const dcInfos = result[0].data.data.list
-          const dcStats = result[1].data.data.list.filter(dc => dc.asset)
+          // const dcStats = result[1].data.data.list.filter(dc => dc.asset)
+          const dcStats = result[1].data.data.list
           dcStats.sort((a, b) => {
-            return a.asset.total - b.asset.total
+            return (a.asset ? a.asset.total : -1) - (b.asset ? b.asset.total : -1)
           })
           dcStats.forEach(s => {
             const dc = dcInfos.find(i => i.name === s.name)
@@ -230,7 +231,9 @@ export default {
           dcStats.forEach(dcStat => {
             if (regNum.test(dcStat.latitude) && regNum.test(dcStat.longitude)) {
               let symbolSize
-              if (dcStat.asset.total >= bigBoundary) {
+              if (!dcStat.asset) {
+                symbolSize = smallScatter
+              } else if (dcStat.asset.total >= bigBoundary) {
                 symbolSize = bigScatter
               } else if (dcStat.asset.total < bigBoundary && dcStat.asset.total >= mediumBoundary) {
                 symbolSize = mediumScatter
@@ -248,6 +251,9 @@ export default {
       })
     },
     pointEnter (param) {
+      if (!param.features[0].properties.asset) {
+        return
+      }
       const point = param.point
       const event = param.originalEvent
       const boxWidth = window.innerWidth / 2

nezha-fronted/src/components/chart/chartDetail.vue

@@ -33,10 +33,46 @@
                 <div class="asset-info-value">{{chartDetail.state ? chartDetail.state.name : '--'}}</div>
               </div>
               <div class="asset-info-row">
-                <div class="asset-info-title">Ping</div>
+                <div class="asset-info-title">{{ $t("config.operationlog.ip") }}</div>
-                <div class="asset-info-value">
+                <div class="asset-info-value" style="position: relative;">
-                  <div :class="{'green-bg': chartDetail && chartDetail.pingInfo && chartDetail.pingInfo.status === 1,'red-bg': chartDetail && chartDetail.pingInfo && chartDetail.pingInfo.status === 0}" class="active-icon"></div>
+                  <div class="ip-info">
-                  <span>{{chartDetail && chartDetail.pingInfo && chartDetail.pingInfo.rtt ? chartDetail.pingInfo.rtt + 'ms':''}}</span>
+                    <copy :copyData='chartDetail.manageIp' :showInfo='chartDetail.manageIp' v-if="chartDetail && chartDetail.manageIp">
+                      <template slot="copy-text">
+                        <i
+                          class="ip-icon nz-icon nz-icon-mgt"
+                          :class="(getPingInfo(chartDetail, 'mgt') && getPingInfo(chartDetail, 'mgt').status == 1) ? 'green-color' : 'red-color'"
+                        ></i>
+                        {{chartDetail.manageIp ? chartDetail.manageIp : '--'}}
+                      </template>
+                    </copy>
+                    <div class="active-icon-content" v-if="getPingInfo(chartDetail, 'mgt')">
+                      <p v-if="getPingInfo(chartDetail, 'mgt').rtt">
+                        {{$t('asset.rtt') +' '+ (getPingInfo(chartDetail, 'mgt').rtt + 'ms')}}
+                      </p>
+                      <p>
+                        {{$t('asset.assetStatPre') +' '+ (getPingInfo(chartDetail, 'mgt').lastUpdate ? utcTimeToTimezoneStr(getPingInfo(chartDetail, 'mgt').lastUpdate) : $t('asset.assetStatDown'))}}
+                      </p>
+                    </div>
+                  </div>
+                  <div class="ip-info">
+                    <copy :copyData='chartDetail.ipmiIp' :showInfo='chartDetail.ipmiIp' v-if="chartDetail && chartDetail.ipmiIp">
+                      <template slot="copy-text">
+                        <i
+                          class="ip-icon nz-icon nz-icon-ipmi"
+                          :class="(getPingInfo(chartDetail, 'ipmi') && getPingInfo(chartDetail, 'ipmi').status == 1) ? 'green-color' : 'red-color'"
+                        ></i>
+                        {{chartDetail.ipmiIp ? chartDetail.ipmiIp : '--'}}
+                      </template>
+                    </copy>
+                    <div class="active-icon-content" v-if="getPingInfo(chartDetail, 'ipmi')">
+                      <p v-if="getPingInfo(chartDetail, 'ipmi').rtt">
+                        {{$t('asset.rtt') +' '+ (getPingInfo(chartDetail, 'ipmi').rtt + 'ms')}}
+                      </p>
+                      <p>
+                        {{$t('asset.assetStatPre') +' '+ (getPingInfo(chartDetail, 'ipmi').lastUpdate ? utcTimeToTimezoneStr(getPingInfo(chartDetail, 'ipmi').lastUpdate) : $t('asset.assetStatDown'))}}
+                      </p>
+                    </div>
+                  </div>
                 </div>
               </div>
               <div class="asset-info-row">
@@ -172,6 +208,7 @@
 <script>
 import bus from '@/libs/bus'
 import trendMixin from '../common/alert/trendMixins'
+import copy from '@/components/common/copy'
 
 export default {
   name: 'chartDetail',
@@ -180,6 +217,9 @@ export default {
     chartDetail: Object,
     chartInfo: Object
   },
+  components: {
+    copy
+  },
   mixins: [trendMixin],
   watch: {
     chartDetail: {
@@ -284,6 +324,13 @@ export default {
           })
         }
       })
+    },
+    getPingInfo (row, type) {
+      if (!(row && row.pingInfo && row.pingInfo.length)) {
+        return false
+      }
+      const info = row.pingInfo.find(item => item.type == type)
+      return info
     }
   }
 }

nezha-fronted/src/components/chart/chartDetailNew.vue

@@ -174,7 +174,6 @@
 
 <script>
 import chartDataFormat from '@/components/chart/chartDataFormat'
-import bus from '@/libs/bus'
 export default {
   name: 'chartDetailNew',
   props: {