bug修复

ZZJ

2022-05-27 a689af1348938afd3b4506aad9b6d5057193e25d

 src/components/canvas/index.vue

@@ -79,9 +79,8 @@
      },
      type: Object,
    },
    currentCameraId: {
      type: String,
      default: "",
    currentCamera: {
      type: Object,
    },
    snapshot_url: {
      type: String,
@@ -116,9 +115,14 @@
          return this.snapshot_url.replace("/opt/vasystem", "");
        }

        if (this.snapshot_url.indexOf("data:image/png;base64,") != -1) {
          return `${this.snapshot_url}`;
        }

        if (this.sourceType == 2) {
          return `${this.snapshot_url}`;
        } else {
          console.log(this.snapshot_url);
          return `/httpImage/${this.snapshot_url}`;
        }
      } else {
@@ -148,7 +152,6 @@
  watch: {
    loading: {
      handler(newVal, oldVal) {
        // console.log(newVal,'loading')
        if (newVal) {
          this.baseImg = "";
          this.refresh();
@@ -182,30 +185,30 @@
    async getCanvasPic() {
      // this.$emit('changeBaseImg',this.currentCameraId)
      this.$emit("changeLoading", true);
      if (this.currentCameraId) {
      if (this.currentCamera.cameraId) {
        let _this = this;
        await updateSnapshot(this.currentCameraId)
          .then((res) => {
            if (res.data.cameraId === _this.currentCameraId) {
              this.baseImg = res.data.snapshotUrl;
              this.$emit(
                "refresh",
                res.data.snapshotUrl,
                _this.currentCameraId
              );
              this.$forceUpdate();
              this.$notify({
                type: "success",
                message: "底图已刷新",
              });
            }
          })
          .catch((err) => {
            this.$notify({
              type: "error",
              message: "底图刷新失败",

        await updateSnapshot({
          id: _this.currentCamera.cameraId,
          name: _this.currentCamera.cameraName,
          type: _this.currentCamera.type,
          rtsp: _this.currentCamera.rtsp,
        }).then((res) => {
          if (res.data.cameraId === _this.currentCamera.cameraId) {
            _this.baseImg = "data:image/png;base64," + res.data.base64;
            _this.$emit(
              "refresh",
              _this.baseImg,
              _this.currentCamera.cameraName
            );
            _this.$forceUpdate();
            _this.$notify({
              type: "success",
              message: "底图已刷新",
            });
          });
          }
        });

        this.$emit("changeLoading", false);
      }
    },
@@ -523,8 +526,9 @@
      ctx.restore();
    },
    async refresh() {
      // console.log(this.loading,'刷新底图',this.snapshot_url)
      if (!this.currentCameraId) {
      console.log("刷新底图");
      if (!this.currentCamera.cameraId) {
        console.log("没刷新");
        return false;
      }
      // await this.$emit('changeLoading', true)