shaogen1995 10 kuukautta sitten
vanhempi
commit
5ac5b28357

+ 12 - 8
hot/src/views/Home.vue

@@ -205,12 +205,16 @@ export default {
   methods: {
     // 本地化 url 适配
     urlToFitFu(url) {
-      const resUrl = url;
-      if (url.includes("https://super.4dage.com")) {
-        return url.replace("https://super.4dage.com", "");
-      } else if (url.includes("http://super.4dage.com")) {
-        return url.replace("http://super.4dage.com", "");
-      } else return resUrl;
+
+      return url
+
+
+      // const resUrl = url;
+      // if (url.includes("https://super.4dage.com")) {
+      //   return url.replace("https://super.4dage.com", "");
+      // } else if (url.includes("http://super.4dage.com")) {
+      //   return url.replace("http://super.4dage.com", "");
+      // } else return resUrl;
     },
 
     // 点击左右箭头
@@ -227,9 +231,9 @@ export default {
     async getData() {
       // https://www.4dmodel.com/
 
-      // let url = `https://super.4dage.com/data/${   // 线上数据
+      let url = `https://super.4dage.com/data/${   // 线上数据
 
-      let url = `/data/${
+      // let url = `/data/${
         //本地化部署
         this.id
       }/hot/js/data.js?time=${Math.random()}`;

BIN
scene/public/code.png


+ 7 - 6
scene/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>粤韵匠心  艺铸华章 —庆祝中华人民共和国成立75周年广东工艺美术大展</title>
+    <title>粤韵匠心 艺铸华章 —庆祝中华人民共和国成立75周年广东工艺美术大展</title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">
@@ -15,8 +15,11 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/oldVer/main0.css" />
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/main.css?v=2.25" />
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/CAD/cad.css?v=2.25"/> -->
-    <style>
-    </style>
+    <!-- <style>
+        #cad {
+            transform: rotate(-4.5deg);
+        }
+    </style> -->
     <script>
         // var number = window.location.href.substring(window.location.href.indexOf("=") + 1);
         // if (number.indexOf("&") != -1) {
@@ -26,9 +29,7 @@
         //     number = number.substring(0, number.indexOf("#"));
         // }
 
-        // 待完善
-        // 'SG-ebhiLPJ6Ktb'
-        var number ='1359'
+        var number = 'SG-ebhiLPJ6Ktb'
     </script>
 
     <script class="build keep">

+ 8 - 0
scene/public/static/js/loadCAD.js

@@ -131,6 +131,14 @@ window.grendCAD = (function grendCAD() {
         window.cad.setSign(point, dire)
       }
       $layer.style.visibility = 'visible'
+      
+      
+      
+      if(_settings.angleShift2d){
+        $layer.querySelector('svg').style.transform = 'rotate(-'+ _settings.angleShift2d +'deg)'//xzw 校准模型旋转
+      }
+      
+      
     })
 
   }

+ 4 - 1
scene/public/static/js/main_2020_show.js

@@ -3423,7 +3423,9 @@ window.Modernizr = function(n, e, t) {
                 }
             }
               
-
+            if(_settings.angleShift2d){
+                i += THREE.Math.degToRad(_settings.angleShift2d)
+            }
             this.rotateLeft(i);
             this.update(0);
             
@@ -14524,6 +14526,7 @@ window.Modernizr = function(n, e, t) {
                 }
                 {//其他
                     _settings.floorPlanAngle = DATA.floorPlanAngle || 0  
+                    _settings.angleShift2d = DATA.angleShift2d || 0 
                 }
             }).fail(e=>{
                 alert("缺少someData文件,请检查场景码是否正确。")

+ 4 - 3
scene/src/views/gui/menu.vue

@@ -247,7 +247,7 @@
 
     <div class="openBox" :class="{ openBoxAc: openInd }">
       <HotList v-if="openInd === 1" @close="openInd = 0" />
-      <Share v-show="openInd === 2" @close="openInd = 0" :openInd="openInd" />
+      <!-- <Share v-show="openInd === 2" @close="openInd = 0" :openInd="openInd" /> -->
     </div>
     <!-- 手动触发导览 -->
 
@@ -256,10 +256,11 @@
 
 <script>
 import HotList from "./components/hotList.vue";
-import Share from "./components/share.vue";
+// import Share from "./components/share.vue";
 
 export default {
-  components: { HotList, Share },
+  // components: { HotList, Share },
+  components: { HotList },
   props: {
     hideTools: Boolean
   },