Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-04-24 d4b05c11c07e771bace8c83327e92216748116ca

 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平台对接