From fd2c35adb79e51946d82f348bf715b1fa31539bd Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 24 Nov 2022 22:33:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=9B=BA=E5=AE=9A=E8=A7=86=E8=A7=92?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/Viewer3D/SceneSurveyViewerPreview.vue      | 11 ++++++++---
 .../planetDesign/SceneSurveyViewerPage/Index.vue      | 11 +++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue b/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue
index 874499ca..d2bdfd0f 100644
--- a/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue
+++ b/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="container-viewer-1-"></div>
+  <div class="container-viewer-1-">
+    <div v-if="freezeRotY" style="position: absolute; left: 0; top: 0; right: 0; bottom: 0;"></div>
+  </div>
 </template>
 
 <script>
@@ -49,6 +51,10 @@ export default {
     page(newVal, oldVal) {
       // console.log('page ........', newVal, oldVal)
       if (this.viewer_) {
+        
+        this.viewer_.flyAnimation = !(this.defaultWare?.planetid);
+        this.viewer_.frostFarScene = this.isLocked;
+        
         this.viewer_.arrange(newVal).then(() => {
           this.$emit("onPageCompletion");
           
@@ -58,8 +64,7 @@ export default {
           this.viewer_.hold({
               wareId: this.defaultWare?.planetid,
               keepHold: this.isLocked,
-              frostFarScene: this.isLocked,
-              freezeRotY: this.freezeRotY ? "0" : undefined,
+              // freezeRotY: this.freezeRotY ? "0" : undefined,
           })
         });
       }
diff --git a/src/views/planetDesign/SceneSurveyViewerPage/Index.vue b/src/views/planetDesign/SceneSurveyViewerPage/Index.vue
index 72c32b5b..454a189d 100644
--- a/src/views/planetDesign/SceneSurveyViewerPage/Index.vue
+++ b/src/views/planetDesign/SceneSurveyViewerPage/Index.vue
@@ -5,6 +5,7 @@
     <div v-if="spinning" style="position: absolute; left: 0; top: 0; right: 0; bottom: 0; background-color: #fff;">
       <a-spin style="position: absolute; left: 50%; top: 50%;"/>
     </div>
+    <div v-if="freezeRotY" style="position: absolute; left: 0; top: 0; right: 0; bottom: 0;"></div>
   </div>
 </template>
 
@@ -121,6 +122,10 @@ export default {
     page(newVal, oldVal) {
       // console.log('page ........', newVal, oldVal)
       if (this.viewer_) {
+        
+        this.viewer_.flyAnimation = !(this.defaultWare?.planetid);
+        this.viewer_.frostFarScene = this.isLocked;
+        
         this.viewer_.arrange(newVal).then(() => {
           // this.$emit("onPageCompletion");
           setTimeout(() => {
@@ -130,14 +135,12 @@ export default {
             command: "onPageCompletion",
           }), '*');
 
-          this.viewer_.flyAnimation = !(this.defaultWare?.planetid);
-
-          this.viewer_.frostFarScene = this.isLocked;
           // #20221018
           this.viewer_.hold({
               wareId: this.defaultWare?.planetid,
               keepHold: this.isLocked,
-              freezeRotY: this.freezeRotY ? "0" : undefined,
+              // 组件内置的固定角度有问题，单独通过遮罩实现
+              // freezeRotY: this.freezeRotY ? "0" : undefined,
           })
         });
       }

From 12109059924b7e47051f91a606868fde9c78ab75 Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 24 Nov 2022 20:25:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20bug=20=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/planetDesign/Design/components/config/Config3D.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/planetDesign/Design/components/config/Config3D.vue b/src/views/planetDesign/Design/components/config/Config3D.vue
index 42485e0d..f573db8a 100644
--- a/src/views/planetDesign/Design/components/config/Config3D.vue
+++ b/src/views/planetDesign/Design/components/config/Config3D.vue
@@ -393,9 +393,10 @@ export default {
   },
   async mounted() {
     // 环境类型
-    var type = process.env.VUE_APP_CURRENTMODE == "prod" ? "prod" : "uat";
+    var type0 = process.env.VUE_APP_CURRENTMODE == "prod" ? "prod" : "test";
+    var type1 = process.env.VUE_APP_CURRENTMODE == "prod" ? "prod" : "uat";
     // 默认的模型接口
-    var res = await fetch(`https://test-cxp-public-web-1302259445.cos.ap-beijing.myqcloud.com/${type}-yls/3D/shelves/scenes_data/yili.json`).then(res => res.json());
+    var res = await fetch(`https://${type0}-cxp-public-web-1302259445.cos.ap-beijing.myqcloud.com/${type1}-yls/3D/shelves/scenes_data/yili.json`).then(res => res.json());
     this.scenes = res;
   },
   methods: {

From b6feed110b12886ff218168a65b51df64d6af2be Mon Sep 17 00:00:00 2001
From: wam <525987762@qq.com>
Date: Thu, 24 Nov 2022 21:28:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/questions/components/viewer.utils.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Answer/questions/components/viewer.utils.scss b/src/views/Answer/questions/components/viewer.utils.scss
index d6afc53c..f9124fd7 100644
--- a/src/views/Answer/questions/components/viewer.utils.scss
+++ b/src/views/Answer/questions/components/viewer.utils.scss
@@ -89,6 +89,7 @@
   transform: translate(-50%, -50%);
   display: inline-block;
   z-index: 998;
+  text-align: center;
 }
 
 .pc .q-content-top {