Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-05-18 6fbac144d6e68ee8b4d8f68aedc997fb2042e2ec

 web_src/src/components/DeviceList.vue

@@ -194,7 +194,7 @@
      this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
    },
    showDevicePosition: function (row) {
      this.$router.push(`/devicePosition/${row.deviceId}/0/15/1`);
      this.$router.push(`/map?deviceId=${row.deviceId}`);
    },

    //gb28181平台对接