|
@@ -38,13 +38,13 @@
|
|
|
<el-table-column label="设备名称" align="center" prop="deviceName" show-overflow-tooltip />
|
|
|
<el-table-column label="设备编号" align="center" prop="deviceId" show-overflow-tooltip />
|
|
|
<el-table-column label="设备类型" align="center" prop="deviceTypeName" show-overflow-tooltip />
|
|
|
-
|
|
|
+
|
|
|
<!-- <el-table-column label="状态" align="center" prop="evt" show-overflow-tooltip >
|
|
|
<template slot-scope="scope">
|
|
|
<span :class="scope.row.alarmStatus == '1' ? 'handle2' : 'untreated2'">{{scope.row.alarmStatus == "1" ? "已处理" : "未处理"}}</span>
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
-
|
|
|
+
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</el-card>
|
|
@@ -73,25 +73,25 @@
|
|
|
<ul id="pop">
|
|
|
<li>
|
|
|
<div>
|
|
|
- <p class="num-huan color-green">{{collectList.checkCount}}</p>
|
|
|
+ <p class="num-huan" style="color:#6F99FA">{{collectList.checkCount}}</p>
|
|
|
<p class="des-huan">已处理</p>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li>
|
|
|
<div>
|
|
|
- <p class="num-huan color-red">{{collectList.noCheckCount}}</p>
|
|
|
+ <p class="num-huan" style="color:#6F99FA">{{collectList.noCheckCount}}</p>
|
|
|
<p class="des-huan">未处理</p>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li>
|
|
|
<div>
|
|
|
- <p class="num-huan color-yellow">{{Number((collectList.checkRadio)*100).toFixed(2)}}%</p>
|
|
|
+ <p class="num-huan" style="color:#6F99FA">{{Number((collectList.checkRadio)*100).toFixed(2)}}%</p>
|
|
|
<p class="des-huan">处理率</p>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li>
|
|
|
<div>
|
|
|
- <p class="num-huan color-blue">{{collectList.total}}</p>
|
|
|
+ <p class="num-huan" style="color:#6F99FA">{{collectList.total}}</p>
|
|
|
<p class="des-huan">隐患总数</p>
|
|
|
</div>
|
|
|
</li>
|
|
@@ -162,7 +162,7 @@ export default {
|
|
|
open: false,
|
|
|
t:null,
|
|
|
timeList:[],
|
|
|
- collectList:[]
|
|
|
+ collectList:[],
|
|
|
|
|
|
};
|
|
|
},
|
|
@@ -177,7 +177,9 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
getList(){
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/* 设备工况 */
|
|
|
/* 饼图 */
|
|
|
index1Api().then(response =>{
|
|
@@ -244,13 +246,13 @@ export default {
|
|
|
let num = 0
|
|
|
if ("WebSocket" in window) {
|
|
|
this.ws = new WebSocket("ws://10.21.39.1:8084/dm/alarmPush");
|
|
|
- console.log(this.ws)
|
|
|
+ // console.log(this.ws)
|
|
|
this.ws.onopen = ()=> {
|
|
|
- console.log("websocket连接成功");
|
|
|
+ // console.log("websocket连接成功");
|
|
|
this.sendWs({agentid:'admin'});
|
|
|
};
|
|
|
this.ws.onmessage = (res) => { //接收websocket消息
|
|
|
- console.log(res)
|
|
|
+
|
|
|
let warningInfo = JSON.parse(res.data)
|
|
|
if(warningInfo.property != "火警" && warningInfo.property != "故障"){
|
|
|
that.index4Data.push(warningInfo)
|
|
@@ -274,7 +276,7 @@ export default {
|
|
|
// 浏览器不支持 WebSocket
|
|
|
alert("您的浏览器不支持 WebSocket!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
sendWs(val){
|
|
|
if (this.ws && this.ws.readyState == 1) {
|
|
@@ -467,26 +469,26 @@ export default {
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
margin-top: 2vh;
|
|
|
- padding: 1vh 0 ;
|
|
|
+ padding: 0.5vh 0 ;
|
|
|
}
|
|
|
#pop li:nth-child(2n){
|
|
|
margin-left:10%;
|
|
|
}
|
|
|
|
|
|
.num-huan {
|
|
|
- font-size: 1.5vh;
|
|
|
+ font-size: 2vh;
|
|
|
margin-top:4px;
|
|
|
}
|
|
|
|
|
|
.des-huan {
|
|
|
max-width: 100%;
|
|
|
- font-size: 1vh;
|
|
|
- color: #02DDF2;
|
|
|
+ font-size: 1.5vh;
|
|
|
+ color: #000;
|
|
|
margin-top:-15px;
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
.unprocess{
|
|
|
color: #FF5801
|
|
|
}
|