浏览代码

修改bug

bill 1 年之前
父节点
当前提交
919a41ccae

+ 1 - 0
src/api/setting.ts

@@ -49,4 +49,5 @@ export const updateSetting = async (setting: Setting) => {
     caseId: params.caseId,
     ...toService(setting)
   })
+  
 }

+ 1 - 1
src/model/platform.ts

@@ -129,7 +129,7 @@ export async function exposeFactory(type: ModelType, win?: any): Promise<ModelEx
       expose: {
         async getView() {
           const dataURL = await sdk.scene.screenshot(260, 160)
-          const res = await fetch(dataURL)
+          const res = await fetch(dataURL.dataUrl)
           const image = await res.blob()
           const pose = await sdk.scene.getPose()
           const mode = sdk.customMap.mode

+ 1 - 0
src/store/setting.ts

@@ -15,5 +15,6 @@ export const updataSetting = async () => {
   if (setting.value) {
     const cover = await uploadFile(setting.value.cover)
     await updateSetting({ ...setting.value, cover })
+    await initialSetting()
   }
 }

+ 9 - 4
src/views/registration/index.vue

@@ -73,7 +73,7 @@ import { diffArrayChange } from '@/utils'
 import { useViewStack } from '@/hook'
 import { autoSaveFuseModels, getFuseModel, leave } from '@/store'
 import { router, RoutesName } from '@/router'
-import { currentModelStack } from '@/env'
+import { currentModelStack, custom, showMeasuresStack } from '@/env'
 
 import type { ControlExpose } from '@/components/control-panl'
 
@@ -137,9 +137,14 @@ watchEffect((onCleanup) => {
 })
 
 
-useViewStack(() => () => {
-  if (selectOptions.value.length) {
-    selectOptions.value = []
+useViewStack(() => {
+  showMeasuresStack.push(ref(false));
+
+  return () => {
+    showMeasuresStack.pop()
+    if (selectOptions.value.length) {
+      selectOptions.value = []
+    }
   }
 })
 useViewStack(autoSaveFuseModels)

二进制
src/views/setting/images/huimengmeng.jpg


二进制
src/views/setting/images/lantianbaiyun.jpg


二进制
src/views/setting/images/pic.jpg


二进制
src/views/setting/images/pic_hmm@2x.png


二进制
src/views/setting/images/pic_ltby@2x.png


二进制
src/views/setting/images/pic_xk@2x.png


二进制
src/views/setting/images/pic_yj@2x.png


二进制
src/views/setting/images/preller_drive_2k.jpg


+ 1 - 0
src/views/setting/images/vue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

二进制
src/views/setting/images/xingkong.jpg


+ 4 - 4
src/views/setting/index.vue

@@ -36,10 +36,10 @@ import ltby from '@/assets/pic_ltby@2x.png'
 import hmm from '@/assets/pic_hmm@2x.png'
 import xk from '@/assets/pic_xk@2x.png'
 import yk from '@/assets/pic_yj@2x.png'
-import hmm360 from '/images/huimengmeng.jpg'
-import ltby360 from '/images/lantianbaiyun.jpg'
-import yk360 from '/images/preller_drive_2k.jpg'
-import xk360 from '/images/xingkong.jpg'
+import hmm360 from './images/huimengmeng.jpg'
+import ltby360 from './images/lantianbaiyun.jpg'
+import yk360 from './images/preller_drive_2k.jpg'
+import xk360 from './images/xingkong.jpg'
 import { enterEdit, enterOld, setting, isEdit, updataSetting } from '@/store'
 import { reactive, ref } from 'vue'
 import { togetherCallback, getFileUrl, loadPack } from '@/utils'

+ 1 - 1
vite.config.ts

@@ -33,7 +33,7 @@ const proxy = {
   '/laser': {
     target: config.dev ? 'https://uat-laser.4dkankan.com' : 'https://laser.4dkankan.com',
     changeOrigin: true,
-    rewrite: path => path.replace(/^\/swss/, '')
+    rewrite: path => path.replace(/^\/laser/, '/laser')
   }
 }