diff --git a/device-manager-ui/admin/src/assets/images/icon1.png b/device-manager-ui/admin/src/assets/images/icon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..719166482015d5e8ac79da2b8c2876ee1c6c8919
Binary files /dev/null and b/device-manager-ui/admin/src/assets/images/icon1.png differ
diff --git a/device-manager-ui/admin/src/assets/images/icon2.png b/device-manager-ui/admin/src/assets/images/icon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8085a14edaa57abe1076f958adeafa9cc3475d8
Binary files /dev/null and b/device-manager-ui/admin/src/assets/images/icon2.png differ
diff --git a/device-manager-ui/admin/src/assets/images/icon3.png b/device-manager-ui/admin/src/assets/images/icon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ccee5ff687fd5605a0ddcf4e60ca82f34cab337
Binary files /dev/null and b/device-manager-ui/admin/src/assets/images/icon3.png differ
diff --git a/device-manager-ui/admin/src/assets/images/icon4.png b/device-manager-ui/admin/src/assets/images/icon4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c58d50c13d0676b88f19d09e7ac4021d51bdc415
Binary files /dev/null and b/device-manager-ui/admin/src/assets/images/icon4.png differ
diff --git a/device-manager-ui/admin/src/views/analysis/Analysis.vue b/device-manager-ui/admin/src/views/analysis/Analysis.vue
index 1f2460da871597b55cdb6239d008046f0dd2ba02..b697460e3e42f58c383a6649dc2a70201273adff 100644
--- a/device-manager-ui/admin/src/views/analysis/Analysis.vue
+++ b/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;
diff --git a/device-manager-ui/admin/src/views/analysis/components/three/three.vue b/device-manager-ui/admin/src/views/analysis/components/three/three.vue
index 297b1afbfd873917e5c68fb0bb81f653b06aea05..de65eeb3434b3592112134cdb92c25f8fa6c2a71 100644
--- a/device-manager-ui/admin/src/views/analysis/components/three/three.vue
+++ b/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()
}
},