Przeglądaj źródła

fix:修复w,h显示 修复无背景图无法上传

chauncey 1 rok temu
rodzic
commit
dd3bd0542a

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

@@ -59,7 +59,7 @@
           <img src="~@/assets/images/img-upload.png" />
         </el-upload>
       </div>
-      <div v-show="!isUploadBg && shopCameraList.length === 1" class="camera-one-tip">仅此一个相机,无需添加背景图片</div>
+      <!-- <div v-show="!isUploadBg && shopCameraList.length === 1" class="camera-one-tip">仅此一个相机,无需添加背景图片</div> -->
     </div>
   </div>
 </template>
@@ -289,12 +289,12 @@ const handleSave = () => {
   isMap.value = true;
   const layout = konvaMap.value.saveLayout();
   const cameraList = JSON.parse(layout).cameraList;
-  if (cameraList.length === 0) {
+  if (cameraList.length === 0 && hasBg.value) {
     ElMessage.error('请至少添加1个相机标签后发布');
     return;
   }
   updateMinMapViewLayoutApi({
-    layout: JSON.stringify({ ...JSON.parse(layout), isUploadBg: true }),
+    layout: JSON.stringify({ ...JSON.parse(layout), isUploadBg: hasBg.value }),
     targetId: String(selectedShopId.value),
     viewType: viewType.value,
   }).then(() => {

+ 4 - 2
src/views/map-config/mini-map/components/DefaultTip.vue

@@ -27,8 +27,10 @@ const positionText = computed(() => {
 const sizeText = computed(() => {
   const cameraInfo = props.cameraInfo;
   if (!cameraInfo) return ''
-  const w = Math.round(cameraInfo.config.width! * cameraInfo.groupConfig.scaleX!)
-  const h = Math.round(cameraInfo.config.height! * cameraInfo.groupConfig.scaleY!)
+  const scaleX = cameraInfo.groupConfig.scaleX ? cameraInfo.groupConfig.scaleX : 1;
+  const scaleY = cameraInfo.groupConfig.scaleY ? cameraInfo.groupConfig.scaleY : 1;
+  const w = Math.round(cameraInfo.config.width! * scaleX)
+  const h = Math.round(cameraInfo.config.height! * scaleY)
   return `大小:(w:${w},h:${h})`
 })
 </script>