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

nezha-fronted/src/components/common/table/settings/agentTable.vue

@@ -41,6 +41,7 @@
                 {{findServerType(scope.row[item.prop]).text}}
               </span>
         <span v-else-if="item.prop === 'checkTime'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
+        <span v-else-if="item.prop === 'ts'">{{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}</span>
         <span v-else-if="item.prop === 'status'">
           <el-popover :content="$t('asset.assetStatPre')+(scope.row.checkTime?utcTimeToTimezoneStr(scope.row.checkTime):$t('asset.assetStatDown'))" placement="right" trigger="hover" width="200">
             <div slot="reference" style="width: 60px">
@@ -146,6 +147,12 @@ export default {
           prop: 'protocol',
           show: false,
           minWidth: 150
+        },
+        {
+          label: this.$t('dashboard.panel.chartForm.typeVal.server'),
+          prop: 'ts',
+          show: false,
+          minWidth: 150
         }
       ]
     }