Merge branch 'feature_1.0'

quanyawei

2023-10-25 a386f08fcf875f54860951834cfc6c888091e192

Merge branch 'feature_1.0'

 src/components/Wind/Map.vue

@@ -1428,24 +1428,25 @@
      return bgColorList

    },

    deviceDetail () {

      console.log('this.farterItem', this.farterItem)

      console.log('this.farterItem', this.clickmac)

      console.log('this.childerItem', this.childerItem)

      this.monitorPointInfo = this.farterItem



      this.$router.push({

        name: 'deviceDetail',

        params: {

          monitorPointInfo: this.farterItem,

          device: this.clickmac,

          device: this.childerItem,

          macName: this.clickmac,

          indexs: this.indexsLaber,

          items: [this.clickmac.latitude, this.clickmac.longitude]

          items: [this.childerItem.latitude, this.childerItem.longitude]

        },

        query: {

          monitorPointInfo: JSON.stringify(this.farterItem),

          device: JSON.stringify(this.clickmac),

          device: JSON.stringify(this.childerItem),

          macName: this.clickmac,

          indexs: this.indexsLaber,

          items: [this.clickmac.latitude, this.clickmac.longitude]

          items: [this.childerItem.latitude, this.childerItem.longitude]

        }

      })

    },

@@ -1480,6 +1481,7 @@
              .openPopup()

            return

          }

          this.childerItem.name = res.data.name

          let colorliststyleBgColor = this.styleBgColor(res.data)

          console.log('colorliststyleBgColor', colorliststyleBgColor)

          let deviceDetails = res.data