Selaa lähdekoodia

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

xzw 1 vuosi sitten
vanhempi
commit
68fa6f7fc3
3 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 1 1
      public/smart-kankan.html
  2. 1 1
      src/pages/Viewer.vue
  3. 2 0
      src/pages/kankan.js

+ 1 - 1
public/smart-kankan.html

@@ -29,7 +29,7 @@
         <div id="app">
             <div class="widgets-design-option" style="display: none">
                 <div class="delete-ruler">
-                    <li>删除测量线</li>
+                    <li id="deleteRulerLine">删除测量线</li>
                 </div>
             </div>
             <div xui_tags></div>

+ 1 - 1
src/pages/Viewer.vue

@@ -22,7 +22,7 @@
                     </div>
                     <div class="item-mode" v-if="source.type == 2 || source.type == 3">
                         <div class="iconfont icon-show_roaming" :class="{ active: mode == 0 }" @click="onModeChange(0)"></div>
-                        <div class="iconfont icon-show_plane" :class="{ active: mode == 1 }" @click="noPanorama"></div>
+                        <div class="iconfont icon-show_plane" :class="{ active: mode == 1 }" @click="onModeChange(1)"></div>
                     </div>
                     <div class="item-density" v-if="(source.type == 2 && mode == 1) || (source.type == 3 && mode == 1)" :class="{ active: showDensity }" @click="showDensity = !showDensity">
                         <span>{{ densityType.text }}</span>

+ 2 - 0
src/pages/kankan.js

@@ -6,6 +6,8 @@ const { t } = i18n.global
 const local = getLocale()
 loadLocaleMessages(i18n, local).then(() => {
     setI18nLanguage(i18n, local)
+    let deleteRulerLine = document.getElementById('deleteRulerLine')
+    deleteRulerLine.innerHTML = t('common.deleteRuleLine')
     const lan = {
         'common.about': t('common.about'),
         'common.meter': t('unit.meter'),