From f857a9130f97694c756dc8913e900bf9a74563ef Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 23 十月 2020 09:41:49 +0800
Subject: [PATCH] 新增标注应用demo,场景配置添加区域判空检测(复制算法可能导致区域为空)
---
src/components/canvas/Dialog.vue | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/components/canvas/Dialog.vue b/src/components/canvas/Dialog.vue
index f275172..8d66184 100644
--- a/src/components/canvas/Dialog.vue
+++ b/src/components/canvas/Dialog.vue
@@ -86,7 +86,7 @@
@click="undo"
:disabled="disableSelect"
style="position:absolute;left:25px;top:400px;font-size:2rem;cursor:pointer"
- ></span> -->
+ ></span>-->
</el-tooltip>
<!-- <el-button type="default" @click="undo()">鎾ら攢</el-button> -->
</el-col>
@@ -97,11 +97,7 @@
width="960"
height="540"
:style="
- `position:static;background:url(${
- snapshot_url
- ? `/httpImage/${snapshot_url}`
- : backImg
- }) 0% 0%/960px 540px no-repeat;`
+ `position:static;background:url(${snapshot_url}) 0% 0%/960px 540px no-repeat;`
"
></canvas>
<p
@@ -112,7 +108,7 @@
class="iconfont icongengxin"
@click="refresh"
style="position:absolute;left:930px;font-size:2.5rem;cursor:pointer;color:white"
- ></span> -->
+ ></span>-->
</el-col>
</el-row>
</div>
@@ -122,7 +118,7 @@
name: "canvasDialog",
data() {
return {
- backImg: require("../../assets/baseimg.png"),
+ backImg: require("../../assets/img/baseimg.png"),
url: "", // canvas鍥剧墖鐨勪簩杩涘埗鏍煎紡杞负dataURL鏍煎紡
type: "0", // 缁樺浘鐘舵�� '0'涓洪�変腑鍒犻櫎锛�'1'涓虹敾绾匡紝鈥�2鈥欎负鐢荤煩褰紝鈥�4鈥欎负鐢荤澶达紝鈥�5鈥欎负鐢诲杈瑰舰
points: [], // 璁板綍缁樺埗澶氳竟褰㈡椂鐨勫悇鐐瑰潗鏍囷紝缁樺埗澶氳竟褰㈡椂鐢变簬涓嶆槸涓�绗斿畬鎴愶紝浠ユ暟缁勬暟鎹仛濮嬬粓闂悎鐨勫浘褰紝鍙屽嚮鍚庡綍鎴愬揩鐓э紝鎶婃暟缁勫唴瀹硅浆绉诲埌鏈�缁堟暟鎹腑锛岀劧鍚庢竻绌烘暟缁�
@@ -215,7 +211,7 @@
src: this.c.toDataURL("image/png")
});
this.delCursor = { type: -1, index: -1, remarksName: "", id: "" }
-
+
console.log("鐢诲竷鍒濆鍖�");
},
// 鍙栨秷鐢诲竷娓呴櫎鐘舵�佸嚱鏁�
@@ -789,8 +785,8 @@
}
// console.log("鎾ら攢锛�",this.canvasData);
},
- disabledOthers(type){
- console.log("褰撳墠type:",type)
+ disabledOthers(type) {
+ console.log("褰撳墠type:", type)
switch (type) {
case "1":
this.disableLine = false
@@ -817,14 +813,14 @@
this.disableLine = true
this.disableRect = true
this.disableArrow = true
- this.disablePolygon = false
+ this.disablePolygon = false
this.disableSelect = true
break
}
- console.log("绂佺敤鐩寸嚎锛�",this.disableLine)
- console.log("绂佺敤鐭╁舰锛�",this.disableRect)
- console.log("绂佺敤绠ご锛�",this.disableArrow)
- console.log("绂佺敤澶氳竟褰細",this.disablePolygon)
+ console.log("绂佺敤鐩寸嚎锛�", this.disableLine)
+ console.log("绂佺敤鐭╁舰锛�", this.disableRect)
+ console.log("绂佺敤绠ご锛�", this.disableArrow)
+ console.log("绂佺敤澶氳竟褰細", this.disablePolygon)
},
undisabled() {
this.disableLine = false
--
Gitblit v1.8.0