添加新数据需求

server/test/SS-t-P1d6CwREny2/attach/sceneStore

@@ -1 +1 @@
-{"measures":[],"baseLines":[],"basePoints":[],"fixPoints":[],"photos":[{"id":"1685322831909330","url":"/attach/upload/1685322830903159.jpg","time":1685322831909,"measures":[],"baseLines":[],"fixPoints":[],"basePoints":[]},{"id":"1685323965417784","url":"/attach/upload/1685323964422649.jpg","time":1685323965417,"measures":[],"baseLines":[],"fixPoints":[],"basePoints":[]}],"accidentPhotos":[],"roadPhotos":[]}
+{"measures":[],"baseLines":[],"basePoints":[],"fixPoints":[],"photos":[{"id":"1685323965417784","url":"/attach/upload/1685323964422649.jpg","time":1685323965417,"measures":[],"baseLines":[],"fixPoints":[],"basePoints":[]},{"id":"1685322831909330","url":"/attach/upload/1685322830903159.jpg","time":1685322831909,"measures":[],"baseLines":[],"fixPoints":[],"basePoints":[]}],"accidentPhotos":[],"roadPhotos":[]}

src/components/base/components/icon/iconfont/demo_index.html

@@ -55,6 +55,24 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe746;</span>
+                <div class="name">measure_f</div>
+                <div class="code-name">&amp;#xe746;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe747;</span>
+                <div class="name">measure_r</div>
+                <div class="code-name">&amp;#xe747;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe748;</span>
+                <div class="name">measure_c</div>
+                <div class="code-name">&amp;#xe748;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe740;</span>
                 <div class="name">control_a</div>
                 <div class="code-name">&amp;#xe740;</div>
@@ -360,9 +378,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1685323395791') format('woff2'),
-       url('iconfont.woff?t=1685323395791') format('woff'),
-       url('iconfont.ttf?t=1685323395791') format('truetype');
+  src: url('iconfont.woff2?t=1685345794465') format('woff2'),
+       url('iconfont.woff?t=1685345794465') format('woff'),
+       url('iconfont.ttf?t=1685345794465') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -389,6 +407,33 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-measure_f"></span>
+            <div class="name">
+              measure_f
+            </div>
+            <div class="code-name">.icon-measure_f
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-measure_r"></span>
+            <div class="name">
+              measure_r
+            </div>
+            <div class="code-name">.icon-measure_r
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-measure_c"></span>
+            <div class="name">
+              measure_c
+            </div>
+            <div class="code-name">.icon-measure_c
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-control_a"></span>
             <div class="name">
               control_a
@@ -849,6 +894,30 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-measure_f"></use>
+                </svg>
+                <div class="name">measure_f</div>
+                <div class="code-name">#icon-measure_f</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-measure_r"></use>
+                </svg>
+                <div class="name">measure_r</div>
+                <div class="code-name">#icon-measure_r</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-measure_c"></use>
+                </svg>
+                <div class="name">measure_c</div>
+                <div class="code-name">#icon-measure_c</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-control_a"></use>
                 </svg>
                 <div class="name">control_a</div>

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=1685323395791') format('woff2'),
-       url('iconfont.woff?t=1685323395791') format('woff'),
-       url('iconfont.ttf?t=1685323395791') format('truetype');
+  src: url('iconfont.woff2?t=1685345794465') format('woff2'),
+       url('iconfont.woff?t=1685345794465') format('woff'),
+       url('iconfont.ttf?t=1685345794465') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-measure_f:before {
+  content: "\e746";
+}
+
+.icon-measure_r:before {
+  content: "\e747";
+}
+
+.icon-measure_c:before {
+  content: "\e748";
+}
+
 .icon-control_a:before {
   content: "\e740";
 }

src/components/base/components/icon/iconfont/iconfont.json

@@ -6,6 +6,27 @@
   "description": "交通事故现场勘验系统",
   "glyphs": [
     {
+      "icon_id": "35727407",
+      "name": "measure_f",
+      "font_class": "measure_f",
+      "unicode": "e746",
+      "unicode_decimal": 59206
+    },
+    {
+      "icon_id": "35727411",
+      "name": "measure_r",
+      "font_class": "measure_r",
+      "unicode": "e747",
+      "unicode_decimal": 59207
+    },
+    {
+      "icon_id": "35727413",
+      "name": "measure_c",
+      "font_class": "measure_c",
+      "unicode": "e748",
+      "unicode_decimal": 59208
+    },
+    {
       "icon_id": "35710135",
       "name": "control_a",
       "font_class": "control_a",

src/dbo/main.ts

@@ -3,9 +3,9 @@ import {params} from "@/hook";
 
 const instance = axios.create()
 const baseURL =
-  (import.meta.env.VITE_API_BASE_URL
-    ? `/${import.meta.env.VITE_API_BASE_URL}`
-    : "") + `/${params.m}`;
+  import.meta.env.VITE_API_BASE_URL
+    ? `/${import.meta.env.VITE_API_BASE_URL}/${params.m}`
+    : "";
 
 instance.defaults.baseURL = baseURL
 

src/store/sync.ts

@@ -81,7 +81,7 @@ export const api =
             global.android.getSceneStore(params.m + "/store.json", "getSceneStoreCallback");
           });
         },
-        getFile(fileUrl: string) {
+        async getFile(fileUrl: string) {
           fileUrl = fileUrl.trim();
           if (fileUrl.includes(params.m)) {
             fileUrl = fileUrl.substring(fileUrl.indexOf(params.m) + params.m.length)
@@ -91,7 +91,7 @@ export const api =
           console.error("处理后url:" + fileUrl)
 
           if (import.meta.env.DEV) {
-            return new Promise<string>((resolve) => {
+            return await new Promise<string>((resolve) => {
               const apiName = `getImageCallback${count++}`
               global[apiName] = (base64) => {
                 console.error("请求url:" + fileUrl, "返回:" + base64.substring(0, 60))
@@ -101,8 +101,12 @@ export const api =
               global.android.getImage(fileUrl, apiName);
             });
           } else {
-            console.log("请求文件" + fileUrl)
-            return Promise.resolve(fileUrl);
+            // console.log("请求文件" + fileUrl)
+            const data = await axios.get(fileUrl, { responseType: "blob" });
+            console.log("axios请求文件" + fileUrl, "结果为" + data.status)
+            const base64 = await blobToBase64(data.data);
+            return base64
+            // return Promise.resolve(fileUrl);
           }
         },
         uploadImage(file: File) {

src/views/graphic/menus.ts

@@ -83,10 +83,11 @@ export const measureMenusRaw = [
     disabled: computed(() => graphicState.value.existsBaseLine)
   },
   { key: UIType.BasePoint, text: "基准点", icon: "point", },
-  { key: UIType.NormalLocationMode, text: "自由测量" },
+  { key: UIType.NormalLocationMode, text: "自由测量", icon: "measure_f" },
   {
     key: UIType.AngleLocationMode,
     text: "直角定位法",
+    icon: "measure_r",
     onClick(data) {
       if (graphicState.value.canAllLocationMode) {
         uiType.change(data.key)
@@ -98,6 +99,7 @@ export const measureMenusRaw = [
   {
     key: UIType.AllLocationMode,
     text: "综合定位法",
+    icon: "measure_c",
     onClick(data) {
       if (graphicState.value.canAllLocationMode) {
         uiType.change(data.key)