From 4f11d6a54ade61ba7daf8ba856014d2f8994badf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 08:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/clientManagement/clientManagement.vue | 94 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 832a1f0..4562030 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -67,11 +67,17 @@
<!-- </el-button>-->
<!-- </template>-->
- <template slot-scope="{ row }" slot="dxzt">
- <el-tag>{{
- row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "报警":row.dxzt == "3" ? "故障":"无"
+ <template class="tdtype" slot-scope="{ row }" slot="dxzt">
+ <el-tag class="dtype">
+ {{
+ row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "预警":row.dxzt == "3" ? "故障":"无"
}}
+ <i class="dx" v-if="row.dxzt == '0' "></i>
+ <i class="zc" v-if="row.dxzt == '1' "></i>
+ <i class="yj" v-if="row.dxzt == '2' "></i>
+ <i class="gz" v-if="row.dxzt == '3' "></i>
</el-tag>
+
</template>
<template slot-scope="{ row }" slot="type">
@@ -213,6 +219,9 @@
},
data() {
return {
+ dataLIU:{
+ color:"#DFDFDF"
+ },
//legend-liu数据
datalistLIU:[
{
@@ -1020,7 +1029,7 @@
if(data.records[i].dtype=="" || data.records[i].dtype==0){
data.records[i].dxzt = 1;
}
-
+
}
}
@@ -1049,26 +1058,26 @@
// }
if(row.dtype!=null && row.dtype!=""){
- if(row.dtype=='0'){
- return {
- color: "#DFDFDF"
- };
- }
- if(row.dtype=='1'){
- return {
- color: "#29C093"
- };
- }
+ // if(row.dtype=='0'){
+ // return {
+ // color: "#DFDFDF"
+ // };
+ // }
+ // if(row.dtype=='1'){
+ // return {
+ // color: "#29C093"
+ // };
+ // }
if(row.dtype=='2'){
return {
color: "#F34A4A"
};
}
- if(row.dtype=='3'){
- return {
- color: "#F48F57"
- };
- }
+ // if(row.dtype=='3'){
+ // return {
+ // color: "#F48F57"
+ // };
+ // }
}
},
handleManage(row) {
@@ -1116,7 +1125,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},rightClick(row, event) {
@@ -1251,6 +1260,51 @@
color: red;
}
+ .dtype{
+ width: 80px;
+ }
+
+ .dx{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #DFDFDF;
+ }
+ .zc{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #29C093;
+ }
+ .yj{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #F34A4A;
+ }
+ .gz{
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #F48F57;
+ }
+
.tabFontSize{
font-size: 15px;
}
--
Gitblit v1.9.3