From 401524fb5661d57ffb2229d683fe4de85b65fd1c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 31 八月 2023 17:54:24 +0800
Subject: [PATCH] 生产管理看板+删不需要的文件
---
src/components/canvas/index.vue | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index c26ef7b..7e4e217 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,16 +93,26 @@
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}`
+ // 鏁版嵁鏍堣嚜鍔ㄤ笂浼犲鐞�
+ if (this.snapshot_url.indexOf("/opt/vasystem") == 0) {
+ return this.snapshot_url.replace("/opt/vasystem", "");
}
+
+ if (this.sourceType == 2) {
+ return `${this.snapshot_url}`;
+ } else {
+ return `/httpImage/${this.snapshot_url}`;
+ }
+
} else {
return this.blackImg;
}
@@ -124,7 +134,7 @@
ctx: null,
visible: false,
baseImg: undefined,
- showProportion: 1.666
+ //showProportion: 1.666
};
},
watch: {
@@ -193,10 +203,11 @@
this.$nextTick(() => {
// this.$refs.bigCanvas.delCursor = {}
})
+
},
cancelFunc() {
this.visible = false;
- this.$refs.bigCanvas.cancel()
+ this.$refs.bigCanvas.cancel();
// console.log("鍏抽棴浜�");
},
handleOk() {
@@ -220,6 +231,7 @@
// 椤轰究鐢╁埌鏇村灞傚幓
this.$emit("fromCanvas", this.$refs.bigCanvas.canvasData);
// console.log("浣犲ソ", this.canvasData);
+
this.clickSelect(this.canvasData);
this.visible = false;
},
@@ -501,8 +513,8 @@
left: 0;
}
.s-cavas {
- width: 576px;
- height: 324px;
+ // width: 576px;
+ // height: 324px;
margin-top: 10px;
position: relative;
overflow: auto;
--
Gitblit v1.8.0