Home Explore Help
Register Sign In
4dkankan
/
4dkankan_bim
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

# Conflicts:
#	src/pages/SViewer.vue
xzw 2 years ago
parent
40396e413d c29263f905
commit
3a13a4fce7
5 changed files with 14 additions and 6 deletions
Split View Show Diff Stats
  1. 2 2
      public/smart-viewer.html
  2. 1 0
      public/static/ext/base64.min.js
  3. 0 0
      public/static/ext/mobile-detect.js
  4. 4 3
      src/pages/SViewer.vue
  5. 7 1
      src/pages/Viewer.vue

+ 2 - 2
public/smart-viewer.html
View File 

@@ -6,9 +6,9 @@
 
         <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" />
 
         <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css" />
 
         <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3693743_qnz6eozqyvk.css" />
 
-        <script src="<%= VUE_APP_STATIC_DIR %>/lib/mobile-detect.js"></script>
 
+        <script src="<%= VUE_APP_STATIC_DIR %>/ext/mobile-detect.js"></script>
 
+        <script src="<%= VUE_APP_STATIC_DIR %>/ext/base64.min.js"></script>
 
         <script src="<%= VUE_APP_STATIC_DIR %>/lib/three.js/build/three.min.js"></script>
 
-        <script src="<%= VUE_APP_STATIC_DIR %>/lib/base64.min.js"></script>
 
     </head>
 
     <body>
 
         <noscript>

File diff suppressed because it is too large
+ 1 - 0
public/static/ext/base64.min.js


+ 0 - 0
public/static/ext/mobile-detect.js
View File


+ 4 - 3
src/pages/SViewer.vue
View File 

@@ -103,19 +103,20 @@ const onLoadSource = () => {
 
         lastFakeApp = sync.views.createTempApp(sourceFrame.value.contentWindow);  
     } 
 
+ 
      
     if(bimChecked.value){//bim
 
         win.sceneType = 'bim'
 
         win.loaded.then(sdk => { 
             loaded() 
         }) 
-    }else if (source.value.type < 2) {
 
+    }else if (source.value.type < 2) { 
         win.sceneType = 'kankan'
 
         let sdk = win.app 
         sdk.Scene.on('loaded', () => {
 
             loaded() 
-        }) 
-    }else{  
+        })  
+    }else{ 
         win.sceneType = 'laser' 
         win.loaded.then(sdk => { 
             loaded()

+ 7 - 1
src/pages/Viewer.vue
View File 

@@ -681,10 +681,16 @@ main {
 
 .vuejs3-datepicker__calendar header .next:not(.disabled):hover {
 
     background: rgba(0, 0, 0, 0.3);
 
 }
 
+.vuejs3-datepicker__calendar .cell{
 
+    font-size:16px !important;
 
+    border-radius:4px;
 
+}
 
 .highlighted {
 
-    background: #4ebde1 !important;
 
+    color:#076EDE !important;
 
+    background: transparent !important;
 
 }
 
 .selected {
 
+    color:#fff !important;
 
     background: #0076f6 !important;
 
 }
 
 </style>