1、尘负荷走航路段

yichenxi

2022-12-12 98e00421c572ef955c2eca5445800096e215b779

 src/views/car/index.vue

@@ -541,32 +541,6 @@
          }
        },
      },
<<<<<<< HEAD
      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()
          }
        },
      },
=======
>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
      sensorDate: null,
      noneData: false,
      defaultData: [],
@@ -1148,44 +1122,20 @@
              timeArrSub[i] = v.split(' ')[0]
              if (i === 1) timeArrSub[2] = v.split(' ')[1]
            })
<<<<<<< HEAD
            if (
              that.carMac === 'p5dnd7a0243626' &&
              timeArrSub[0] === '2022-12-11' &&
              (timeArrSub[1] === '2022-12-11' ||
                (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,23 +1148,12 @@
              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)
@@ -1228,7 +1167,6 @@
            //   point.dustld = value.dustld - 0
            // }
            // point.dustld = value.dustld - 0
>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229
            trackPoints.push(point)
          }
        })
@@ -1291,13 +1229,9 @@
              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 +1364,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 +1722,6 @@
          backgroundColor: '0.05',
          fontWeight: 'bold',
        }
<<<<<<< HEAD
        label.addEventListener('click', (e) => {
          console.log(e)
          // var ps = e.target.latLng.lat
@@ -1808,8 +1737,7 @@
            that.endL = times
          }
        })
=======
>>>>>>> 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229

        label.setStyle(labelStyle)
        that.map.addOverlay(label)
      }