From 620460930976dd6e9a725a0915ab7b2b44c06b4e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 07 四月 2022 15:14:41 +0800
Subject: [PATCH] #
---
static/js/object/ObjectSelect.js | 19 +++++++--
static/js/utils/DataShow.js | 57 +++++++++-------------------
2 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/static/js/object/ObjectSelect.js b/static/js/object/ObjectSelect.js
index 5ff7e0a..d53e610 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,11 +23,10 @@
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;
}
@@ -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;");
}
diff --git a/static/js/utils/DataShow.js b/static/js/utils/DataShow.js
index 8836e97..a96c23f 100644
--- a/static/js/utils/DataShow.js
+++ b/static/js/utils/DataShow.js
@@ -1,46 +1,25 @@
-function DataShow(type,no) {
- this.type=type;
- this.no=no;
- this.colRowDistributionChart = null;
- this.RowDistributionChart = null;
+function DataShow(type, uuid) {
+ this.type = type;
+ this.uuid = uuid;
}
-DataShow.prototype.showHint=function(){
- let htmltext='';
- return htmltext='<p>浠撳簱缂栫爜锛�'+ 12312 +'</p>';
- let dataAnalyze = new DataAnalyze(this.no);
- if(this.type=='StoreSign'||this.type=='Store')
- {
- let store= dataAnalyze.getStore(this.no);
- htmltext='<p>浠撳簱缂栫爜锛�'+store.No +'</p>';
- htmltext+='<p>浠撳簱鍚嶇О锛�'+store.Name +'</p>';
- htmltext+='<p>鎬诲簱瀛橈細'+dataAnalyze.getStoreTotalBin(this.no) +'</p>';
- htmltext+='<p>宸插崰搴撳瓨锛�'+dataAnalyze.getStoreOccurpyBin(this.no) +'</p>';
- htmltext+='<p>浠婃棩鍏ュ簱锛�'+dataAnalyze.getStoreTotalBin(this.no) +'</p>';
- htmltext+='<p>浠婃棩鍑哄簱锛�'+dataAnalyze.getStoreOccurpyBin(this.no) +'</p>';
- htmltext+='<p1>鎻愮ず锛氬弻鍑诲彲鏌ョ湅璇︾粏淇℃伅</p1>';
- }
- else if(this.type=='StoreGroup')
- {
- let group= dataAnalyze.getGroup(this.no);
- htmltext='<p>缂栫爜锛�'+group.No +'</p>';
- htmltext+='<p>鍚嶇О锛�'+group.Name +'</p>';
- htmltext+='<p>鎬诲簱瀛橈細'+dataAnalyze.getGroupTotalBin(this.no) +'</p>';
- htmltext+='<p>宸插崰搴撳瓨锛�'+dataAnalyze.getGroupOccurpyBin(this.no) +'</p>';
- htmltext+='<p>浠婃棩鍏ュ簱锛�'+dataAnalyze.getGroupTotalBin(this.no) +'</p>';
- htmltext+='<p>浠婃棩鍑哄簱锛�'+dataAnalyze.getGroupOccurpyBin(this.no) +'</p>';
- htmltext+='<p1>鎻愮ず锛氬弻鍑诲彲鏌ョ湅璇︾粏淇℃伅</p1>';
+DataShow.prototype.showHint = function(){
+ let htmlText='';
+ switch (type) {
+ case 'locNo':
+ htmlText+='<p>搴撲綅缂栧彿锛�'+ this.uuid +'</p>';
+
+ break
+ case "wrkNo":
+ htmlText+='<p>浠诲姟缂栧彿锛�'+ this.uuid +'</p>';
+
+ break
+ default:
+ break
}
- else if(this.type=='StoreGoods')
- {
- let bin= dataAnalyze.getBin(this.no);
- htmltext='<p>缂栫爜锛�'+bin.No +'</p>';
- htmltext+='<p>鍚嶇О锛�'+bin.Name +'</p>';
- htmltext+='<p>鏉＄爜鍙凤細'+bin.Barcode +'</p>';
- htmltext+='<p>鐘舵�侊細'+bin.State +'</p>';
- }
- return htmltext;
+
+ return htmlText;
}
--
Gitblit v1.9.1