Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/views/analysis/Analysis.vue

@@ -62,7 +62,39 @@
         </div>
       </div>
       <div class="center">
-        <three :floorArr="floorArr" lv="1" :checkItem="checkDeviceItem"/>
+        <div class="center-top">
+          <div class="center-top-item">
+            <img src="@/assets/images/icon1.png" alt="">
+            <div>
+              <h2 style="color: #69f3ff;text-shadow: 0 0 10px #69f3ff5b,0 0 20px #69f3ff5b,0 0 30px #69f3ff5b,0 0 40px #69f3ff5b;">{{centerTop.deviceTotalCount || 0}}</h2>
+              <p>在线设备总数</p>
+            </div>
+          </div>
+          <div class="center-top-item">
+            <img src="@/assets/images/icon2.png" alt="">
+            <div>
+              <h2 style="color: #ffba69;text-shadow: 0 0 10px #ffb9693d,0 0 20px #ffb9693d,0 0 30px #ffb9693d,0 0 40px #ffb9693d;">{{centerTop.deviceOfflineCount || 0}}</h2>
+              <p>离线设备总数</p>
+            </div>
+          </div>
+          <div class="center-top-item">
+            <img src="@/assets/images/icon3.png" alt="">
+            <div>
+              <h2 style="color: #ff69b3;text-shadow: 0 0 10px #ff69b452,0 0 20px #ff69b452,0 0 30px #ff69b452,0 0 40px #ff69b452;">{{centerTop.deviceStopCount || 0}}</h2>
+              <p>停用设备总数</p>
+            </div>
+          </div>
+          <div class="center-top-item">
+            <img src="@/assets/images/icon4.png" alt="">
+            <div>
+              <h2 style="color: #25f06c;text-shadow: 0 0 10px #25f06c3a,0 0 20px #25f06c3a,0 0 30px #25f06c3a,0 0 40px #25f06c3a;">{{centerTop.pushTotalCount || 0}}</h2>
+              <p>今日消息推送总数</p>
+            </div>
+          </div>
+        </div>
+        <div class="center-three">
+          <three :floorArr="floorArr" lv="1" :checkItem="checkDeviceItem"/>
+        </div>
       </div>
       <div class="right">
         <div class="right-content">
@@ -206,7 +238,8 @@ export default {
       alarmLevelCollect: {}, // 今日告警等级分布
       deviceAlarmMapInfoList: [], // 实施告警消息
       Statlist:[],//设备列表
-      checkDeviceItem:{}//选中设备
+      checkDeviceItem:{},//选中设备
+      centerTop:{}
     };
   },
   created() {
@@ -216,13 +249,26 @@ export default {
     setTimeout(()=>{
       this.floorArr = floorArr
     },500)
+    this.centerDeviceType()
   },
   methods: {
+    // 中间设备状态
+    centerDeviceType(){
+      this.$post("/device/stat/list", { siteId: this.siteId,selected:0 }).then(res=>{
+        
+        const {code,data} = res
+        console.log(data,"@@@@@")
+        if(code == 1 && data.data.length>0){
+          this.centerTop = data.data[0]
+        }
+      })
+    },
     // 点击设备
     tabelRow(arr){
       
       const {rowIndex} = arr
       this.checkDeviceItem = this.Statlist[rowIndex]
+      console.log(this.checkDeviceItem,"111")
     },
     // 获取今日告警设备统计
     getDevAlarm() {
@@ -293,7 +339,6 @@ export default {
     // 查询单个异常设备
     getStatlist(){
       this.$post("/device/alarm/info/statlist", { siteId: this.siteId }).then(res=>{
-        console.log(res,"@@@@@")
         const {code,data} = res
         if(code == 1){
           this.Statlist = data || []
@@ -792,9 +837,32 @@ export default {
     }
   }
   .center {
-    height: 780px;
     width: 780px;
     position: relative;
+    .center-top{
+      display: flex;
+      align-items: center;
+      justify-content:space-around;
+    }
+    .center-three{
+      height: 780px;
+      width: 780px;
+    }
+    .center-top-item{
+      display: flex;
+      align-items: center;
+      img{
+        display: block;
+        width: 55px;
+        margin-right: 5px;
+      }
+      h2{
+        font-size: 20px;
+      }
+      p{
+        font-size: 12px;
+      }
+    }
   }
   .right {
     width: 500px;

device-manager-ui/admin/src/views/analysis/components/three/three.vue

@@ -11,6 +11,7 @@
                                 <p>设备编码:{{device.deviceName}}</p>
                                 <p>MAC地址:{{ device.deviceCode }}</p>
                                 <p>设备位置：{{ device.deviceName }}</p>
+                                <p>接收人员：{{ device.leadingOfficial }}</p> 
                                 <p>负责人：{{ device.leadingOfficial }}</p> 
                                 <p>联系电话：{{ device.leadingOfficialTelephone }}</p>
                                 <p>告警程度：--</p>
@@ -18,6 +19,9 @@
                                 <p>告警状态：<span style="color: #FF4A4A;">({{ checkItem.alarmTypeStr }})</span></p>
                                 <p>处理人：--</p> 
                                 <p>处理时间：--</p>
+                                <p>发送状态：--</p>
+                                <p>发送时间：--</p>
+                                <p>发送内容：--</p>
                             </div>
                             <div class="ant-popover-arrow">
                                 <img src="./ycjg.png" alt="">
@@ -136,7 +140,10 @@ export default {
                     // camera.position.y = y*0.8;
                     // camera.position.z = z;
                 } else {
-                    Tips.visible = false
+                    // Tips.visible = false
+                    Tips.position.set(0, 0, 0);//文字地址
+                    Tips.visible = true
+
                     this._initCamera()
                 }
             },