Browse Source

添加模型加载方法

hongrunxia 1 year ago
parent
commit
2dfdf2b3e2

+ 11 - 11
src/layouts/default/sider/bottomSideder.vue

@@ -9,19 +9,19 @@
             </div>
             <div class="vent-flex-row-wrap child-menu" >
               <template v-for="(childMenu, childIndex) in menu.children" :key="childIndex">
-                  <template v-if="!childMenu.hideMenu">
-                    <template v-if="childMenu['ver'] == 1">
-                      <div class="child-menu-item" @click="handleMenuClick(childMenu)">
-                        {{ childMenu.name }}
-                      </div>
-                    </template>
-                    <template v-else>
-                      <div class="child-menu-item-disabled" :style="{ backgroundColor: '#314671' }">
-                        {{ childMenu.name }}
-                      </div>
-                    </template>
+                <template v-if="!childMenu.hideMenu">
+                  <template v-if="childMenu['ver'] == 1">
+                    <div class="child-menu-item" @click="handleMenuClick(childMenu)">
+                      {{ childMenu.name }}
+                    </div>
+                  </template>
+                  <template v-else>
+                    <div class="child-menu-item-disabled" :style="{ backgroundColor: '#314671' }">
+                      {{ childMenu.name }}
+                    </div>
                   </template>
                 </template>
+              </template>
             </div>
           </div>
         </FourBorderBg>

+ 3 - 3
src/main.ts

@@ -23,7 +23,7 @@ import { registerGlobComp } from '/@/components/registerGlobComp';
 import { registerThirdComp } from '/@/settings/registerThirdComp';
 import { useSso } from '/@/hooks/web/useSso';
 import { registerPackages } from '/@/utils/monorepo/registerPackages';
-// import { initModalWorker, initTHREE } from '/@/utils/threejs/main.worker';
+import { initModalWorker, initTHREE } from '/@/utils/threejs/main.worker';
 
 // 在本地开发中引入的,以提高浏览器响应速度
 if (import.meta.env.DEV) {
@@ -71,9 +71,9 @@ async function bootstrap() {
   // 当路由准备好时再执行挂载( https://next.router.vuejs.org/api/#isready)
   await router.isReady();
 
-  // initModalWorker();
+  initModalWorker();
 
-  // initTHREE();
+  initTHREE();
 
   // 挂载应用
   app.mount('#app', true);

+ 2 - 2
src/views/vent/home/clique/index.vue

@@ -40,7 +40,7 @@
               </div>
             </div>
             <div class="three-modal" id="modalBox">
-              <iframe
+              <!-- <iframe
                 id="iframe"
                 ref="iframe"
                 src="http://182.92.126.35:8091/user/autologin"
@@ -48,7 +48,7 @@
                 frameborder="0"
                 width="100%"
                 height="100%"
-              ></iframe>
+              ></iframe> -->
             </div>
           </div>
           <!-- 风量监测 -->

+ 1 - 1
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -539,7 +539,7 @@
           await getDataSource();
           if (dataSource.value.length > 0 && selectRowIndex.value == -1 && MonitorDataTable.value) {
             // 初始打开页面
-            if (currentRoute.value['query'] && currentRoute.value['query']['id']) {
+            if (currentRoute.value && currentRoute.value['query'] && currentRoute.value['query']['id']) {
               MonitorDataTable.value.setSelectedRowKeys(currentRoute.value['query']['id']);
             } else {
               MonitorDataTable.value.setSelectedRowKeys(dataSource.value[0]['deviceID']);