From 4e15972e4db30f68e4ea74759fd04f00e6e44be2 Mon Sep 17 00:00:00 2001
From: yichenxi <yichenxi0601@163.com>
Date: Tue, 13 Dec 2022 11:21:23 +0800
Subject: [PATCH] 1、尘负荷走航路段报告
---
src/views/car/index.vue | 88 ++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/src/views/car/index.vue b/src/views/car/index.vue
index d3ac8e8..46a9ab8 100644
--- a/src/views/car/index.vue
+++ b/src/views/car/index.vue
@@ -541,7 +541,6 @@
}
},
},
-<<<<<<< HEAD
timeOne: '',
threeOptions: {
onPick: ({ maxDate, minDate }) => {
@@ -565,8 +564,6 @@
}
},
},
-=======
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
sensorDate: null,
noneData: false,
defaultData: [],
@@ -626,12 +623,12 @@
{
sensorName: 'O3',
unit: 'ug/m��',
- tab1: '160',
- tab2: '200',
- tab3: '300',
- tab4: '400',
+ tab1: '100',
+ tab2: '160',
+ tab3: '215',
+ tab4: '265',
tab5: '800',
- tab6: '1000',
+ tab6: '800',
},
{
sensorName: 'TVOC',
@@ -765,9 +762,17 @@
// console.log(file, fileList)
},
handleChange(file, fileList) {
- this.file = file
- console.log(this.file.raw)
- this.fileList = fileList
+ var str = file.name //���������4���
+ let a = str.substring(str.length - 3)
+ console.log(a)
+ if (a === 'png') {
+ this.file = file
+ console.log(this.file.raw)
+ this.fileList = fileList
+ }else{
+ this.$message('���������png���������������')
+ }
+ // console.log(file.name, 'file')
},
insLuDuan() {
if (this.startL == '') {
@@ -817,6 +822,21 @@
this.Lname = ''
}
})
+ // this.$request({
+ // url:'',
+ // method:'post',
+ // data:{
+ // starttime:this.startL,
+ // endtime:this.endL,
+ // name:this.Lname,
+ // mac:this.carMac,
+ // sTime:times[0],
+ // eTime:times[1],
+ // img:this.file.raw
+ // }
+ // }).then((res)=>{
+ // console.log(res);
+ // })
},
//������������
@@ -1148,7 +1168,6 @@
timeArrSub[i] = v.split(' ')[0]
if (i === 1) timeArrSub[2] = v.split(' ')[1]
})
-<<<<<<< HEAD
if (
that.carMac === 'p5dnd7a0243626' &&
timeArrSub[0] === '2022-12-11' &&
@@ -1156,36 +1175,25 @@
(timeArrSub[1] === '2022-12-12' &&
timeArrSub[2] === '00:00:00'))
) {
-=======
- if (that.carMac === 'p5dnd7a0243626' && timeArrSub[0] === '2022-12-11' && (timeArrSub[1] === '2022-12-11' || timeArrSub[1] === '2022-12-12' && timeArrSub[2] === '00:00:00')) {
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
if (value.a34004) point.a34004 = parseInt(value.a34004 * 2.7)
if (value.a34002) point.a34002 = parseInt(value.a34002 * 2.2)
if (value.a21026) point.a21026 = parseInt(value.a21026 - 0 + 5)
if (value.a21004) point.a21004 = parseInt(value.a21004 - 20)
// point.a21004 = parseInt(value.a21004)
-<<<<<<< HEAD
if (value.a21005)
point.a21005 = parseFloat(value.a21005 - 0 + 0.85).toFixed(3)
-=======
- if (value.a21005) point.a21005 = parseFloat(value.a21005 - 0 + 0.85).toFixed(3)
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
if (value.a05024 < 15) {
point.a05024 = parseInt(value.a05024 + 3)
} else if (value.a05024 > 18) {
point.a05024 = parseInt(value.a05024 - 3)
} else point.a05024 = parseInt(value.a05024)
point.a99054 = parseFloat(value.a99054).toFixed(3)
-<<<<<<< HEAD
if (
value.dustld - 0 !== 0 &&
value.dustld - 0 < 100 &&
(that.carMac === 'p5dnd7a0243622' ||
that.carMac === 'p5dnd7a0243625')
) {
-=======
- if (value.dustld - 0 !== 0 && value.dustld - 0 < 100 && (that.carMac === 'p5dnd7a0243622' || that.carMac === 'p5dnd7a0243625')) {
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
point.dustld = 100
} else {
point.dustld = value.dustld - 0
@@ -1198,37 +1206,19 @@
point.a21005 = parseFloat(value.a21005).toFixed(3)
point.a05024 = parseInt(value.a05024)
point.a99054 = parseFloat(value.a99054).toFixed(3)
-<<<<<<< HEAD
if (
value.dustld - 0 !== 0 &&
value.dustld - 0 < 100 &&
(that.carMac === 'p5dnd7a0243622' ||
that.carMac === 'p5dnd7a0243625')
) {
-=======
- if (value.dustld - 0 !== 0 && value.dustld - 0 < 100 && (that.carMac === 'p5dnd7a0243622' || that.carMac === 'p5dnd7a0243625')) {
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
point.dustld = 100
} else {
point.dustld = value.dustld - 0
}
}
-<<<<<<< HEAD
-=======
- // point.a34004 = parseInt(value.a34004)
- // point.a34002 = parseInt(value.a34002)
- // point.a21026 = parseInt(value.a21026)
- // point.a21004 = parseInt(value.a21004)
- // point.a21005 = parseFloat(value.a21005).toFixed(3)
- // point.a05024 = parseInt(value.a05024)
- // point.a99054 = parseFloat(value.a99054).toFixed(3)
- // if (value.dustld - 0 !== 0 && value.dustld - 0 < 100 && (that.carMac === 'p5dnd7a0243622' || that.carMac === 'p5dnd7a0243625')) {
- // point.dustld = 100
- // } else {
- // point.dustld = value.dustld - 0
- // }
// point.dustld = value.dustld - 0
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
+ point.times = value.time
trackPoints.push(point)
}
})
@@ -1291,13 +1281,7 @@
selectedColor: '#ee1111', // ���������������
autoSelect: true, // ������������������������������������������
riseTime: 1800, // ���������������������������
-<<<<<<< HEAD
onClick: (e) => {},
-=======
- onClick: (e) => {
- // console.log(e)
- },
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
})
that.shapeLayer.setData(data)
that.view.addLayer(that.shapeLayer)
@@ -1430,11 +1414,7 @@
// ���������������10���������������
lng = (lng * 180) / Math.PI
lat = (lat * 180) / Math.PI
-<<<<<<< HEAD
// console.log(lng, lat,123)
-=======
- // console.log(lng, lat)
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
return new BMapGL.Point(lng, lat)
}
@@ -1792,7 +1772,6 @@
backgroundColor: '0.05',
fontWeight: 'bold',
}
-<<<<<<< HEAD
label.addEventListener('click', (e) => {
console.log(e)
// var ps = e.target.latLng.lat
@@ -1808,8 +1787,6 @@
that.endL = times
}
})
-=======
->>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
label.setStyle(labelStyle)
that.map.addOverlay(label)
}
@@ -2111,3 +2088,4 @@
margin-top: 0.8rem;
}
</style>
+
\ No newline at end of file
--
Gitblit v1.8.0