Merge branch 'v1.9.0-position' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0-position

src/assets/equipment_e.svg

@@ -1,19 +1,5 @@
 <svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_21207_259375)">
 <path d="M13 10C13.5523 10 14 10.4477 14 11V15H23C23.5523 15 24 15.4477 24 16V23C24 23.5523 23.5523 24 23 24H3C2.44772 24 2 23.5523 2 23V16C2 15.4477 2.44772 15 3 15H12V11C12 10.4477 12.4477 10 13 10ZM5.5 18C4.67157 18 4 18.6716 4 19.5C4 20.3284 4.67157 21 5.5 21C6.32843 21 7 20.3284 7 19.5C7 18.6716 6.32843 18 5.5 18ZM10.5 18C9.67157 18 9 18.6716 9 19.5C9 20.3284 9.67157 21 10.5 21C11.3284 21 12 20.3284 12 19.5C12 18.6716 11.3284 18 10.5 18Z" fill="white"/>
 <path d="M13 2C17.9706 2 22 6.02944 22 11C22 11.5523 21.5523 12 21 12C20.4477 12 20 11.5523 20 11C20 7.13401 16.866 4 13 4C9.13401 4 6 7.13401 6 11C6 11.5523 5.55228 12 5 12C4.44772 12 4 11.5523 4 11C4 6.02944 8.02944 2 13 2Z" fill="white"/>
 <path d="M13 6C15.7614 6 18 8.23858 18 11C18 11.5523 17.5523 12 17 12C16.4477 12 16 11.5523 16 11C16 9.34315 14.6569 8 13 8C11.3431 8 10 9.34315 10 11C10 11.5523 9.55228 12 9 12C8.44772 12 8 11.5523 8 11C8 8.23858 10.2386 6 13 6Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_21207_259375" x="-1" y="-1" width="28" height="28" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.8 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_21207_259375"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_21207_259375" result="shape"/>
-</filter>
-</defs>
 </svg>

src/views/positioning/components/sign.vue

@@ -2,7 +2,7 @@
     <ui-group-option v-if="position" class="sign-position" :class="{ search }">
       <div class="info" @click="flyPlayPosition(position)">
         <div class="position-cover">
-          <img src="@/assets/equipment_e.svg" />
+          <img  src="@/assets/equipment_e.svg" />
           <!-- <ui-icon
             type="preview"
             class="icon"
@@ -91,7 +91,6 @@
           content: "";
           position: absolute;
           inset: 0;
-          background: rgba(0, 0, 0, 0.2);
         }
   
         .icon {
@@ -109,7 +108,6 @@
           object-fit: cover;
           border-radius: 4px;
           overflow: hidden;
-          background-color: rgba(255, 255, 255, 0.6);
           display: block;
         }
       }

src/views/positioning/index.vue

@@ -1,7 +1,7 @@
 <template>
     <RightFillPano>
     <template #header>
-      <div class="tabs">
+      <div class="tabs" v-if="positionList.length > 0">
         <span class="tabs-left">行动录制</span>
         <div class="tabs-right">
             <span v-if="!isRecord"></span>
@@ -13,7 +13,10 @@
         </div>
       </div>
     </template>
-    <mediaList />
+    <mediaList v-if="positionList.length > 0" />
+    <div v-else class="positioning-content">
+      暂无定位信息或已结束定位
+    </div>
   </RightFillPano>
 </template>
 
@@ -107,6 +110,11 @@ onUnmounted(() => {
 </script>
 
 <style lang="scss" scoped>
+.positioning-content{
+  display: flex;
+  justify-content: center;
+  padding-top: 60px;
+}
 .tabs {
   height: 60px;
   border-bottom: 1px solid rgba(255, 255, 255, 0.16);

src/views/setting/index.vue

@@ -40,7 +40,7 @@
 
 <script lang="ts" setup>
 import { RightFillPano } from "@/layout";
-import { enterEdit, enterOld, setting, isEdit, updataSetting } from "@/store";
+import { enterEdit, enterOld, setting, isEdit, updataSetting, initialPositionList } from "@/store";
 import { ref, watch } from "vue";
 import { togetherCallback, getFileUrl, loadPack } from "@/utils";
 import { showRightPanoStack, showRightCtrlPanoStack } from "@/env";
@@ -75,7 +75,8 @@ let initBack = setting.value!.back;
 let initMapId = setting.value!.mapId;
 let isFirst = true;
 let isInPutFirst = true;
-let oldlocationModelName = JSON.parse(JSON.stringify(setting.value!.locationModelName))
+let thisName = setting.value!.locationModelName
+let oldlocationModelName = thisName ? JSON.parse(JSON.stringify(thisName)) : ''
 const isEditModelName = ref<boolean>(false);
 const changeBack = ([back, mapId]: [string | null, number | null]) => {
   setting.value!.back = back;
@@ -107,7 +108,7 @@ const enterSetModelName = () => {
   enterEdit(() => {
     if (!isSave) {
       // 不保存重置
-      console.log(oldlocationModelName, 9999)
+      console.log(oldlocationModelName, '不保存重置')
       setting.value!.locationModelName = oldlocationModelName;
     }
     isInPutFirst = true;
@@ -120,10 +121,11 @@ const getLocationModelName = (locationModelName: string) => {
   if(isInPutFirst){
     isInPutFirst = false
     enterOld(async () => {
-      oldlocationModelName = locationModelName
+      oldlocationModelName = setting.value!.locationModelName
       await updataSetting();
+      await initialPositionList()
     });
-    }
+  }
 };