From 9af0ba7e5a51b187f762234755ed1559ab91f5f5 Mon Sep 17 00:00:00 2001
From: yupan <yupanx@163.com>
Date: Mon, 07 Nov 2022 16:23:37 +0800
Subject: [PATCH] 1、监测因子趋势时间控件修改 2、监测因子对比echarts显示修改
---
src/views/car/index.vue | 656 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 458 insertions(+), 198 deletions(-)
diff --git a/src/views/car/index.vue b/src/views/car/index.vue
index 6027950..7ed41bd 100644
--- a/src/views/car/index.vue
+++ b/src/views/car/index.vue
@@ -7,10 +7,20 @@
v-if="this.$store.state.aside"
width="300px"
style="background-color: rgb(238, 241, 246);padding-top:10px"
+
>
- <span style="font-size:13px;padding-left:10px;font-weight:500;color:rgb(64, 158, 255)">���������������</span>
- <el-menu style="margin-top:10px">
+ <span
+ style="
+ font-size: 13px;
+ padding-left: 10px;
+ font-weight: 500;
+ color: rgb(64, 158, 255);
+ "
+ >���������������</span
+ >
+ <el-menu style="margin-top: 10px">
<el-menu-item
+
v-for="(item,index) in defaultData"
:key="index"
style="display: flex;justify-content: space-between;align-items: center;padding-right: 0;border-bottom:1px solid #eee"
@@ -19,20 +29,33 @@
>
<span>{{ item.name }}</span>
<i
- style="vertical-align: -2.5px;font-size: 20px;margin-right:10px;margin-left:auto"
- class="iconfont iconfaxianzuobiao"
- @click="deviceDetail(item.mac,null,item,0)"
+ style="
+ vertical-align: -2.5px;
+ font-size: 20px;
+ margin-right: 10px;
+ margin-left: auto;
+ "
+ class="iconfont iconfaxianzuobiao"
+ @click="deviceDetail(item.mac, null, item, 0)"
/>
<!-- @click="deviceDetail('p5dnd7a0245390',null,item,0)"-->
</el-menu-item>
</el-menu>
</el-aside>
+ <el-dialog> </el-dialog>
<el-container style="position: relative">
<div class="carTop">
- <span style="float:left;margin: 1px 10px 0 0;">
- <el-button size="medium" type="primary" icon="el-icon-setting" @click="dialogFormVisible = true">6���������</el-button>
+ <span style="float: left; margin: 1px 10px 0 0">
+ <el-button
+ size="medium"
+ type="primary"
+ icon="el-icon-setting"
+ @click="dialogFormVisible = true"
+ >6���������</el-button
+ >
</span>
<span
+
v-for="(item, index) in snesorParams"
:key="index"
class="left"
@@ -48,8 +71,10 @@
@click="changeCode1(index)"
>{{ item }}
</span>
- <span v-if="webSocketView" style="float:right;margin: 2px 10px 0 0;">
- <el-button size="medium" type="primary" @click="wsStart()">������������</el-button>
+ <span v-if="webSocketView" style="float: right; margin: 2px 10px 0 0">
+ <el-button size="medium" type="primary" @click="wsStart()"
+ >������������</el-button
+ >
</span>
<!-- <el-date-picker
v-if="historyView"
@@ -95,7 +120,16 @@
end-placeholder="������������">
</el-date-picker>
<!-- ������/��������������������� -->
- <el-select v-model="dataTypeValue" placeholder="������������" style="float:right;line-height:40px;margin-right:10px;width:103px">
+ <el-select
+ v-model="dataTypeValue"
+ placeholder="������������"
+ style="
+ float: right;
+ line-height: 40px;
+ margin-right: 10px;
+ width: 103px;
+ "
+ >
<el-option
v-for="item in dataTypeList"
:key="item.value"
@@ -105,7 +139,8 @@
</el-select>
</div>
<div v-if="noneData" class="noneData">������������������������������</div>
- <div id="map_container" v-loading="loading" /> <!-- ������������ -->
+ <div id="map_container" v-loading="loading" />
+ <!-- ������������ -->
</el-container>
</el-container>
<!-- <div id="selectSenor">
@@ -122,7 +157,12 @@
<!-- 6��������������� -->
<el-dialog title="6���������" :visible.sync="dialogFormVisible" width="1000px">
<el-descriptions title="������6���" :column="3" border>
- <el-descriptions-item label="PM2.5 | ug/m��" label-class-name="my-label" content-class-name="my-content">22</el-descriptions-item>
+ <el-descriptions-item
+ label="PM2.5 | ug/m��"
+ label-class-name="my-label"
+ content-class-name="my-content"
+ >22</el-descriptions-item
+ >
<el-descriptions-item label="PM10 | ug/m��">34</el-descriptions-item>
<el-descriptions-item label="SO2 | ug/m��">4</el-descriptions-item>
<el-descriptions-item label="NO2 | ug/m��">16</el-descriptions-item>
@@ -132,6 +172,7 @@
<!-- <el-descriptions title="���������������" border>
</el-descriptions> -->
<div
+
style="font-size: 16px;font-weight: 700;margin:10px 0 20px 0;font-size: 16px;
font-weight: 700;color: #303133;"
>���������������</div>
@@ -189,97 +230,120 @@
import requestObj from '@/utils/request'
var GPS = {
PI: 3.14159265358979324,
- x_pi: 3.14159265358979324 * 3000.0 / 180.0,
- delta: function(lat, lon) {
+ x_pi: (3.14159265358979324 * 3000.0) / 180.0,
+ delta: function (lat, lon) {
var a = 6378245.0 // a: ������������������������������������������������������������������
var ee = 0.00669342162296594323 // ee: ���������������������
var dLat = this.transformLat(lon - 105.0, lat - 35.0)
var dLon = this.transformLon(lon - 105.0, lat - 35.0)
- var radLat = lat / 180.0 * this.PI
+ var radLat = (lat / 180.0) * this.PI
var magic = Math.sin(radLat)
magic = 1 - ee * magic * magic
var sqrtMagic = Math.sqrt(magic)
- dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * this.PI)
- dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * this.PI)
- return { 'lat': dLat, 'lon': dLon }
+ dLat = (dLat * 180.0) / (((a * (1 - ee)) / (magic * sqrtMagic)) * this.PI)
+ dLon = (dLon * 180.0) / ((a / sqrtMagic) * Math.cos(radLat) * this.PI)
+ return { lat: dLat, lon: dLon }
},
// WGS-84 to GCJ-02
- gcj_encrypt: function(wgsLat, wgsLon) {
- if (this.outOfChina(wgsLat, wgsLon)) { return { 'lat': wgsLat, 'lon': wgsLon } }
+ gcj_encrypt: function (wgsLat, wgsLon) {
+ if (this.outOfChina(wgsLat, wgsLon)) {
+ return { lat: wgsLat, lon: wgsLon }
+ }
var d = this.delta(wgsLat, wgsLon)
- return { 'lat': wgsLat + d.lat, 'lon': wgsLon + d.lon }
+ return { lat: wgsLat + d.lat, lon: wgsLon + d.lon }
},
// GCJ-02 to WGS-84
- gcj_decrypt: function(gcjLat, gcjLon) {
- if (this.outOfChina(gcjLat, gcjLon)) { return { 'lat': gcjLat, 'lon': gcjLon } }
+ gcj_decrypt: function (gcjLat, gcjLon) {
+ if (this.outOfChina(gcjLat, gcjLon)) {
+ return { lat: gcjLat, lon: gcjLon }
+ }
var d = this.delta(gcjLat, gcjLon)
- return { 'lat': gcjLat - d.lat, 'lon': gcjLon - d.lon }
+ return { lat: gcjLat - d.lat, lon: gcjLon - d.lon }
},
// GCJ-02 to WGS-84 exactly
- gcj_decrypt_exact: function(gcjLat, gcjLon) {
+ gcj_decrypt_exact: function (gcjLat, gcjLon) {
var initDelta = 0.01
var threshold = 0.000000001
- var dLat = initDelta; var dLon = initDelta
- var mLat = gcjLat - dLat; var mLon = gcjLon - dLon
- var pLat = gcjLat + dLat; var pLon = gcjLon + dLon
- var wgsLat; var wgsLon; var i = 0
+ var dLat = initDelta
+ var dLon = initDelta
+ var mLat = gcjLat - dLat
+ var mLon = gcjLon - dLon
+ var pLat = gcjLat + dLat
+ var pLon = gcjLon + dLon
+ var wgsLat
+ var wgsLon
+ var i = 0
while (1) {
wgsLat = (mLat + pLat) / 2
wgsLon = (mLon + pLon) / 2
var tmp = this.gcj_encrypt(wgsLat, wgsLon)
dLat = tmp.lat - gcjLat
dLon = tmp.lon - gcjLon
- if ((Math.abs(dLat) < threshold) && (Math.abs(dLon) < threshold)) { break }
+ if (Math.abs(dLat) < threshold && Math.abs(dLon) < threshold) {
+ break
+ }
- if (dLat > 0) pLat = wgsLat; else mLat = wgsLat
- if (dLon > 0) pLon = wgsLon; else mLon = wgsLon
+ if (dLat > 0) pLat = wgsLat
+ else mLat = wgsLat
+ if (dLon > 0) pLon = wgsLon
+ else mLon = wgsLon
if (++i > 10000) break
}
- return { 'lat': wgsLat, 'lon': wgsLon }
+ return { lat: wgsLat, lon: wgsLon }
},
// GCJ-02 to BD-09
- bd_encrypt: function(gcjLat, gcjLon) {
- var x = gcjLon; var y = gcjLat
+ bd_encrypt: function (gcjLat, gcjLon) {
+ var x = gcjLon
+ var y = gcjLat
var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.x_pi)
var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.x_pi)
this.bdLon = z * Math.cos(theta) + 0.0065
this.bdLat = z * Math.sin(theta) + 0.006
- return { 'lat': this.bdLat, 'lon': this.bdLon }
+ return { lat: this.bdLat, lon: this.bdLon }
},
// BD-09 to GCJ-02
- bd_decrypt: function(bdLat, bdLon) {
- var x = bdLon - 0.0065; var y = bdLat - 0.006
+ bd_decrypt: function (bdLat, bdLon) {
+ var x = bdLon - 0.0065
+ var y = bdLat - 0.006
var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * this.x_pi)
var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * this.x_pi)
var gcjLon = z * Math.cos(theta)
var gcjLat = z * Math.sin(theta)
- return { 'lat': gcjLat, 'lon': gcjLon }
+ return { lat: gcjLat, lon: gcjLon }
},
// WGS-84 to Web mercator
// mercatorLat -> y mercatorLon -> x
- mercator_encrypt: function(wgsLat, wgsLon) {
- var x = wgsLon * 20037508.34 / 180.0
- var y = Math.log(Math.tan((90.0 + wgsLat) * this.PI / 360.0)) / (this.PI / 180.0)
- y = y * 20037508.34 / 180.0
- return { 'lat': y, 'lon': x }
+ mercator_encrypt: function (wgsLat, wgsLon) {
+ var x = (wgsLon * 20037508.34) / 180.0
+ var y =
+ Math.log(Math.tan(((90.0 + wgsLat) * this.PI) / 360.0)) /
+ (this.PI / 180.0)
+ y = (y * 20037508.34) / 180.0
+ return { lat: y, lon: x }
},
// Web mercator to WGS-84
// mercatorLat -> y mercatorLon -> x
- mercator_decrypt: function(mercatorLat, mercatorLon) {
- var x = mercatorLon / 20037508.34 * 180.0
- var y = mercatorLat / 20037508.34 * 180.0
- y = 180 / this.PI * (2 * Math.atan(Math.exp(y * this.PI / 180.0)) - this.PI / 2)
- return { 'lat': y, 'lon': x }
+ mercator_decrypt: function (mercatorLat, mercatorLon) {
+ var x = (mercatorLon / 20037508.34) * 180.0
+ var y = (mercatorLat / 20037508.34) * 180.0
+ y =
+ (180 / this.PI) *
+ (2 * Math.atan(Math.exp((y * this.PI) / 180.0)) - this.PI / 2)
+ return { lat: y, lon: x }
},
// two point's distance
- distance: function(latA, lonA, latB, lonB) {
+ distance: function (latA, lonA, latB, lonB) {
var earthR = 6371000.0
- var x = Math.cos(latA * this.PI / 180.0) * Math.cos(latB * this.PI / 180.0) * Math.cos((lonA - lonB) * this.PI / 180)
- var y = Math.sin(latA * this.PI / 180.0) * Math.sin(latB * this.PI / 180.0)
+ var x =
+ Math.cos((latA * this.PI) / 180.0) *
+ Math.cos((latB * this.PI) / 180.0) *
+ Math.cos(((lonA - lonB) * this.PI) / 180)
+ var y =
+ Math.sin((latA * this.PI) / 180.0) * Math.sin((latB * this.PI) / 180.0)
var s = x + y
if (s > 1) s = 1
if (s < -1) s = -1
@@ -287,25 +351,63 @@
var distance = alpha * earthR
return distance
},
- outOfChina: function(lat, lon) {
- if (lon < 72.004 || lon > 137.8347) { return true }
- if (lat < 0.8293 || lat > 55.8271) { return true }
+ outOfChina: function (lat, lon) {
+ if (lon < 72.004 || lon > 137.8347) {
+ return true
+ }
+ if (lat < 0.8293 || lat > 55.8271) {
+ return true
+ }
return false
},
- transformLat: function(x, y) {
- var ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
- ret += (20.0 * Math.sin(6.0 * x * this.PI) + 20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0
- ret += (20.0 * Math.sin(y * this.PI) + 40.0 * Math.sin(y / 3.0 * this.PI)) * 2.0 / 3.0
- ret += (160.0 * Math.sin(y / 12.0 * this.PI) + 320 * Math.sin(y * this.PI / 30.0)) * 2.0 / 3.0
+ transformLat: function (x, y) {
+ var ret =
+ -100.0 +
+ 2.0 * x +
+ 3.0 * y +
+ 0.2 * y * y +
+ 0.1 * x * y +
+ 0.2 * Math.sqrt(Math.abs(x))
+ ret +=
+ ((20.0 * Math.sin(6.0 * x * this.PI) +
+ 20.0 * Math.sin(2.0 * x * this.PI)) *
+ 2.0) /
+ 3.0
+ ret +=
+ ((20.0 * Math.sin(y * this.PI) + 40.0 * Math.sin((y / 3.0) * this.PI)) *
+ 2.0) /
+ 3.0
+ ret +=
+ ((160.0 * Math.sin((y / 12.0) * this.PI) +
+ 320 * Math.sin((y * this.PI) / 30.0)) *
+ 2.0) /
+ 3.0
return ret
},
- transformLon: function(x, y) {
- var ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
- ret += (20.0 * Math.sin(6.0 * x * this.PI) + 20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0
- ret += (20.0 * Math.sin(x * this.PI) + 40.0 * Math.sin(x / 3.0 * this.PI)) * 2.0 / 3.0
- ret += (150.0 * Math.sin(x / 12.0 * this.PI) + 300.0 * Math.sin(x / 30.0 * this.PI)) * 2.0 / 3.0
+ transformLon: function (x, y) {
+ var ret =
+ 300.0 +
+ x +
+ 2.0 * y +
+ 0.1 * x * x +
+ 0.1 * x * y +
+ 0.1 * Math.sqrt(Math.abs(x))
+ ret +=
+ ((20.0 * Math.sin(6.0 * x * this.PI) +
+ 20.0 * Math.sin(2.0 * x * this.PI)) *
+ 2.0) /
+ 3.0
+ ret +=
+ ((20.0 * Math.sin(x * this.PI) + 40.0 * Math.sin((x / 3.0) * this.PI)) *
+ 2.0) /
+ 3.0
+ ret +=
+ ((150.0 * Math.sin((x / 12.0) * this.PI) +
+ 300.0 * Math.sin((x / 30.0) * this.PI)) *
+ 2.0) /
+ 3.0
return ret
- }
+ },
}
export default {
data() {
@@ -321,7 +423,7 @@
'CO',
'O3',
'TVOC',
- '���������'
+ '���������',
],
changeColor: 0,
changeColor1: 0,
@@ -339,26 +441,53 @@
disabledDate(time) {
return time.getTime() > Date.now()
},
- shortcuts: [{
- text: '������',
- onClick(picker) {
- picker.$emit('pick', new Date())
+ shortcuts: [
+ {
+ text: '������',
+ onClick(picker) {
+ picker.$emit('pick', new Date())
+ },
+ },
+ {
+ text: '������',
+ onClick(picker) {
+ const date = new Date()
+ date.setTime(date.getTime() - 3600 * 1000 * 24)
+ picker.$emit('pick', date)
+ },
+ },
+ {
+ text: '���������',
+ onClick(picker) {
+ const date = new Date()
+ date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+ picker.$emit('pick', date)
+ },
+ },
+ ],
+ },
+ timeOne: '',
+ threeOptions: {
+ onPick: ({ maxDate, minDate }) => {
+ // ������������ ������������
+ this.timeOne = minDate.getTime() // ��������������������� ������������������
+ // ������������������������������������������������������������
+ if (maxDate) this.timeOne = ''
+ },
+ disabledDate: (time) => {
+ if (this.timeOne) {
+ const WEEK = 3 * 24 * 3600 * 1000 - 1 // ������������3���������1��������� ������3���������
+ const minTime = this.timeOne // ������������
+ const maxTime = this.timeOne + WEEK // ������������
+ return (
+ time.getTime() < minTime ||
+ time.getTime() > maxTime ||
+ time.getTime() > new Date()
+ )
+ } else {
+ return time.getTime() > new Date()
}
- }, {
- text: '������',
- onClick(picker) {
- const date = new Date()
- date.setTime(date.getTime() - 3600 * 1000 * 24)
- picker.$emit('pick', date)
- }
- }, {
- text: '���������',
- onClick(picker) {
- const date = new Date()
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
- picker.$emit('pick', date)
- }
- }]
+ },
},
timeOne: '',
threeOptions: {
@@ -385,14 +514,86 @@
carMac: null,
dialogFormVisible: false,
sensorTableData: [
- { sensorName: 'PM2.5', unit: 'ug/m��', tab1: '35', tab2: '75', tab3: '115', tab4: '150', tab5: '250', tab6: '350' },
- { sensorName: 'PM10', unit: 'ug/m��', tab1: '50', tab2: '150', tab3: '250', tab4: '350', tab5: '420', tab6: '500' },
- { sensorName: 'SO2', unit: 'ug/m��', tab1: '50', tab2: '150', tab3: '475', tab4: '800', tab5: '1600', tab6: '2100' },
- { sensorName: 'NO2', unit: 'ug/m��', tab1: '40', tab2: '80', tab3: '180', tab4: '280', tab5: '565', tab6: '750' },
- { sensorName: 'CO', unit: 'mg/m��', tab1: '2', tab2: '4', tab3: '14', tab4: '24', tab5: '36', tab6: '48' },
- { sensorName: 'O3', unit: 'ug/m��', tab1: '100', tab2: '160', tab3: '215', tab4: '265', tab5: '800', tab6: '800' },
- { sensorName: 'TVOC', unit: 'mg/m��', tab1: '0.1', tab2: '0.3', tab3: '0.5', tab4: '0.7', tab5: '0.9', tab6: '1' },
- { sensorName: '���������', unit: 'ug/m��', tab1: '300', tab2: '500', tab3: '1000', tab4: '10000', tab5: '20000', tab6: '50000' }
+ {
+ sensorName: 'PM2.5',
+ unit: 'ug/m��',
+ tab1: '35',
+ tab2: '75',
+ tab3: '115',
+ tab4: '150',
+ tab5: '250',
+ tab6: '350',
+ },
+ {
+ sensorName: 'PM10',
+ unit: 'ug/m��',
+ tab1: '50',
+ tab2: '150',
+ tab3: '250',
+ tab4: '350',
+ tab5: '420',
+ tab6: '500',
+ },
+ {
+ sensorName: 'SO2',
+ unit: 'ug/m��',
+ tab1: '50',
+ tab2: '150',
+ tab3: '475',
+ tab4: '800',
+ tab5: '1600',
+ tab6: '2100',
+ },
+ {
+ sensorName: 'NO2',
+ unit: 'ug/m��',
+ tab1: '40',
+ tab2: '80',
+ tab3: '180',
+ tab4: '280',
+ tab5: '565',
+ tab6: '750',
+ },
+ {
+ sensorName: 'CO',
+ unit: 'mg/m��',
+ tab1: '2',
+ tab2: '4',
+ tab3: '14',
+ tab4: '24',
+ tab5: '36',
+ tab6: '48',
+ },
+ {
+ sensorName: 'O3',
+ unit: 'ug/m��',
+ tab1: '100',
+ tab2: '160',
+ tab3: '215',
+ tab4: '265',
+ tab5: '800',
+ tab6: '800',
+ },
+ {
+ sensorName: 'TVOC',
+ unit: 'mg/m��',
+ tab1: '0.1',
+ tab2: '0.3',
+ tab3: '0.5',
+ tab4: '0.7',
+ tab5: '0.9',
+ tab6: '1',
+ },
+ {
+ sensorName: '���������',
+ unit: 'ug/m��',
+ tab1: '300',
+ tab2: '500',
+ tab3: '1000',
+ tab4: '10000',
+ tab5: '20000',
+ tab6: '50000',
+ },
],
carWs: null,
map: null,
@@ -409,13 +610,16 @@
firstPlayFlag: true,
firstWsFlag: true,
msgTemp: [],
- dataTypeList: [{
- value: 'history',
- label: '������������'
- }, {
- value: 'webSocket',
- label: '������������'
- }],
+ dataTypeList: [
+ {
+ value: 'history',
+ label: '������������',
+ },
+ {
+ value: 'webSocket',
+ label: '������������',
+ },
+ ],
dataTypeValue: 'history',
historyView: true,
webSocketView: false,
@@ -428,7 +632,10 @@
endTime: '',
dataDate: '',
sensorTime: [],
- timeValue: [new Date(2020, 1, 1, 0, 0, 0), new Date(2022, 12, 31, 23, 59, 59)]
+ timeValue: [
+ new Date(2020, 1, 1, 0, 0, 0),
+ new Date(2022, 12, 31, 23, 59, 59),
+ ],
}
},
watch: {
@@ -482,8 +689,7 @@
}
// })
},
- beforeDestroy() {
- },
+ beforeDestroy() {},
created() {
this.newTime(this.timeValue)
this.newDate()
@@ -529,7 +735,7 @@
device: items,
macName: mac,
indexs: indexs,
- items: [items.latitude, items.longitude]
+ items: [items.latitude, items.longitude],
},
query: {
monitorPointInfo: JSON.stringify(item),
@@ -537,8 +743,8 @@
macName: mac,
indexs: indexs,
items: [items.latitude, items.longitude],
- equipment: 'car'
- }
+ equipment: 'car',
+ },
})
},
// 6���������������
@@ -588,7 +794,7 @@
},
// ���������������������������������������
Rad(d) {
- return d * Math.PI / 180.0// ���������������������������������������������������
+ return (d * Math.PI) / 180.0 // ���������������������������������������������������
},
// ���������������������������������������������������������������������������������������
GetDistance(lat1, lng1, lat2, lng2) {
@@ -606,7 +812,10 @@
// ���������������
newDate() {
var aData = new Date()
- var month = aData.getMonth() < 9 ? '0' + (aData.getMonth() + 1) : aData.getMonth() + 1
+ var month =
+ aData.getMonth() < 9
+ ? '0' + (aData.getMonth() + 1)
+ : aData.getMonth() + 1
var date = aData.getDate() <= 9 ? '0' + aData.getDate() : aData.getDate()
this.sensorDate = aData.getFullYear() + '-' + month + '-' + date
},
@@ -615,10 +824,13 @@
let str = ''
let str2 = ''
this.sensorTime = []
- timeArr.map(v => {
+ timeArr.map((v) => {
v = JSON.stringify(v)
str2 = v.substr(12, 8).split(':')
- str2[0] = (str2[0] - 0 + 8) % 24 < 9 ? '0' + (str2[0] - 0 + 8) % 24 : (str2[0] - 0 + 8) % 24
+ str2[0] =
+ (str2[0] - 0 + 8) % 24 < 9
+ ? '0' + ((str2[0] - 0 + 8) % 24)
+ : (str2[0] - 0 + 8) % 24
str = str2.join(':')
this.sensorTime.push(str)
})
@@ -689,11 +901,11 @@
// ������http���WS
socketUrl = socketUrl.replace('https', 'ws').replace('http', 'ws')
this.ws = new WebSocket(socketUrl)
- this.ws.onopen = function() {
+ this.ws.onopen = function () {
console.log('wsStart������������')
}
// ���������������������������������������������������
- this.ws.onmessage = function(msg) {
+ this.ws.onmessage = function (msg) {
if (that.firstWsFlag) {
that.initStart([JSON.parse(msg.data)])
that.firstWsFlag = false
@@ -763,11 +975,15 @@
if (this.responseJSON.length > 0) {
this.noneData = false
$.each(this.responseJSON, (item, value) => {
- if (typeof (value.flylon) === 'undefined') {
+ if (typeof value.flylon === 'undefined') {
showNoPoints()
} else {
- var lng = parseFloat(value.flylon.substr(0, value.flylon.length - 1))
- var lat = parseFloat(value.flylat.substr(0, value.flylat.length - 1))
+ var lng = parseFloat(
+ value.flylon.substr(0, value.flylon.length - 1)
+ )
+ var lat = parseFloat(
+ value.flylat.substr(0, value.flylat.length - 1)
+ )
if (lng < 70 || lng > 150 || lat > 60 || lat < 20) {
return true
}
@@ -775,7 +991,7 @@
lat = GPS.gcj_encrypt(lat, lng).lat
lng = GPS.bd_encrypt(lat, lng).lon
lat = GPS.bd_encrypt(lat, lng).lat
- var point = new BMapGL.Point(lng, lat);
+ var point = new BMapGL.Point(lng, lat)
point.a34004 = parseInt(value.a34004)
point.a34002 = parseInt(value.a34002)
point.a21026 = parseInt(value.a21026)
@@ -795,7 +1011,7 @@
that.sensor = this.sensorKey
that.viewType = this.viewKey
that.size = 50
- that.distance = that.size / 2 / Math.sin(1 * Math.PI / 4)
+ that.distance = that.size / 2 / Math.sin((1 * Math.PI) / 4)
// ���������������������������������
if (!that.showPoints) {
that.map = new BMapGL.Map('map_container')
@@ -807,12 +1023,13 @@
} else {
that.map.setTilt(52)
}
- that.map.setDisplayOptions({ // ������������������
+ that.map.setDisplayOptions({
+ // ������������������
skyColors: ['rgba(186, 0, 255, 0)', 'rgba(186, 0, 255, 0.2)'], // ������������
building: false, // ������������������
- poiText: true// ������poi������
+ poiText: true, // ������poi������
})
- that.map.addControl(new BMapGL.NavigationControl3D())// ������3d������
+ that.map.addControl(new BMapGL.NavigationControl3D()) // ������3d������
if (this.responseJSON.length === 0) {
showNoPoints()
}
@@ -823,7 +1040,7 @@
if (that.firstPlayFlag) {
that.map.centerAndZoom(that.centerPoint, that.mapZoom)
that.view = new mapvgl.View({
- map: that.map
+ map: that.map,
})
that.firstPlayFlag = false
} else {
@@ -835,10 +1052,10 @@
// drawPolygon(sensor);//���������
draw(that.sensor, that.viewType, that.carMac)
// drawLine()// ������
- drawStartAndEnd()// ���������������������
+ drawStartAndEnd() // ���������������������
function draw(sensor, type, carMac) {
var levels = getGrading(sensor, type, carMac)
- $.each(levels, function(index, value) {
+ $.each(levels, function (index, value) {
var color = value.color
var data = value.data
if (data.length > 0) {
@@ -849,7 +1066,10 @@
selectedIndex: -1, // ���������
selectedColor: '#ee1111', // ���������������
autoSelect: true, // ������������������������������������������
- riseTime: 1800 // ���������������������������
+ riseTime: 1800, // ���������������������������
+ onClick: (e) => {
+ console.log(e)
+ },
})
that.shapeLayer.setData(data)
that.view.addLayer(that.shapeLayer)
@@ -857,7 +1077,7 @@
})
that.map.setDefaultCursor('default')
if (type === '2D') {
- $.each(that.showPoints, function(item, point) {
+ $.each(that.showPoints, function (item, point) {
setLabelStyle(point[sensor], point)
})
}
@@ -865,18 +1085,21 @@
// ���������������������������������
function drawPolygon(sensor) {
- $.each(that.showPoints, function(item, point) {
+ $.each(that.showPoints, function (item, point) {
var sw = getPoint(225, point.lng, point.lat, that.distance)
var ne = getPoint(45, point.lng, point.lat, that.distance)
var data = point[sensor]
// ������������������������������������
color = getColorAndLevel(sensor, data).color
- var polygon = new BMapGL.Polygon([
- new BMapGL.Point(sw.lng, sw.lat), // ���������
- new BMapGL.Point(ne.lng, sw.lat), // ���������
- new BMapGL.Point(ne.lng, ne.lat), // ���������
- new BMapGL.Point(sw.lng, ne.lat)// ���������
- ], { strokeWeight: 0.5, strokeOpacity: 0.0, fillColor: color })
+ var polygon = new BMapGL.Polygon(
+ [
+ new BMapGL.Point(sw.lng, sw.lat), // ���������
+ new BMapGL.Point(ne.lng, sw.lat), // ���������
+ new BMapGL.Point(ne.lng, ne.lat), // ���������
+ new BMapGL.Point(sw.lng, ne.lat), // ���������
+ ],
+ { strokeWeight: 0.5, strokeOpacity: 0.0, fillColor: color }
+ )
that.map.addOverlay(polygon)
// ���������������label������
setLabelStyle(data, point)
@@ -885,14 +1108,26 @@
// ���������������������
function drawStartAndEnd() {
- var startIcon = new BMapGL.Icon(require('@/assets/images/start.png'), new BMapGL.Size(48, 48))
- var startMark = new BMapGL.Marker(that.showPoints[0], { icon: startIcon, offset: new BMapGL.Size(0, -20) })
- that.map.addOverlay(startMark)
- var endIcon = new BMapGL.Icon(require('@/assets/images/end.png'), new BMapGL.Size(48, 48))
- var endMark = new BMapGL.Marker(that.showPoints[that.showPoints.length - 1], {
- icon: endIcon,
- offset: new BMapGL.Size(0, -20)
+ var startIcon = new BMapGL.Icon(
+ require('@/assets/images/start.png'),
+ new BMapGL.Size(48, 48)
+ )
+ var startMark = new BMapGL.Marker(that.showPoints[0], {
+ icon: startIcon,
+ offset: new BMapGL.Size(0, -20),
})
+ that.map.addOverlay(startMark)
+ var endIcon = new BMapGL.Icon(
+ require('@/assets/images/end.png'),
+ new BMapGL.Size(48, 48)
+ )
+ var endMark = new BMapGL.Marker(
+ that.showPoints[that.showPoints.length - 1],
+ {
+ icon: endIcon,
+ offset: new BMapGL.Size(0, -20),
+ }
+ )
that.map.addOverlay(endMark)
}
@@ -900,16 +1135,16 @@
function drawLine() {
var data = []
var points = []
- $.each(trackPoints, function(index, value) {
+ $.each(trackPoints, function (index, value) {
var point = []
- point.push(value['lng'],value['lat'])
+ point.push(value['lng'], value['lat'])
points.push(point)
})
data.push({
geometry: {
type: '"LineString"',
- coordinates: [points]
- }
+ coordinates: [points],
+ },
})
var lineLayer = new mapvgl.LineLayer({
color: 'red',
@@ -917,7 +1152,7 @@
animation: true,
duration: 10, // ������������2s
trailLength: 0.1, // ������������������������0.4
- interval: 0.3 // ���������������������������������0.2
+ interval: 0.3, // ���������������������������������0.2
})
that.view.addLayer(lineLayer)
lineLayer.setData(data)
@@ -941,6 +1176,7 @@
points.push(point1)
}
}
+
return points
}
@@ -950,14 +1186,23 @@
// ���������������������������������������
var ra = distance / EARTH_RADIUS
// ���������radian���������������������������
- angle = angle / 180 * Math.PI
- lng = lng / 180 * Math.PI
- lat = lat / 180 * Math.PI
- lng = lng + Math.atan2(Math.sin(angle) * Math.sin(ra) * Math.cos(lat), Math.cos(ra) - Math.sin(lat) * Math.sin(lat))
- lat = Math.asin(Math.sin(lat) * Math.cos(ra) + Math.cos(lat) * Math.sin(ra) * Math.cos(angle))
+ angle = (angle / 180) * Math.PI
+ lng = (lng / 180) * Math.PI
+ lat = (lat / 180) * Math.PI
+ lng =
+ lng +
+ Math.atan2(
+ Math.sin(angle) * Math.sin(ra) * Math.cos(lat),
+ Math.cos(ra) - Math.sin(lat) * Math.sin(lat)
+ )
+ lat = Math.asin(
+ Math.sin(lat) * Math.cos(ra) +
+ Math.cos(lat) * Math.sin(ra) * Math.cos(angle)
+ )
// ���������������10���������������
- lng = lng * 180 / Math.PI
- lat = lat * 180 / Math.PI
+ lng = (lng * 180) / Math.PI
+ lat = (lat * 180) / Math.PI
+ console.log(lng, lat)
return new BMapGL.Point(lng, lat)
}
@@ -987,7 +1232,7 @@
level5.color = '#99004c'
level6.color = '#7e0023'
- $.each(that.showPoints, function(index, value) {
+ $.each(that.showPoints, function (index, value) {
var sw = getPoint(225, value.lng, value.lat, that.distance)
var ne = getPoint(45, value.lng, value.lat, that.distance)
var polygon = []
@@ -1024,77 +1269,77 @@
data0.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 1:
data1.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 2:
data2.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 3:
data3.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 4:
data4.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 5:
data5.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
case 6:
data6.push({
geometry: {
type: 'Polygon',
- coordinates: [polygon]
+ coordinates: [polygon],
},
properties: {
- height: height
- }
+ height: height,
+ },
})
break
}
@@ -1297,7 +1542,6 @@
position: point
}
)// label���������
-
var offsetSize = new BMapGL.Size(0, 0)
var size = '10px'
if (that.map.getZoom() <= 15.5) {
@@ -1310,8 +1554,8 @@
lineHeight: '20px',
fontFamily: '������������',
backgroundColor: '0.05',
- fontWeight: 'bold'
- }
+ fontWeight: 'bold',
+ }
label.setStyle(labelStyle)
that.map.addOverlay(label)
}
@@ -1319,18 +1563,20 @@
// ������������,������������������
function showNoPoints() {
that.map.centerAndZoom('���������', 17)
- setTimeout(function() {
+ setTimeout(function () {
document.getElementById('cpm').style.display = 'block'
document.getElementById('data').style.display = 'none'
}, 250)
}
// ������������������������
- that.map.addEventListener('zoomend', function() {
+ that.map.addEventListener('zoomend', function () {
// ���������������������������������������
var zoom = that.map.getZoom()
$('span.my-maptip').parent()[zoom <= 15.5 ? 'hide' : 'show']()
- $('span.my-maptip').parent().css('font-size', 30 - zoom)
+ $('span.my-maptip')
+ .parent()
+ .css('font-size', 30 - zoom)
})
// var that = this
@@ -1367,28 +1613,36 @@
this.changeColor = index
// var pr = ''
switch (index) {
- case 0: this.sensorKey = 'a34004'
+ case 0:
+ this.sensorKey = 'a34004'
// this.bg = require('@/assets/images/tl_PM10.png')
break
- case 1: this.sensorKey = 'a34002'
+ case 1:
+ this.sensorKey = 'a34002'
// this.bg = require('@/assets/images/tl_PM2.5.png')
break
- case 2: this.sensorKey = 'a21026'
+ case 2:
+ this.sensorKey = 'a21026'
// this.bg = require('@/assets/images/tl_SO2.png')
break
- case 3: this.sensorKey = 'a21004'
+ case 3:
+ this.sensorKey = 'a21004'
// this.bg = require('@/assets/images/tl_NO2.png')
break
- case 4: this.sensorKey = 'a21005'
+ case 4:
+ this.sensorKey = 'a21005'
// this.bg = require('@/assets/images/tl_CO.png')
break
- case 5: this.sensorKey = 'a05024'
+ case 5:
+ this.sensorKey = 'a05024'
// this.bg = require('@/assets/images/tl_O3.png')
break
- case 6: this.sensorKey = 'a99054'
+ case 6:
+ this.sensorKey = 'a99054'
// this.bg = require('@/assets/images/tl_TVOCNew.png')
break
- case 7: this.sensorKey = 'dustld'
+ case 7:
+ this.sensorKey = 'dustld'
// this.bg = require('@/assets/images/tl_TVOCNew.png')
break
}
@@ -1402,8 +1656,8 @@
this.viewKey = '3D'
}
this.getStart()
- }
- }
+ },
+ },
}
</script>
<style lang="less" scoped>
@@ -1510,7 +1764,8 @@
background: rgba(204, 204, 204, 0.5);
box-shadow: 1px 1px 5px #666;
}
-.carTop > .left,.right {
+.carTop > .left,
+.right {
padding: 5px 10px;
border: 1px solid #aaa;
border-right: none;
@@ -1521,26 +1776,30 @@
margin-top: 4px;
-webkit-transform-origin-x: 0;
}
-.carTop .left:nth-child(1),.carTop .right:nth-child(1) {
+.carTop .left:nth-child(1),
+.carTop .right:nth-child(1) {
border-radius: 5px 0 0 5px;
}
-.carTop .left:nth-last-child(2),.carTop .right:nth-child(2) {
+.carTop .left:nth-last-child(2),
+.carTop .right:nth-child(2) {
border-radius: 0 5px 5px 0;
border-right: 1px solid #aaa;
}
+
.carTop{
&>.left:nth-child(1){
border-radius: 5px 0 0 5px;
}
}
.carTop {
- .left{
- &:nth-last-child(2){
+ .left {
+ &:nth-last-child(2) {
margin-left: -12px !important;
}
}
}
-.carTop > .left:hover,.right:hover {
+.carTop > .left:hover,
+.right:hover {
background: rgb(64, 158, 255);
color: #fff;
}
@@ -1563,10 +1822,11 @@
font-size: 28px;
border: 2px solid #ff7f50;
}
-.main_body .el-date-editor .el-range-input{
+.main_body .el-date-editor .el-range-input {
width: 30%;
}
-.main_body /deep/ .el-date-editor .el-range-separator{
+.main_body /deep/ .el-date-editor .el-range-separator {
width: 15%;
}
</style>
+
\ No newline at end of file
--
Gitblit v1.8.0