From 162eca31378c749b8f70c32ce2ed988b1101e881 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 19 八月 2022 09:15:09 +0800
Subject: [PATCH] #
---
static/js/object/ObjectSelect.js | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/static/js/object/ObjectSelect.js b/static/js/object/ObjectSelect.js
index 5ff7e0a..28738d8 100644
--- a/static/js/object/ObjectSelect.js
+++ b/static/js/object/ObjectSelect.js
@@ -5,8 +5,13 @@
let selectedObjects = [];
window.addEventListener( 'click', onMouseClick);
+ window.addEventListener('dblclick', onMouseDbClick);
function onMouseClick(event) {
+ $("#label").attr("style", "display:none;");
+ }
+
+ function onMouseDbClick(event) {
let x, y;
if (event.changedTouches) {
x = event.changedTouches[0].pageX;
@@ -18,14 +23,13 @@
mouse.x = (x/ window.innerWidth) * 2 - 1;
mouse.y = -(y/ window.innerHeight) * 2 + 1;
raycaster.setFromCamera(mouse, _camera);
- var intersects = raycaster.intersectObjects([_scene], true);
-
+ let intersects = raycaster.intersectObjects([_scene], true);
if (intersects.length === 0) {
- $("#label").attr("style", "display:none;");//闅愯棌璇存槑鎬ф爣绛�
+ $("#label").attr("style", "display:none;");
return;
}
-
+ console.log(intersects[0].object)
let objName = intersects[0].object.name;
if (objName) {
let dest = objName.split("-")[0];
@@ -35,14 +39,21 @@
$("#label").attr("style", "display:block;");
$("#label").css({left: x, top: y - 40});
- let dataShow = new DataShow();
+ let dataShow = new DataShow('locNo', dest);
selectedObjects.pop();
selectedObjects.push(intersects[0].object);
$("#label").html(dataShow.showHint());
// 杩愯涓�
} else if (dest.length === 4) {
+ $("#label").attr("style", "display:block;");
+ $("#label").css({left: x, top: y - 40});
+ let dataShow = new DataShow('wrkNo', dest);
+
+ selectedObjects.pop();
+ selectedObjects.push(intersects[0].object);
+ $("#label").html(dataShow.showHint());
} else {
$("#label").attr("style", "display:none;");
}
--
Gitblit v1.9.1