gemercheung 2 سال پیش
والد
کامیت
85368bb168

+ 11 - 11
packages/qjkankan-editor/src/views/hotspot/EditPanel.vue

@@ -8,7 +8,7 @@
     <div class="hots-panel" v-show="show">
       <div class="ui-between header">
         <span>{{ editTitle }}{{ $i18n.t("hotspot.hotspot_name") }}</span>
-        <i class="iconfont icon_close" @click="cancel"></i>
+        <i class="iconfont icon_close" @click="realCancel"></i>
       </div>
 
       <div class="content" ref="content">
@@ -600,16 +600,16 @@ export default {
     },
 
     cancel() {
-      if (!(this.editTitle == this.$i18n.t("hotspot.edit"))) {
-        // this.$confirm({
-        //   title: this.$i18n.t("tips.title"),
-        //   content: this.$i18n.t("hotspot.cancel_add_hotspot"),
-        //   ok: () => {
-        //     this.realCancel();
-        //   },
-        // });
-        this.realCancel();
-      }
+      // if (!(this.editTitle == this.$i18n.t("hotspot.edit"))) {
+      this.$confirm({
+        title: this.$i18n.t("tips.title"),
+        content: this.$i18n.t("hotspot.cancel_add_hotspot"),
+        ok: () => {
+          this.realCancel();
+        },
+      });
+
+      // }
     },
     realCancel() {
       this.$store.commit("SetHotspot", this.backupHotSpot);

+ 3 - 2
packages/qjkankan-editor/src/views/hotspot/HotSpotList.vue

@@ -266,9 +266,10 @@ export default {
       this.$msg.success(this.editTitle + this.$i18n.t("hotspot.success"));
 
       // window.g_hotspotCurrentScale = mapFontSize[data.fontSize] || 1;
-      debugger
-      window.g_hotspotCurrentScale = Math.floor(data.fontSize / 12) || 1;
 
+      window.g_hotspotCurrentScale =
+        Math.ceil((data.fontSize * 10) / 12) / 10 || 1;
+      console.log("g_hotspotCurrentScale", g_hotspotCurrentScale);
       let iidx = this.info.scenes.findIndex(
         (item) => this.currentScene.sceneCode == item.sceneCode
       );