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

648540858

2023-04-19 c56538813e36abc3ef162319d5fb7e0f47e04f05

 web_src/src/components/dialog/queryTrace.vue

@@ -72,7 +72,7 @@
    onSubmit: function () {
      console.log("onSubmit");
      this.isLoging = true;
      let url = `./api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
      let url = `/api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
      if (this.channel.channelId) {
        url+="&channelId=${this.channel.channelId}"
      }