From 524f74f87ef5720bf9d56e08dcbe85c1f5b44342 Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Mon, 8 Jan 2024 23:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/yj.png                                 | Bin 0 -> 1559 bytes
 src/assets/styles/index.scss                  |   6 +-
 .../bim/bimHome/components/CheckDetial.vue    |  81 ++++++++++++++++--
 .../bimHome/components/DeviceInfoDialog.vue   |   4 +-
 .../bim/bimHome/components/ThreeView2.vue     |  29 ++++++-
 5 files changed, 108 insertions(+), 12 deletions(-)
 create mode 100644 public/yj.png

diff --git a/public/yj.png b/public/yj.png
new file mode 100644
index 0000000000000000000000000000000000000000..7433b0571f5400d1086d0171ad3c6e3ce364569c
GIT binary patch
literal 1559
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
JPDHLkV1l7h-{1fM

literal 0
HcmV?d00001

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 53599e4..5d1123e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -248,6 +248,10 @@ aside {
   .el-table__inner-wrapper::after,
   .el-table__inner-wrapper::before {
     background-color: #00174b !important;
-    color: #fff !important
+    color: #fff !important;
+    
+  }
+  .el-table {
+    border: 1px solid #2E6099 !important;
   }
 }
\ No newline at end of file
diff --git a/src/views/bim/bimHome/components/CheckDetial.vue b/src/views/bim/bimHome/components/CheckDetial.vue
index a4f6d6b..61c647d 100644
--- a/src/views/bim/bimHome/components/CheckDetial.vue
+++ b/src/views/bim/bimHome/components/CheckDetial.vue
@@ -1,16 +1,32 @@
 <template>
-    <div>
+    <div class="check-div">
+        <div class="device-list">
+            <div v-for="(item, index) of deviceList" :key="index">
+                <el-icon size="60" color="#1890ff" v-if="index == 0">
+                    <Suitcase />
+                </el-icon>
+                <el-icon size="60" color="#1890ff" v-if="index == 1">
+                    <TakeawayBox />
+                </el-icon>
+                <el-icon size="60" color="#1890ff" v-if="index == 2">
+                    <Box />
+                </el-icon>
+                <font class="num" :style="{ 'color': item.color }">{{ item.num }}</font>
+                <span>{{ item.name }}</span>
+            </div>
+        </div>
         <el-table :data="checkArr" border style="width: 100%" height="320">
             <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column prop="name" label="设备名称" align="center" />
             <el-table-column prop="isPass" label="巡检结果" align="center">
                 <template #default="scope">
-                    <span :style="{'color': scope.row.isPass? '#0dbc79' : '#e03528'}">{{ scope.row.isPass ? '通过' : '不通过' }}</span>
+                    <span :style="{ 'color': scope.row.isPass ? '#0dbc79' : '#e03528' }">{{ scope.row.isPass ? '通过' : '不通过'
+                    }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="巡检时间" align="center">
                 <template #default="scope">
-                    {{ scope.row.isPass ? '2023-12-23': '2023-01-11' }}
+                    {{ scope.row.isPass ? '2023-12-23' : '2023-01-11' }}
                 </template>
             </el-table-column>
         </el-table>
@@ -18,8 +34,63 @@
 </template>
 <script setup>
 import bimStore from '@/store/modules/bim';
+import IconBy from '@/assets/images/icon-by.png';
+import IconWx from '@/assets/images/icon-wx.png';
+import IconXj from '@/assets/images/icon-xj.png';
+import IconPd from '@/assets/images/icon-pd.png';
 import { computed } from 'vue';
+const deviceList = [
+    {
+        name: '巡检总数',
+        num: '4',
+        color: '#fff',
+        imgUrl: IconPd,
+        icon: 'Suitcase'
+    },
+    {
+        name: '通过数',
+        num: '2',
+        color: '#fff',
+        imgUrl: IconWx,
+        icon: 'TakeawayBox'
+    },
+    {
+        name: '未通过数',
+        num: '2',
+        color: '#fff',
+        imgUrl: IconXj,
+        icon: 'Box'
+    }
+]
 const checkArr = computed(() =>
-  bimStore().checkArr
+    bimStore().checkArr
 );
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+.check-div {
+    .device-list {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        border: 1px solid #2E6099;
+        margin-bottom: 15px;
+        border-radius: 4px;
+
+        >div {
+            width: 24%;
+            height: 80%;
+            // border: 1px solid red;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            padding: 10px 0;
+            color: #fff;
+
+            .num {
+                font-size: 36px;
+            }
+        }
+    }
+}</style>
\ No newline at end of file
diff --git a/src/views/bim/bimHome/components/DeviceInfoDialog.vue b/src/views/bim/bimHome/components/DeviceInfoDialog.vue
index cf84546..b3645d5 100644
--- a/src/views/bim/bimHome/components/DeviceInfoDialog.vue
+++ b/src/views/bim/bimHome/components/DeviceInfoDialog.vue
@@ -13,7 +13,7 @@
                     style="width: 100%;height:100%"></div>
             </div>
             <div class="bottom-div">
-                <el-table :data="tableData" border style="width: 100%" height="420">
+                <el-table :data="tableData" border style="width: 100%" height="445">
                     <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
                     <el-table-column prop="name" label="名称" align="center" />
                     <el-table-column prop="num" label="编码" align="center" />
@@ -460,7 +460,7 @@ const viewDetail = (val) => {
 
         .bottom-div {
             height: 74%;
-            border: 1px solid #2E6099;
+            // border: 1px solid #2E6099;
         }
     }
 }
diff --git a/src/views/bim/bimHome/components/ThreeView2.vue b/src/views/bim/bimHome/components/ThreeView2.vue
index 23742b4..a422762 100644
--- a/src/views/bim/bimHome/components/ThreeView2.vue
+++ b/src/views/bim/bimHome/components/ThreeView2.vue
@@ -177,6 +177,9 @@ const loadSence = () => {
             if (enableGroup.indexOf(e.name) != -1) {
                 xfobj.push(e);
             }
+            if (yjGroup.indexOf(e.name) != -1) {
+                yjobj.push(e);
+            }
         })
         // 设置漫游点位
         const objname = ['start', 'middle1', 'middle2', 'end']
@@ -254,6 +257,10 @@ const enableGroup = [
     'T11',// 立仓
     'T12'
 ]
+// 预警设备
+const yjGroup = [
+    'T11',
+]
 const isSelent = (obj) => {
     var o = obj
     while (true) {
@@ -377,17 +384,18 @@ const cleanColor = () => {
 }
 // 预警
 const warn = () => {
-    ['T3', 'T4', 'T5', 'T6', 'T7', 'T8', 'T9', 'T10', 'T11', 'T12'].forEach(item => {
+    ['T11'].forEach(item => {
         warnSets.push(scene.getObjectByName(item));
     })
 
-    warnSets[2].traverse(e => {
+    warnSets[0].traverse(e => {
         e.material = new THREE.MeshBasicMaterial({
             transparent: true,
             opacity: 0.9,
             color: new THREE.Color('rgb( 237,33,2 )')
         });
     })
+    yjf();
 
     // animateCamera(warnSets[0]);
 }
@@ -591,12 +599,22 @@ const xiaof = () => {
         xfadd(o, Math.random() < 0.3);
     })
 }
+// 预警
+const yjf = () => {
+    yjobj.forEach((o) => {
+        xfadd(o, 'yj');
+    })
+}
 let xfobj = [];
+let yjobj = [];
 // 消防标签
 const xfadd = (obj, state) => {
     const texLoader = new THREE.TextureLoader();
     let texture = null;
-    if (state) {
+    if(state == 'yj') {
+        texture = texLoader.load("/yj.png");
+    }
+    else if (state) {
         texture = texLoader.load("/ygr.png");
     } else {
         texture = texLoader.load("/yg.png");
@@ -825,6 +843,9 @@ const checkComplete = () => {
 }
 .arrow_outer {
     display: flex;
-    
+    flex-direction: column;
+    >div {
+        line-height: 24px;
+    }
 }
 </style>
\ No newline at end of file