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 | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index ea4715e..a7dae5a 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -1,13 +1,13 @@
<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(${snapshot_url ? `/httpImage/${snapshot_url}` : blackImg}) 100% 100% / 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">
+ <el-tooltip content="鍒锋柊搴曞浘" placement="bottom" popper-class="atooltip" v-if="isShowRefresh">
<span class="iconfont icongengxin" @click="refresh"></span>
</el-tooltip>
<p class="tip" :style="disabled ? `display:block;` : `display:none;`">鎵归噺閰嶇疆鏂瑰紡涓嶅厑璁哥粯鍒跺尯鍩燂紝璇烽�夋嫨鎽勫儚鏈鸿繘琛屽尯鍩熺粯鍒�</p>
@@ -21,7 +21,7 @@
<canvas-dialog
ref="bigCanvas"
:canvasDataToChild="canvasData"
- :snapshot_url="snapshot_url"
+ :snapshot_url="canvasBg"
@refresh="refresh"
></canvas-dialog>
<span slot="footer" class="dialog-footer">
@@ -47,6 +47,14 @@
isGB28181: {
default: false,
type: Boolean
+ },
+ isShowRefresh: {
+ default: true,
+ type: Boolean
+ },
+ sourceType: {
+ default: 1,
+ type: Number
},
isShowDrawArrow: {
default: false,
@@ -85,6 +93,23 @@
canvasHeight: {
type: Number,
default: 324
+ },
+ showProportion: {
+ type: Number,
+ default: 1.666
+ }
+ },
+ computed: {
+ canvasBg() {
+ if (this.snapshot_url) {
+ if (this.sourceType == 2) {
+ return `${this.snapshot_url}`
+ } else {
+ return `/httpImage/${this.snapshot_url}`
+ }
+ } else {
+ return this.blackImg;
+ }
}
},
data() {
@@ -103,7 +128,7 @@
ctx: null,
visible: false,
baseImg: undefined,
- showProportion: 1.666
+ //showProportion: 1.666
};
},
watch: {
@@ -144,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.$emit('refresh', res.data.snapshotUrl, _this.currentCameraId)
this.$forceUpdate()
this.$notify({
type: "success",
@@ -171,10 +197,11 @@
this.$nextTick(() => {
// this.$refs.bigCanvas.delCursor = {}
})
+
},
cancelFunc() {
this.visible = false;
- this.$refs.bigCanvas.cancel()
+ this.$refs.bigCanvas.cancel();
// console.log("鍏抽棴浜�");
},
handleOk() {
@@ -198,6 +225,7 @@
// 椤轰究鐢╁埌鏇村灞傚幓
this.$emit("fromCanvas", this.$refs.bigCanvas.canvasData);
// console.log("浣犲ソ", this.canvasData);
+
this.clickSelect(this.canvasData);
this.visible = false;
},
@@ -473,14 +501,14 @@
};
</script>
<style lang="scss" scoped>
-canvas{
+canvas {
position: absolute;
top: 0;
left: 0;
}
.s-cavas {
- width: 576px;
- height: 324px;
+ // width: 576px;
+ // height: 324px;
margin-top: 10px;
position: relative;
overflow: auto;
--
Gitblit v1.8.0