rindy 2 éve
szülő
commit
8bda644959
4 módosított fájl, 19 hozzáadás és 15 törlés
  1. 10 3
      public/smart-kankan.html
  2. 8 10
      src/pages/DesignOption/index.vue
  3. 0 2
      src/pages/Viewer.vue
  4. 1 0
      src/pages/kankan.js

+ 10 - 3
public/smart-kankan.html

@@ -24,12 +24,19 @@
         <noscript>
             <strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
         </noscript>
-        <div id="app"></div>
+        <div id="app">
+            <div class="widgets-design-option">
+                <div class="delete-ruler">
+                    <li>删除标尺</li>
+                </div>
+            </div>
+            <div xui_tags></div>
+        </div>
         <!-- <script src="<%= BASE_URL %><%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=<%= VUE_APP_VERSION %>"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=<%= VUE_APP_VERSION %>"></script> -->
         
-        <script src="http://192.168.0.130:3099/dist/sdk/kankan-sdk-deps.js"></script>
-        <script src="http://192.168.0.130:3099/dist/sdk/kankan-sdk.js"></script>
+        <script src="http://127.0.0.1:3099/dist/sdk/kankan-sdk-deps.js"></script>
+        <script src="http://127.0.0.1:3099/dist/sdk/kankan-sdk.js"></script>
        
         
     </body>

+ 8 - 10
src/pages/DesignOption/index.vue

@@ -1,12 +1,3 @@
-<!--  -->
-<template>
-    <div class="widgets-design-option">
-        <div class="delete-ruler">
-            <li>{{ $t('common.deleteRuleLine') }}</li>
-        </div>
-    </div>
-</template>
-<style lang="scss">
 .delete-ruler {
     li {
         white-space: nowrap;
@@ -82,4 +73,11 @@
         list-style: none;
     }
 }
-</style>
+
+
+
+[xui_tags] {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}

+ 0 - 2
src/pages/Viewer.vue

@@ -1,5 +1,4 @@
 <template>
-    <DesignOption />
     <Rules v-if="showRules" @close="closeRules" />
 
     <AppHeader v-show="!fscChecked" :project="project" @getUserId="getUserId" :show-adjust="showAdjust" @update="onPointsUpdate" />
@@ -121,7 +120,6 @@ import Files from '@/components/files'
 import TagManager from '@/components/files/TagManager'
 import sync, { beforeChangeURL, loadSourceScene, loadTargetScene, setPanoWithBim, flyToP1P2 } from '@/utils/sync'
 import i18n from '@/i18n'
-import DesignOption from './DesignOption'
 import Rules from './Rules'
 const { t } = i18n.global
 const isDev = process.env.VUE_APP_TEST == 1

+ 1 - 0
src/pages/kankan.js

@@ -1,3 +1,4 @@
+import './DesignOption/measure.scss'
 import browser from '../utils/browser'
 
 window.app = new KanKan({