From e2ed7cb4ef578d970beca80aea4903e9b13cd1f8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Apr 2021 17:21:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/dataL/dataL.vue | 200 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 136 insertions(+), 64 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 32577e2..2e01cbb 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1,6 +1,6 @@
<template>
- <div id="Lour">
- <div class="left">
+ <div id="Lour" style="height: 100%">
+ <div class="left" style="height: 101%">
<div class="top">
<div class="top-l">
<div class="left-top">
@@ -8,11 +8,25 @@
{{ name.length > 14 ? name.substr(0, 14) + "···" : name }}
</p>
<div class="l-t-state">
+ <!-- dataState: ["掉线", "在线", "故障", "预警"],
+ if (s != "") {
+ states = "故障";
+ } else {
+ if (j != 1) {
+ if (o == 1) {
+ states = "在线";
+ } else {
+ states = "掉线";
+ }
+ } else {
+ states = "预警";
+ }
+ }-->
<span
:class="{
'l-t-s-grey': state == dataState[0],
'l-t-s-green': state == dataState[1],
- 'l-t-s-yewllo': state == dataState[3],
+ 'l-t-s-yewllo': state == dataState[2],
'l-t-s-red': state == dataState[3],
'l-t-s-yuan': true,
}"
@@ -44,7 +58,7 @@
ref="echart01"
></div>
- <div class="l-main-2">
+ <div class="l-main-2" ref="aaa">
<div class="l-m-2-heard">
<span style="font-size: 14px">历史事件</span>
<span style="font-size: 12px">全部事件类型</span>
@@ -98,8 +112,9 @@
viewBox="0 0 1024 1024"
width="100%"
height="100%"
- fill="#29c093"
+ fill="rgba(0,0,0,0.5)"
style="width: 13px; position: relative; top: 2px"
+ ref="svgBut"
>
<path
d="M870.52 63.32H153.19c-25.61 0-40.84 28.57-26.57 49.83l295.73 440.58V927a32 32 0 0 0 47.06 28.24l116-61.87a32 32 0 0 0 16.94-28.23v-312.9l294.74-439.09c14.27-21.26-0.96-49.83-26.57-49.83z"
@@ -134,7 +149,12 @@
{{ value.year }}年
</p>
<div class="l-m-2-m-tablemain">
- <el-table :data="value.data" style="width: 100%" highlight-current-row @current-change="handleCurrentChange"><!--highlight-current-row: 单选，current-change单选事件-->
+ <el-table
+ :data="value.data"
+ style="width: 100%"
+ highlight-current-row
+ @current-change="handleCurrentChange"
+ ><!--highlight-current-row: 单选，current-change单选事件-->
<el-table-column type="index"> </el-table-column>
<el-table-column label="日期" prop="day">
</el-table-column>
@@ -462,7 +482,7 @@
<div class="r-one">
<div class="r-heard">
<div class="r-heard-top">部署信息</div>
- <button @click="modifyl" class="r-but-top">修改</button>
+ <!-- <button @click="modifyl" class="r-but-top">修改</button> -->
</div>
<div class="r-body">
<div class="r-b-top">
@@ -553,7 +573,7 @@
</template>
<script>
import { Loading } from "element-ui";
-import { getdataL, getGalarm, getnum } from "../../api/dataL/axiosL";
+import { getdataL, getGalarm, getnum, getImg } from "../../api/dataL/axiosL";
import axios from "axios";
import echarts from "echarts";
import { Form } from "element-ui";
@@ -591,7 +611,7 @@
isRecord: true,
screens: false,
//复选框
- dataState: ["掉线", "在线", '故障', "预警"],
+ dataState: ["掉线", "在线", "故障", "预警"],
// [grey,green,red][
// onlineStatus = 0,
// onlineStatus = 1,
@@ -871,6 +891,7 @@
this.checkedCities = ["未处理", "处理中", "已处理"];
// console.log(`按钮重置`);
this.doEvents(this.checkedCities);
+ this.$refs.svgBut.setAttribute("fill", "rgba(0,0,0,0.5)"); //改变svg图片样式
// this.eventDetails = this.eventDetaill;
},
determine() {
@@ -880,8 +901,14 @@
if (this.checkedCities.length == 0) {
// console.log(`未选择`);
this.eventDetails = [];
+ this.$refs.svgBut.setAttribute("fill", "rgba(41,192,147)"); //改变svg图片样式
} else {
this.doEvents(this.checkedCities); //筛选数据
+ if (this.checkedCities.length == 3) {
+ this.$refs.svgBut.setAttribute("fill", "rgba(0,0,0,0.5)"); //改变svg图片样式
+ } else {
+ this.$refs.svgBut.setAttribute("fill", "rgba(41,192,147)"); //改变svg图片样式
+ }
}
},
doEvents(ends) {
@@ -931,14 +958,38 @@
current: "1",
size: "10",
};
+ var imgdadta = {
+ deviceNumber: this.myDeviceNumber,
+ };
getdataL(data).then((res) => {
var data = res.data.data.records[0];
- this.stetDetails(data);
+ var setimgl = null;
+ //插入图片api获取图片
+ // this.stetDetails(data);
+ getImg(imgdadta, "post").then((res) => {
+ // console.log(res.data.data.length != 0)
+ var imgdatas = [];
+ if (res.data.data.length != 0) {
+ imgdatas = res.data.data[0].paddress.split(",");
+ } else {
+ }
+ // console.log(imgdatas);
+ // imgdatas = [ //最多5张照片
+ // "https://resource-city.sensoro.com/B8D675A3C4F71C5C8DE2FD764881BE57",
+ // "https://resource-city.sensoro.com/B8D675A3C4F71C5C8DE2FD764881BE57",
+ // "https://resource-city.sensoro.com/B8D675A3C4F71C5C8DE2FD764881BE57",
+
+ // "https://resource-city.sensoro.com/1723C1A66DB44F792564F3648E5AA1EE",
+ // "https://web.byisf.com/minio/jfpt/upload/depl/ad049799e7024c529b9c890d3ba434bc.JPEG",
+ // ];
+ setimgl = imgdatas.length == 0 ? ["no"] : imgdatas;
+ this.stetDetails(data, setimgl);
+ });
// console.log(data);
});
},
- stetDetails(d) {
- this.name = "无数据" && d.deviceName;
+ stetDetails(d, imgdata) {
+ this.name = "无数据" && this.a.deviceName;
//设备状态
// [grey,green,red][
// onlineStatus = 0,
@@ -947,48 +998,65 @@
// jtype != 2
// ]
var states,
- o = this.a.onlineStatus,
- s = this.a.state,
- j = this.a.jtype;
- if(o == 0){
- states = '掉线';
- }else if(o == 1){
- states = '在线';
- }else if(s != ""){
- states = '故障';
- }else if(j != 2){
- states = '预警';
+ o = this.a.onlineStatus,
+ s = this.a.state,
+ j = this.a.jtype;
+ // if (o == 0) {
+ // states = "掉线";
+ // } else if (o == 1) {
+ // states = "在线";
+ // } else if (s != "") {
+ // states = "故障";
+ // } else if (j != 2) {
+ // states = "预警";
+ // }
+ if (s != "") {
+ states = "故障";
+ } else {
+ if (j != 1) {
+ if (o == 1) {
+ states = "在线";
+ } else {
+ states = "掉线";
+ }
+ } else {
+ states = "预警";
+ }
}
- this.state = "无数据" && states;
+ // console.log(o, 1000);
+ // console.log(s, 1000);
+ // console.log(j, 1000);
+
+ // console.log(states, 1000);
+ this.state = states;
this.evaluate = "空气质量";
- this.machineCode = "无数据" && d.deviceNumber;
+ this.machineCode = "无数据" && this.a.deviceNumber;
this.smoke = "烟雾";
this.proportion = "电量";
- this.ReportTime = "最近上报：" + d.heartbeat;
- this.contacts = "无数据" && d.oneContacts;
- this.calls = "无数据" && d.onePhone;
- this.labels = ["无数据"] && [d.deviceType];
- var imgD = ["no"];
- this.imgsl = ["no"] && imgD;
- this.deploymentTime = "无数据" && d.stime;
+ this.ReportTime = "最近上报：" + this.a.heartbeat;
+ this.contacts = "无数据" && this.a.oneContacts;
+ this.calls = "无数据" && this.a.onePhone;
+ this.labels = ["无数据"] && [this.a.deviceType];
+ this.imgsl = imgdata;
+ this.deploymentTime = "无数据" && this.a.stime;
this.detailsData = {
- machineName: d.deviceName, // 设备名称
- machineNumber: d.deviceNumber, //
- user: d.ownership, // 使用方
- serialNumber: d.serialNumber, // 序列号
- channel: d.channelNumber, // 通道号
- deployment: d.devicestate == 1 ? "布防" : "撤防", // 布撤防状态:
- machineType: d.deviceType, // 设备类型
- province: ["邮编：", d.district, ""], // 省份
- street: d.street, // 街道
- person: d.oneContacts, // 负责人
- call: d.onePhone, // 负责人电话
- dueDate: d.expireTime, // 到期时间
- payment: d.pay, // 缴费信息
- installation: d.stime, // 安装时间
- heartbeat: d.heartbeat, // 心跳时间
+ machineName: this.a.deviceName, // 设备名称
+ machineNumber: this.a.deviceNumber, //
+ user: this.a.ownership, // 使用方
+ serialNumber: this.a.serialNumber, // 序列号
+ channel: this.a.channelNumber, // 通道号
+ deployment: this.a.devicestate == 1 ? "布防" : "撤防", // 布撤防状态:
+ machineType: this.a.deviceType, // 设备类型
+ province: ["邮编：", this.a.district, ""], // 省份
+ street: this.a.street, // 街道
+ person: this.a.oneContacts, // 负责人
+ call: this.a.onePhone, // 负责人电话
+ dueDate: this.a.expireTime, // 到期时间
+ payment: this.a.pay, // 缴费信息
+ installation: this.a.stime, // 安装时间
+ heartbeat: this.a.heartbeat, // 心跳时间
};
this.form = d;
},
@@ -1060,13 +1128,16 @@
creates(i, tData);
}
}
- for(var k1 in Num){//添加序号
+ for (var k1 in Num) {
+ //添加序号
var n2 = Num[k1];
- for(var k2 in n2){
- if(k2 == 'year'){continue};
+ for (var k2 in n2) {
+ if (k2 == "year") {
+ continue;
+ }
// console.log(n2[k2])
var n3 = n2[k2];
- for(var k3 in n3){
+ for (var k3 in n3) {
// console.log(+k3 + 1);
n3[k3].i = +k3 + 1;
}
@@ -1109,14 +1180,15 @@
// _iframe1.contentWindow.location.reload(true);
location.reload();
},
- handleCurrentChange(val){
- console.log(val.i)
- }
+ handleCurrentChange(val) {
+ console.log(val.i);
+ },
},
created() {
// let loadingInstance1 = Loading.service({ fullscreen: true });
// this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
this.a = this.$route.query;
+ // console.log(this.a);
this.baseUrl = `/map/index.html?ISinit=1&openid=DetailMap&jd=${this.a.jd}&wd=${this.a.wd}`;
this.myDeviceNumber = this.$route.query.deviceNumber;
// console.log(this.a);
@@ -1139,7 +1211,7 @@
this.getMap();
} else {
// this.re();
- this.getMap();
+ console.log(`没有找到到window.frames[0].init`);
}
};
},
@@ -1149,7 +1221,7 @@
#Lour {
width: 100%;
font-size: 14px;
- height: 99.5%;
+ height: 100%;
// font: 12px/1.5 Tahoma,Helvetica,Arial,'宋体',sans-serif;
// font: 12px/1 Tahoma,Helvetica,Arial,"\5b8b\4f53",sans-serif;
// font: 14px/1.5 'Microsoft YaHei',arial,tahoma,\5b8b\4f53,sans-serif;
@@ -1167,7 +1239,7 @@
overflow: hidden;
.left {
width: 67%;
- height: 99.5%;
+ height: 100%;
// border: 1px solid rgb(236, 24, 24);
background-color: #fff;
display: flex;
@@ -1213,16 +1285,16 @@
border: 1px solid transparent;
}
.l-t-s-grey {
- background-color: rgb(187, 187, 187);
+ background-color: #CDCDCD;
}
.l-t-s-green {
- background-color: rgb(41, 202, 135);
+ background-color: #32C1A2;
}
- .l-t-s-yewllo{
- background-color: rgb(240, 181, 20);
+ .l-t-s-yewllo {
+ background-color: #F49966;
}
.l-t-s-red {
- background-color: rgba(247, 28, 28, 0.877);
+ background-color: #F35B5B;
}
}
}
@@ -1333,7 +1405,7 @@
width: 100%;
height: 370px;
// overflow: scroll;
- overflow-y: scroll;//滚动条
+ overflow-y: scroll; //滚动条
scrollbar-color: transparent transparent;
scrollbar-track-color: transparent;
-ms-scrollbar-track-color: transparent;
@@ -1392,7 +1464,7 @@
}
.right {
width: 30%;
- height: 90.5%;
+ height: 95.5%;
// border: 1px solid rgb(23, 201, 62);
background-color: #fff;
display: flex;
--
Gitblit v1.9.3