tangning 1 день назад
Родитель
Сommit
f9deefb7f5

+ 143 - 5
src/assets/icon/fire/demo_index.html

@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8"/>
   <title>iconfont Demo</title>
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
   <link rel="stylesheet" href="demo.css">
   <link rel="stylesheet" href="iconfont.css">
@@ -55,6 +55,42 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe7ef;</span>
+                <div class="name">nav_point</div>
+                <div class="code-name">&amp;#xe7ef;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7db;</span>
+                <div class="name">media</div>
+                <div class="code-name">&amp;#xe7db;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7d9;</span>
+                <div class="name">screen_d</div>
+                <div class="code-name">&amp;#xe7d9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7da;</span>
+                <div class="name">data_s</div>
+                <div class="code-name">&amp;#xe7da;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7d7;</span>
+                <div class="name">multi_m</div>
+                <div class="code-name">&amp;#xe7d7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7d8;</span>
+                <div class="name">point_c</div>
+                <div class="code-name">&amp;#xe7d8;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe6e2;</span>
                 <div class="name">fire_role_management</div>
                 <div class="code-name">&amp;#xe6e2;</div>
@@ -252,9 +288,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1639981610282') format('woff2'),
-       url('iconfont.woff?t=1639981610282') format('woff'),
-       url('iconfont.ttf?t=1639981610282') format('truetype');
+  src: url('iconfont.woff2?t=1773300071977') format('woff2'),
+       url('iconfont.woff?t=1773300071977') format('woff'),
+       url('iconfont.ttf?t=1773300071977') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -281,6 +317,60 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont iconnav_point"></span>
+            <div class="name">
+              nav_point
+            </div>
+            <div class="code-name">.iconnav_point
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconmedia"></span>
+            <div class="name">
+              media
+            </div>
+            <div class="code-name">.iconmedia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconscreen_d"></span>
+            <div class="name">
+              screen_d
+            </div>
+            <div class="code-name">.iconscreen_d
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icondata_s"></span>
+            <div class="name">
+              data_s
+            </div>
+            <div class="code-name">.icondata_s
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconmulti_m"></span>
+            <div class="name">
+              multi_m
+            </div>
+            <div class="code-name">.iconmulti_m
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconpoint_c"></span>
+            <div class="name">
+              point_c
+            </div>
+            <div class="code-name">.iconpoint_c
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont iconfire_role_management"></span>
             <div class="name">
               fire_role_management
@@ -579,6 +669,54 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconnav_point"></use>
+                </svg>
+                <div class="name">nav_point</div>
+                <div class="code-name">#iconnav_point</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconmedia"></use>
+                </svg>
+                <div class="name">media</div>
+                <div class="code-name">#iconmedia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconscreen_d"></use>
+                </svg>
+                <div class="name">screen_d</div>
+                <div class="code-name">#iconscreen_d</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icondata_s"></use>
+                </svg>
+                <div class="name">data_s</div>
+                <div class="code-name">#icondata_s</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconmulti_m"></use>
+                </svg>
+                <div class="name">multi_m</div>
+                <div class="code-name">#iconmulti_m</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconpoint_c"></use>
+                </svg>
+                <div class="name">point_c</div>
+                <div class="code-name">#iconpoint_c</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconfire_role_management"></use>
                 </svg>
                 <div class="name">fire_role_management</div>

+ 27 - 3
src/assets/icon/fire/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2466491 */
-  src: url('iconfont.woff2?t=1639981610282') format('woff2'),
-       url('iconfont.woff?t=1639981610282') format('woff'),
-       url('iconfont.ttf?t=1639981610282') format('truetype');
+  src: url('iconfont.woff2?t=1773300071977') format('woff2'),
+       url('iconfont.woff?t=1773300071977') format('woff'),
+       url('iconfont.ttf?t=1773300071977') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconnav_point:before {
+  content: "\e7ef";
+}
+
+.iconmedia:before {
+  content: "\e7db";
+}
+
+.iconscreen_d:before {
+  content: "\e7d9";
+}
+
+.icondata_s:before {
+  content: "\e7da";
+}
+
+.iconmulti_m:before {
+  content: "\e7d7";
+}
+
+.iconpoint_c:before {
+  content: "\e7d8";
+}
+
 .iconfire_role_management:before {
   content: "\e6e2";
 }

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/assets/icon/fire/iconfont.js


+ 42 - 0
src/assets/icon/fire/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "47052838",
+      "name": "nav_point",
+      "font_class": "nav_point",
+      "unicode": "e7ef",
+      "unicode_decimal": 59375
+    },
+    {
+      "icon_id": "46107130",
+      "name": "media",
+      "font_class": "media",
+      "unicode": "e7db",
+      "unicode_decimal": 59355
+    },
+    {
+      "icon_id": "46106856",
+      "name": "screen_d",
+      "font_class": "screen_d",
+      "unicode": "e7d9",
+      "unicode_decimal": 59353
+    },
+    {
+      "icon_id": "46106855",
+      "name": "data_s",
+      "font_class": "data_s",
+      "unicode": "e7da",
+      "unicode_decimal": 59354
+    },
+    {
+      "icon_id": "46106858",
+      "name": "multi_m",
+      "font_class": "multi_m",
+      "unicode": "e7d7",
+      "unicode_decimal": 59351
+    },
+    {
+      "icon_id": "46106857",
+      "name": "point_c",
+      "font_class": "point_c",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
+    {
       "icon_id": "26624915",
       "name": "fire_role_management",
       "font_class": "fire_role_management",

BIN
src/assets/icon/fire/iconfont.ttf


BIN
src/assets/icon/fire/iconfont.woff


BIN
src/assets/icon/fire/iconfont.woff2


Разница между файлами не показана из-за своего большого размера
+ 2816 - 332
src/assets/icon/newfire/demo_index.html


+ 471 - 39
src/assets/icon/newfire/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 5058908 */
-  src: url('iconfont.woff2?t=1765185348668') format('woff2'),
-       url('iconfont.woff?t=1765185348668') format('woff'),
-       url('iconfont.ttf?t=1765185348668') format('truetype');
+  font-family: "iconfont"; /* Project id 4647199 */
+  src: url('iconfont.woff2?t=1773300809797') format('woff2'),
+       url('iconfont.woff?t=1773300809797') format('woff'),
+       url('iconfont.ttf?t=1773300809797') format('truetype');
 }
 
 .iconfont {
@@ -13,79 +13,511 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-screen_f:before {
-  content: "\e7db";
+.icon-nav_teach:before {
+  content: "\e7f0";
 }
 
-.icon-look_t:before {
-  content: "\e7da";
+.icon-nav_multi:before {
+  content: "\e7f1";
+}
+
+.icon-nav_media:before {
+  content: "\e7f2";
+}
+
+.icon-nav_user:before {
+  content: "\e7f3";
+}
+
+.icon-nav_point:before {
+  content: "\e7ef";
+}
+
+.icon-nav_organization:before {
+  content: "\e7f4";
+}
+
+.icon-nav_statistics:before {
+  content: "\e7f5";
+}
+
+.icon-orientation:before {
+  content: "\e7bf";
+}
+
+.icon-window_n:before {
+  content: "\e7b4";
+}
+
+.icon-window_m:before {
+  content: "\e7b5";
+}
+
+.icon-screen_s:before {
+  content: "\e7b2";
+}
+
+.icon-a-3D_scence:before {
+  content: "\e7b3";
+}
+
+.icon-media:before {
+  content: "\e7af";
+}
+
+.icon-rename:before {
+  content: "\e7b0";
+}
+
+.icon-display:before {
+  content: "\e7b1";
+}
+
+.icon-line_d:before {
+  content: "\e79e";
+}
+
+.icon-a-label_s:before {
+  content: "\e79d";
+}
+
+.icon-guide_p:before {
+  content: "\e79c";
+}
+
+.icon-view:before {
+  content: "\e79b";
+}
+
+.icon-ratio:before {
+  content: "\e799";
+}
+
+.icon-a-1b1:before {
+  content: "\e79a";
+}
+
+.icon-reset:before {
+  content: "\e65a";
+}
+
+.icon-menu:before {
+  content: "\e798";
+}
+
+.icon-keys_a:before {
+  content: "\e797";
+}
+
+.icon-add_a:before {
+  content: "\e796";
+}
+
+.icon-rectification:before {
+  content: "\e78a";
+}
+
+.icon-a-zoom:before {
+  content: "\e78b";
+}
+
+.icon-a-play:before {
+  content: "\e78c";
+}
+
+.icon-a-animation_s:before {
+  content: "\e78d";
+}
+
+.icon-keys:before {
+  content: "\e78e";
+}
+
+.icon-a-anchor:before {
+  content: "\e78f";
+}
+
+.icon-a-monitoring_s:before {
+  content: "\e790";
+}
+
+.icon-a-rotate:before {
+  content: "\e791";
+}
+
+.icon-a-move:before {
+  content: "\e792";
+}
+
+.icon-a-path_s:before {
+  content: "\e793";
+}
+
+.icon-a-pause:before {
+  content: "\e794";
+}
+
+.icon-a-guide_s:before {
+  content: "\e795";
+}
+
+.icon-magnify:before {
+  content: "\e788";
+}
+
+.icon-reduce:before {
+  content: "\e789";
+}
+
+.icon-pic_path:before {
+  content: "\e778";
+}
+
+.icon-list_s:before {
+  content: "\e776";
+}
+
+.icon-message_c:before {
+  content: "\e777";
+}
+
+.icon-pen:before {
+  content: "\e750";
+}
+
+.icon-show_dot_s:before {
+  content: "\e64f";
+}
+
+.icon-show_dot_n:before {
+  content: "\e657";
+}
+
+.icon-show_pic_n:before {
+  content: "\e650";
+}
+
+.icon-show_pic_s:before {
+  content: "\e658";
+}
+
+.icon-show_3d_s:before {
+  content: "\e72b";
+}
+
+.icon-show_3d_n:before {
+  content: "\e72e";
+}
+
+.icon-show_roaming_s:before {
+  content: "\e730";
+}
+
+.icon-show_roaming_n:before {
+  content: "\e731";
+}
+
+.icon-index:before {
+  content: "\e76d";
+}
+
+.icon-symbol:before {
+  content: "\e76e";
+}
+
+.icon-arrows1:before {
+  content: "\e76f";
+}
+
+.icon-text1:before {
+  content: "\e770";
+}
+
+.icon-fire_firmware:before {
+  content: "\e767";
+}
+
+.icon-fire_app:before {
+  content: "\e768";
+}
+
+.icon-fire_statistics:before {
+  content: "\e74d";
+}
+
+.icon-query_home:before {
+  content: "\e74b";
+}
+
+.icon-list-detail:before {
+  content: "\e740";
+}
+
+.icon-without:before {
+  content: "\e70e";
+}
+
+.icon-keyboard:before {
+  content: "\e70d";
+}
+
+.icon-recover:before {
+  content: "\e693";
+}
+
+.icon-repeal:before {
+  content: "\e694";
+}
+
+.icon-broken_l:before {
+  content: "\e6fd";
+}
+
+.icon-arrows:before {
+  content: "\e6fe";
+}
+
+.icon-blood:before {
+  content: "\e6ff";
+}
+
+.icon-circle:before {
+  content: "\e700";
+}
+
+.icon-cigarette_e:before {
+  content: "\e701";
+}
+
+.icon-corpse:before {
+  content: "\e702";
+}
+
+.icon-icon_n:before {
+  content: "\e703";
+}
+
+.icon-form:before {
+  content: "\e704";
+}
+
+.icon-footprint_l:before {
+  content: "\e705";
+}
+
+.icon-footprint_r:before {
+  content: "\e706";
+}
+
+.icon-fire_p:before {
+  content: "\e707";
+}
+
+.icon-rectangle:before {
+  content: "\e708";
+}
+
+.icon-shoeprints_l:before {
+  content: "\e709";
+}
+
+.icon-text:before {
+  content: "\e70a";
+}
+
+.icon-fingerprint:before {
+  content: "\e70b";
+}
+
+.icon-shoeprints_r:before {
+  content: "\e70c";
+}
+
+.icon-nav-setup:before {
+  content: "\e64b";
+}
+
+.icon-a-film:before {
+  content: "\e6e8";
+}
+
+.icon-nav-edit:before {
+  content: "\e642";
+}
+
+.icon-pic:before {
+  content: "\e648";
+}
+
+.icon-list-scene:before {
+  content: "\e6e4";
+}
+
+.icon-list-file:before {
+  content: "\e6e5";
+}
+
+.icon-list-record:before {
+  content: "\e6e6";
+}
+
+.icon-list-view:before {
+  content: "\e6e7";
+}
+
+.icon-video1:before {
+  content: "\e63b";
+}
+
+.icon-order:before {
+  content: "\e6dd";
+}
+
+.icon-pin1:before {
+  content: "\e6e3";
+}
+
+.icon-nav-measure:before {
+  content: "\e64a";
+}
+
+.icon-v-l:before {
+  content: "\e66f";
+}
+
+.icon-h-r:before {
+  content: "\e670";
+}
+
+.icon-f-l:before {
+  content: "\e673";
 }
 
 .icon-search:before {
   content: "\e64c";
 }
 
-.icon-Left:before {
-  content: "\e7d8";
+.icon-left1:before {
+  content: "\e6ae";
+}
+
+.icon-right:before {
+  content: "\e6af";
+}
+
+.icon-state_e:before {
+  content: "\e624";
+}
+
+.icon-state_f:before {
+  content: "\e625";
+}
+
+.icon-state_s:before {
+  content: "\e626";
+}
+
+.icon-eye-n:before {
+  content: "\e621";
+}
+
+.icon-eye-s:before {
+  content: "\e622";
+}
+
+.icon-more:before {
+  content: "\e600";
 }
 
-.icon-Right:before {
-  content: "\e7d9";
+.icon-element:before {
+  content: "\e666";
 }
 
-.icon-play:before {
-  content: "\e7d5";
+.icon-extend:before {
+  content: "\e690";
 }
 
-.icon-record:before {
-  content: "\e7d6";
+.icon-shrink:before {
+  content: "\e691";
 }
 
 .icon-pause:before {
-  content: "\e7d7";
+  content: "\e636";
 }
 
-.icon-rename_s:before {
-  content: "\e7d4";
+.icon-preview:before {
+  content: "\e63a";
 }
 
-.icon-CloseCircle:before {
-  content: "\e7d0";
+.icon-clear:before {
+  content: "\e63f";
 }
 
-.icon-Edit:before {
-  content: "\e7d1";
+.icon-play_stop:before {
+  content: "\e6b4";
 }
 
-.icon-Up:before {
-  content: "\e7d2";
+.icon-transparency:before {
+  content: "\e6d7";
 }
 
-.icon-Down:before {
-  content: "\e7d3";
+.icon-pull-down:before {
+  content: "\e61d";
 }
 
-.icon-window_m:before {
-  content: "\e7b5";
+.icon-pull-up:before {
+  content: "\e61e";
 }
 
-.icon-window_n:before {
-  content: "\e7b4";
+.icon-add:before {
+  content: "\e631";
 }
 
-.icon-download:before {
-  content: "\e7cf";
+.icon-close:before {
+  content: "\e633";
 }
 
-.icon-rename:before {
-  content: "\e7c6";
+.icon-pin:before {
+  content: "\e67c";
+}
+
+.icon-flip:before {
+  content: "\e67e";
+}
+
+.icon-move:before {
+  content: "\e680";
+}
+
+.icon-del:before {
+  content: "\e632";
+}
+
+.icon-checkbox:before {
+  content: "\e649";
+}
+
+.icon-nor:before {
+  content: "\e696";
+}
+
+.icon-joint:before {
+  content: "\e6e0";
+}
+
+.icon-path:before {
+  content: "\e6e1";
+}
+
+.icon-label:before {
+  content: "\e6e2";
 }
 
-.icon-import:before {
-  content: "\e7c9";
+.icon-case:before {
+  content: "\e6da";
 }
 
-.icon-Upload:before {
-  content: "\e7c8";
+.icon-scene:before {
+  content: "\e6db";
 }
 

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/assets/icon/newfire/iconfont.js


+ 846 - 90
src/assets/icon/newfire/iconfont.json

@@ -1,23 +1,674 @@
 {
-  "id": "5058908",
-  "name": "项目中心",
+  "id": "4647199",
+  "name": "多元数据融合系统",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
     {
-      "icon_id": "46294922",
-      "name": "screen_f",
-      "font_class": "screen_f",
-      "unicode": "e7db",
-      "unicode_decimal": 59355
+      "icon_id": "47052841",
+      "name": "nav_teach",
+      "font_class": "nav_teach",
+      "unicode": "e7f0",
+      "unicode_decimal": 59376
     },
     {
-      "icon_id": "46269927",
-      "name": "look_t",
-      "font_class": "look_t",
-      "unicode": "e7da",
-      "unicode_decimal": 59354
+      "icon_id": "47052842",
+      "name": "nav_multi",
+      "font_class": "nav_multi",
+      "unicode": "e7f1",
+      "unicode_decimal": 59377
+    },
+    {
+      "icon_id": "47052840",
+      "name": "nav_media",
+      "font_class": "nav_media",
+      "unicode": "e7f2",
+      "unicode_decimal": 59378
+    },
+    {
+      "icon_id": "47052839",
+      "name": "nav_user",
+      "font_class": "nav_user",
+      "unicode": "e7f3",
+      "unicode_decimal": 59379
+    },
+    {
+      "icon_id": "47052838",
+      "name": "nav_point",
+      "font_class": "nav_point",
+      "unicode": "e7ef",
+      "unicode_decimal": 59375
+    },
+    {
+      "icon_id": "47052837",
+      "name": "nav_organization",
+      "font_class": "nav_organization",
+      "unicode": "e7f4",
+      "unicode_decimal": 59380
+    },
+    {
+      "icon_id": "47052836",
+      "name": "nav_statistics",
+      "font_class": "nav_statistics",
+      "unicode": "e7f5",
+      "unicode_decimal": 59381
+    },
+    {
+      "icon_id": "45357208",
+      "name": "orientation",
+      "font_class": "orientation",
+      "unicode": "e7bf",
+      "unicode_decimal": 59327
+    },
+    {
+      "icon_id": "44890707",
+      "name": "window_n",
+      "font_class": "window_n",
+      "unicode": "e7b4",
+      "unicode_decimal": 59316
+    },
+    {
+      "icon_id": "44890706",
+      "name": "window_m",
+      "font_class": "window_m",
+      "unicode": "e7b5",
+      "unicode_decimal": 59317
+    },
+    {
+      "icon_id": "44889955",
+      "name": "screen_s",
+      "font_class": "screen_s",
+      "unicode": "e7b2",
+      "unicode_decimal": 59314
+    },
+    {
+      "icon_id": "44889954",
+      "name": "3D_scence",
+      "font_class": "a-3D_scence",
+      "unicode": "e7b3",
+      "unicode_decimal": 59315
+    },
+    {
+      "icon_id": "44887769",
+      "name": "media",
+      "font_class": "media",
+      "unicode": "e7af",
+      "unicode_decimal": 59311
+    },
+    {
+      "icon_id": "44887770",
+      "name": "rename",
+      "font_class": "rename",
+      "unicode": "e7b0",
+      "unicode_decimal": 59312
+    },
+    {
+      "icon_id": "44887771",
+      "name": "display",
+      "font_class": "display",
+      "unicode": "e7b1",
+      "unicode_decimal": 59313
+    },
+    {
+      "icon_id": "43973886",
+      "name": "line_d",
+      "font_class": "line_d",
+      "unicode": "e79e",
+      "unicode_decimal": 59294
+    },
+    {
+      "icon_id": "43913586",
+      "name": "a-label_s",
+      "font_class": "a-label_s",
+      "unicode": "e79d",
+      "unicode_decimal": 59293
+    },
+    {
+      "icon_id": "43886962",
+      "name": "guide_p",
+      "font_class": "guide_p",
+      "unicode": "e79c",
+      "unicode_decimal": 59292
+    },
+    {
+      "icon_id": "43623992",
+      "name": "view",
+      "font_class": "view",
+      "unicode": "e79b",
+      "unicode_decimal": 59291
+    },
+    {
+      "icon_id": "43616883",
+      "name": "ratio",
+      "font_class": "ratio",
+      "unicode": "e799",
+      "unicode_decimal": 59289
+    },
+    {
+      "icon_id": "43616882",
+      "name": "1b1",
+      "font_class": "a-1b1",
+      "unicode": "e79a",
+      "unicode_decimal": 59290
+    },
+    {
+      "icon_id": "25654903",
+      "name": "reset",
+      "font_class": "reset",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "43615153",
+      "name": "menu",
+      "font_class": "menu",
+      "unicode": "e798",
+      "unicode_decimal": 59288
+    },
+    {
+      "icon_id": "43559284",
+      "name": "keys_a",
+      "font_class": "keys_a",
+      "unicode": "e797",
+      "unicode_decimal": 59287
+    },
+    {
+      "icon_id": "43559283",
+      "name": "add_a",
+      "font_class": "add_a",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
+    {
+      "icon_id": "43549167",
+      "name": "rectification",
+      "font_class": "rectification",
+      "unicode": "e78a",
+      "unicode_decimal": 59274
+    },
+    {
+      "icon_id": "43549165",
+      "name": "a-zoom",
+      "font_class": "a-zoom",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
+    {
+      "icon_id": "43549159",
+      "name": "a-play",
+      "font_class": "a-play",
+      "unicode": "e78c",
+      "unicode_decimal": 59276
+    },
+    {
+      "icon_id": "43549156",
+      "name": "a-animation_s",
+      "font_class": "a-animation_s",
+      "unicode": "e78d",
+      "unicode_decimal": 59277
+    },
+    {
+      "icon_id": "43549164",
+      "name": "keys",
+      "font_class": "keys",
+      "unicode": "e78e",
+      "unicode_decimal": 59278
+    },
+    {
+      "icon_id": "43549163",
+      "name": "a-anchor",
+      "font_class": "a-anchor",
+      "unicode": "e78f",
+      "unicode_decimal": 59279
+    },
+    {
+      "icon_id": "43549160",
+      "name": "a-monitoring_s",
+      "font_class": "a-monitoring_s",
+      "unicode": "e790",
+      "unicode_decimal": 59280
+    },
+    {
+      "icon_id": "43549162",
+      "name": "a-rotate",
+      "font_class": "a-rotate",
+      "unicode": "e791",
+      "unicode_decimal": 59281
+    },
+    {
+      "icon_id": "43549161",
+      "name": "a-move",
+      "font_class": "a-move",
+      "unicode": "e792",
+      "unicode_decimal": 59282
+    },
+    {
+      "icon_id": "43549158",
+      "name": "a-path_s",
+      "font_class": "a-path_s",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
+      "icon_id": "43549157",
+      "name": "a-pause",
+      "font_class": "a-pause",
+      "unicode": "e794",
+      "unicode_decimal": 59284
+    },
+    {
+      "icon_id": "43549155",
+      "name": "a-guide_s",
+      "font_class": "a-guide_s",
+      "unicode": "e795",
+      "unicode_decimal": 59285
+    },
+    {
+      "icon_id": "43549168",
+      "name": "magnify",
+      "font_class": "magnify",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
+    {
+      "icon_id": "43549166",
+      "name": "reduce",
+      "font_class": "reduce",
+      "unicode": "e789",
+      "unicode_decimal": 59273
+    },
+    {
+      "icon_id": "42880568",
+      "name": "pic_path",
+      "font_class": "pic_path",
+      "unicode": "e778",
+      "unicode_decimal": 59256
+    },
+    {
+      "icon_id": "42851849",
+      "name": "list_s",
+      "font_class": "list_s",
+      "unicode": "e776",
+      "unicode_decimal": 59254
+    },
+    {
+      "icon_id": "42851848",
+      "name": "message_c",
+      "font_class": "message_c",
+      "unicode": "e777",
+      "unicode_decimal": 59255
+    },
+    {
+      "icon_id": "39993146",
+      "name": "pen",
+      "font_class": "pen",
+      "unicode": "e750",
+      "unicode_decimal": 59216
+    },
+    {
+      "icon_id": "25633715",
+      "name": "show_dot_s",
+      "font_class": "show_dot_s",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "25633717",
+      "name": "show_dot_n",
+      "font_class": "show_dot_n",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "25633765",
+      "name": "show_pic_n",
+      "font_class": "show_pic_n",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "25633777",
+      "name": "show_pic_s",
+      "font_class": "show_pic_s",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "35129313",
+      "name": "show_3d_s",
+      "font_class": "show_3d_s",
+      "unicode": "e72b",
+      "unicode_decimal": 59179
+    },
+    {
+      "icon_id": "35129316",
+      "name": "show_3d_n",
+      "font_class": "show_3d_n",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "35129318",
+      "name": "show_roaming_s",
+      "font_class": "show_roaming_s",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
+    {
+      "icon_id": "35129319",
+      "name": "show_roaming_n",
+      "font_class": "show_roaming_n",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "41299621",
+      "name": "index",
+      "font_class": "index",
+      "unicode": "e76d",
+      "unicode_decimal": 59245
+    },
+    {
+      "icon_id": "41299620",
+      "name": "symbol",
+      "font_class": "symbol",
+      "unicode": "e76e",
+      "unicode_decimal": 59246
+    },
+    {
+      "icon_id": "41299619",
+      "name": "arrows",
+      "font_class": "arrows1",
+      "unicode": "e76f",
+      "unicode_decimal": 59247
+    },
+    {
+      "icon_id": "41299618",
+      "name": "text",
+      "font_class": "text1",
+      "unicode": "e770",
+      "unicode_decimal": 59248
+    },
+    {
+      "icon_id": "41207891",
+      "name": "fire_firmware",
+      "font_class": "fire_firmware",
+      "unicode": "e767",
+      "unicode_decimal": 59239
+    },
+    {
+      "icon_id": "41207890",
+      "name": "fire_app",
+      "font_class": "fire_app",
+      "unicode": "e768",
+      "unicode_decimal": 59240
+    },
+    {
+      "icon_id": "39135106",
+      "name": "fire_statistics",
+      "font_class": "fire_statistics",
+      "unicode": "e74d",
+      "unicode_decimal": 59213
+    },
+    {
+      "icon_id": "38948724",
+      "name": "query_home",
+      "font_class": "query_home",
+      "unicode": "e74b",
+      "unicode_decimal": 59211
+    },
+    {
+      "icon_id": "37076167",
+      "name": "list-detail",
+      "font_class": "list-detail",
+      "unicode": "e740",
+      "unicode_decimal": 59200
+    },
+    {
+      "icon_id": "33692561",
+      "name": "without",
+      "font_class": "without",
+      "unicode": "e70e",
+      "unicode_decimal": 59150
+    },
+    {
+      "icon_id": "33322597",
+      "name": "keyboard",
+      "font_class": "keyboard",
+      "unicode": "e70d",
+      "unicode_decimal": 59149
+    },
+    {
+      "icon_id": "27198776",
+      "name": "recover",
+      "font_class": "recover",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "27198777",
+      "name": "repeal",
+      "font_class": "repeal",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "33292114",
+      "name": "broken_l",
+      "font_class": "broken_l",
+      "unicode": "e6fd",
+      "unicode_decimal": 59133
+    },
+    {
+      "icon_id": "33292115",
+      "name": "arrows",
+      "font_class": "arrows",
+      "unicode": "e6fe",
+      "unicode_decimal": 59134
+    },
+    {
+      "icon_id": "33292116",
+      "name": "blood",
+      "font_class": "blood",
+      "unicode": "e6ff",
+      "unicode_decimal": 59135
+    },
+    {
+      "icon_id": "33292117",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e700",
+      "unicode_decimal": 59136
+    },
+    {
+      "icon_id": "33292118",
+      "name": "cigarette_e",
+      "font_class": "cigarette_e",
+      "unicode": "e701",
+      "unicode_decimal": 59137
+    },
+    {
+      "icon_id": "33292119",
+      "name": "corpse",
+      "font_class": "corpse",
+      "unicode": "e702",
+      "unicode_decimal": 59138
+    },
+    {
+      "icon_id": "33292120",
+      "name": "icon_n",
+      "font_class": "icon_n",
+      "unicode": "e703",
+      "unicode_decimal": 59139
+    },
+    {
+      "icon_id": "33292121",
+      "name": "form",
+      "font_class": "form",
+      "unicode": "e704",
+      "unicode_decimal": 59140
+    },
+    {
+      "icon_id": "33292122",
+      "name": "footprint_l",
+      "font_class": "footprint_l",
+      "unicode": "e705",
+      "unicode_decimal": 59141
+    },
+    {
+      "icon_id": "33292123",
+      "name": "footprint_r",
+      "font_class": "footprint_r",
+      "unicode": "e706",
+      "unicode_decimal": 59142
+    },
+    {
+      "icon_id": "33292124",
+      "name": "fire_p",
+      "font_class": "fire_p",
+      "unicode": "e707",
+      "unicode_decimal": 59143
+    },
+    {
+      "icon_id": "33292125",
+      "name": "rectangle",
+      "font_class": "rectangle",
+      "unicode": "e708",
+      "unicode_decimal": 59144
+    },
+    {
+      "icon_id": "33292126",
+      "name": "shoeprints_l",
+      "font_class": "shoeprints_l",
+      "unicode": "e709",
+      "unicode_decimal": 59145
+    },
+    {
+      "icon_id": "33292127",
+      "name": "text",
+      "font_class": "text",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
+      "icon_id": "33292128",
+      "name": "fingerprint",
+      "font_class": "fingerprint",
+      "unicode": "e70b",
+      "unicode_decimal": 59147
+    },
+    {
+      "icon_id": "33292129",
+      "name": "shoeprints_r",
+      "font_class": "shoeprints_r",
+      "unicode": "e70c",
+      "unicode_decimal": 59148
+    },
+    {
+      "icon_id": "25631133",
+      "name": "nav-setup",
+      "font_class": "nav-setup",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "31503933",
+      "name": "a-film",
+      "font_class": "a-film",
+      "unicode": "e6e8",
+      "unicode_decimal": 59112
+    },
+    {
+      "icon_id": "25631122",
+      "name": "nav-edit",
+      "font_class": "nav-edit",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "23786363",
+      "name": "pic",
+      "font_class": "pic",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "31485449",
+      "name": "list-scene",
+      "font_class": "list-scene",
+      "unicode": "e6e4",
+      "unicode_decimal": 59108
+    },
+    {
+      "icon_id": "31485450",
+      "name": "list-file",
+      "font_class": "list-file",
+      "unicode": "e6e5",
+      "unicode_decimal": 59109
+    },
+    {
+      "icon_id": "31485451",
+      "name": "list-record",
+      "font_class": "list-record",
+      "unicode": "e6e6",
+      "unicode_decimal": 59110
+    },
+    {
+      "icon_id": "31485452",
+      "name": "list-view",
+      "font_class": "list-view",
+      "unicode": "e6e7",
+      "unicode_decimal": 59111
+    },
+    {
+      "icon_id": "23781429",
+      "name": "video",
+      "font_class": "video1",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "30948192",
+      "name": "order",
+      "font_class": "order",
+      "unicode": "e6dd",
+      "unicode_decimal": 59101
+    },
+    {
+      "icon_id": "31365069",
+      "name": "pin",
+      "font_class": "pin1",
+      "unicode": "e6e3",
+      "unicode_decimal": 59107
+    },
+    {
+      "icon_id": "25631400",
+      "name": "nav-measure",
+      "font_class": "nav-measure",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "26077352",
+      "name": "v-l",
+      "font_class": "v-l",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "26077353",
+      "name": "h-r",
+      "font_class": "h-r",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "26077356",
+      "name": "f-l",
+      "font_class": "f-l",
+      "unicode": "e673",
+      "unicode_decimal": 58995
     },
     {
       "icon_id": "25631464",
@@ -27,116 +678,221 @@
       "unicode_decimal": 58956
     },
     {
-      "icon_id": "46003485",
-      "name": "Left",
-      "font_class": "Left",
-      "unicode": "e7d8",
-      "unicode_decimal": 59352
+      "icon_id": "27765016",
+      "name": "left",
+      "font_class": "left1",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "27765017",
+      "name": "right",
+      "font_class": "right",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "22132762",
+      "name": "state_e",
+      "font_class": "state_e",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "22132763",
+      "name": "state_f",
+      "font_class": "state_f",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "22132764",
+      "name": "state_s",
+      "font_class": "state_s",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "22099675",
+      "name": "eye-n",
+      "font_class": "eye-n",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "22099676",
+      "name": "eye-s",
+      "font_class": "eye-s",
+      "unicode": "e622",
+      "unicode_decimal": 58914
     },
     {
-      "icon_id": "46003486",
-      "name": "Right",
-      "font_class": "Right",
-      "unicode": "e7d9",
-      "unicode_decimal": 59353
+      "icon_id": "11304931",
+      "name": "more read",
+      "font_class": "more",
+      "unicode": "e600",
+      "unicode_decimal": 58880
     },
     {
-      "icon_id": "46003440",
-      "name": "play",
-      "font_class": "play",
-      "unicode": "e7d5",
-      "unicode_decimal": 59349
+      "icon_id": "25764812",
+      "name": "element",
+      "font_class": "element",
+      "unicode": "e666",
+      "unicode_decimal": 58982
     },
     {
-      "icon_id": "46003439",
-      "name": "record",
-      "font_class": "record",
-      "unicode": "e7d6",
-      "unicode_decimal": 59350
+      "icon_id": "27032625",
+      "name": "extend",
+      "font_class": "extend",
+      "unicode": "e690",
+      "unicode_decimal": 59024
     },
     {
-      "icon_id": "46003438",
+      "icon_id": "27032630",
+      "name": "shrink",
+      "font_class": "shrink",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "23773343",
       "name": "pause",
       "font_class": "pause",
-      "unicode": "e7d7",
-      "unicode_decimal": 59351
+      "unicode": "e636",
+      "unicode_decimal": 58934
     },
     {
-      "icon_id": "46003195",
-      "name": "rename_s",
-      "font_class": "rename_s",
-      "unicode": "e7d4",
-      "unicode_decimal": 59348
+      "icon_id": "23773344",
+      "name": "preview",
+      "font_class": "preview",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
     },
     {
-      "icon_id": "46002896",
-      "name": "CloseCircle",
-      "font_class": "CloseCircle",
-      "unicode": "e7d0",
-      "unicode_decimal": 59344
+      "icon_id": "23781433",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
     },
     {
-      "icon_id": "46002898",
-      "name": "Edit",
-      "font_class": "Edit",
-      "unicode": "e7d1",
-      "unicode_decimal": 59345
+      "icon_id": "29255507",
+      "name": "play_stop",
+      "font_class": "play_stop",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
     },
     {
-      "icon_id": "46002897",
-      "name": "Up",
-      "font_class": "Up",
-      "unicode": "e7d2",
-      "unicode_decimal": 59346
+      "icon_id": "30499411",
+      "name": "transparency",
+      "font_class": "transparency",
+      "unicode": "e6d7",
+      "unicode_decimal": 59095
     },
     {
-      "icon_id": "46002895",
-      "name": "Down",
-      "font_class": "Down",
-      "unicode": "e7d3",
-      "unicode_decimal": 59347
+      "icon_id": "22099518",
+      "name": "pull-down",
+      "font_class": "pull-down",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
     },
     {
-      "icon_id": "44890706",
-      "name": "window_m",
-      "font_class": "window_m",
-      "unicode": "e7b5",
-      "unicode_decimal": 59317
+      "icon_id": "22099519",
+      "name": "pull-up",
+      "font_class": "pull-up",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
     },
     {
-      "icon_id": "44890707",
-      "name": "window_n",
-      "font_class": "window_n",
-      "unicode": "e7b4",
-      "unicode_decimal": 59316
+      "icon_id": "23773068",
+      "name": "add",
+      "font_class": "add",
+      "unicode": "e631",
+      "unicode_decimal": 58929
     },
     {
-      "icon_id": "46001982",
-      "name": "download",
-      "font_class": "download",
-      "unicode": "e7cf",
-      "unicode_decimal": 59343
+      "icon_id": "23773070",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e633",
+      "unicode_decimal": 58931
     },
     {
-      "icon_id": "45263630",
-      "name": "rename",
-      "font_class": "rename",
-      "unicode": "e7c6",
-      "unicode_decimal": 59334
+      "icon_id": "26621105",
+      "name": "pin",
+      "font_class": "pin",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "26625827",
+      "name": "flip",
+      "font_class": "flip",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "26625859",
+      "name": "move",
+      "font_class": "move",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "23773069",
+      "name": "del",
+      "font_class": "del",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "23842269",
+      "name": "sel",
+      "font_class": "checkbox",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "27200779",
+      "name": "nor",
+      "font_class": "nor",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "31132312",
+      "name": "joint",
+      "font_class": "joint",
+      "unicode": "e6e0",
+      "unicode_decimal": 59104
+    },
+    {
+      "icon_id": "31132318",
+      "name": "path",
+      "font_class": "path",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    },
+    {
+      "icon_id": "31132319",
+      "name": "label",
+      "font_class": "label",
+      "unicode": "e6e2",
+      "unicode_decimal": 59106
     },
     {
-      "icon_id": "45434742",
-      "name": "import",
-      "font_class": "import",
-      "unicode": "e7c9",
-      "unicode_decimal": 59337
+      "icon_id": "30885164",
+      "name": "case",
+      "font_class": "case",
+      "unicode": "e6da",
+      "unicode_decimal": 59098
     },
     {
-      "icon_id": "45434743",
-      "name": "Upload",
-      "font_class": "Upload",
-      "unicode": "e7c8",
-      "unicode_decimal": 59336
+      "icon_id": "30885165",
+      "name": "scene",
+      "font_class": "scene",
+      "unicode": "e6db",
+      "unicode_decimal": 59099
     }
   ]
 }

BIN
src/assets/icon/newfire/iconfont.ttf


BIN
src/assets/icon/newfire/iconfont.woff


BIN
src/assets/icon/newfire/iconfont.woff2


+ 5 - 5
src/router/config.ts

@@ -76,7 +76,7 @@ export const routes: Routes = [
         name: RouteName.mediaLibrary,
         path: "mediaLibrary",
         component: () => import("@/view/mediaLibrary/index.vue"),
-        meta: { title: "媒体库", iconSrc: 'svg/media.svg', icon: "" }, // icon不知道放在哪里的iconfont,新增直接引入svg
+        meta: { title: "媒体库", iconSrc: 'svg/media.svg', icon: "iconmedia" }, // icon不知道放在哪里的iconfont,新增直接引入svg
       },
       {
         name: RouteName.camera,
@@ -89,7 +89,7 @@ export const routes: Routes = [
         name: RouteName.organization,
         path: "organization",
         component: () => import("@/view/organization/index.vue"),
-        meta: { title: "组织架构", iconSrc: 'svg/fire_organization.svg', icon: "" },
+        meta: { title: "组织架构", iconSrc: 'svg/fire_organization.svg', icon: "iconfire_organization" },
       },
       {
         name: RouteName.role,
@@ -113,7 +113,7 @@ export const routes: Routes = [
         name: RouteName.statistics,
         path: "/statistics",
         component: () => import("@/view/statistics/index.vue"),
-        meta: { title: "数据统计", iconSrc: 'svg/data_s.svg', icon: "" },
+        meta: { title: "数据统计", iconSrc: 'svg/data_s.svg', icon: "icondata_s" },
       },
       {
         name: RouteName.setting,
@@ -131,13 +131,13 @@ export const routes: Routes = [
         name: RouteName.dyManager,
         path: "dyManager",
         component: () => import("@/view/newFireCase/dyManager/index.vue"),
-        meta: { title: "点云场景", iconSrc: 'svg/point_c.svg', icon: "" },
+        meta: { title: "点云场景", iconSrc: 'svg/point_c.svg', icon: "iconnav_point" },
       },
       {
         name: RouteName.mix3dManager,
         path: "mix3dManager",
         component: () => import("@/view/newFireCase/mix3dManager/index.vue"),
-        meta: { title: "多元融合", iconSrc: 'svg/multi_m.svg', icon: "" },
+        meta: { title: "多元融合", iconSrc: 'svg/multi_m.svg', icon: "iconmulti_m" },
       },
     ],
   },

+ 2 - 24
src/view/mediaLibrary/index.vue

@@ -70,7 +70,7 @@
       </el-table-column>
       <el-table-column label="上传时间" width="200px" prop="createTime">
         <template #default="{ row }">
-          {{ formatDateTime(row.createTime) }}
+            {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240px" v-slot:default="{ row }">
@@ -118,6 +118,7 @@ import { getMediaPagging, uploadNewMedia, deleteMediaItem, Media, getGroupList,
 import { ref, onMounted, watch } from "vue";
 import GroupManage from './groupManage.vue';
 import UploadMedia from './uploadMedia.vue';
+import { dateFormat } from "@/util";
 import EditMedia from './editMedia.vue';
 const appId = import.meta.env.VITE_APP_APP;
 
@@ -174,29 +175,6 @@ const formatStatus = (status: string | number) => {
   }
 };
 
-// 格式化日期时间
-const formatDateTime = (dateTimeStr: string) => {
-  if (!dateTimeStr) return '-';
-  
-  try {
-    // 创建日期对象
-    const date = new Date(dateTimeStr);
-    
-    // 格式化为 YYYY-MM-DD HH:MM:SS
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
-    const hours = String(date.getHours()).padStart(2, '0');
-    const minutes = String(date.getMinutes()).padStart(2, '0');
-    const seconds = String(date.getSeconds()).padStart(2, '0');
-    
-    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-  } catch (error) {
-    console.error('日期格式化错误:', error);
-    return dateTimeStr; // 如果格式化失败,返回原始字符串
-  }
-};
-
 const { state, queryReset, refresh, changPageCurrent, changPageSize, add, del } = usePagging({
   get: getMediaPagging,
   add: uploadNewMedia,

+ 5 - 1
src/view/newFireCase/dyManager/downloadLog.vue

@@ -55,7 +55,11 @@
       <el-table-column label="组织类型" prop="deptLevelStr"></el-table-column>
       <el-table-column label="用户姓名" prop="nickName"></el-table-column>
       <el-table-column label="用户账号" prop="userName"></el-table-column>
-      <el-table-column label="下载时间" prop="createTime"></el-table-column>
+      <el-table-column label="下载时间" prop="createTime">
+          <template #default="{ row }">
+             {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
+          </template>
+      </el-table-column>
       <el-table-column label="场景标题" prop="sceneTitle"></el-table-column>
       <el-table-column label="场景码" prop="sceneNum"></el-table-column>
       <el-table-column label="SN码" prop="snCode"></el-table-column>

+ 2 - 2
src/view/newFireCase/dyManager/sceneContent.vue

@@ -46,9 +46,9 @@
         <span class="oper-span" v-if="row.status != 0 && row.status == 2 && row.isAuth == 2" v-pdpath="['edit']" @click="openSceneEdit(row, 0)">
           编辑
         </span>
-        <!-- <span v-pdpath="['gen']" v-if="pagging.state.query.searchType != '1' && row.status == 2 && row.location != 6" class="oper-span" @click="getMeshScene(row)">
+        <span v-pdpath="['gen']" v-if="pagging.state.query.searchType != '1' && row.status == 2 && row.location == 4" class="oper-span" @click="getMeshScene(row)">
           生成obj
-        </span> -->
+        </span>
         <span class="oper-span" v-pdpath="['del']" v-if="pagging.state.query.searchType === '0' && row.status == 2" @click="openSceneShareDialog(row)">
           权限
         </span>

+ 5 - 1
src/view/newFireCase/meshManager/downloadLog.vue

@@ -55,7 +55,11 @@
       <el-table-column label="组织类型" prop="deptLevelStr"></el-table-column>
       <el-table-column label="用户姓名" prop="nickName"></el-table-column>
       <el-table-column label="用户账号" prop="userName"></el-table-column>
-      <el-table-column label="下载时间" prop="createTime"></el-table-column>
+      <el-table-column label="下载时间" prop="createTime">
+          <template #default="{ row }">
+             {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
+          </template>
+      </el-table-column>
       <el-table-column label="场景标题" prop="sceneTitle"></el-table-column>
       <el-table-column label="场景码" prop="sceneNum"></el-table-column>
       <el-table-column label="SN码" prop="snCode"></el-table-column>

+ 5 - 1
src/view/newFireCase/mix3dManager/downloadLog.vue

@@ -55,7 +55,11 @@
       <el-table-column label="组织类型" prop="deptLevelStr"></el-table-column>
       <el-table-column label="用户姓名" prop="nickName"></el-table-column>
       <el-table-column label="用户账号" prop="userName"></el-table-column>
-      <el-table-column label="下载时间" prop="createTime"></el-table-column>
+      <el-table-column label="下载时间" prop="createTime">
+          <template #default="{ row }">
+             {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
+          </template>
+      </el-table-column>
       <el-table-column label="场景标题" prop="sceneTitle"></el-table-column>
       <el-table-column label="场景码" prop="sceneNum"></el-table-column>
       <el-table-column label="SN码" prop="snCode"></el-table-column>

+ 2 - 1
src/view/newFireCase/mix3dManager/sceneContent.vue

@@ -21,7 +21,7 @@
       {{ row.createUserName }}
     </el-table-column>
     <el-table-column label="创建时间" prop="createTime" v-slot:default="{ row }">
-      {{ row.createTime }}
+      {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
     </el-table-column>
   <el-table-column
       label="操作"
@@ -63,6 +63,7 @@ import { confirm } from "@/helper/message";
 import { fusionDownload } from "./quisk";
 import { sceneShare as sceneShareDialog } from "@/view/case/quisk";
 import { axios, downSceneHash, addOrUpdateCaseFusion, delFusion } from "@/request";
+import { dateFormat } from "@/util";
 
 const url = import.meta.env.VITE_SEVER_URL || 'https://mix3d.4dkankan.com';
 const nowRouteName = import.meta.env.VITE_APP_APP;

+ 5 - 1
src/view/vrmodel/downloadLog.vue

@@ -55,7 +55,11 @@
       <el-table-column label="组织类型" prop="deptLevelStr"></el-table-column>
       <el-table-column label="用户姓名" prop="nickName"></el-table-column>
       <el-table-column label="用户账号" prop="userName"></el-table-column>
-      <el-table-column label="下载时间" prop="createTime"></el-table-column>
+      <el-table-column label="下载时间" prop="createTime">
+          <template #default="{ row }">
+             {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
+          </template>
+      </el-table-column>
       <el-table-column label="场景标题" prop="sceneTitle"></el-table-column>
       <el-table-column label="场景码" prop="sceneNum"></el-table-column>
       <el-table-column label="SN码" prop="snCode"></el-table-column>