From b47da15ef38b754aa9ead53279a689ef0ba8e23f Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 29 一月 2021 09:46:59 +0800
Subject: [PATCH] 事件声音列表获取字段由data.list改为data
---
src/components/canvas/index.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index aa5f89f..a7dae5a 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -1,10 +1,10 @@
<template>
- <div class="s-cavas">
+ <div class="s-cavas" :style="{width:canvasWidth+'px',height:canvasHeight+'px'}">
<canvas
ref="myCanvas"
:width="canvasWidth"
:height="canvasHeight"
- :style="`background:url(${canvasBg}) center / 576px 324px no-repeat; background-size: contain;`"
+ :style="`background:url(${canvasBg}) center / ${canvasWidth}px ${canvasHeight}px no-repeat; background-size: contain;`"
></canvas>
<el-tooltip content="鍒锋柊搴曞浘" placement="bottom" popper-class="atooltip" v-if="isShowRefresh">
@@ -93,6 +93,10 @@
canvasHeight: {
type: Number,
default: 324
+ },
+ showProportion: {
+ type: Number,
+ default: 1.666
}
},
computed: {
@@ -124,7 +128,7 @@
ctx: null,
visible: false,
baseImg: undefined,
- showProportion: 1.666
+ //showProportion: 1.666
};
},
watch: {
@@ -165,11 +169,12 @@
// this.$emit('changeBaseImg',this.currentCameraId)
this.$emit('changeLoading', true)
if (this.currentCameraId) {
+ let _this = this;
await updateSnapshot(this.currentCameraId)
.then(res => {
- if (res.data.cameraId === this.currentCameraId) {
+ if (res.data.cameraId === _this.currentCameraId) {
this.baseImg = res.data.snapshotUrl;
- this.$emit('refresh', res.data.snapshotUrl,this.currentCameraId)
+ this.$emit('refresh', res.data.snapshotUrl, _this.currentCameraId)
this.$forceUpdate()
this.$notify({
type: "success",
@@ -192,10 +197,11 @@
this.$nextTick(() => {
// this.$refs.bigCanvas.delCursor = {}
})
+
},
cancelFunc() {
this.visible = false;
- this.$refs.bigCanvas.cancel()
+ this.$refs.bigCanvas.cancel();
// console.log("鍏抽棴浜�");
},
handleOk() {
@@ -219,6 +225,7 @@
// 椤轰究鐢╁埌鏇村灞傚幓
this.$emit("fromCanvas", this.$refs.bigCanvas.canvasData);
// console.log("浣犲ソ", this.canvasData);
+
this.clickSelect(this.canvasData);
this.visible = false;
},
@@ -500,8 +507,8 @@
left: 0;
}
.s-cavas {
- width: 576px;
- height: 324px;
+ // width: 576px;
+ // height: 324px;
margin-top: 10px;
position: relative;
overflow: auto;
--
Gitblit v1.8.0