guoshipeng
2023-08-20 a315f8bc5864848b2f408cbad42414ef09871464
fix:修改图标偏移,打开websocket
2 files modified
60 ■■■■■ changed files
src/components/Wind/Map.vue 10 ●●●● patch | view | raw | blame | history
src/views/main/index.vue 50 ●●●● patch | view | raw | blame | history
src/components/Wind/Map.vue
@@ -1334,7 +1334,7 @@
          iconUrl: require('@/assets/icon/ico' + colorNum + '.png'),
          // iconUrl: require('@/assets/icon/ico2.png'),
          iconSize: [60, 60],
          iconAnchor: [13, 21],
          iconAnchor: [30, 48],
          className: 'my-device',
        })
        // 添加标记到地图
@@ -1345,7 +1345,8 @@
        var myIcon = L.divIcon({
          html: this.keys[i],
          className: 'my-div-icon',
          iconSize: 30,
          iconSize: [60, 60],
          iconAnchor: [40, 40],
        })
        var marker = L.marker([lat, lng], { icon: myIcon }).addTo(group)
        // 给标记添加鼠标移入事件,mouseover事件会冒泡
@@ -2117,4 +2118,9 @@
  background-color: #ff0000 !important;
  color: #790000 !important;
}
.leaflet-marker-icon.leaflet-interactive {
  pointer-events: auto;
  margin-left: -45px;
  margin-top: -40px;
}
</style>
src/views/main/index.vue
@@ -303,39 +303,39 @@
    },
    // 跳转设备详情页
    deviceDetail(mac, item, items, indexs) {
      this.$message.warning('该功能优化中,暂不支持开放')
      // this.$message.warning('该功能优化中,暂不支持开放')
      // console.log('这是传输过去的值')
      // console.log(mac)
      // console.log(item)
      // console.log(items)
      // console.log(indexs)
      // this.monitorPointInfo = item
      // // console.log(this.monitorPointInfo)
      // // this.$router.push({
      // //   path: '/deviceDetail/index',
      // //   query: {
      // //     macName: mac
      // //   }
      // // })
      // // console.log('items')
      // // console.log(items)
      this.monitorPointInfo = item
      // console.log(this.monitorPointInfo)
      // this.$router.push({
      //   name: 'deviceDetail',
      //   params: {
      //     monitorPointInfo: item,
      //     device: items,
      //     macName: mac,
      //     indexs: indexs,
      //     items: [items.latitude, items.longitude],
      //   },
      //   path: '/deviceDetail/index',
      //   query: {
      //     monitorPointInfo: JSON.stringify(item),
      //     device: JSON.stringify(items),
      //     macName: mac,
      //     indexs: indexs,
      //     items: [items.latitude, items.longitude],
      //   },
      //     macName: mac
      //   }
      // })
      // console.log('items')
      // console.log(items)
      this.$router.push({
        name: 'deviceDetail',
        params: {
          monitorPointInfo: item,
          device: items,
          macName: mac,
          indexs: indexs,
          items: [items.latitude, items.longitude],
        },
        query: {
          monitorPointInfo: JSON.stringify(item),
          device: JSON.stringify(items),
          macName: mac,
          indexs: indexs,
          items: [items.latitude, items.longitude],
        },
      })
    },
    // 改变regionCode触发子组件重新请求五分钟接口功能
    getRegionApi() {