style:快照图标更换

nezha-fronted/src/assets/css/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nz-icon"; /* Project id 2030432 */
-  src: url('iconfont.woff2?t=1653383698922') format('woff2'),
-       url('iconfont.woff?t=1653383698922') format('woff'),
-       url('iconfont.ttf?t=1653383698922') format('truetype');
+  src: url('iconfont.woff2?t=1654482769343') format('woff2'),
+       url('iconfont.woff?t=1654482769343') format('woff'),
+       url('iconfont.ttf?t=1654482769343') format('truetype');
 }
 
 .nz-icon {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nz-icon-moshiqiehuan:before {
+  content: "\e783";
+}
+
+.nz-icon-a-xingzhuang2:before {
+  content: "\e781";
+}
+
+.nz-icon-xingzhuang:before {
+  content: "\e782";
+}
+
+.nz-icon-liulanlishi:before {
+  content: "\e77e";
+}
+
+.nz-icon-a-leimucuquanbu:before {
+  content: "\e77f";
+}
+
+.nz-icon-wodechuangjian:before {
+  content: "\e780";
+}
+
+.nz-icon-kuaizhao:before {
+  content: "\e77d";
+}
+
 .nz-icon-shujubeifenhuifu:before {
   content: "\e6ba";
 }

nezha-fronted/src/assets/css/font/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "nz-icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "30102525",
+      "name": "模式切换",
+      "font_class": "moshiqiehuan",
+      "unicode": "e783",
+      "unicode_decimal": 59267
+    },
+    {
+      "icon_id": "30097248",
+      "name": "形状 2",
+      "font_class": "a-xingzhuang2",
+      "unicode": "e781",
+      "unicode_decimal": 59265
+    },
+    {
+      "icon_id": "30097249",
+      "name": "形状",
+      "font_class": "xingzhuang",
+      "unicode": "e782",
+      "unicode_decimal": 59266
+    },
+    {
+      "icon_id": "30097042",
+      "name": "浏览历史",
+      "font_class": "liulanlishi",
+      "unicode": "e77e",
+      "unicode_decimal": 59262
+    },
+    {
+      "icon_id": "30097043",
+      "name": "类目－粗－全部",
+      "font_class": "a-leimucuquanbu",
+      "unicode": "e77f",
+      "unicode_decimal": 59263
+    },
+    {
+      "icon_id": "30097054",
+      "name": "我的创建",
+      "font_class": "wodechuangjian",
+      "unicode": "e780",
+      "unicode_decimal": 59264
+    },
+    {
+      "icon_id": "30091797",
+      "name": "快照",
+      "font_class": "kuaizhao",
+      "unicode": "e77d",
+      "unicode_decimal": 59261
+    },
     {
       "icon_id": "2781697",
       "name": "数据备份恢复",

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

@@ -44,7 +44,7 @@
                 <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
               </el-dropdown-item>
               <el-dropdown-item v-has="'panel_view'">
-                <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.snapshoot') }}</div>
+                <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
               </el-dropdown-item>
             </template>
           </top-tool-more-options>
@@ -80,7 +80,7 @@
                 <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
               </el-dropdown-item>
               <el-dropdown-item v-has="'panel_view'">
-                <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.snapshoot') }}</div>
+                <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
               </el-dropdown-item>
             </template>
           </top-tool-more-options>

nezha-fronted/src/components/common/mixin/mainMixinFun.js

@@ -1,4 +1,5 @@
 import bus from '@/libs/bus'
+import moment from 'moment-timezone'
 import i18n from '@/components/common/i18n'
 export default {
   methods: {
@@ -79,5 +80,17 @@ export default {
         return str
       }
     },
+    momentTz (timestamp, fmt) { // moment 转化时间戳为str
+      const offset = localStorage.getItem('nz-sys-timezone')
+      const format = fmt || localStorage.getItem('nz-default-dateFormat')
+      return moment.tz(timestamp, offset).format(format)
+    },
+    momentStrToTimestamp (str, fmt) {
+      const offset = localStorage.getItem('nz-sys-timezone')
+      const format = fmt || localStorage.getItem('nz-default-dateFormat')
+      const date = moment.tz(str, format, offset).valueOf()
+      console.log(date)
+      return date
+    }
   }
 }

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

@@ -41,7 +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]?timeFormate(computeTimezoneTime(scope.row[item.prop])):'-'}}</span>
+        <span v-else-if="item.prop === 'ts'">{{scope.row[item.prop]?momentTz(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">

nezha-fronted/src/components/page/dashboard/panel.vue

@@ -94,7 +94,7 @@
                     <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
                   </el-dropdown-item>
                   <el-dropdown-item v-has="'panel_view'">
-                    <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.snapshoot') }}</div>
+                    <div id="chart-export-html" @click="exportType"><i class="nz-icon nz-icon-kuaizhao"></i>{{ $t('overall.snapshoot') }}</div>
                   </el-dropdown-item>
                 </template>
               </top-tool-more-options>