lanxin před 3 týdny
rodič
revize
f84eab7411

+ 2 - 2
scene/public/js/Hot.js

@@ -55,8 +55,8 @@ window.initHot = function (model) {
       o = 'en' == manage.number('lang') ? '&lang=' + manage.number('lang') : ''
       ; -1 == r.indexOf('?') ? (src = link + '?time=' + randomTime().getTime() + '&id=' + window.number + o) : (src = link + '&time=' + randomTime().getTime() + '&id=' + window.number + o)
 
-    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/WuhanMuseum/hot')
-    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
+    return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'https://houseoss.4dkankan.com/project/shandongMuseum/yinqueshan/hot')
+    // return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://localhost:8080')
     // return src
   }
   var removeSrcPostMark = function (url) {

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3140 - 13606
scene/public/js/main_2020_show.js


+ 10 - 6
scene/public/showa/js/loadCAD.js

@@ -43,9 +43,13 @@ window.grendCAD = (function grendCAD() {
         right: 20px;
         top: 16px;
         width: 200px;
-        height: 200px;
+        height: 150px;
         background: rgba(0, 0, 0, .3);
-        border-radius: 5px;
+        border-radius: 5px; 
+        visibility: visible;
+        g.sign>path {
+          opacity: 1;
+        }
       }
 
       .cad > div {
@@ -73,6 +77,9 @@ window.grendCAD = (function grendCAD() {
             height: 100px;
             background: rgba(0, 0, 0, .3);
             border-radius: 5px;
+            g.sign>path {
+              opacity: 1;
+            }
           }
           .img {
             width: 90%;
@@ -117,10 +124,8 @@ window.grendCAD = (function grendCAD() {
     initFloor = floor
 
     loadScript(function () {
-      let [$layer, $img] = loadDOM($parent)
+      let [$layer] = loadDOM($parent)
 
-
-      $layer.style.visibility = 'hidden'
       window.cad = structureCAD({
         data: {
           block: [],
@@ -144,7 +149,6 @@ window.grendCAD = (function grendCAD() {
       if (point && dire) {
         window.cad.setSign(point, dire)
       }
-      $layer.style.visibility = 'hidden'
     })
   }
 })()

+ 1 - 1
scene/src/pages/A2main/index.module.scss

@@ -199,7 +199,7 @@
 
     .modalBtn{
       position: fixed;
-      top: 4%;
+      top: 20%;
       right: 40px;
       width: 200px;
       cursor: pointer;

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 12 - 5
scene/src/pages/A2main/index.tsx