From 6d21dd8cdb40c6734c90f6a4a180cc00bae53e20 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 08:39:43 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/UVA/index.vue | 429 ++++++++++++++++++++++++++++------------------------
1 files changed, 231 insertions(+), 198 deletions(-)
diff --git a/src/views/UVA/index.vue b/src/views/UVA/index.vue
index dc2c246..0266911 100644
--- a/src/views/UVA/index.vue
+++ b/src/views/UVA/index.vue
@@ -42,12 +42,7 @@
class="coll"
>
<!--accordion ���������������-->
- <el-collapse
- v-show="shou1 === true"
- v-loading="loading"
- accordion
- style="box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)"
- >
+ <el-collapse v-show="shou1 === true" v-loading="loading">
<el-collapse-item
style="text-indent: 2em; position: relative; padding-botton: 10px"
>
@@ -55,11 +50,12 @@
<img
style="position: absolute; left: 18px"
src="../../assets/images/uav/uav.png"
- >
+ />
<span
style="display: inline-block; position: absolute; left: 20px"
>
- ������������������������������</span>
+ ������������������������������</span
+ >
</template>
</el-collapse-item>
</el-collapse>
@@ -82,11 +78,12 @@
<img
style="position: absolute; left: 18px"
src="../../assets/images/uav/uav.png"
- >
+ />
<span
style="display: inline-block; position: absolute; left: 20px"
>
- {{ item1.name }}</span>
+ {{ item1.name }}</span
+ >
</template>
<el-scrollbar style="height: 200px; overflow-x: hidden">
<div
@@ -144,17 +141,9 @@
<div v-if="selecttrue === 2" class="Duo">
<div class="spantuu">
<span>���������������������������(���): </span>
- <el-input
- ref="uvas"
- v-model="tallone"
- class="inputtu"
- />
+ <el-input ref="uvas" v-model="tallone" class="inputtu" />
--
- <el-input
- ref="uvas"
- v-model="talltwo"
- class="inputtu"
- />
+ <el-input ref="uvas" v-model="talltwo" class="inputtu" />
</div>
<!-- <el-select v-model="Duovalue" placeholder="������������" class="slee">
<el-option
@@ -166,7 +155,8 @@
</el-option>
</el-select> -->
<div class="spantu">
- <span>������������(���): </span><el-input
+ <span>������������(���): </span
+ ><el-input
ref="uvas"
v-model="uvasize"
class="inputtu"
@@ -198,11 +188,9 @@
</div> -->
</div>
<div v-if="selecttrue === 1" style="margin-left: 10px">
- <el-button
- type="primary"
- style="margin-top: 10px"
- @click="gengD"
- >������������</el-button>
+ <el-button type="primary" style="margin-top: 10px" @click="gengD">
+ ������������
+ </el-button>
</div>
<div
v-if="selecttrue === 2"
@@ -213,9 +201,11 @@
type="primary"
icon="el-icon-setting"
@click="dialogFormVisible = true"
- >6���������</el-button>
- <el-button class="gengD" @click="shou">������</el-button>
- <el-button type="primary" @click="selectDuo">������</el-button>
+ >
+ 6���������
+ </el-button>
+ <el-button class="gengD" @click="shou"> ������ </el-button>
+ <el-button type="primary" @click="selectDuo"> ������ </el-button>
</div>
</div>
<!-- <div class="Duo" v-if="selecttrue === 2">
@@ -256,12 +246,14 @@
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>
- <el-descriptions-item label="CO | mg/m��">0.5</el-descriptions-item>
- <el-descriptions-item label="O3 | ug/m��">149</el-descriptions-item>
+ >
+ 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>
+ <el-descriptions-item label="CO | mg/m��"> 0.5 </el-descriptions-item>
+ <el-descriptions-item label="O3 | ug/m��"> 149 </el-descriptions-item>
</el-descriptions>
<!-- <el-descriptions title="���������������" border>
</el-descriptions> -->
@@ -313,8 +305,8 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
- <el-button @click="dialogFormVisible = false">��� ���</el-button>
- <el-button type="primary" @click="customLevel">��� ���</el-button>
+ <el-button @click="dialogFormVisible = false"> ��� ��� </el-button>
+ <el-button type="primary" @click="customLevel"> ��� ��� </el-button>
</div>
</el-dialog>
</div>
@@ -329,7 +321,7 @@
var GPS = {
PI: 3.14159265358979324,
x_pi: (3.14159265358979324 * 3000.0) / 180.0,
- delta: function(lat, lon) {
+ delta: function (lat, lon) {
var a = 6378245.0 // a: ������������������������������������������������������������������
var ee = 0.00669342162296594323 // ee: ���������������������
var dLat = this.transformLat(lon - 105.0, lat - 35.0)
@@ -344,7 +336,7 @@
},
// WGS-84 to GCJ-02
- gcj_encrypt: function(wgsLat, wgsLon) {
+ gcj_encrypt: function (wgsLat, wgsLon) {
if (this.outOfChina(wgsLat, wgsLon)) {
return { lat: wgsLat, lon: wgsLon }
}
@@ -353,7 +345,7 @@
return { lat: wgsLat + d.lat, lon: wgsLon + d.lon }
},
// GCJ-02 to WGS-84
- gcj_decrypt: function(gcjLat, gcjLon) {
+ gcj_decrypt: function (gcjLat, gcjLon) {
if (this.outOfChina(gcjLat, gcjLon)) {
return { lat: gcjLat, lon: gcjLon }
}
@@ -362,7 +354,7 @@
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
@@ -384,17 +376,25 @@
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
+ if (++i > 10000) {
+ break
+ }
}
return { lat: wgsLat, lon: wgsLon }
},
// GCJ-02 to BD-09
- bd_encrypt: function(gcjLat, gcjLon) {
+ 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)
@@ -404,7 +404,7 @@
return { lat: this.bdLat, lon: this.bdLon }
},
// BD-09 to GCJ-02
- bd_decrypt: function(bdLat, bdLon) {
+ 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)
@@ -415,7 +415,7 @@
},
// WGS-84 to Web mercator
// mercatorLat -> y mercatorLon -> x
- mercator_encrypt: function(wgsLat, wgsLon) {
+ 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)) /
@@ -425,7 +425,7 @@
},
// Web mercator to WGS-84
// mercatorLat -> y mercatorLon -> x
- mercator_decrypt: function(mercatorLat, mercatorLon) {
+ mercator_decrypt: function (mercatorLat, mercatorLon) {
var x = (mercatorLon / 20037508.34) * 180.0
var y = (mercatorLat / 20037508.34) * 180.0
y =
@@ -434,7 +434,7 @@
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) *
@@ -443,13 +443,17 @@
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
+ if (s > 1) {
+ s = 1
+ }
+ if (s < -1) {
+ s = -1
+ }
var alpha = Math.acos(s)
var distance = alpha * earthR
return distance
},
- outOfChina: function(lat, lon) {
+ outOfChina: function (lat, lon) {
if (lon < 72.004 || lon > 137.8347) {
return true
}
@@ -458,7 +462,7 @@
}
return false
},
- transformLat: function(x, y) {
+ transformLat: function (x, y) {
var ret =
-100.0 +
2.0 * x +
@@ -482,7 +486,7 @@
3.0
return ret
},
- transformLon: function(x, y) {
+ transformLon: function (x, y) {
var ret =
300.0 +
x +
@@ -505,14 +509,16 @@
2.0) /
3.0
return ret
- }
+ },
}
export default {
filters: {
- sensorFilter: function(value) {
- if (!value) return ''
+ sensorFilter: function (value) {
+ if (!value) {
+ return ''
+ }
return json[value]
- }
+ },
},
data() {
return {
@@ -531,7 +537,7 @@
if (this.timeNums.includes(timeDate)) {
return 'dateArrClass' // ������������������������������������������
}
- }
+ },
},
tallone: 0,
@@ -542,7 +548,7 @@
activeNames: [0],
uavTimeFly: [], // ���������������������������������������������
activeKey: -1,
- activeAreaKey: 0
+ activeAreaKey: 0,
},
load: 1,
value: [],
@@ -554,7 +560,7 @@
{ code: 'a21004', name: 'NO2' },
{ code: 'a21005', name: 'CO' },
{ code: 'a05024', name: 'O3' },
- { code: 'a99054', name: 'TVOC' }
+ { code: 'a99054', name: 'TVOC' },
],
valuetime: '2023-01-01',
defautRadio: { code: 'a34004', name: 'PM2.5' },
@@ -579,7 +585,7 @@
'CO',
'O3',
'TVOC',
- '���������'
+ '���������',
],
changeColor: 0,
changeColor1: 0,
@@ -596,7 +602,9 @@
// ������������ ������������
this.timeOne = minDate.getTime() // ��������������������� ������������������
// ������������������������������������������������������������
- if (maxDate) this.timeOne = ''
+ if (maxDate) {
+ this.timeOne = ''
+ }
},
disabledDate: (time) => {
if (this.timeOne) {
@@ -611,7 +619,7 @@
} else {
return time.getTime() > new Date()
}
- }
+ },
},
sensorDate: null,
noneData: true,
@@ -627,16 +635,16 @@
{ code: 'a99054', name: 'TVOC' },
{
code: 'a01006',
- name: '������'
+ name: '������',
},
{
code: 'a01001',
- name: '������'
+ name: '������',
},
{
code: 'a01002',
- name: '������'
- }
+ name: '������',
+ },
],
sensorTableData: [
{
@@ -647,7 +655,7 @@
tab3: '115',
tab4: '150',
tab5: '250',
- tab6: '350'
+ tab6: '350',
},
{
sensorName: 'PM10',
@@ -657,7 +665,7 @@
tab3: '250',
tab4: '350',
tab5: '420',
- tab6: '500'
+ tab6: '500',
},
{
sensorName: 'SO2',
@@ -667,7 +675,7 @@
tab3: '475',
tab4: '800',
tab5: '1600',
- tab6: '2100'
+ tab6: '2100',
},
{
sensorName: 'NO2',
@@ -677,7 +685,7 @@
tab3: '180',
tab4: '280',
tab5: '565',
- tab6: '750'
+ tab6: '750',
},
{
sensorName: 'CO',
@@ -687,7 +695,7 @@
tab3: '14',
tab4: '24',
tab5: '36',
- tab6: '48'
+ tab6: '48',
},
{
sensorName: 'O3',
@@ -697,7 +705,7 @@
tab3: '300',
tab4: '400',
tab5: '800',
- tab6: '1000'
+ tab6: '1000',
},
{
sensorName: 'TVOC',
@@ -707,7 +715,7 @@
tab3: '0.5',
tab4: '0.7',
tab5: '0.9',
- tab6: '1'
+ tab6: '1',
},
{
sensorName: '���������',
@@ -717,21 +725,21 @@
tab3: '1000',
tab4: '10000',
tab5: '20000',
- tab6: '50000'
+ tab6: '50000',
},
{
sensorName: '������',
- unit: 'hpa'
+ unit: 'hpa',
},
{
sensorName: '������',
- unit: '%'
+ unit: '%',
},
{
sensorName: '������',
- unit: '���'
- }
+ unit: '���',
+ },
],
carWs: null,
map: null,
@@ -751,12 +759,12 @@
dataTypeList: [
{
value: 'history',
- label: '������������'
+ label: '������������',
},
{
value: 'webSocket',
- label: '������������'
- }
+ label: '������������',
+ },
],
dataTypeValue: 'history',
historyView: true,
@@ -773,7 +781,7 @@
uvasize: 20,
timeValue: [
new Date(2020, 1, 1, 0, 0, 0),
- new Date(2022, 12, 31, 23, 59, 59)
+ new Date(2022, 12, 31, 23, 59, 59),
],
timeNums: [],
batchs: '',
@@ -787,7 +795,7 @@
tab3: '115',
tab4: '150',
tab5: '250',
- tab6: '350'
+ tab6: '350',
},
{
sensorName: 'PM10',
@@ -797,7 +805,7 @@
tab3: '250',
tab4: '350',
tab5: '420',
- tab6: '500'
+ tab6: '500',
},
{
sensorName: 'SO2',
@@ -807,7 +815,7 @@
tab3: '650',
tab4: '800',
tab5: '',
- tab6: ''
+ tab6: '',
},
{
sensorName: 'NO2',
@@ -817,7 +825,7 @@
tab3: '700',
tab4: '1200',
tab5: '2340',
- tab6: '3090'
+ tab6: '3090',
},
{
sensorName: 'CO',
@@ -827,7 +835,7 @@
tab3: '35',
tab4: '60',
tab5: '90',
- tab6: '120'
+ tab6: '120',
},
{
sensorName: 'O3',
@@ -837,7 +845,7 @@
tab3: '300',
tab4: '400',
tab5: '800',
- tab6: '1000'
+ tab6: '1000',
},
{
sensorName: 'TVOC',
@@ -847,7 +855,7 @@
tab3: '0.5',
tab4: '0.7',
tab5: '0.9',
- tab6: '1'
+ tab6: '1',
},
{
sensorName: '���������',
@@ -857,9 +865,9 @@
tab3: '1000',
tab4: '10000',
tab5: '20000',
- tab6: '50000'
- }
- ]
+ tab6: '50000',
+ },
+ ],
}
},
watch: {
@@ -883,11 +891,14 @@
// console.log(n)
},
deep: true,
- immediate: true
+ immediate: true,
},
mounted() {
- this.initStart()
+ this.$nextTick(() => {
+ this.initStart()
+ })
+
// this.$refs.datePick.focus()
// this.getDate()
// this.flyData()
@@ -927,9 +938,9 @@
uvasize: this.uvasize,
mac: this.macs,
height1: this.tallone,
- height2: this.talltwo
+ height2: this.talltwo,
// batch: '2023-06-16 16:21:21',
- }
+ },
}).then((res) => {
// console.log(res)
this.carData = []
@@ -1005,7 +1016,7 @@
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
- a: date.getDay()
+ a: date.getDay(),
}
const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
const value = formatObj[key]
@@ -1110,8 +1121,8 @@
method: 'get',
params: {
organizationId: this.$store.state.orgId,
- date: item
- }
+ date: item,
+ },
}).then((res) => {
// console.log(res, 'res.data.vos')
if (res.code === -47) {
@@ -1169,9 +1180,9 @@
uvasize: this.uvasize,
height1: this.tallone,
height2: this.talltwo,
- mac: mac
+ mac: mac,
// batch: '2023-06-16 16:21:21',
- }
+ },
}).then((res) => {
// console.log(res)
this.carData = []
@@ -1195,8 +1206,8 @@
url: '/uav/queryDate',
method: 'get',
params: {
- organizationId: this.$store.state.orgId
- }
+ organizationId: this.$store.state.orgId,
+ },
}).then((res) => {
this.asideData.dates = JSON.parse(JSON.stringify(res.data.datesStr))
this.timeNums = this.asideData.dates
@@ -1223,11 +1234,14 @@
this.abc += 1
const that = this
if (!res) {
- that.map = new window.window.BMapGL.Map('map_container')
+ that.map = new BMapGL.Map('map_container')
+ console.log('BMapGL', BMapGL)
+ console.log('BMapGL', BMapGL)
+ console.log('window', window.BMapGL)
that.map.enableScrollWheelZoom(true) // ������������������������������������������������������s
that.map.setMapType(BMAP_EARTH_MAP) // ���������������������������������
that.map.setDisplayOptions({
- street: false // ������������������������������������������������������������
+ street: false, // ������������������������������������������������������������
})
that.map.setHeading(0) // ������������������
if (that.viewKey === '2D') {
@@ -1242,31 +1256,31 @@
elementType: 'all',
stylers: {
color: '#ffffff',
- visibility: 'off'
- }
+ visibility: 'off',
+ },
},
{
featureType: 'building',
elementType: 'all',
stylers: {
- visibility: 'off'
- }
+ visibility: 'off',
+ },
},
{
featureType: 'poilabel',
elementType: 'all',
stylers: {
- visibility: 'off'
- }
+ visibility: 'off',
+ },
},
{
featureType: 'manmade',
elementType: 'all',
stylers: {
- visibility: 'off'
- }
- }
- ]
+ visibility: 'off',
+ },
+ },
+ ],
})
showNoPoints()
this.loading1 = false
@@ -1302,7 +1316,7 @@
// lat = GPS.bd_encrypt(lat, lng).lat
// lng = GPS.bd_decrypt(lat, lng).lon
// lat = GPS.bd_decrypt(lat, lng).lat
- var point = new window.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)
@@ -1358,7 +1372,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
that.loading1 = false
@@ -1367,7 +1381,7 @@
this.map.clearOverlays()
that.map.centerAndZoom(that.centerPoint, that.mapZoom)
that.view = new mapvgl.View({
- map: that.map
+ map: that.map,
})
that.loading1 = false
@@ -1380,7 +1394,7 @@
// 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) {
@@ -1391,7 +1405,7 @@
selectedIndex: -1, // ���������
selectedColor: '#ee1111', // ���������������
autoSelect: true, // ������������������������������������������
- riseTime: 1800 // ���������������������������
+ riseTime: 1800, // ���������������������������
})
that.shapeLayer.setData(data)
that.view.addLayer(that.shapeLayer)
@@ -1399,7 +1413,7 @@
})
that.map.setDefaultCursor('default')
if (type === '2D') {
- $.each(that.showPoints, function(item, point) {
+ $.each(that.showPoints, function (item, point) {
setLabelStyle(point[sensor], point)
})
}
@@ -1407,18 +1421,18 @@
// ���������������������������������
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]
// ������������������������������������
var color = getColorAndLevel(sensor, data).color
- var polygon = new window.BMapGL.Polygon(
+ var polygon = new BMapGL.Polygon(
[
- new window.BMapGL.Point(sw.lng, sw.lat), // ���������
- new window.BMapGL.Point(ne.lng, sw.lat), // ���������
- new window.BMapGL.Point(ne.lng, ne.lat), // ���������
- new window.BMapGL.Point(sw.lng, ne.lat) // ���������
+ 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.1, // ������������������,������������������
@@ -1426,7 +1440,7 @@
fillColor: color, // ���������������������
fillOpacity: 0.8, // ������������������������0~1������
strokeColor: 'black', // ������������������
- strokeStyle: 'solid' // ������������������solid���dashed���
+ strokeStyle: 'solid', // ������������������solid���dashed���
}
)
that.map.addOverlay(polygon)
@@ -1437,24 +1451,24 @@
// ���������������������
function drawStartAndEnd() {
- var startIcon = new window.BMapGL.Icon(
+ var startIcon = new BMapGL.Icon(
require('@/assets/images/start.png'),
- new window.BMapGL.Size(48, 48)
+ new BMapGL.Size(48, 48)
)
- var startMark = new window.BMapGL.Marker(that.showPoints[0], {
+ var startMark = new BMapGL.Marker(that.showPoints[0], {
icon: startIcon,
- offset: new window.BMapGL.Size(0, -20)
+ offset: new BMapGL.Size(0, -20),
})
that.map.addOverlay(startMark)
- var endIcon = new window.BMapGL.Icon(
+ var endIcon = new BMapGL.Icon(
require('@/assets/images/end.png'),
- new window.BMapGL.Size(48, 48)
+ new BMapGL.Size(48, 48)
)
- var endMark = new window.BMapGL.Marker(
+ var endMark = new BMapGL.Marker(
that.showPoints[that.showPoints.length - 1],
{
icon: endIcon,
- offset: new window.BMapGL.Size(0, -20)
+ offset: new BMapGL.Size(0, -20),
}
)
that.map.addOverlay(endMark)
@@ -1464,7 +1478,7 @@
function drawLine() {
var data = []
var points = []
- $.each(trackPoints, function(index, value) {
+ $.each(trackPoints, function (index, value) {
var point = []
point.push(value['lng'], value['lat'])
points.push(point)
@@ -1472,8 +1486,8 @@
data.push({
geometry: {
type: '"LineString"',
- coordinates: [points]
- }
+ coordinates: [points],
+ },
})
var lineLayer = new mapvgl.LineLayer({
color: 'red',
@@ -1481,7 +1495,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)
@@ -1534,7 +1548,7 @@
lng = (lng * 180) / Math.PI
lat = (lat * 180) / Math.PI
// console.log(lng, lat)
- return new window.BMapGL.Point(lng, lat)
+ return new BMapGL.Point(lng, lat)
}
function getGrading(sensor, type, carMac) {
@@ -1563,7 +1577,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, 30)
var polygon = []
@@ -1600,77 +1614,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
}
@@ -1885,14 +1899,14 @@
// point���������label������
function setLabelStyle(content, point) {
- var label = new window.BMapGL.Label(
+ var label = new BMapGL.Label(
"<span class='my-maptip'>" + content + '<br /><span>', // ���lable������������
{
- offset: new window.BMapGL.Size(-8, -10), // label������������������������label������������������������
- position: point
+ offset: new BMapGL.Size(-8, -10), // label������������������������label������������������������
+ position: point,
} // label���������
)
- var offsetSize = new window.BMapGL.Size(0, 0)
+ var offsetSize = new BMapGL.Size(0, 0)
var size = '10px'
if (that.map.getZoom() <= 15.5) {
size = '0px'
@@ -1904,7 +1918,7 @@
lineHeight: '20px',
fontFamily: '������������',
backgroundColor: '0.05',
- fontWeight: 'bold'
+ fontWeight: 'bold',
}
label.setStyle(labelStyle)
that.map.addOverlay(label)
@@ -1913,14 +1927,14 @@
// ������������,������������������
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']()
@@ -1997,12 +2011,27 @@
break
}
this.initStart(this.carData)
- }
- }
+ },
+ },
}
</script>
-<style lang="scss" >
+<style lang="scss" scoped>
+.main-container {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: vertical;
+ -webkit-box-direction: normal;
+ -ms-flex-flow: column;
+ flex-flow: column;
+ min-height: 100%;
+ -webkit-transition: margin-left 0.28s;
+ transition: margin-left 0.28s;
+ margin-left: 210px;
+ position: relative;
+ height: 100%;
+}
/deep/.BMap_cpyCtrl {
display: none;
}
@@ -2177,20 +2206,7 @@
/deep/.inputNum {
width: 4% !important;
}
-.dateArrClass {
- position: relative;
-}
-.dateArrClass > div ::after {
- content: '';
- position: absolute;
- right: 8px;
- top: 23px;
- width: 5px;
- height: 5px;
- border-radius: 50%;
- z-index: 999;
- background-color: #f40;
-}
+
.numss {
width: 700px;
background-color: white;
@@ -2237,13 +2253,7 @@
width: 20%;
}
}
-.jlpMySelectPopper.el-picker-panel {
- width: 280px;
- height: 330px;
-}
-.jlpMySelectPopper.el-date-picker table {
- width: 88%;
-}
+
.BMap_cpyCtrl {
display: none;
}
@@ -2262,3 +2272,26 @@
overflow-x: hidden;
}
</style>
+<style >
+.jlpMySelectPopper.el-picker-panel {
+ width: 280px;
+ height: 330px;
+}
+.jlpMySelectPopper.el-date-picker table {
+ width: 88%;
+}
+.dateArrClass {
+ position: relative;
+}
+.dateArrClass > div ::after {
+ content: '';
+ position: absolute;
+ right: 8px;
+ top: 23px;
+ width: 5px;
+ height: 5px;
+ border-radius: 50%;
+ z-index: 999;
+ background-color: #f40;
+}
+</style>
--
Gitblit v1.8.0