From 936633659148e800a8d09322a9f1e646104010a7 Mon Sep 17 00:00:00 2001
From: yichenxi <yichenxi0601@163.com>
Date: Mon, 12 Dec 2022 14:14:57 +0800
Subject: [PATCH] 1、尘负荷走航路段报告

---
 src/views/car/index.vue |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/views/car/index.vue b/src/views/car/index.vue
index a423c11..d3ac8e8 100644
--- a/src/views/car/index.vue
+++ b/src/views/car/index.vue
@@ -541,6 +541,7 @@
           }
         },
       },
+<<<<<<< HEAD
       timeOne: '',
       threeOptions: {
         onPick: ({ maxDate, minDate }) => {
@@ -564,6 +565,8 @@
           }
         },
       },
+=======
+>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
       sensorDate: null,
       noneData: false,
       defaultData: [],
@@ -623,12 +626,12 @@
         {
           sensorName: 'O3',
           unit: 'ug/m��',
-          tab1: '100',
-          tab2: '160',
-          tab3: '215',
-          tab4: '265',
+          tab1: '160',
+          tab2: '200',
+          tab3: '300',
+          tab4: '400',
           tab5: '800',
-          tab6: '800',
+          tab6: '1000',
         },
         {
           sensorName: 'TVOC',
@@ -1145,6 +1148,7 @@
               timeArrSub[i] = v.split(' ')[0]
               if (i === 1) timeArrSub[2] = v.split(' ')[1]
             })
+<<<<<<< HEAD
             if (
               that.carMac === 'p5dnd7a0243626' &&
               timeArrSub[0] === '2022-12-11' &&
@@ -1152,25 +1156,36 @@
                 (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
@@ -1183,17 +1198,37 @@
               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
             trackPoints.push(point)
           }
         })
@@ -1256,7 +1291,13 @@
               selectedColor: '#ee1111', // ���������������
               autoSelect: true, // ������������������������������������������
               riseTime: 1800, // ���������������������������
+<<<<<<< HEAD
               onClick: (e) => {},
+=======
+              onClick: (e) => {
+                // console.log(e)
+              },
+>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
             })
             that.shapeLayer.setData(data)
             that.view.addLayer(that.shapeLayer)
@@ -1389,7 +1430,11 @@
         // ���������������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)
       }
 
@@ -1747,6 +1792,7 @@
           backgroundColor: '0.05',
           fontWeight: 'bold',
         }
+<<<<<<< HEAD
         label.addEventListener('click', (e) => {
           console.log(e)
           // var ps = e.target.latLng.lat
@@ -1762,6 +1808,8 @@
             that.endL = times
           }
         })
+=======
+>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
         label.setStyle(labelStyle)
         that.map.addOverlay(label)
       }
@@ -2063,4 +2111,3 @@
   margin-top: 0.8rem;
 }
 </style>
-  
\ No newline at end of file

--
Gitblit v1.8.0