bill пре 1 месец
родитељ
комит
0aae2e85ff

+ 49 - 3
src/components/base/components/icon/iconfont/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe7d5;</span>
+                <div class="name">scene_pin</div>
+                <div class="code-name">&amp;#xe7d5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7d4;</span>
+                <div class="name">scene_a</div>
+                <div class="code-name">&amp;#xe7d4;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe7b8;</span>
                 <div class="name">stone</div>
                 <div class="code-name">&amp;#xe7b8;</div>
@@ -1056,9 +1068,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1695894601293') format('woff2'),
-       url('iconfont.woff?t=1695894601293') format('woff'),
-       url('iconfont.ttf?t=1695894601293') format('truetype');
+  src: url('iconfont.woff2?t=1762418912230') format('woff2'),
+       url('iconfont.woff?t=1762418912230') format('woff'),
+       url('iconfont.ttf?t=1762418912230') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -1085,6 +1097,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-scene_pin"></span>
+            <div class="name">
+              scene_pin
+            </div>
+            <div class="code-name">.icon-scene_pin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-scene_a"></span>
+            <div class="name">
+              scene_a
+            </div>
+            <div class="code-name">.icon-scene_a
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-stone"></span>
             <div class="name">
               stone
@@ -2589,6 +2619,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-scene_pin"></use>
+                </svg>
+                <div class="name">scene_pin</div>
+                <div class="code-name">#icon-scene_pin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-scene_a"></use>
+                </svg>
+                <div class="name">scene_a</div>
+                <div class="code-name">#icon-scene_a</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-stone"></use>
                 </svg>
                 <div class="name">stone</div>

+ 11 - 3
src/components/base/components/icon/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4084834 */
-  src: url('iconfont.woff2?t=1695894601293') format('woff2'),
-       url('iconfont.woff?t=1695894601293') format('woff'),
-       url('iconfont.ttf?t=1695894601293') format('truetype');
+  src: url('iconfont.woff2?t=1762418912230') format('woff2'),
+       url('iconfont.woff?t=1762418912230') format('woff'),
+       url('iconfont.ttf?t=1762418912230') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-scene_pin:before {
+  content: "\e7d5";
+}
+
+.icon-scene_a:before {
+  content: "\e7d4";
+}
+
 .icon-stone:before {
   content: "\e7b8";
 }

Разлика између датотеке није приказан због своје велике величине
+ 1 - 1
src/components/base/components/icon/iconfont/iconfont.js


+ 14 - 0
src/components/base/components/icon/iconfont/iconfont.json

@@ -6,6 +6,20 @@
   "description": "交通事故现场勘验系统",
   "glyphs": [
     {
+      "icon_id": "46006056",
+      "name": "scene_pin",
+      "font_class": "scene_pin",
+      "unicode": "e7d5",
+      "unicode_decimal": 59349
+    },
+    {
+      "icon_id": "46005973",
+      "name": "scene_a",
+      "font_class": "scene_a",
+      "unicode": "e7d4",
+      "unicode_decimal": 59348
+    },
+    {
       "icon_id": "37553590",
       "name": "stone",
       "font_class": "stone",

BIN
src/components/base/components/icon/iconfont/iconfont.ttf


BIN
src/components/base/components/icon/iconfont/iconfont.woff


BIN
src/components/base/components/icon/iconfont/iconfont.woff2


+ 2 - 1
src/views/scene/covers/fixPoint.vue

@@ -8,7 +8,7 @@
     class="fix-cover"
   >
     <div class="label">
-      <img :src="active ? activeIcon : icon" />
+      <img :src="url || (active ? activeIcon : icon)" />
       <p>{{ data.text }}</p>
     </div>
   </Cover>
@@ -28,6 +28,7 @@ const props = defineProps<{
   data: FixPoint;
   active: boolean;
   fd?: boolean;
+  url?: string
 }>();
 const emit = defineEmits<{
   (m: "changePos", pos: Pos3D): void;

BIN
src/views/scene/covers/icon/scene_pin.png


+ 3 - 1
src/views/scene/covers/reshoot.vue

@@ -3,6 +3,7 @@
     :data="data"
     v-if="data"
     :active="true"
+    :url="url"
     fd
     @changePos="(pos) => (reshootPointStack.current.value.value.pos = pos)"
   />
@@ -16,6 +17,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import FixPoint from './fixPoint.vue';
+import url from './icon/scene_pin.png'
 import { customMap, genUseLoading, reshootPointStack } from '@/hook';
 import { type FixPoint as FixPointT } from '@/store/fixPoint';
 import Confirm from '@/views/graphic/confirm.vue';
@@ -30,7 +32,7 @@ const data = computed(() => {
   if (!point.value?.pos) return;
   const data: FixPointT = {
     id: 'reshootPoint',
-    text: '补拍点',
+    text: '采集点',
     pos: point.value.pos,
     measure: false,
     lines: []

+ 1 - 1
src/views/scene/menus/actions.ts

@@ -351,7 +351,7 @@ const menuActions = {
     });
     customMap.mode = Mode.cloud;
     const add = () => {
-      hide = Message.success({ msg: "请单击选择补拍点位置" });
+      hide = Message.success({ msg: "请选择采集全景的位置" });
       disableCover.value = true;
       onDestroy = trackPosMenuAction(
         () => {

+ 1 - 1
src/views/scene/menus/menus.ts

@@ -203,7 +203,7 @@ export const pubMenus: MenuRaw[] = [
 
 export const reshootMenus: MenuRaw[] = [
   {
-    icon: "line_d",
+    icon: "scene_a",
     text: "全景",
     key: menuEnum.ADD_RESHOOT,
   },