Merge branch 'v2.0.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v2.0.0-ga

src/api/fuse-model.ts

@@ -106,7 +106,10 @@ const serviceToLocal = (
     fusionId: serviceModel.fusionId,
     type: serviceModel.sceneData?.type === SceneType.DSFXJ ? SceneType.SWKK : serviceModel.sceneData?.type,
     size: serviceModel.sceneData?.modelSize,
-    raw: serviceModel.sceneData,
+    raw: {
+      panoRoot: (window as any).offline && (window as any).offlinePrev,
+      ...serviceModel.sceneData,
+    },
     time: serviceModel.sceneData?.createTime,
     status: serviceModel.sceneData
       ? serviceModel.sceneData.status

src/api/offline.ts

@@ -4,10 +4,15 @@ import { AxiosInstance } from "axios";
 import {namespace} from '@/env'
 import Axios from 'axios'
 
-export const offlinePrev = import.meta.env.DEV ? './offlineData/' : './'
+export const offlinePreva = import.meta.env.DEV ? './fusion_offline/' : './'
+// export const offlinePreva = import.meta.env.DEV ? './fusion_offline/134/env/www/' : './'
+export const offlinePrev = new URL(offlinePreva, location.href).pathname
+// /fusion_offline/134/env/www/
+;(window as any).offlinePrev = offlinePrev;
+
 export const setOfflineAxios = (axios: AxiosInstance) => {
   const data: {[key in string]: any} = {}
-  Axios.get(`./${offlinePrev}package/data.json`, {headers: { Accept: "application/json"}}).then(res => {
+  Axios.get(`${offlinePrev}package/data.json`, {headers: { Accept: "application/json"}}).then(res => {
     Object.assign(data, res.data)
     const prev = import.meta.env.DEV ? offlinePrev : offlinePrev.substring(0, offlinePrev.length - 1)
     for (const key in data) {

src/app.vue

@@ -44,11 +44,6 @@
   </ConfigProvider>
   <Login v-else />
 
-  <p class="botton-marker" v-if="fuseModels.length > 0">
-    <img src="/images/logo_police.png" /><span class="s1">&</span>
-    <img src="/images/logo_4dage.png" /><span class="s2">|</span
-    >公安部科技强警基础工作计划(2022JC13)
-  </p>
 </template>
 
 <script lang="ts" setup>
@@ -275,27 +270,4 @@ watch(
   left: 20px !important;
 }
 
-.botton-marker {
-  display: flex;
-  align-items: center;
-  .s1 {
-    margin: 0 6px;
-  }
-  .s2 {
-    margin: 0 20px;
-  }
-  img {
-    // height: 25px;
-    margin: 0 4px;
-  }
-  position: absolute;
-  z-index: 99999999;
-  bottom: 20px;
-  left: 50%;
-  transform: translateX(-50%);
-  font-size: 14px;
-  pointer-events: none;
-  color: #fff;
-  letter-spacing: 2px;
-}
 </style>

src/layout/show/index.vue

@@ -27,6 +27,12 @@
       <GlobalSearch />
     </div>
     <ViewSetting class="show-setting-layout" />
+
+    <p class="botton-marker" v-if="fuseModels.length > 0">
+      <img src="/images/logo_police.png" /><span class="s1">&</span>
+      <img src="/images/logo_4dage.png" /><span class="s2">|</span
+      >公安部科技强警基础工作计划(2022JC13)
+    </p>
   </template>
 </template>
 
@@ -153,8 +159,33 @@ watchEffect((onCleanup) => {
   text-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
   font-size: 22px;
   color: #fff !important;
+
   &.fullScreen {
     right: calc(var(--editor-menu-right) + var(--editor-toolbox-width) + 20px);
   }
 }
+
+.botton-marker {
+  display: flex;
+  align-items: center;
+  .s1 {
+    margin: 0 6px;
+  }
+  .s2 {
+    margin: 0 20px;
+  }
+  img {
+    // height: 25px;
+    margin: 0 4px;
+  }
+  position: absolute;
+  z-index: 99999999;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 14px;
+  pointer-events: none;
+  color: #fff;
+  letter-spacing: 2px;
+}
 </style>

src/sdk/cover/index.js

@@ -108,12 +108,13 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         Potree.settings.urls.prefix = Potree.settings.urls.prefix7
         Potree.settings.webSite = 'datav1'
     }
-    if(window.offline){//离线版 
-   
+    if(window.offline){//离线版
         Potree.settings.urls.templates = {
-            depthTex : 'swss/{sceneCode}/env/www/{sceneCode}/wwwroot/{sceneCode}/data/{sceneCode}/depthmap',
+            depthTex : offlinePrev + 'swss/{sceneCode}/env/www/{sceneCode}/wwwroot/{sceneCode}/data/{sceneCode}/depthmap',
             vision : '/swkk/{sceneCode}/env/wwwroot/scene_view_data/{sceneCode}/images/vision.txt'
         }
+
+        Potree.settings.panoRoot = offlinePrev
         Potree.fileStorage = { 
             get(url){
                 return new Promise(async function(resolve,reject){ 
@@ -187,9 +188,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         viewer.images360.tileDownloader.getTiles = function(d, sceneNum, useV4url, model){ 
             let kankan = !model.isPointcloud //ModelTypes[model.props.fromType].panos4dkk  
             if(kankan){
-                return `/swkk/${sceneNum}/env/wwwroot/scene_view_data/${sceneNum}/images/${d}`
+                return window.offlinePrev +`swkk/${sceneNum}/env/wwwroot/scene_view_data/${sceneNum}/images/${d}`
             }else{
-                return `/swss/${sceneNum}/env/www/${sceneNum}/scene_view_data/${sceneNum}/images/${d}`
+                return window.offlinePrev + `swss/${sceneNum}/env/www/${sceneNum}/scene_view_data/${sceneNum}/images/${d}`
             }  
         } 
     }

src/views/login.vue

@@ -115,7 +115,7 @@ const login = (username: string, password: string) => {
 };
 
 if (import.meta.env.DEV) {
-  login("qyc001", "Aa123456");
+  login("super-admin", "Aa123456");
 }
 </script>
 

vite.config.ts

@@ -12,10 +12,10 @@ import { resolve } from 'path'
 const oss = `http://192.168.0.125:1804/`
 const ip = `http://192.168.0.125:1804/`
 const proxy = {
-  '/offlineData': {
-    target: 'http://192.168.0.13:8080/',
+  '/fusion_offline': {
+    target: 'http://192.168.0.72:9001/fusion_offline',
     changeOrigin: true,
-    rewrite: path => path.replace(/^\/offlineData/, '')
+    rewrite: path => path.replace(/^\/fusion_offline/, '')
   },
   '/fusion/ws': {
     target: 'wss://test-mix3d.4dkankan.com/',