Merge branch 'mapFix' into 'master'

单相机不传背景图功能fix

See merge request tian-group/skyeye-admin-fe!39

src/views/map-config/mini-map/MiniMapConfig.vue

@@ -95,7 +95,11 @@
           </div>
         </el-scrollbar>
       </div>
-      <div ref="drawContainer" v-show="isUploadBg" class="draw-container">
+      <div
+        ref="drawContainer"
+        v-show="isUploadBg || shopCameraList.length !== 1"
+        class="draw-container"
+      >
         <KonvaMap
           ref="konvaMap"
           @change-default-camera="changeDefault"
@@ -117,7 +121,9 @@
           <img src="~@/assets/images/img-upload.png" />
         </el-upload>
       </div>
-      <div v-show="!isUploadBg" class="camera-one-tip">仅此一个相机，无需添加背景图片</div>
+      <div v-show="!isUploadBg && shopCameraList.length === 1" class="camera-one-tip"
+        >仅此一个相机，无需添加背景图片</div
+      >
     </div>
   </div>
 </template>
@@ -242,7 +248,10 @@
   const handleSave = () => {
     if (shopCameraList.value.length === 1 && !isUploadBg.value) {
       isMap.value = false;
-      const layout = JSON.stringify({ isUploadBg: isUploadBg.value });
+      const layout = JSON.stringify({
+        isUploadBg: isUploadBg.value,
+        defaultCamera: shopCameraList.value[0],
+      });
       updateMinMapViewLayoutApi({ layout, targetId: String(selectedShopDetail.value?.id) }).then(
         (res) => {
           console.log('updateMinMapViewLayoutApi', res);
@@ -253,7 +262,7 @@
       isMap.value = true;
       const layout = konvaMap.value.saveLayout();
       updateMinMapViewLayoutApi({
-        layout: { ...layout, isUploadBg: true },
+        layout: JSON.stringify({ ...JSON.parse(layout), isUploadBg: true }),
         targetId: String(selectedShopDetail.value?.id),
       }).then((res) => {
         console.log('updateMinMapViewLayoutApi', res);

src/views/page-config/stores/useMapEditor.ts

@@ -5,7 +5,6 @@ import { cloneDeep } from 'lodash-es';
 import { useGlobSetting } from '@/hooks/setting';
 import safeParse from '@/utils/safeParse';
 import urlJoin from 'url-join';
-import { resolve } from 'path';
 // import emptyImg from '@/assets/images/table/table-empty.png';
 
 export enum LabelPositionEnum {
@@ -80,8 +79,10 @@ export const useMapEditor = defineStore('home-map-ediotr', () => {
     });
     const layout = {
       bgInfo: {
-        width: mapWidth.value,
-        height: mapHeight.value,
+        // width: mapWidth.value,
+        // height: mapHeight.value,
+        width: 1920,
+        height: 1080,
         img: bgImg.value,
       },
       shopList: shopListAdded,