From 98a6297b10a4b97c3022f84d3ba7908c178d9ee0 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 20 十月 2020 10:30:10 +0800
Subject: [PATCH] 应用中心安装提示bug修复
---
src/components/canvas/index.vue | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index ba2e0d7..cd8f3b5 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -4,10 +4,10 @@
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 / 576px 324px 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,
@@ -87,9 +95,22 @@
default: 324
}
},
+ computed:{
+ canvasBg(){
+ if(this.snapshot_url){
+ if(this.sourceType == 2){
+ return `/files/${this.snapshot_url}`
+ }else{
+ return `/httpImage/${this.snapshot_url}`
+ }
+ }else{
+ return this.blackImg;
+ }
+ }
+ },
data() {
return {
- blackImg: require("../../assets/baseimg.png"),
+ blackImg: require("../../assets/img/baseimg.png"),
canvasData: {
line: [],
rect: [],
@@ -103,7 +124,7 @@
ctx: null,
visible: false,
baseImg: undefined,
- showProportion: 1.71
+ showProportion: 1.666
};
},
watch: {
@@ -148,7 +169,7 @@
.then(res => {
if (res.data.cameraId === this.currentCameraId) {
this.baseImg = res.data.snapshotUrl;
- this.$emit('refresh',res.data.snapshotUrl)
+ this.$emit('refresh', res.data.snapshotUrl)
this.$forceUpdate()
this.$notify({
type: "success",
@@ -473,6 +494,11 @@
};
</script>
<style lang="scss" scoped>
+canvas{
+ position: absolute;
+ top: 0;
+ left: 0;
+}
.s-cavas {
width: 576px;
height: 324px;
--
Gitblit v1.8.0