From 8c42512b59f2d0ff64c97dc6293d6653d7f1af91 Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Thu, 11 Jan 2024 23:33:51 +0800
Subject: [PATCH] ..

---
 src/layoutMain/components/Navbar.vue              | 1 +
 src/views/bim/bimHome/components/BasicInfo.vue    | 9 ++++++++-
 src/views/bim/bimHome/components/DeviceDetial.vue | 8 ++++----
 src/views/bim/bimHome/components/ThreeView2.vue   | 4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/layoutMain/components/Navbar.vue b/src/layoutMain/components/Navbar.vue
index 8e319cc..52503cb 100644
--- a/src/layoutMain/components/Navbar.vue
+++ b/src/layoutMain/components/Navbar.vue
@@ -175,6 +175,7 @@ function setLayout() {
   display: flex;
   justify-content: space-between;
   background: url('@/assets/images/top_banner_deep.png') no-repeat #000000;
+  background-size: 100% 100%;
 
   .left {
     width: 33%;
diff --git a/src/views/bim/bimHome/components/BasicInfo.vue b/src/views/bim/bimHome/components/BasicInfo.vue
index d0edd84..65ebd56 100644
--- a/src/views/bim/bimHome/components/BasicInfo.vue
+++ b/src/views/bim/bimHome/components/BasicInfo.vue
@@ -11,12 +11,19 @@
             </div>
         </div>
         <div class="right-div">
-            <img :src="getAssetsFile(infoList.imgUrl)" alt="" width="400">
+            <!-- <img :src="getAssetsFile(infoList.imgUrl)" alt="" width="400"> -->
+            <img :src="licang" alt="" width="400" v-if="infoList.imgUrl == 'licang'">
+            <img :src="guolvcao" alt="" width="400" v-else-if="infoList.imgUrl == 'guolvcao'">
+            <img :src="device" alt="" width="400" v-else>
             <span>设备图片</span>
         </div>
     </div>
 </template>
+
 <script setup>
+import licang from '@/assets/images/licang.jpg';
+import guolvcao from '@/assets/images/guolvcao.jpg';
+import device from '@/assets/images/device.jpg'
 const props = defineProps({
     infoList: {
         default: {},
diff --git a/src/views/bim/bimHome/components/DeviceDetial.vue b/src/views/bim/bimHome/components/DeviceDetial.vue
index f8ff56f..9974729 100644
--- a/src/views/bim/bimHome/components/DeviceDetial.vue
+++ b/src/views/bim/bimHome/components/DeviceDetial.vue
@@ -67,7 +67,7 @@ const deviceData = {
             },
             {
                 name: '距离过保天数',
-                value: '-34天'
+                value: '314天'
             },
             {
                 name: '设备二维码',
@@ -75,7 +75,7 @@ const deviceData = {
             },
         ]
     },
-    'guolvcao': {
+    'guolvcao_1': {
         name: '过滤槽',
         imgUrl: 'guolvcao',
         detail: [
@@ -125,7 +125,7 @@ const deviceData = {
             },
             {
                 name: '距离过保天数',
-                value: '-34天'
+                value: '34天'
             },
             {
                 name: '设备二维码',
@@ -199,7 +199,7 @@ const defaultData = {
         },
         {
             name: '距离过保天数',
-            value: '-34天'
+            value: '84天'
         },
         {
             name: '设备二维码',
diff --git a/src/views/bim/bimHome/components/ThreeView2.vue b/src/views/bim/bimHome/components/ThreeView2.vue
index 52c12e5..c559f66 100644
--- a/src/views/bim/bimHome/components/ThreeView2.vue
+++ b/src/views/bim/bimHome/components/ThreeView2.vue
@@ -130,8 +130,6 @@ watch(() => bimStore().activateMenu, value => {
     // 更换场景颜色
     scene.background = new THREE.Color(value.background);
     toHomeView();
-    // 移除消防图标
-    removexf();
 }, { deep: true });
 
 const init = () => {
@@ -430,6 +428,8 @@ const toHomeView = () => {
     cleanColor();
     // 隐藏图例
     isShowWall.value = false;
+    // 移除消防图标
+    removexf();
 }
 // 拉近距离
 const nearCamera = (floor) => {