瀏覽代碼

fix: 修改图标

bill 2 月之前
父節點
當前提交
2056068ce2

+ 1 - 1
.env.jm

@@ -8,7 +8,7 @@ VITE_MESH_API='/'
 VITE_CLOUD_API='/'
 VITE_FUSE_API='/'
 
-VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&env=prod&token={token}'
+VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh'
 VITE_CLOUD_VIEW='/swss/index.html?m={m}&lang=zh'
 VITE_FUSE_VIEW='/code/'
 VITE_LOGIN_VIEW='/admin/index.html#/login?redirect={redirect}'

+ 1 - 1
.env.jmdev

@@ -13,7 +13,7 @@ VITE_MESH_API='/meshAPI/'
 VITE_CLOUD_API='/cloudAPI/'
 VITE_FUSE_API='/fuseAPI/'
 
-VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&env=dev&token={token}'
+VITE_MESH_VIEW='./static/kankan.html?m={m}&lang=zh&token={token}&host=https://survey.4dkankan.com/'
 VITE_CLOUD_VIEW='https://survey.4dkankan.com//swss/index.html?m={m}&lang=zh&token={token}'
 VITE_FUSE_VIEW='https://survey.4dkankan.com//code/'
 VITE_LOGIN_VIEW='https://survey.4dkankan.com//admin/index.html#/login?redirect={redirect}'

文件差異過大導致無法顯示
+ 8 - 1
public/icons/cad-loudao.svg


文件差異過大導致無法顯示
+ 8 - 1
public/icons/cad-luodichuang.svg


文件差異過大導致無法顯示
+ 8 - 1
public/icons/cad-men.svg


+ 9 - 1
public/icons/cad-piaochuang.svg

@@ -1 +1,9 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M896 256v320h96v192H32v-192h96V256h768zM224 736h576V352H224v384zM864 288H160v288h32v-256h640v256h32V288z" /></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1"
+  xmlns="http://www.w3.org/2000/svg">
+  <path
+
+    fill="#000000"
+    d="M896 256v320h96v192H32v-192h96V256h768zM224 736h576V352H224v384zM864 288H160v288h32v-256h640v256h32V288z" />
+</svg>

文件差異過大導致無法顯示
+ 8 - 1
public/icons/cad-shuangkaimen.svg


文件差異過大導致無法顯示
+ 8 - 1
public/icons/cad-yakou.svg


+ 8 - 1
public/icons/cad-yandao.svg

@@ -1 +1,8 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M960 64v896H64V64h896z m-32 32H96v832h832V96z m-32 32v768H128V128h768zM160 176.512V864h687.488L709.984 313.984 160 176.512zM864 160H226.08l510.304 127.616L864 798.016V160z" /></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1"
+  xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill="#000000"
+    d="M960 64v896H64V64h896z m-32 32H96v832h832V96z m-32 32v768H128V128h768zM160 176.512V864h687.488L709.984 313.984 160 176.512zM864 160H226.08l510.304 127.616L864 798.016V160z" />
+</svg>

+ 8 - 1
public/icons/cad-yimen.svg

@@ -1 +1,8 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M832 512v-96h192v192H416v-96H192v96H0v-192h608v96h224z m0 32H448v32h384v-32z m-256-96H192v32h384v-32z" /></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1"
+  xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill="#000000"
+    d="M832 512v-96h192v192H416v-96H192v96H0v-192h608v96h224z m0 32H448v32h384v-32z m-256-96H192v32h384v-32z" />
+</svg>

+ 8 - 1
public/icons/cad-zhuzi.svg

@@ -1 +1,8 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M960 64v896H64V64h896zM512 534.624L118.592 928h786.784L512 534.624zM928 118.592L534.624 512 928 905.376V118.592zM96 118.624v786.72L489.376 512 96 118.624zM905.344 96H118.624L512 489.376 905.344 96z" /></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg class="icon" width="64px" height="64.00px" viewBox="0 0 1024 1024" version="1.1"
+  xmlns="http://www.w3.org/2000/svg">
+  <path
+    fill="#000000"
+    d="M960 64v896H64V64h896zM512 534.624L118.592 928h786.784L512 534.624zM928 118.592L534.624 512 928 905.376V118.592zM96 118.624v786.72L489.376 512 96 118.624zM905.344 96H118.624L512 489.376 905.344 96z" />
+</svg>

+ 1 - 2
public/icons/piaochuang.svg

@@ -1,4 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M28 18H31V24H1V18H4V8H28V18ZM7 23H25V11H7V23ZM5 18H6V10H26V18H27V9H5V18Z" fill="black"/>
-<path d="M28 18H31V24H1V18H4V8H28V18ZM7 23H25V11H7V23ZM5 18H6V10H26V18H27V9H5V18Z" stroke="black"/>
+<path d="M28 18H31V24H1V18H4V8H28V18ZM7 23H25V11H7V23ZM5 18H6V10H26V18H27V9H5V18Z" fill="#000000"/>
 </svg>

二進制
public/icons/归档.zip


+ 1 - 5
public/static/kankan.html

@@ -26,11 +26,7 @@
   <div class="map"></div>
   <script>
     const params = new URLSearchParams(location.search)
-    const env = params.get('env')
-    let host = 'http://192.168.0.25'
-    if (env === 'prod') {
-      host = ''
-    }
+    let host = params.get('host') || ''
 
     const $script1 = document.createElement('script')
     $script1.src = `${host}/sdk/kankan-sdk-deps.js`

+ 2 - 1
src/example/env.ts

@@ -62,6 +62,7 @@ watch(
     for (const key in params.value) {
       params.value[key] && sParams.append(key, params.value[key]);
     }
+    console.error(params.value)
     const ndx = location.hash.indexOf("?");
     location.replace(
       location.hash.substring(0, ~ndx ? ndx : undefined) +
@@ -70,7 +71,7 @@ watch(
     );
     const keys =  new Set([...Object.keys(nParams), ...Object.keys(oParams)])
     for (const key of keys) {
-      if (nParams[key] && oParams[key]) {
+      if (!nParams[key] || (nParams[key] && oParams[key])) {
         if (nParams[key] !== oParams[key]) {
           setTimeout(() => {
             location.reload();

+ 7 - 4
src/example/fuse/views/overview/header.vue

@@ -32,7 +32,7 @@ import { Mode } from "@/constant/mode.ts";
 import { lineLen } from "@/utils/math.ts";
 import { repTabulationStore } from "../tabulation/gen-tab.ts";
 import { router } from "../../router.ts";
-import { overviewId, tabulationId } from "@/example/env.ts";
+import { overviewId, params, tabulationId } from "@/example/env.ts";
 import { listener } from "@/utils/event.ts";
 import { repeatedlyOnly } from "@/utils/shared.ts";
 
@@ -163,7 +163,7 @@ const saveHandler = repeatedlyOnly(async () => {
     proportion: { ...draw.store.config.proportion, scale },
   };
 
-  console.log(cover);
+  console.log({ ...storeData.config.compass });
   tabulationId.value = await window.platform.getTabulationId(overviewId.value);
   await refreshTabulationData();
   const tabStore = await repTabulationStore(
@@ -194,8 +194,11 @@ onUnmounted(
 
 const gotoTabulation = repeatedlyOnly(async () => {
   await saveHandler();
-  console.log("跳转tab");
-  router.push({ ...router.currentRoute.value, name: "tabulation" } as any);
+  router.push({
+    ...router.currentRoute.value,
+    name: "tabulation",
+    query: params.value,
+  } as any);
 });
 
 defineExpose({ gotoTabulation, saveHandler });

+ 1 - 0
src/example/fuse/views/tabulation/gen-tab.ts

@@ -208,6 +208,7 @@ export const genTabulationData = async (paperKey: PaperKey, compass?: number, co
       mat: mat.m,
       name: '指南针'
     };
+    console.error('指南针', data)
     
     const pos = getFixPosition(
       {

+ 1 - 0
src/example/platform/platform-draw.ts

@@ -382,6 +382,7 @@ export const drawPlatformResource = async (data: AIExposeData, draw: Draw) => {
       // draw.store.setCurrentLayer(layer.name);
       layerBounds.push(await drawLayerResource(layer, draw)!);
     }
+    console.error(data.compass)
     if (typeof data.compass === "number") {
       draw.store.setConfig({
         compass: {

+ 2 - 1
src/example/platform/platform-resource.ts

@@ -132,9 +132,10 @@ export const compassGets = {
       .then((res) => res.json())
       .then((data) => data.compass)
       .catch(() => null);
+
     return typeof floorpanCompass === "number"
       ? floorpanCompass
-      : Number(config.orientation);
+      : Number(config.orientation || 0);
   },
 };