Compare commits

..

No commits in common. "204a47bde4364508eb2d57191d46ae7db0b2f5ef" and "bebbe51b73140937d3c3a4917f3ac7bdb33b4cbd" have entirely different histories.

1 changed files with 33 additions and 40 deletions

View File

@ -91,7 +91,6 @@ Bus.on('clickDevice', (isParent) => {
if (!isParent) {// if (!isParent) {//
var clickName = bimStore().activateDevice.clickName; var clickName = bimStore().activateDevice.clickName;
var Floor = scene.getObjectByName(clickName); var Floor = scene.getObjectByName(clickName);
removeLabel();
boxLight(Floor); boxLight(Floor);
// //
// nearCamera(Floor); // nearCamera(Floor);
@ -216,7 +215,7 @@ const isSelent = (obj) => {
} }
let selectedObjects = ref([]); let selectedObjects = ref([]);
let selectBoxByClick, selectBoxByMouseon, pointLabel, selectedObject; let selectBoxByClick, selectBoxByMouseon, pointLabel;
var marginLeft = 0; var marginLeft = 0;
var marginTop = 70; var marginTop = 70;
// //
@ -228,7 +227,7 @@ const onMouseMove = (event) => {
const intersects = raycaster.intersectObjects(scene.children, true); const intersects = raycaster.intersectObjects(scene.children, true);
if (intersects.length > 0) { if (intersects.length > 0) {
const clickedObject = intersects[0].object; const clickedObject = intersects[0].object;
selectedObject = isSelent(clickedObject); var selectedObject = isSelent(clickedObject);
if (selectedObject) { if (selectedObject) {
selectedObjects[0] = selectedObject; selectedObjects[0] = selectedObject;
if (selectBoxByMouseon) { if (selectBoxByMouseon) {
@ -252,8 +251,9 @@ const onMouseDownRight = (event) => {
if (intersects.length > 0) { if (intersects.length > 0) {
const clickedObject = intersects[0].object; const clickedObject = intersects[0].object;
console.log('这是我选中的模型', clickedObject); console.log('这是我选中的模型', clickedObject);
selectedObject = isSelent(clickedObject); var selectedObject = isSelent(clickedObject);
addLabel(selectedObject, true); // addLabel(selectedObject, true);
emit('handleRightClick', selectedObject);
} }
} }
// //
@ -269,7 +269,7 @@ const onMouseDown = (event) => {
if (intersects.length > 0) { if (intersects.length > 0) {
clickedObject = intersects[0].object; clickedObject = intersects[0].object;
console.log('这是我选中的模型', clickedObject); console.log('这是我选中的模型', clickedObject);
selectedObject = isSelent(clickedObject); var selectedObject = isSelent(clickedObject);
// //
boxLight(selectedObject); boxLight(selectedObject);
// //
@ -417,8 +417,10 @@ const toHomeView = () => {
scene.remove(selectBoxByClick); scene.remove(selectBoxByClick);
} }
// //
if(!isAddLabel.value) {
removeLabel(); removeLabel();
isAddLabel.value = true; isAddLabel.value = !isAddLabel.value;
}
// //
controls.reset(); controls.reset();
} }
@ -449,7 +451,6 @@ const setLabel = () => {
} }
// //
const addLabel = (obj,isShowDetail) => { const addLabel = (obj,isShowDetail) => {
removeLabel();
// console.log(123, obj); // console.log(123, obj);
centerSelectedGroup(obj); centerSelectedGroup(obj);
let text = "设备二"; let text = "设备二";
@ -460,6 +461,7 @@ const addLabel = (obj, isShowDetail) => {
labelRenderer.domElement.style.top = 0; labelRenderer.domElement.style.top = 0;
labelRenderer.domElement.style.pointerEvents = 'none';// labelRenderer.domElement.style.pointerEvents = 'none';//
document.body.appendChild(labelRenderer.domElement); document.body.appendChild(labelRenderer.domElement);
// HTML // HTML
document.getElementById("dom").appendChild(renderer.domElement); document.getElementById("dom").appendChild(renderer.domElement);
}; };
@ -469,22 +471,14 @@ const createLableObj = (text, isShowDetail) => {
laberDiv.className = "laber_name"; laberDiv.className = "laber_name";
laberDiv.innerHTML = `<div class="arrow_outer"></div><span>设备名称:${text}</span><span>状态:启用</span><span>压力50 Pa</span>` laberDiv.innerHTML = `<div class="arrow_outer"></div><span>设备名称:${text}</span><span>状态:启用</span><span>压力50 Pa</span>`
} else { } else {
laberDiv.style.pointerEvents = 'auto';//
laberDiv.className = "laber_name1"; laberDiv.className = "laber_name1";
laberDiv.innerHTML = `<div class="detail-btn">详情</div>`; laberDiv.innerHTML = `<div class="detail-btn">详情</div>`
laberDiv.addEventListener('click', function (event) {
emit('handleRightClick', selectedObject);
console.log(labelRenderer.domElement);
})
} }
let pointLabel = new CSS2DObject(laberDiv); let pointLabel = new CSS2DObject(laberDiv);
return pointLabel; return pointLabel;
}; };
const removeLabel = () => { const removeLabel = () => {
if(pointLabel) { document.body.removeChild(labelRenderer.domElement);
pointLabel.visible = false;
}
// document.body.removeChild(labelRenderer.domElement);
} }
@ -572,7 +566,6 @@ const xfadd = (obj, state) => {
line-height: 24px; line-height: 24px;
} }
} }
.laber_name1 { .laber_name1 {
width:100px; width:100px;
height: 50px; height: 50px;