From e060b5724d307c1a3bc8015bf8d8a815c2aaca52 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 23 Apr 2021 11:42:19 +0800
Subject: [PATCH] 地图修改 详情图片获取
---
public/map/popup/html/FlareClusterLayer_v3 copy.html | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/public/map/popup/html/FlareClusterLayer_v3 copy.html b/public/map/popup/html/FlareClusterLayer_v3 copy.html
index 05fefc7..742ea32 100644
--- a/public/map/popup/html/FlareClusterLayer_v3 copy.html
+++ b/public/map/popup/html/FlareClusterLayer_v3 copy.html
@@ -31,7 +31,7 @@
height: 484px;
border-radius: 10px;
margin: 16px 15px 16px 15px;
-
+ overflow: hidden;
/* border: springgreen solid 0.5px; */
}
@@ -63,11 +63,19 @@
justify-content: space-around;
}
+ .f-l-t-center {
+ width: auto;
+ position: relative;
+ left: -103px;
+ top: 5px;
+ }
+
.f-l-t-r-msg {
width: 200px;
height: 28px;
position: relative;
- top: 23px;
+ top: 10px;
+ left: -5px;
}
.f-l-t-r-but {
@@ -155,6 +163,7 @@
<input type="text" id="sidIput" ref="sidIput" style="display:none">
<div class="flare-liu-top">
<div class="f-l-t-heard">{{name}}</div>
+ <div class="f-l-t-center">{{machineCode}}</div>
<div class="f-l-t-right">
<div class="f-l-t-r-msg">{{statesss}}</div>
<div class="f-l-t-r-but"> <a href="#" @click="looks">查看详情</a> </div>
@@ -235,13 +244,14 @@
deploymentTime: '',
oldtime: '',
newtime: '',
+ machineCode: '',
a: true,
activeName: 'first'
},
methods: {
- looks(){
- window.parent.parent.location.hash = `#/dataL/dataL?id=${this.ourData.id}&deviceName=${this.ourData.deviceName}&deviceNumber=${this.ourData.deviceNumber}&deviceType=${this.ourData.deviceType}&ownership=${this.ourData.ownership}&ownerId=&devicestate=${this.ourData.devicestate}&stime=${this.ourData.stime}&parentId=${this.ourData.parentId}&jd=${this.ourData.jd}&wd=${this.ourData.wd}&street=${this.ourData.street}&dtype=${this.ourData.dtype}&serialNumber=${this.ourData.serialNumber}&stype=&channelNumber=${this.ourData.channelNumber}&pay=&expireTime=${this.ourData.expireTime}&heartbeat=${this.ourData.heartbeat}&province=${this.ourData.province}&city=${this.ourData.city}&district=${this.ourData.district}&state=&reason=&deptId=${this.ourData.deptId}&onePhone=${this.ourData.onePhone}&twoPhone=${this.ourData.twoPhone}&oneId=${this.ourData.oneId}&twoId=&threeId=&oneContacts=${this.ourData.oneContacts}&twoContacts=${this.ourData.twoContacts}&type=${this.ourData.type}&beginTime=&endTime=&pid=${this.ourData.pid}&onlineStatus=${this.ourData.onlineStatus}&jtype=${this.ourData.jtype}&threePhone=${this.ourData.threePhone}&threeContacts=${this.ourData.threeContacts}`;
+ looks() {
+ window.parent.parent.location.hash = `#/dataL/dataL?id=${this.ourData.id}&deviceName=${this.ourData.deviceName}&deviceNumber=${this.ourData.deviceNumber}&deviceType=${this.ourData.deviceType}&ownership=${this.ourData.ownership}&ownerId=&devicestate=${this.ourData.devicestate}&stime=${this.ourData.stime}&parentId=${this.ourData.parentId}&jd=${this.ourData.jd}&wd=${this.ourData.wd}&street=${this.ourData.street}&dtype=${this.ourData.dtype}&serialNumber=${this.ourData.serialNumber}&stype=&channelNumber=${this.ourData.channelNumber}&pay=&expireTime=${this.ourData.expireTime}&heartbeat=${this.ourData.heartbeat}&province=${this.ourData.province}&city=${this.ourData.city}&district=${this.ourData.district}&state=&reason=&deptId=${this.ourData.deptId}&onePhone=${this.ourData.onePhone}&twoPhone=${this.ourData.twoPhone}&oneId=${this.ourData.oneId}&twoId=&threeId=&oneContacts=${this.ourData.oneContacts}&twoContacts=${this.ourData.twoContacts}&type=${this.ourData.type}&beginTime=&endTime=&pid=${this.ourData.pid}&onlineStatus=${this.ourData.onlineStatus}&jtype=${this.ourData.jtype}&threePhone=${this.ourData.threePhone}&threeContacts=${this.ourData.threeContacts}`;
},
getdatas(dat) {
@@ -261,10 +271,19 @@
if (xhr.status === 200) {
// 判断isJson是否传进来了
var imgD = JSON.parse(xhr.responseText);// JSON转js
- my.imgsl = imgD.data.length == 0? ['no'] : imgD.data;
+ console.log(imgD)
+
+ var imgdatas = [];
+ if (imgD.data.length != 0) {
+ imgdatas = imgD.data[0].paddress.split(',');
+ } else {
+
+ }
+ // var imgdatas = imgD.data[0].paddress.split(',');
+ my.imgsl = imgdatas.length == 0 ? ['no'] : imgdatas;
// my.imgsl = [ //最多3张照片
// "https://resource-city.sensoro.com/B8D675A3C4F71C5C8DE2FD764881BE57",
-
+
// "https://resource-city.sensoro.com/1723C1A66DB44F792564F3648E5AA1EE",
// "https://resource-city.sensoro.com/6E0FB78DC42C35F3B8FF0F6A03472433",
// ]
@@ -272,7 +291,7 @@
}
}
}
- this.name = dat.deviceName;
+ this.name = dat.deviceName.length >= 15 ? dat.deviceName.substring(0, 15) + '···' : dat.deviceName;
me.num = dat.deviceNumber;
this.evaluate = "空气质量";
this.machineCode = "无数据" && dat.deviceNumber;
@@ -289,16 +308,26 @@
var ct = document.getElementsByClassName('flare-liu-top')[0];
var cordActive = document.getElementsByClassName('el-tabs__active-bar')[0];//滑块背景颜色
- if (dat.onlineStatus == 1) {//el-tabs__active-bar
- ct.style.backgroundImage = 'linear-gradient(to right, #3DDEA8 , #1FBD9A';
- cordActive.style.backgroundImage = 'linear-gradient(to right, #3DDEA8 , #1FBD9A';
- this.statesss = '在线';
-
+ if (dat.state != '') {
+ ct.style.backgroundImage = 'linear-gradient(to right, #F49966 , #F49966';
+ cordActive.style.backgroundImage = 'linear-gradient(to right, #F49966 , #F49966';
+ this.statesss = '故障';
} else {
- ct.style.backgroundImage = 'linear-gradient(to right, #787878 , #5F5F5F';
- cordActive.style.backgroundImage = 'linear-gradient(to right, #787878 , #5F5F5F';
- this.statesss = '离线';
-
+ if (dat.jtype != 1) {
+ if (dat.onlineStatus == 1) {//el-tabs__active-bar
+ ct.style.backgroundImage = 'linear-gradient(to right, #32C1A2 , #32C1A2';
+ cordActive.style.backgroundImage = 'linear-gradient(to right, #32C1A2 , #32C1A2';
+ this.statesss = '在线';
+ } else {
+ ct.style.backgroundImage = 'linear-gradient(to right, #CDCDCD , #CDCDCD';
+ cordActive.style.backgroundImage = 'linear-gradient(to right, #CDCDCD , #CDCDCD';
+ this.statesss = '离线';
+ }
+ } else {
+ ct.style.backgroundImage = 'linear-gradient(to right, #F35B5B , #F35B5B';
+ cordActive.style.backgroundImage = 'linear-gradient(to right, #F35B5B , #F35B5B';
+ this.statesss = '警报';
+ }
}
},
handleClick(tab, event) {//标签tab点击事件
--
Gitblit v1.9.3