guoshipeng
2023-05-11 b82c1f5e2c6daeede03f6fcf7c91ae66348d97e3
1、道路尘负荷分析尘负荷值修改
2、6参设定修改
4 files modified
101 ■■■■ changed files
.idea/workspace.xml 1 ●●●● patch | view | raw | blame | history
src/components/Wind/Map.vue 3 ●●●● patch | view | raw | blame | history
src/utils/request.js 4 ●●●● patch | view | raw | blame | history
src/views/car/index.vue 93 ●●●● patch | view | raw | blame | history
.idea/workspace.xml
@@ -373,6 +373,7 @@
      <workItem from="1679296917474" duration="8000" />
      <workItem from="1680243193398" duration="162000" />
      <workItem from="1680502666801" duration="6000" />
      <workItem from="1683791620023" duration="3000" />
    </task>
    <task id="LOCAL-00001" summary="处理详情页侧面菜单不消失">
      <created>1627269084478</created>
src/components/Wind/Map.vue
@@ -669,7 +669,7 @@
      // this.dateFormat = currentDate.toString()
      const aData = new Date()
      const month = aData.getMonth() < 9 ? '0' + (aData.getMonth() + 1) : aData.getMonth() + 1
      const date = aData.getDate()
      const date = aData.getDate() < 10 ? '0' + aData.getDate()  : aData.getDate()
      const hour = aData.getHours() 
      const currentDate = aData.getFullYear() + '-' + month + '-' + date + ' ' + hour + ':00'
      this.dateFormat = currentDate.toString()
@@ -1491,7 +1491,6 @@
            this.times = 300
          }, 100)
        }
        this.currentHour();
      }, 1000)
    },
    // 初始化地图容器
src/utils/request.js
@@ -6,8 +6,8 @@
// const baseUrl = 'http://192.168.0.42:8081/' // lzj
// const baseUrl = 'http://192.168.0.33:8081/' // yy
// const baseUrl = 'http://192.168.0.25:8081' // jj
// const baseUrl = 'http://192.168.0.33:8085/'// swb
// const baseUrl = 'http://192.168.0.33:8081/' // new swb
// const baseUrl = 'http://192.168.0.11:8085/'// swb
// const baseUrl = 'http://192.168.0.11:8081/' // new swb
// const baseUrl = 'http://121.43.179.139:8080'
// const baseUrl = 'http://192.168.0.33:8085/'
// const baseUrl = 'http://192.168.0.33:8081/'
src/views/car/index.vue
@@ -618,32 +618,32 @@
        {
          sensorName: 'SO2',
          unit: 'ug/m³',
          tab1: '50',
          tab2: '150',
          tab3: '475',
          tab1: '150',
          tab2: '500',
          tab3: '650',
          tab4: '800',
          tab5: '1600',
          tab6: '2100',
          tab5: '',
          tab6: '',
        },
        {
          sensorName: 'NO2',
          unit: 'ug/m³',
          tab1: '40',
          tab2: '80',
          tab3: '180',
          tab4: '280',
          tab5: '565',
          tab6: '750',
          tab1: '100',
          tab2: '200',
          tab3: '700',
          tab4: '1200',
          tab5: '2340',
          tab6: '3090',
        },
        {
          sensorName: 'CO',
          unit: 'mg/m³',
          tab1: '2',
          tab2: '4',
          tab3: '14',
          tab4: '24',
          tab5: '36',
          tab6: '48',
          tab1: '5',
          tab2: '10',
          tab3: '35',
          tab4: '60',
          tab5: '90',
          tab6: '120',
        },
        {
          sensorName: 'O3',
@@ -1241,34 +1241,34 @@
              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 < 150 &&
                (that.carMac === 'p5dnd7a0243622' ||
                  that.carMac === 'p5dnd7a0243625')
              ) {
                point.dustld = 200
              } else if (
                value.dustld - 0 !== 0 &&
                value.dustld - 0 >= 150 &&
                value.dustld - 0 <= 180 &&
                (that.carMac === 'p5dnd7a0243622' ||
                  that.carMac === 'p5dnd7a0243625')
              ) {
                point.dustld = 220
              } else if (
                value.dustld - 0 !== 0 &&
                value.dustld - 0 > 180 &&
                value.dustld - 0 <= 200 &&
                (that.carMac === 'p5dnd7a0243622' ||
                  that.carMac === 'p5dnd7a0243625')
              ) {
                point.dustld = 230
              } else {
                point.dustld = value.dustld - 0
              }
            //   if (
            //     value.dustld - 0 !== 0 &&
            //     value.dustld - 0 < 150 &&
            //     (that.carMac === 'p5dnd7a0243622' ||
            //       that.carMac === 'p5dnd7a0243625')
            //   ) {
            //     point.dustld = 200
            //   } else if (
            //     value.dustld - 0 !== 0 &&
            //     value.dustld - 0 >= 150 &&
            //     value.dustld - 0 <= 180 &&
            //     (that.carMac === 'p5dnd7a0243622' ||
            //       that.carMac === 'p5dnd7a0243625')
            //   ) {
            //     point.dustld = 220
            //   } else if (
            //     value.dustld - 0 !== 0 &&
            //     value.dustld - 0 > 180 &&
            //     value.dustld - 0 <= 200 &&
            //     (that.carMac === 'p5dnd7a0243622' ||
            //       that.carMac === 'p5dnd7a0243625')
            //   ) {
            //     point.dustld = 230
            //   } else {
            //     point.dustld = value.dustld - 0
            //   }
            }
            // point.dustld = value.dustld - 0
            point.dustld = value.dustld - 0
            point.times = value.time
            trackPoints.push(point)
          }
@@ -1426,7 +1426,7 @@
        var points = []
        points.push(trackPoints[0])
        for (var i = 1; i < trackPoints.length; i++) {
          var flag = true
          // var flag = true
          var point1 = trackPoints[i]
          for (var j = 0; j < points.length; j++) {
            var point2 = points[j]
@@ -1435,8 +1435,11 @@
              flag = false
            }
          }
          points.push(point1)
          console.log(points,'num');
          if (flag) {
            points.push(point1)
            // console.log(points,'num');
          }
        }