From 767bafda3034a784b36139f00a8fb65ba1dfd002 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 8 Aug 2022 16:17:07 +0800 Subject: [PATCH] =?UTF-8?q?3D=E5=BA=93=E6=88=BF=E9=85=8D=E7=BD=AE=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA/=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/webA/index.js | 36 +++++++++++++++---- public/webB/index.js | 30 +++++++++++++--- public/webC/index.js | 28 +++++++++++---- .../archivesManage/archivesList/index.vue | 4 +-- .../archivesList/mixins/archives.js | 3 ++ src/views/components/echarts/lendAcross.vue | 5 +-- src/views/components/echarts/typePie.vue | 2 +- src/views/home.vue | 4 +-- .../warehouse3D/archivesStorage/index.vue | 17 ++++++++- .../warehouse3D/collateRoom/index.vue | 14 ++++++++ src/views/storeManage/warehouse3D/index.vue | 2 +- .../warehouse3D/readRoom/index.vue | 14 ++++++++ src/views/system/archiveStatistics/index.vue | 2 +- 13 files changed, 134 insertions(+), 27 deletions(-) diff --git a/public/webA/index.js b/public/webA/index.js index f5d47d0..4fd3c96 100644 --- a/public/webA/index.js +++ b/public/webA/index.js @@ -22,6 +22,8 @@ var deviceData = []; BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() { if (document.getElementById("customLoadingScreenDiv")) { document.getElementById("customLoadingScreenDiv").style.display = "initial"; + // 给vue页面传值，加载完成之前 + parent.getIframeLoading("true") return; } @@ -202,9 +204,9 @@ var moveTrans = function(move_transformNode) { BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { show = 50; document.getElementById("customLoadingScreenDiv").style.display = "none"; - document.getElementById("customLoadingScreenDiv_first").style.display = - "none"; + document.getElementById("customLoadingScreenDiv_first").style.display = "none"; document.title = "档案库"; + //scene.getMaterialByName("材质.023").roughness = 0; @@ -340,7 +342,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { "#000000", true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } else { var location = transformNodex.absolutePosition; var xd = scene.getMeshByName("tapblue"); @@ -372,7 +376,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } } } @@ -412,7 +418,7 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { var location = transformNodex.absolutePosition; var xd = scene.getMeshByName("tapblue"); // x = x-0.6;; y = y+0.3 z=z+0.5 - + xd.setEnabled(false); } } @@ -598,6 +604,11 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { yangan03.baojing = false; yangan04.baojing = false; + yangan01.canshow = true; + yangan02.canshow = true; + yangan03.canshow = true; + yangan04.canshow = true; + yangan01.wendu = 0; yangan01.sidu = 0; yangan02.wendu = 0; @@ -616,6 +627,7 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { prepareGroupButtonOther(yangan03, new BABYLON.Color3(0, 0, 1)); prepareGroupButtonOther(yangan04, new BABYLON.Color3(0, 0, 1)); + var x = scene.getMeshByName("档案架01_primitive0"); x.overlayColor = BABYLON.Color3.White(); x.renderOverlay = true; @@ -865,6 +877,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { material3.emissiveColor = new BABYLON.Color3(0.278, 0.278, 0.278); material3.metallic = 0.87; material3.roughness = 0; + + // 给vue页面传值，加载完成之后 + parent.getIframeLoading("false") }; // createScene function that creates and return the scene @@ -1506,7 +1521,6 @@ var createScene = function() { /*show--; showdd--;*/ }); - return scene; }; @@ -1674,6 +1688,16 @@ function setAlertValue(MathineID, wendu, sidu) { } //设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5) +// 设置是否显示 +function setYangGanCanshow(MathineID, canshow){ + var theName = yangans.get(MathineID); + if(theName.indexOf("yangan") >= 0){ + scene.getTransformNodeByName(theName).canshow = canshow; + } +} +// setYangGanCanshow("DAK_MO_OAO_001",false) + + //功能：档案柜标点点击 // function cabinetClick(cabinet) { // alert(cabinet.nameID); diff --git a/public/webB/index.js b/public/webB/index.js index 9ad1609..fe4de2c 100644 --- a/public/webB/index.js +++ b/public/webB/index.js @@ -20,7 +20,8 @@ var deviceData = []; BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() { if (document.getElementById("customLoadingScreenDiv")) { document.getElementById("customLoadingScreenDiv").style.display = "initial"; - + // 给vue页面传值，加载完成之前 + parent.getIframeLoading("true") return; } this._loadingDiv = document.createElement("div"); @@ -166,7 +167,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { "#000000", true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } else { var location = transformNodex.absolutePosition; var xd = scene.getMeshByName("tapblue"); @@ -198,7 +201,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } } } @@ -277,12 +282,16 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { camera05.baojing = false; camera06.baojing = false; + + var yangan05 = scene.getTransformNodeByName("yangan_4"); yangan05.name = "yangan05"; yangan05.nameID = "ZLS_MO_OAO_001"; yangan05.wendu = 0; yangan05.sidu = 0; + yangan05.baojing = false; + yangan05.canshow = true; prepareGroupButtonOther(yangan05, new BABYLON.Color3(0, 0, 1)); @@ -491,6 +500,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { scene.getMaterialByName("Desk.018").roughness = 0.72; scene.getMaterialByName("材质.29").metallic = 0.8; + + // 给vue页面传值，加载完成之后 + parent.getIframeLoading("false") }; // createScene function that creates and return the scene @@ -933,11 +945,9 @@ function Myalert(MathineID, baojing) { scene.getMeshByName("tapblue").setEnabled(false); scene.getMeshByName("tapred").setEnabled(false); var theName = yangans.get(MathineID); - alert(theName); if (theName == "yangan05") { scene.getTransformNodeByName("yangan05").baojing = baojing; } - if (theName == "camera05") { scene.getTransformNodeByName("camera05").baojing = baojing; } @@ -959,6 +969,16 @@ function setAlertValue(MathineID, wendu, sidu) { } //设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5) +// 设置是否显示 +function setYangGanCanshow(MathineID, canshow){ + var theName = yangans.get(MathineID); + if(theName == "yangan05"){ + scene.getTransformNodeByName("yangan05").canshow = canshow; + } +} +// setYangGanCanshow("DAK_MO_OAO_001",false) + + // function cameraClick(TheCamera) { // alert(TheCamera.nameID); // } diff --git a/public/webC/index.js b/public/webC/index.js index 2a43dbe..40fbb36 100644 --- a/public/webC/index.js +++ b/public/webC/index.js @@ -21,7 +21,8 @@ var deviceData = []; BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function() { if (document.getElementById("customLoadingScreenDiv")) { document.getElementById("customLoadingScreenDiv").style.display = "initial"; - + // 给vue页面传值，加载完成之前 + parent.getIframeLoading("true") return; } this._loadingDiv = document.createElement("div"); @@ -68,6 +69,7 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { yangan06.wendu = 0; yangan06.sidu = 0; + yangan06.canshow = true; var prepareGroupButtonOther = function(transformNodex, color) { var mesheses = null; @@ -185,7 +187,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { "#000000", true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } else { var location = transformNodex.absolutePosition; var xd = scene.getMeshByName("tapblue"); @@ -217,7 +221,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { true ); - xd.setEnabled(true); + if(transformNodex.canshow == true){ + xd.setEnabled(true); + } } } } @@ -481,6 +487,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { plane.position = new BABYLON.Vector3(0.11, 1.93, -0.28); plane.rotation = new BABYLON.Vector3((90 * Math.PI) / 180, 0, 0); plane.scaling = new BABYLON.Vector3(1.2, 0.8, 1); + + // 给vue页面传值，加载完成之后 + parent.getIframeLoading("false") }; // createScene function that creates and return the scene @@ -890,9 +899,6 @@ function Myalert(MathineID, baojing) { function setAlertValue(MathineID, wendu, sidu) { var theName = yangans.get(MathineID); - console.log(theName); - console.log(wendu); - console.log(sidu); if (theName == "yangan06") { scene.getTransformNodeByName("yangan06").wendu = wendu; scene.getTransformNodeByName("yangan06").sidu = sidu; @@ -901,6 +907,16 @@ function setAlertValue(MathineID, wendu, sidu) { //设置温湿度: setAlertValue("DAK_MO_OAO_001",4,5) // setAlertValue("YLS_MO_OAO_001", 4, 5); +// 设置是否显示 +function setYangGanCanshow(MathineID, canshow){ + var theName = yangans.get(MathineID); + if(theName == "yangan06"){ + scene.getTransformNodeByName(theName).canshow = canshow; + } +} +// setYangGanCanshow("DAK_MO_OAO_001",false) + + // function cameraClick(TheCamera) { // alert(TheCamera.nameID); // } diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index de52247..ff7a34e 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -39,7 +39,7 @@ /> - +
diff --git a/src/views/home.vue b/src/views/home.vue index c8391f2..49d933e 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -147,7 +147,7 @@

-

档案类别

+

档案类型

@@ -209,7 +209,7 @@ export default { }, data() { return { - lendData: [18203, 23489, 29034, 104970], + lendData: [100, 18203, 23489, 29034, 104970], cateData: [1000, 700], typeData: [1110, 2000, 800, 600, 900] } diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue index 2cfc900..ccea014 100644 --- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue +++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue @@ -121,9 +121,12 @@ export default { isScroll: false // 是否滚动 } }, + created() { + window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象 + }, mounted() { const _this = this - this.iframeWin = this.$refs.myIframe.contentWindow + _this.iframeWin = this.$refs.myIframe.contentWindow // inframe 加载完成之后 document.getElementById('myIframe').onload = function() { _this.deviceState() @@ -131,6 +134,14 @@ export default { window.addEventListener('message', this.handleMessageDevice) }, methods: { + // 加载完成状态传值 + getIframeLoading(value) { + // console.log(`我是iframe传过来的参数：${value}`) + if (value === 'false') { + this.handleHide('DAK_MO_OAO_001') + this.handleAlarm('DAK_MO_OAO_003') + } + }, // 传入设备状态data / 给iframe传初始值 deviceState(e) { this.iframeWin.postMessage({ @@ -182,6 +193,10 @@ export default { handleAlarm(deviceId) { window.frames['iframeMap'].Myalert(deviceId, true) }, + // 设置是否显示 + handleHide(deviceId) { + window.frames['iframeMap'].setYangGanCanshow(deviceId, false) + }, getData() { this.tableData = data1.rows }, diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue index 78adfa8..7608159 100644 --- a/src/views/storeManage/warehouse3D/collateRoom/index.vue +++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue @@ -26,6 +26,9 @@ export default { return { } }, + created() { + window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象 + }, mounted() { const _this = this this.iframeWin = this.$refs.myIframe.contentWindow @@ -36,6 +39,13 @@ export default { // window.addEventListener('message', this.handleMessageDevice) }, methods: { + // 加载完成状态传值 + getIframeLoading(value) { + // console.log(`我是iframe传过来的参数：${value}`) + if (value === 'false') { + this.handleHide('ZLS_MO_OAO_001') + } + }, // 传入设备状态data / 给iframe传初始值 deviceState(e) { this.iframeWin.postMessage({ @@ -48,6 +58,10 @@ export default { } ] }, '*') + }, + // 设置是否显示 + handleHide(deviceId) { + window.frames['iframeMap'].setYangGanCanshow(deviceId, false) } // 点击查看设备状况 // handleMessageDevice(event) { diff --git a/src/views/storeManage/warehouse3D/index.vue b/src/views/storeManage/warehouse3D/index.vue index 3614d36..e0a1b48 100644 --- a/src/views/storeManage/warehouse3D/index.vue +++ b/src/views/storeManage/warehouse3D/index.vue @@ -1,5 +1,5 @@