Quellcode durchsuchen

Merge branch 'dev' of http://192.168.0.115:3000/chenzhiguang/qjkankan_v1.1.1 into dev

rindy vor 5 Monaten
Ursprung
Commit
3de6bde9f7
22 geänderte Dateien mit 109 neuen und 128 gelöschten Zeilen
  1. 2 1
      packages/qjkankan-editor/src/Store/modules/explanation.js
  2. 19 18
      packages/qjkankan-editor/src/components/dragTree/index.vue
  3. 2 1
      packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue
  4. 0 1
      packages/qjkankan-editor/src/components/sceneGroupInEditor.vue
  5. 35 21
      packages/qjkankan-editor/src/framework/EditorHead.vue
  6. 6 6
      packages/qjkankan-editor/src/framework/play/pano/components/new-list.vue
  7. 0 3
      packages/qjkankan-editor/src/framework/play/pano/index.vue
  8. 35 37
      packages/qjkankan-editor/src/views/material/works/list.vue
  9. 0 1
      packages/qjkankan-view/src/components/Pano/index.vue
  10. 0 3
      packages/qjkankan-view/src/components/UIGather/list copy 2.vue
  11. 4 2
      packages/qjkankan-view/src/components/UIGather/list.vue
  12. 1 4
      packages/qjkankan-view/src/components/UIGather/mobile/list.vue
  13. 1 1
      packages/qjkankan-view/src/components/UIGather/new-list.vue
  14. 3 12
      packages/qjkankan-view/src/components/UIGather/tips.vue
  15. 0 2
      packages/qjkankan-view/src/components/assembly/Password.vue
  16. 1 2
      packages/qjkankan-view/src/hooks/useAudio.js
  17. 0 4
      packages/qjkankan-view/src/pages/show.vue
  18. 0 2
      packages/qjkankan-view/src/pages/showMobile.vue
  19. 0 2
      packages/qjkankan-view/src/sdk/QJKanKan/modules/Scene.js
  20. 0 2
      packages/qjkankan-view/src/sdk/QJKanKan/modules/Tags.js
  21. 0 1
      packages/qjkankan-view/src/store/modules/scene.js
  22. 0 2
      packages/qjkankan-view/src/store/modules/tags.js

+ 2 - 1
packages/qjkankan-editor/src/Store/modules/explanation.js

@@ -75,7 +75,8 @@ export default {
           (res) => {
             // vue.$msg.success(i18n.t("gather.save_done"));
             $waiting.hide();
-            this.commit("base/updateBaseInfo", { workExplanationList: state.workExplanationList });
+            state.workExplanationList = res.data;
+            this.commit("base/updateBaseInfo", { workExplanationList: res.data });
             resolve(res);
           },
           (rej) => {

+ 19 - 18
packages/qjkankan-editor/src/components/dragTree/index.vue

@@ -35,7 +35,7 @@
               <!-- 拖拽图标 -->
               <i ref="drag-group" class="drag-icon iconfont icon-editor_folder_off folder_collapsed"></i>
               <i v-if="data.type == 'group' && expandedNodes.includes(data.id)" class="iconfont icon-editor_folder_on folder_expanded"></i>
-              <span v-if="reNameId != data.id"> {{ data.name }}</span>
+              <span v-if="reNameId != data.id"> {{ fixTitle(data.name) }}</span>
               <input
                 ref="reNameInput"
                 v-model.trim="data.name"
@@ -193,7 +193,6 @@ export default {
               }
             }
 
-            // console.error("保存后", this.$refs.sceneTree.store.nodesMap);
           });
         }
       },
@@ -261,12 +260,24 @@ export default {
   },
   methods: {
     ossImagePreviewUrlSuffix,
-
+    fixTitle(name) {
+      if (name == "默认二级分组") {
+        name = this.$i18n.t("navigation.default_group_two");
+      } else if (name == "一级分组") {
+        name = this.$i18n.t("navigation.group_one");
+      } else if (name == "二级分组") {
+        name = this.$i18n.t("navigation.group_two");
+      } else {
+        // eslint-disable-next-line no-self-assign
+        name = name;
+      }
+      return name;
+    },
     handleNodeExpand(data, node, instance) {
       console.log("节点展开", data);
       // 当节点展开时,将其id添加到数组中
       this.expandedNodes.push(data.id);
-      console.error(this.expandedNodes);
+ 
 
       this.nodesMap = {};
       for (let key in this.$refs.sceneTree.store.nodesMap) {
@@ -280,7 +291,6 @@ export default {
       if (index !== -1) {
         this.expandedNodes.splice(index, 1);
       }
-      console.error(this.expandedNodes);
       this.nodesMap = {};
       for (let key in this.$refs.sceneTree.store.nodesMap) {
         this.nodesMap[key] = this.$refs.sceneTree.store.nodesMap[key];
@@ -301,7 +311,7 @@ export default {
       if (!this.timer) {
         if (dropNode.data.type == "group" && dropNode.data.children.length && !dropNode.expanded) {
           this.timer = setTimeout(() => {
-            console.error("可以展开");
+            // console.error("可以展开");
             dropNode.expanded = true;
             this.clearTimer();
           }, 1000);
@@ -406,7 +416,6 @@ export default {
       this.isShowSelectionWindow = true;
     },
     onSubmitFromMaterialSelector(selected) {
-      console.error(this.insertTag);
       let changeListLength = this.insertTag.children.length || 0;
       let newScenes = [];
       let roundId = new Date().getTime();
@@ -449,8 +458,6 @@ export default {
         }
         changeListLength++;
       }
-      console.error(newScenes);
-      console.error(this.sceneList);
 
       let allSuccess = true;
       newScenes.forEach((item, i) => {
@@ -504,7 +511,6 @@ export default {
       // });
     },
     onInputNewNameComplete(data) {
-      console.error(data.name);
       if (this.inputData.name.trim() == "") {
         // data.name = this.backUpName;
         // data.name = data.name;
@@ -542,7 +548,6 @@ export default {
         return;
       }
 
-      console.error(node, data);
 
       if (this.info.navigationTrees.length == 1 && node.level == 1) {
         this.$alert({
@@ -583,7 +588,7 @@ export default {
 
       //如果删除当前选择的分组
       if (data.id == this.currentRootId || data.id == this.currentSecondId) {
-        console.error("如果删除当前选择的分组");
+        // console.error("如果删除当前选择的分组");
         this.$store.commit("navigation/setData", { currentRootId: null, currentSecondId: null });
 
         let firstScene = null;
@@ -594,7 +599,7 @@ export default {
           firstScene = this.sceneList[0];
         }
         if (!this.currentRootId && !this.currentSecondId) {
-          console.error("初始化");
+          // console.error("初始化");
           // this.$store.commit("scene/setCurrentScene", firstScene);
           let activeScene = null;
           this.info.navigationTrees.forEach((item, index) => {
@@ -644,7 +649,6 @@ export default {
         level: data ? 1 : 0,
         children: [],
       };
-      console.error(group);
       if (data) {
         // if (data.children.length && data.children[0].type != "group") {
         //   //新增子目录的时候,如果目录里面没有子目录,新增一个默认目录包含旧数据
@@ -683,7 +687,6 @@ export default {
           case "add":
             if (panoList.length && groupList.length) {
               //新增目录到二级目录。且二级目录只有场景的时候
-              console.error("add");
               let list = [];
               let defaultDir = {
                 id: "add_" + (this.getRoundId() + 1),
@@ -716,7 +719,7 @@ export default {
 
             break;
           case "del":
-            if (groupList.length == 1 && !panoList.length && groupList[0].children.length) {
+            if (groupList.length == 1 && !panoList.length && groupList[0].children.length && groupList[0].name == "默认二级分组") {
               //当只有一个二级目录,二级目录有场景
               item.children = groupList[0].children;
             }
@@ -730,7 +733,6 @@ export default {
           case "drag":
             if (panoList.length && groupList.length) {
               //新增目录到二级目录。且二级目录只有场景的时候
-              console.error("drag");
               let list = [];
               let defaultDir = {
                 id: "add_" + (this.getRoundId() + 1),
@@ -743,7 +745,6 @@ export default {
               list.push(defaultDir);
               list = list.concat(groupList);
               item.children = list;
-              console.error(item.children);
             }
 
             // if (groupList.length == 1 && !groupList[0].children.length) {

+ 2 - 1
packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue

@@ -699,7 +699,8 @@ export default {
         }
         this.requestMoreData();
       },
-      500,
+      // 500,
+      0,
       false
     ),
     onFileInputChange(e) {

+ 0 - 1
packages/qjkankan-editor/src/components/sceneGroupInEditor.vue

@@ -205,7 +205,6 @@ export default {
       clearDragInfo: "clearEditorNavDragInfo",
     }),
     onClickTopBar() {
-      console.error(1231232)
       if (this.isConfirmingDeletion) {
         return;
       }

+ 35 - 21
packages/qjkankan-editor/src/framework/EditorHead.vue

@@ -96,6 +96,7 @@ export default {
       saveApiList: "scene/saveApiList",
       currentRootId: "navigation/currentRootId",
       currentSecondId: "navigation/currentSecondId",
+      hotspotList: "hotspot/hotspotList",
     }),
 
     info() {
@@ -104,7 +105,7 @@ export default {
         //初始化
 
         if (!this.currentScene) {
-          console.error("初始化");
+          console.log("初始化");
           let firstScene = null;
           if (this.baseInfo.firstScene) {
             firstScene = this.baseInfo.firstScene;
@@ -142,7 +143,6 @@ export default {
             });
           });
         }
-        console.error(this.currentSecondId);
         // if (data.firstScene) {
         //   firstScene = data.scenes.find((item) => item.sceneCode == data.firstScene.sceneCode);
         // }
@@ -196,7 +196,7 @@ export default {
         let promises = [];
         if (this.saveApiList.length) {
           let idx = this.saveApiList.find((item) => item == "navigation");
-          console.error(idx);
+         (idx);
           let length = 0;
           if (idx) {
             //优先保存导航树
@@ -324,8 +324,8 @@ export default {
       //     }
       //   });
       // }
-      if (this.baseInfo && this.baseInfo.workHotList && this.baseInfo.workHotList.length > 0) {
-        this.lockHotspotResourceTree(this.baseInfo.workHotList);
+      if (this.baseInfo && this.hotspotList && this.hotspotList.length > 0) {
+        this.lockHotspotResourceTree(this.hotspotList);
       }
 
       //开场校验
@@ -371,30 +371,45 @@ export default {
         let fodderId = [];
         switch (item.hotspotType) {
           case "image":
-            fodderId = item.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            item.fodderId = fodderId;
-            // fodderId = item.content.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            // item.fodderId = fodderId;
+            try {
+              fodderId = item.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.fodderId = fodderId;
+            } catch (e) {
+              fodderId = item.content.image.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.fodderId = fodderId;
+            }
             break;
           case "audio":
-          item.fodderId = [item.audio.id].map((i) => i);
-            // item.fodderId = [item.content.audio.id].map((i) => i);
+            try {
+              item.fodderId = [item.audio.id].map((i) => i);
+            } catch (e) {
+              item.fodderId = [item.content.audio.id].map((i) => i);
+            }
+
             break;
           case "imageText":
-            fodderId = item.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            item.imageTextInfo.audio.id && fodderId.push(item.imageTextInfo.audio.id);
-            item.fodderId = fodderId;
-            // fodderId = item.content.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
-            // item.imageTextInfo.audio.id && fodderId.push(item.content.imageTextInfo.audio.id);
-            // item.fodderId = fodderId;
+            try {
+              fodderId = item.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.imageTextInfo.audio.id && fodderId.push(item.imageTextInfo.audio.id);
+              item.fodderId = fodderId;
+            } catch (e) {
+              fodderId = item.content.imageTextInfo.imageList.reduce((p, c) => p.concat(c["id"]), []).map((i) => i);
+              item.content.imageTextInfo.audio.id && fodderId.push(item.content.imageTextInfo.audio.id);
+              item.fodderId = fodderId;
+            }
+
             break;
           case "video":
-          item.fodderId = [item.video.id];
+            item.fodderId = [item.video.id];
             // item.fodderId = [item.content.video.id];
             break;
           case "scene":
-            item.fodderId = [item.scene.fodderId].map((i) => i);
-            // item.fodderId = [item.content.scene.fodderId].map((i) => i);
+            try {
+              item.fodderId = [item.scene.fodderId].map((i) => i);
+            } catch (e) {
+              item.fodderId = [item.content.scene.fodderId].map((i) => i);
+            }
+
             break;
           default:
             // target.fodderId = [];
@@ -422,7 +437,6 @@ export default {
         let promises = [];
         if (this.saveApiList.length) {
           let idx = this.saveApiList.find((item) => item == "navigation");
-          console.error(idx);
           let length = 0;
           if (idx) {
             //优先保存导航树

+ 6 - 6
packages/qjkankan-editor/src/framework/play/pano/components/new-list.vue

@@ -18,9 +18,7 @@
           > -->
           <div
             class="swiper-slide scene-slide"
-            v-tooltip="
-              item.type == '4dkk' ? $i18n.t('navigation.scene_edit_tips') : ''
-            "
+            v-tooltip="item.type == '4dkk' ? $i18n.t('navigation.scene_edit_tips') : ''"
             :class="{
               active: currentScene.id == item.id || (currentScene.sid && currentScene.sid == item.sid),
               disabled: isLockV4Scene,
@@ -71,7 +69,8 @@
         </div>
       </div>
     </div>
-    <div class="bottom-com" :style="`width:${catalogRootW}px;`">
+
+    <div class="bottom-com" :style="`width:${catalogRootW > 1150 ? '100%' : catalogRootW + 'px'};`">
       <div v-if="info.navigationTrees.length > 1" :style="`width:${catalogRootW}px;`" class="root-group-list swiper-container" ref="root-group">
         <div class="swiper-wrapper root-group-wrapper">
           <div
@@ -193,7 +192,6 @@ export default {
     },
     catalogRootW() {
       // return this.info.navigationTrees.length * (this.swidth["swcatalogRoot"] + 10);
-
       return this.info.navigationTrees.length * (this.swidth["swcatalogRoot"] + 10);
     },
     rootTabIndex() {
@@ -221,6 +219,8 @@ export default {
         name = this.$i18n.t("navigation.default_group_two");
       } else if (name == "一级分组") {
         name = this.$i18n.t("navigation.group_one");
+      } else if (name == "二级分组") {
+        name = this.$i18n.t("navigation.group_two");
       } else {
         // eslint-disable-next-line no-self-assign
         name = name;
@@ -267,7 +267,7 @@ export default {
 
       // if (this.secondTabIndex == -1) {
       if (!this.currentSecondId) {
-        console.error("没有二级目录");
+        console.log("没有二级目录");
         let rootList = this.info.navigationTrees.find((item) => item.id == this.currentRootId);
         this.$store.commit("scene/setCurrentScenesList", rootList.children);
       }

+ 0 - 3
packages/qjkankan-editor/src/framework/play/pano/index.vue

@@ -78,7 +78,6 @@ export default {
       this.handleRouterCoverForCap();
     },
     currentScene(newVal, oldVal) {
-      console.error(newVal);
       if (newVal) {
         this.$nextTick(() => {
           this.$bus.emit("initView", newVal.icon);
@@ -189,7 +188,6 @@ export default {
       this.$bus.emit("toggleFlash", true);
       let canvas = $("#krpanoSWFObject canvas")[0];
       let data = __krfn.utils.setInitView(this.$getKrpano(), canvas);
-      console.error(this.currentScene, data);
       uploadCover({ file: data.url, filename: "initCover.jpg" }, (res) => {
         if (res.code == 0) {
           let c_scene = JSON.parse(JSON.stringify(this.currentScene));
@@ -329,7 +327,6 @@ export default {
     window.__krfn = __krfn;
 
     this.$bus.on("addhotspot", (data) => {
-      console.error("data", data);
       this.addhotspot(data);
     });
 

+ 35 - 37
packages/qjkankan-editor/src/views/material/works/list.vue

@@ -261,47 +261,45 @@ export default {
           // }
           list.push(newScene);
         }
-        console.error(list);
       }
       addWork({ sceneDtoList: list }, (ok) => {
-        console.error("ok", ok);
         this.newWorkId = ok.data.id;
-        addWorks({ workId: this.newWorkId }, (res) => {
-          $waiting.hide();
-          // 隐藏素材选择弹窗
-          this.isShowMaterialSelector = false;
-
-          // 刷新作品列表
-          this.list = [];
-          this.isRequestingMoreData = false;
-          this.hasMoreData = true;
-          this.requestMoreData()
-            .then(() => {
-              // 刷新成功
-
-              // 弹出提示窗口
-              this.$confirm({
-                title: this.$i18n.t("tips_code.tips"),
-                content: this.$i18n.t("material.works.had_created"),
-                okText: this.$i18n.t("material.works.goto_preview"),
-                ok: () => {
-                  this.handlePreview(this.list[0]);
-                  this.newWorkId = "";
-                  this.$store.commit("SetInfo", {});
-                },
-                ok2Text: this.$i18n.t("material.works.continue_edit"),
-                ok2: () => {
-                  window.open(`./edit.html?id=${this.newWorkId}&lang=${this.$lang}`);
-                  this.newWorkId = "";
-                  this.$store.commit("SetInfo", {});
-                },
-              });
-            })
-            .catch(() => {
-              this.$msg.message(this.$i18n.t("material.works.had_created_but_no_link"));
-              console.error("已成功新建作品,但刷新作品列表失败。");
+        // addWorks({ workId: this.newWorkId }, (res) => {
+        $waiting.hide();
+        // 隐藏素材选择弹窗
+        this.isShowMaterialSelector = false;
+
+        // 刷新作品列表
+        this.list = [];
+        this.isRequestingMoreData = false;
+        this.hasMoreData = true;
+        this.requestMoreData()
+          .then(() => {
+            // 刷新成功
+
+            // 弹出提示窗口
+            this.$confirm({
+              title: this.$i18n.t("tips_code.tips"),
+              content: this.$i18n.t("material.works.had_created"),
+              okText: this.$i18n.t("material.works.goto_preview"),
+              ok: () => {
+                this.handlePreview(this.list[0]);
+                this.newWorkId = "";
+                this.$store.commit("SetInfo", {});
+              },
+              ok2Text: this.$i18n.t("material.works.continue_edit"),
+              ok2: () => {
+                window.open(`./edit.html?id=${this.newWorkId}&lang=${this.$lang}`);
+                this.newWorkId = "";
+                this.$store.commit("SetInfo", {});
+              },
             });
-        });
+          })
+          .catch(() => {
+            this.$msg.message(this.$i18n.t("material.works.had_created_but_no_link"));
+            console.error("已成功新建作品,但刷新作品列表失败。");
+          });
+        // });
       });
 
       // 拿新作品的初始数据

+ 0 - 1
packages/qjkankan-view/src/components/Pano/index.vue

@@ -210,7 +210,6 @@ useApp().then((app) => {
           return;
         }
         if (hotspot.hotspotType == "scene") {
-          console.error(scenesList.value);
           store.commit(
             "scene/setCurrentScene",
             scenesList.value.find((item) => item.id == hotspot.scene.id)

+ 0 - 3
packages/qjkankan-view/src/components/UIGather/list copy 2.vue

@@ -140,7 +140,6 @@ const swidth = ref({
   swScenes: 72,
 });
 const rootTabIndex = computed(() => {
-  console.error(currentRootId.value);
   return metadata.value && metadata.value?.navigationTrees ? metadata.value?.navigationTrees.findIndex((item) => item.id == currentRootId.value) : 0;
 });
 
@@ -254,7 +253,6 @@ const sencordNatSwiperFocus = () => {
     const current = Array.from(secondaryList.value).findIndex((item) => item.id === currentSecondary.value.id);
     if (window.sencordNatSwiper) {
       const index = current < 0 ? 0 : current;
-      console.error("sencordNatSwiperFocus", index);
       // window.sencordNatSwiper.slideTo(current);
       window.sencordNatSwiper.slideTo(current);
     }
@@ -264,7 +262,6 @@ const sencordNatSwiperFocus = () => {
 onMounted(() => {
   useApp().then(async (app) => {
     show.value = true;
-    console.error("app", show.value);
   });
   watchEffect(() => {
     if (metadata.value.navigationTrees && unref(metadata.value.navigationTrees).length > 0) {

+ 4 - 2
packages/qjkankan-view/src/components/UIGather/list.vue

@@ -233,6 +233,8 @@ const fixTitle = (name) => {
     name = t("navigation.default_group_two");
   } else if (name == "一级分组") {
     name = t("navigation.group_one");
+  } else if (name == "二级分组") {
+    name = t("navigation.group_two");
   } else {
     name = name;
   }
@@ -286,7 +288,7 @@ const changeSceneList = () => {
   }
 
   if (secondTabIndex.value == -1) {
-    console.error("没有二级目录");
+    console.log("没有二级目录");
     let rootList = metadata.value.navigationTrees.find((item) => item.id == currentRootId.value);
     store.commit("scene/setCurrentScenesList", rootList.children);
   }
@@ -320,7 +322,7 @@ const initSceneSwiper = () => {
   });
 };
 const tabCurrentScene = (data, index) => {
-  if(data.type == '4dkk') {
+  if (data.type == "4dkk") {
     store.commit("functions/setShowScenesList", false);
   }
   store.commit("scene/setCurrentScene", data);

+ 1 - 4
packages/qjkankan-view/src/components/UIGather/mobile/list.vue

@@ -187,7 +187,6 @@ watch(
 watch(
   () => rootTabIndex.value,
   (val) => {
-    console.error(val);
     nextTick(() => {
       if (metadata.value.navigationTrees[rootTabIndex.value]?.children[secondTabIndex.value]?.type == "group") {
         initSecondGroupSwiper();
@@ -263,7 +262,7 @@ const changeSceneList = () => {
   }
 
   if (secondTabIndex.value == -1) {
-    console.error("没有二级目录");
+    console.log("没有二级目录");
     let rootList = metadata.value.navigationTrees.find((item) => item.id == currentRootId.value);
     store.commit("scene/setCurrentScenesList", rootList.children);
   }
@@ -301,7 +300,6 @@ const tabCurrentScene = (data, index) => {
   // SceneSwiper.value.slideTo(index);
 };
 const initSecondGroupSwiper = () => {
-  console.error("initSecondGroupSwiper");
   if (SecondGroupSwiper.value) {
     SecondGroupSwiper.value.destroy();
     SecondGroupSwiper.value = null;
@@ -351,7 +349,6 @@ onMounted(() => {
       store.commit("functions/setShowScenesList", false);
     }
     show.value = true;
-    console.error("app", show.value);
   });
 });
 </script>

+ 1 - 1
packages/qjkankan-view/src/components/UIGather/new-list.vue

@@ -210,7 +210,7 @@ export default {
       }
 
       if (this.secondTabIndex == -1) {
-        console.error("没有二级目录");
+        console.log("没有二级目录");
         let rootList = this.info.navigationTrees.find((item) => item.id == this.currentRootId);
         this.$store.commit("scene/setCurrentScenesList", rootList.children);
       }

+ 3 - 12
packages/qjkankan-view/src/components/UIGather/tips.vue

@@ -1,12 +1,6 @@
 <template>
   <div v-if="show" class="user-tips-overlay">
-    <img
-      :src="
-        metadata.workOpeningTip.pcIcon ||
-        require('@/assets/images/default/show/img_tipspc_default.png')
-      "
-      alt=""
-    />
+    <img :src="metadata.workOpeningTip.pcIcon || require('@/assets/images/default/show/img_tipspc_default.png')" alt="" />
   </div>
 </template>
 <script setup>
@@ -21,15 +15,12 @@ const isPano = computed(() => currentScene.value.type === "pano");
 
 useApp().then((app) => {
   app.Scene.on("sceneReady", () => {
-    let locoR = "localRemind" + metadata.value.id;
-    console.error("localRemind状态", metadata.value.workOpeningTip.isRemind && isPano.value);
+    let locoR = "localRemind" + metadata.value.work.id;
 
     if (metadata.value.workOpeningTip.isRemind && isPano.value) {
-      show.value =
-        localStorage.getItem(locoR) == 1 ? false : !!metadata.value.remindTime;
+      show.value = localStorage.getItem(locoR) == 1 ? false : !!metadata.value.workOpeningTip.remindTime;
       localStorage.setItem(locoR, 1);
     } else {
-      console.error("remindTime", metadata.value.workOpeningTip.remindTime);
       if (metadata.value.workOpeningTip.remindTime && isPano.value) {
         show.value = true;
       }

+ 0 - 2
packages/qjkankan-view/src/components/assembly/Password.vue

@@ -58,11 +58,9 @@ const onPasswordChange = (e) => {
 };
 
 watch(passwordkey, () => {
-  console.error("passwordkey.value", passwordkey.value);
   if (passwordkey.value) {
     show.value = true;
   } else {
-    console.error(getApp());
     getApp().Scene.unlock();
   }
 });

+ 1 - 2
packages/qjkankan-view/src/hooks/useAudio.js

@@ -116,12 +116,11 @@ function initAudioPlayer() {
 function watchUpdateCurrentScenEexplanation(data) {
   // console.error("watchUpdateCurrentScenEexplanation", metadata.value, data);
   let currentExplanation = metadata.value.workExplanationList.find((item) => item.navigationId == data.id);
-  console.error("currentExplanation", currentExplanation);
   // if ("explanation" in data) {
   if (currentExplanation) {
     store.dispatch("audio/initExplanationBGM", {
       url: currentExplanation.audioUrl,
-      repeat: currentExplanation.repeat,
+      repeat: currentExplanation.playRepeat,
       isAuto: currentExplanation.openByDefault,
     });
   } else {

+ 0 - 4
packages/qjkankan-view/src/pages/show.vue

@@ -146,7 +146,6 @@ onMounted(async () => {
 
     store.dispatch("audio/initNormalBGM", data.workBackgroundMusic ? data.workBackgroundMusic.ossPath : "");
     store.commit("scene/setCurrentScene", currentSceneData);
-    console.error(currentSceneData);
     let activeScene = null;
     navigationTrees.forEach((item, index) => {
       activeScene = item.children.find((pano) => pano.id == currentSceneData.id);
@@ -256,7 +255,6 @@ onMounted(async () => {
       }
 
       if (isHavePano) {
-        console.error("isHavePano", hotspots.value);
         app.Scene.on("sceneReady", () => {
           if (app.krpanoDom) {
             let customMask = workCustomMaskList.find((item) => item.navigationId == currentScene.value.id);
@@ -269,7 +267,6 @@ onMounted(async () => {
           // if (currentScene.value.someData) {
           //   hotspots = typeof currentScene.value.someData == "string" ? JSON.parse(currentScene.value.someData).hotspots : currentScene.value.someData.hotspots;
           // }
-          console.error("sceneReady", hotspots.value);
           let currentHotspots = hotspots.value.filter((item) => item.navigationId == currentScene.value.id);
 
           if (currentHotspots.length) {
@@ -316,7 +313,6 @@ const handleVisualLimit = (app, currentScene, workVisualAngleList) => {
   let currnetVisual = workVisualAngleList.find((item) => item.navigationId == currentScene.id);
   // const { vlookatmax, vlookatmin } = currentScene.initVisual;
   // console.log('initVisual',currentScene.initVisual)
-  console.error("视角", currnetVisual.vlookatmin, currnetVisual.vlookatmax);
 
   app.krpanoDom.set(`view.limitview`, "lookat");
   app.krpanoDom.set(`view.vlookatmin`, currnetVisual.vlookatmin || -90);

+ 0 - 2
packages/qjkankan-view/src/pages/showMobile.vue

@@ -256,7 +256,6 @@ onMounted(async () => {
             handleMasksUpdate(sky, earth, app);
             app.krpanoDom.set(`layer[webvr_exitbutton].html`, t("common.exit_vr"));
           }
-          console.error("sceneReady");
 
           // let hotspots = [];
           // if (currentScene.value.someData) {
@@ -264,7 +263,6 @@ onMounted(async () => {
           // }
 
           let currentHotspots = hotspots.value.filter((item) => item.navigationId == currentScene.value.id);
-          console.error("currentHotspots", currentHotspots);
           if (currentHotspots.length) {
             app.Tags.initHotspot(currentHotspots, false);
           }

+ 0 - 2
packages/qjkankan-view/src/sdk/QJKanKan/modules/Scene.js

@@ -32,7 +32,6 @@ export default class Scene extends Emiter {
 
   async start() {
     window.onPanoReady = () => {
-      console.error("onPanoReady");
       if (!this.app.krpanoDom) {
         this.app.krpanoDom = document.getElementById("krpanoSWFObject");
       }
@@ -56,7 +55,6 @@ export default class Scene extends Emiter {
     if (this.locked) {
       await this.locked;
     }
-    console.error(settings);
     if (this.app.options.isHavePano) {
       // debugger;
       embedpano({

+ 0 - 2
packages/qjkankan-view/src/sdk/QJKanKan/modules/Tags.js

@@ -61,7 +61,6 @@ export default class Tags extends Emiter {
       // debugger;
       const hotspotStyle = Object.values(hotspot.style);
       const hotspotString = hotspotStyle.join("|");
-      console.error(param)
       let hotspotSize;
       if (browser.isMobile()) {
         hotspotSize = (Number(hotspot.size) || 1) * 30;
@@ -110,7 +109,6 @@ export default class Tags extends Emiter {
    */
 
   initHotspot(hotspots, type) {
-    console.error("hotspots", hotspots);
     hotspots.forEach((item) => {
       this.addhotspot(item, type);
     });

+ 0 - 1
packages/qjkankan-view/src/store/modules/scene.js

@@ -65,7 +65,6 @@ export default {
 
     customLink: (state, getters, rootState, rootGetters) => {
       let metadata = getters.metadata;
-      console.error(metadata)
       if (metadata.workCustomButtonList) {
         let temp = JSON.parse(JSON.stringify(metadata.workCustomButtonList));
         const res = covertCustomButton(temp);

+ 0 - 2
packages/qjkankan-view/src/store/modules/tags.js

@@ -83,11 +83,9 @@ export default {
     hotspotIconTypeList: (state) => state.hotspotIconTypeList,
     dataType: (state) => state.dataType,
     hotspots: (state, getters, rootState, rootGetters) => {
-      console.error(rootState.scene?.matedata?.workHotList)
       let hotspots = rootState.scene?.matedata?.workHotList || [];
       if (hotspots.length && !state.hotspots.length) {
         state.hotspots = hotspots;
-        console.error(state.hotspots);
       }
       if (state.hotspots.length) {
         state.hotspots.forEach((item, index) => {