diff --git a/nezha-fronted/src/components/common/alert/alertLabel2.vue b/nezha-fronted/src/components/common/alert/alertLabel2.vue
index 8014f41bb..bed4e3aa3 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel2.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="alertLabels" :class="['alert-labelUp',LRTriangle?'left-triangle':'right-triangle']" :style="{top:that.position.top,left:that.position.left,'--mt': that.position.mt+'px',}">
+  <div ref="alertLabels" :class="['alert-labelUp',LRTriangle?'left-triangle':'right-triangle']" :style="{top:that.position.top + 'px',left:that.position.left + 'px','--mt': that.position.mt+'px',}">
     <div class="alert-label-info" v-if="type==='asset'" v-loading="loading">
       <div class="alert-label-box">
         <div class="alert-label-title">ID</div>
@@ -176,7 +176,6 @@ export default {
       immediate: true,
       deep: true,
       handler (n) {
-
       }
     },
     LRTriangle: {
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 8903072eb..a16fcf502 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -102,9 +102,10 @@ const cn = {
     },
     SyncSave: '保存同时更新 Assets',
     copySuccess: '复制成功',
+    parent: '父级',
     moreOption: '更多选项',
     copy: '复制',
-    silence: '静默'
+    silence: '静默',
   },
   setup: {
     step0: '欢迎',
@@ -603,7 +604,8 @@ const cn = {
     vendor: '厂商',
     name: 'Name',
     dc: '数据中心',
-    type: '主机地址'
+    type: '主机地址',
+    pingInfo: 'Ping'
   },
   config: {
     config: '设置',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 152f6d60e..80ead8489 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -111,7 +111,7 @@ const en = {
     labels: 'Labels',
     moreOption: 'More option',
     copy: 'Copy',
-    silence: 'Silence'
+    silence: 'Silence',
   },
   pageSize: '/page',
   setup: {
@@ -610,7 +610,8 @@ const en = {
     option: 'Operation', // "操作"
     name: 'Name',
     dc: 'DataCenter',
-    type: 'Types'
+    type: 'Types',
+    pingInfo: 'Ping'
   },
   config: {
     config: 'Settings', // "设置"
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 56e93edeb..e66f64555 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -236,10 +236,15 @@ export default {
     }
     let localStorageTableTitle = localStorage.getItem('nz-tableTitle-' + localStorage.getItem('nz-username') + '-' + this.tableId)
     localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : this.$refs.dataTable.tableTitle
-    this.tools.customTableTitle = localStorageTableTitle.map((item, index) => { // 修复切换中英文的问题
-      item.label = this.$refs.dataTable.tableTitle[index].label
+    this.tools.customTableTitle = this.$refs.dataTable.tableTitle.map((item, index) => { // 修复切换中英文的问题
+      item.show = localStorageTableTitle[index].show
       return item
     })
+    if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
+      const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length,localStorageTableTitle.length)
+      this.tools.customTableTitle = this.tools.customTableTitle.concat(arr)
+      console.log(this.tools.customTableTitle)
+    }
     if (!this.fromBottom) {
       this.getTableData()
     }
diff --git a/nezha-fronted/src/components/common/overView/messageAsset.vue b/nezha-fronted/src/components/common/overView/messageAsset.vue
index 04d2ef7d7..65829d8d0 100644
--- a/nezha-fronted/src/components/common/overView/messageAsset.vue
+++ b/nezha-fronted/src/components/common/overView/messageAsset.vue
@@ -149,7 +149,7 @@ export default {
           rx: 5,
           ry: 5
         }).fill({ color: `rgba(${rgbColor},0)` }).data({ color: rgbColor })
-      str = this.from === 'asset' ? item.host : item.module
+      str = this.from === 'asset' ? item.name : item.name
       str += ''
       if (str.length >= 15) {
         str = str.slice(0, 12) + '...'
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index ba1da2ece..445fbb8e1 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -164,7 +164,7 @@
               :options="options.fieldGroupOptions"
               :props="labelCascProp"
               class="hide-input"
-              popper-class="prevent-clickoutside"
+              popper-class="prevent-clickoutside limit-height"
               size="small"
               @change="addLabel"
             ></el-cascader>
@@ -398,28 +398,34 @@ export default {
             if (this.options.parentAssetOptions.length === 0) {
               this.getParentAsset().then(res => {
                 const asset = this.options.parentAssetOptions.find(a => a.id === n)
+                console.log(asset, 1)
                 if (asset) {
-                  this.editAsset.brandId = asset.brand.id
-                  this.editAsset.modelId = asset.model.id
-                  this.editAsset.dcId = asset.dc.id
-                  this.editAsset.cabinetId = asset.cabinet.id
+                  this.editAsset.brandId = asset.brand ? asset.brand.id : ''
+                  this.editAsset.modelId = asset.model ? asset.model.id : ''
+                  this.editAsset.dcId = asset.dc ? asset.dc.id : ''
+                  this.editAsset.cabinetId = asset.cabinet ? asset.cabinet.id : ''
                   this.editAsset.cabinetStart = asset.cabinetStart
                   this.editAsset.cabinetEnd = asset.cabinetEnd
-
+                  if(!asset.cabinet){
+                    asset.cabinet= {}
+                  }
                   this.lockModelInputValue = `${asset.brand.name} / ${asset.model.name}`
                   this.lockLocationInputValue = `${asset.dc.name} / ${asset.cabinet.name} / ${asset.cabinetStart}-${asset.cabinetEnd}`
                 }
               })
             } else {
               const asset = this.options.parentAssetOptions.find(a => a.id === n)
+              console.log(asset, 2)
               if (asset) {
-                this.editAsset.brandId = asset.brand.id
-                this.editAsset.modelId = asset.model.id
-                this.editAsset.dcId = asset.dc.id
-                this.editAsset.cabinetId = asset.cabinet.id
+                this.editAsset.brandId = asset.brand ? asset.brand.id : ''
+                this.editAsset.modelId = asset.model ? asset.model.id : ''
+                this.editAsset.dcId = asset.dc ? asset.dc.id : ''
+                this.editAsset.cabinetId = asset.cabinet ? asset.cabinet.id : ''
                 this.editAsset.cabinetStart = asset.cabinetStart
                 this.editAsset.cabinetEnd = asset.cabinetEnd
-
+                if(!asset.cabinet){
+                  asset.cabinet= {}
+                }
                 this.lockModelInputValue = `${asset.brand.name} / ${asset.model.name}`
                 this.lockLocationInputValue = `${asset.dc.name} / ${asset.cabinet.name} / ${asset.cabinetStart}-${asset.cabinetEnd}`
               }
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index f2a7e179c..19cf73261 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -117,9 +117,9 @@
             <el-form-item :label='$t("overall.remark")' prop="remark">
               <el-input placeholder="" maxlength="512" type="textarea" show-word-limit v-model="editAssetMeta.remark" size="small" id="editAssetMeta-box-input-remark"></el-input>
             </el-form-item>
-            <el-form-item :label='$t("config.assetLabel.example")'>
-              <assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>
-            </el-form-item>
+<!--            <el-form-item :label='$t("config.assetLabel.example")'>-->
+<!--              <assetTagEx :param="editAssetMeta.param" :type="editAssetMeta.type.toUpperCase()"/>-->
+<!--            </el-form-item>-->
           </el-form>
         </div>
       </div>
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 1c50f0987..5638c32a1 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -50,6 +50,11 @@
           <span v-if="scope.row.cabinet && scope.row.cabinet !== '--'">{{scope.row.cabinet.name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
           <span v-else >--</span>
         </template>
+        <template v-else-if="item.prop == 'pingInfo'">
+          <div @mouseenter="showTableTooltip( formatPingTime(scope.row.pingInfo.lastUpdate), true, $event)" @mouseleave="hideTableTooltip" >
+            <div :class="{'active-icon green-bg':scope.row.pingInfo.status == 1,'active-icon red-bg':scope.row.pingInfo.status == 0}"></div><span>{{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}}</span>
+          </div>
+        </template>
         <template v-else-if="item.prop === 'model'">{{scope.row.model ? scope.row.model.name : '-'}}</template>
         <template v-else-if="item.prop === 'parent'">{{scope.row.parent ? scope.row.parent.name : '-'}}</template>
         <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>
@@ -83,6 +88,7 @@
 <script>
 import table from '@/components/common/mixin/table'
 import { showTableTooltip, hideTableTooltip } from '@/components/common/js/tools'
+import bus from '@/libs/bus'
 export default {
   name: 'assetTable',
   mixins: [table],
@@ -104,7 +110,7 @@ export default {
           label: this.$t('asset.manageIp'),
           prop: 'manageIp',
           show: true,
-          width: 120,
+          width: 140,
           sortable: 'custom'
         }, {
           label: this.$t('overall.parent'),
@@ -121,13 +127,18 @@ export default {
           label: this.$t('asset.state'),
           prop: 'state',
           show: true,
-          width: 80,
+          width: 100,
           sortable: 'custom'
+        }, {
+          label: this.$t('asset.pingInfo'),
+          prop: 'pingInfo',
+          show: true,
+          width: 110
         }, {
           label: this.$t('overall.dc'),
           prop: 'dc',
           show: true,
-          width: 110,
+          width: 140,
           sortable: 'custom'
         }, {
           label: this.$t('asset.cabinet'),
@@ -207,6 +218,21 @@ export default {
         return ''
       }
       return `[${start}-${end}]`
+    },
+    formatPingTime (str) {
+      if (!str || str == '') {
+        return this.$t('asset.assetStatPre') + this.$t('asset.assetStatDown')
+      }
+      const ds = '-'
+      const ts = ':'
+      const time = new Date(bus.UTCTimeToConfigTimezone(str))
+      const year = time.getFullYear()
+      const month = time.getMonth() + 1 > 9 ? time.getMonth() + 1 : ('0' + (time.getMonth() + 1))
+      const day = time.getDate() > 9 ? time.getDate() : ('0' + time.getDate())
+      const hours = time.getHours() > 9 ? time.getHours() : ('0' + time.getHours())
+      const minutes = time.getMinutes() > 9 ? time.getMinutes() : ('0' + time.getMinutes())
+      const seconds = time.getSeconds() > 9 ? time.getSeconds() : ('0' + time.getSeconds())
+      return this.$t('asset.assetStatPre') + year + ds + month + ds + day + ' ' + hours + ts + minutes + ts + seconds
     }
   }
 }
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 16f06f803..e6aba9f9a 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -122,12 +122,12 @@ export default {
           prop: 'id',
           show: true,
           width: 80,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('project.endpoint.name'),
           prop: 'name',
           show: true,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('project.module.type'),
           prop: 'type',
@@ -142,7 +142,7 @@ export default {
           label: this.$t('project.endpoint.asset'),
           prop: 'asset',
           show: true,
-          sortable:'custom'
+          sortable: 'custom'
         },
         {
           label: this.$t('project.module.module'),
@@ -158,13 +158,13 @@ export default {
           label: this.$t('project.endpoint.alerts'),
           prop: 'alerts',
           show: true,
-          sortable:'custom'
+          sortable: 'custom'
         },
         {
           label: this.$t('project.endpoint.state'),
           prop: 'state',
           show: true,
-          sortable:'custom'
+          sortable: 'custom'
         }
       ]
     }
diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
index 189191770..9d9da3faa 100644
--- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue
@@ -92,37 +92,37 @@ export default {
           prop: 'id',
           show: true,
           width: 80,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('project.module.moduleName'),
           prop: 'name',
           show: true,
           minWidth: 200,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('project.module.type'),
           prop: 'type',
           show: false,
           width: 150
         }, {
-          label: this.$t('project.project.project'),
+          label: this.$t('project.project.projectName'),
           prop: 'project',
           show: true,
           width: 150,
-          sortable:'custom'
+          sortable: 'custom'
         },
         {
           label: this.$t('project.endpoint.endpoint'),
           prop: 'endpointNum',
           show: true,
           width: 150,
-          sortable:'custom'
+          sortable: 'custom'
         }, {
           label: this.$t('project.module.alerts'),
           prop: 'alertNum',
           show: true,
           width: 150,
-          sortable:'custom'
+          sortable: 'custom'
         },
         {
           label: this.$t('overall.remark'),
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview.vue b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
index 9f1ddfcf0..6b4f649ae 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview.vue
@@ -39,7 +39,7 @@
           </div>
         </div>
         <div class="content-col-box">
-          <div v-loading="projectLoading" class="content-col-content">
+          <div v-loading="projectLoading" class="content-col-content" @click="jumpTo('project')">
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-project"></i></div>
             <div class="content-num-box">
               <el-tooltip :content="`${projectData.total}`" class="item" effect="light" placement="top">
@@ -54,7 +54,7 @@
           </div>
         </div>
         <div class="content-col-box">
-          <div v-loading="moduleLoading" class="content-col-content">
+          <div v-loading="moduleLoading" class="content-col-content" @click="jumpTo('module')">
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-module"></i></div>
             <div class="content-num-box">
               <el-tooltip :content="`${moduleData.total}`" class="item" effect="light" placement="top">
@@ -69,7 +69,7 @@
           </div>
         </div>
         <div class="content-col-box">
-          <div v-loading="endpointLoading" class="content-col-content">
+          <div v-loading="endpointLoading" class="content-col-content" @click="jumpTo('endpoint')">
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-endpoint"></i></div>
             <div class="content-num-box">
               <el-tooltip :content="`${endpointData.num}`" class="item" effect="light" placement="top">
@@ -84,7 +84,7 @@
           </div>
         </div>
         <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-loading="alertMessageLoading" class="content-col-content clickable" @click="jumpTo('alertList')">
             <div class="content-col-content-icon"><i class="nz-icon nz-icon-overview-alert"></i></div>
             <div class="content-num-box">
               <el-tooltip :content="`${alertMessageData.num}`" class="item" effect="light" placement="top">
@@ -432,12 +432,12 @@ export default {
       return new Promise(resolve => {
         this.assetLoading = true
         this.$refs.assetHexagon.startLoading()
-        this.$get('asset/asset', { pageSize: -1 }).then(response => {
+        this.$get('asset/asset', { pageSize: -1}).then(response => {
           this.assetLoading = false
           this.$refs.assetHexagon.endLoading()
           if (response.code === 200) {
             this.assetData = response.data.list.sort((a, b) => b.alertNum - a.alertNum)
-            const alertTopAssets = this.assetData.slice(0, 20)
+            const alertTopAssets = this.assetData.slice(0, 48)
             const requests = alertTopAssets.map(a => axios.get(`stat/alertMessage/severity?assetId=${a.id}`))
             const assetStateData = []
             axios.all(requests).then(result => {
@@ -769,7 +769,7 @@ export default {
         }
       ]
       return new Promise(resolve => {
-        const requests = [axios.get('dc?pageSize=-1'), axios.get('stat/overview/map')]
+        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
@@ -943,7 +943,7 @@ export default {
           if (response.code === 200) {
             const moduleData = response.data.list
             moduleData.sort((a, b) => b.alertNum - a.alertNum)
-            const alertTopModules = moduleData.slice(0, 20)
+            const alertTopModules = moduleData.slice(0,48)
             const requests = alertTopModules.map(a => axios.get(`stat/alertMessage/severity?moduleId=${a.id}`))
             const moduleStateData = []
             axios.all(requests).then(result => {
@@ -1141,6 +1141,12 @@ export default {
         bus.$emit('clear-asset-filter') // 清除leftMenu左侧菜单过滤条件
         // if(this.$store.getters.getIdcArr.length===0){return}//如果不存在idc 则不跳转
       }
+      if (data === 'project' || data === 'module' || data === 'endpoint') {
+        data = 'monitor/' + data
+      }
+      if (data === 'alertList') {
+        data = 'alertMessage'
+      }
       this.$router.push({
         path: '/' + data,
         query: {
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index fd4b792da..52cde9d77 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -32,10 +32,10 @@
           </template>
         </export-excel>
         <delete-button id="account-list-batch-delete" v-has="'monitor_endpoint_delete'" :api="url" :delete-objs="batchDeleteObjs" @after="getTableData" @before="delFlag=true"></delete-button>
-        <button id="account-batch-modify" v-has="'monitor_endpoint_add'" :class="{'nz-btn-disabled' : batchDeleteObjs.length<1}" class="top-tool-btn margin-r-20"
-                type="button" @click="batchModify">
-          <i class="nz-icon-batch-edit nz-icon"></i>
-        </button>
+<!--        <button id="account-batch-modify" v-has="'monitor_endpoint_add'" :class="{'nz-btn-disabled' : batchDeleteObjs.length<1}" class="top-tool-btn margin-r-20"-->
+<!--                type="button" @click="batchModify">-->
+<!--          <i class="nz-icon-batch-edit nz-icon"></i>-->
+<!--        </button>-->
       </template>
       <template v-slot:search>
         <clickSearch :titleSearchList="titleSearchList" :selectValue.sync="selectValue" @reload="reloadTable"/>