Merge branch 'v2.0.0-fire' into v2.0.0-yunnan

index.html

@@ -28,14 +28,14 @@
         console.log(appParam, basePath, 6666)
         if (appParam.fromRoute == 'fire') {
           faviconPath = basePath + 'fire.ico';
-        } else if (appParam.fromRoute == 'crimical') {
+        } else if (appParam.fromRoute == 'criminal') {
           faviconPath = basePath + 'police.ico';
         } else if (appParam.fromRoute == 'xmfire') {
           faviconPath = basePath + 'jmlogo.png';
         } else if (appParam.fromRoute == 'cjzfire') {
           faviconPath = basePath + 'logo_big.ico';
         }
-        
+        console.log(faviconPath, 'faviconPath')
         // 查找现有的favicon链接元素
         let link = document.querySelector("link[rel~='icon']");
         

src/app.vue

@@ -82,12 +82,23 @@ import { addReqErrorHandler, addResErrorHandler, ResCode, setToken } from "./api
 import { mergeFuns } from "./components/drawing/hook";
 import Login from "./views/login.vue";
 
+// 获取URL参数中的app值
+function getAppParam() {
+  const urlParams = new URLSearchParams(window.location.search);
+  return {fromRoute: urlParams.get('fromRoute')};
+}
 const gotoLogin = () => {
-  showLogin.value = true;
+  const params = getAppParam();
+  // alert("请登录");/${params.fromRoute}/#/mix3dManager
+  const loginHref = `/${params.fromRoute}/#/login`
+  location.href = loginHref + '?redirect=' + escape(`/${params.fromRoute}/#/mix3dManager`)
+  // showLogin.value = true;
 };
 
 addResErrorHandler((data: any) => {
   data = data.data;
+  const params = getAppParam();
+  console.log("addResErrorHandler", data, params);
   if (data.code === ResCode.TOKEN_INVALID) {
     gotoLogin();
   } else if (data.code === ResCode.UN_AUTH) {

src/components/bill-ui/assets/scss/components/_audio.scss

@@ -1,7 +1,7 @@
 .audio {
   display: inline-block;
   cursor: pointer;
-  
+  min-width: 20px;
   > span {
     --height: 18px;
     width: 3px;

src/env/index.ts

@@ -7,7 +7,7 @@ export const viewModeStack = stackFactory(ref<"full" | "auto">("auto"));
 export const showToolbarStack = stackFactory(ref<boolean>(false));
 export const showHeadBarStack = stackFactory(ref<boolean>(true));
 export const showRightPanoStack = stackFactory(ref<boolean>(true));
-export const showLeftPanoStack = stackFactory(ref<boolean>(false));
+export const showLeftPanoStack = stackFactory(ref<boolean>(true));
 export const moundLeftPanoStack = stackFactory(ref<boolean>(true));
 export const showLeftCtrlPanoStack = stackFactory(ref<boolean>(true));
 export const showAMsStack = stackFactory(ref<boolean>(false));

src/sdk/cover/index.js

@@ -1142,7 +1142,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 bus,
                 model,
                 getDefaultRotation,
-
+                getDefaultPosition(){
+                    return model.lonLatPos || new THREE.Vector3(0,0, model.zOnGround || 0)
+                },
                 supportPano() {  //是否支持全景图
                     return model?.panos?.length > 0
                 },
@@ -1247,12 +1249,12 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 }, 
                 changePosition(pos) {//校准取消时执行
                     //console.log('changePosition', model.name, pos.x, pos.y, pos.z) 
-                    if(pos.x == 0 && pos.y == 0 && pos.z == 0 && model.lonLatPos ){
+                    /* if(pos.x == 0 && pos.y == 0 && pos.z == 0 && model.lonLatPos ){
                         model && model.position.copy(model.lonLatPos)
                         console.log('changePosition 使用经纬度坐标', model.name )
-                    }else{
+                    }else{ */
                         model && model.position.copy(pos)
-                    }
+                    //}
                     model.dispatchEvent({ type: 'position_changed'/* , byControl:true */})
                 },
                 changeRotation(rot) {//校准取消时执行 

src/sdk/sdk.ts

@@ -53,6 +53,7 @@ export type SceneModel = ToChangeAPI<SceneModelAttrs> & {
   leaveTransform: () => void;
   putInFrontOfCam: () => void;
   getDefaultRotation: () => SceneLocalPos;
+  getDefaultPosition: () => SceneLocalPos;
   enterAlignment: () => void;
   leaveAlignment: () => void;
   enterScaleSet: () => ScaleSet;

src/store/sys.ts

@@ -32,8 +32,8 @@ export const title = computed(() => {
       : defTitle.value;
 
   console.error(prefix.value);
-  if (prefix.value && last) {
-    return prefix.value + " | " + last;
+  if (last) {
+    return  last;
   } else {
     return prefix.value + last;
   }

src/store/tagging-style.ts

@@ -42,7 +42,7 @@ export const getTaggingStyle = (id: TaggingStyle['id']) => {
 let bcStyles: TaggingStyles = []
 export const getBackupTaggingStyles = () => bcStyles
 export const backupTaggingStyles = () => {
-  bcStyles = taggingStyles.value.map(style => ({...style}))
+  bcStyles = taggingStyles.value.map(style => ({...style})) 
 }
 export const recoverTaggingStyles = recoverStoreItems(taggingStyles, getBackupTaggingStyles)
 

src/views/merge/index.vue

@@ -132,8 +132,14 @@ watch(
 const reset = async () => {
   if (custom.currentModel && (await Dialog.confirm("确定恢复默认？此操作无法撤销"))) {
     const rotation = getSceneModel(custom.currentModel)!.getDefaultRotation();
+    const position = getSceneModel(custom.currentModel)!.getDefaultPosition();
     Object.assign(custom.currentModel, {
       ...defaultFuseModelAttrs,
+      position: {
+        x: position.x,
+        y: position.y,
+        z: position.z,
+      },
       rotation: {
         x: rotation.x,
         y: rotation.y,

src/views/tagging/index.vue

@@ -114,7 +114,7 @@ const exposeTagging = async () => {
       tagging.audioName = item.name;
     }
 
-    console.log(item);
+    console.log('item11111111', item);
     if (item.dictId && item.useType === "trace_evidence") {
       const typeId = getStyleTypeId(item.dictId);
       const styles = taggingStyles.value.filter((item) => item.typeId === typeId);
@@ -125,9 +125,10 @@ const exposeTagging = async () => {
       const styles = taggingStyles.value.filter(
         (item) => item.typeId === defStyleType.id
       );
-      console.log(defStyleType);
       if (styles.length) {
-        tagging.styleId = styles[0].id;
+        // 火调这里特殊，默认图片是11
+        // tagging.styleId = styles[0].id;
+        tagging.styleId = styles[11].id;
       }
     }
     return tagging;