diff --git a/public/webA/index.js b/public/webA/index.js index 8208eef..f9c2501 100644 --- a/public/webA/index.js +++ b/public/webA/index.js @@ -1706,12 +1706,12 @@ 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; - } -} +// function setYangGanCanshow(MathineID, canshow){ +// var theName = yangans.get(MathineID); +// if(theName.indexOf("yangan") >= 0){ +// scene.getTransformNodeByName(theName).canshow = canshow; +// } +// } //功能：档案柜标点点击 diff --git a/public/webB/index.js b/public/webB/index.js index 8659135..02d1694 100644 --- a/public/webB/index.js +++ b/public/webB/index.js @@ -234,6 +234,8 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () { yangan05.name = "yangan05" yangan05.nameID = "ZLS_MO_OAO_001" + yangan05.canshow = true; + yangan05.wendu = 0; yangan05.sidu = 0; diff --git a/public/webC/index.js b/public/webC/index.js index 4f7bfc8..c79e591 100644 --- a/public/webC/index.js +++ b/public/webC/index.js @@ -70,7 +70,8 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () { var yangan06 = scene.getTransformNodeByName("yangan_5"); yangan06.name = "yangan06" yangan06.nameID = "YLS_MO_OAO_001" - + + yangan06.canshow = true; yangan06.wendu = 0; yangan06.sidu = 0; diff --git a/public/webD/asset/7lou-AA.glb b/public/webD/asset/7lou-AA.glb index db3ffcc..aa94004 100644 Binary files a/public/webD/asset/7lou-AA.glb and b/public/webD/asset/7lou-AA.glb differ diff --git a/public/webD/asset/7lou-AA1.glb b/public/webD/asset/7lou-AA1.glb new file mode 100644 index 0000000..db3ffcc Binary files /dev/null and b/public/webD/asset/7lou-AA1.glb differ diff --git a/public/webD/index.html b/public/webD/index.html index 918b99e..9f0e78e 100644 --- a/public/webD/index.html +++ b/public/webD/index.html @@ -856,6 +856,7 @@ + diff --git a/public/webD/index.js b/public/webD/index.js index 55d46e7..e1dc31e 100644 --- a/public/webD/index.js +++ b/public/webD/index.js @@ -17,7 +17,9 @@ var showdd = 50; BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function () { if (document.getElementById("customLoadingScreenDiv")) { document.getElementById("customLoadingScreenDiv").style.display = "initial"; - return; + // 给vue页面传值，加载完成之前 + parent.getIframeLoading("true") + return; } this._loadingDiv = document.createElement("div"); //this._loadingDiv.style.height = '1750px'; @@ -474,6 +476,8 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () { //var v2 = scene.getTransformNodeByName("后门01"); //v2.setParent( scene.getTransformNodeByName("档案柜03"),true); //v2.position = new BABYLON.Vector3(v2.position.x,-122.479,v2.position.z); + // 给vue页面传值，加载完成之后 + parent.getIframeLoading("false") } // createScene function that creates and return the scene diff --git a/public/webD/js/draco_decoder.wasm b/public/webD/js/draco_decoder.wasm new file mode 100644 index 0000000..3f0ba9c Binary files /dev/null and b/public/webD/js/draco_decoder.wasm differ diff --git a/public/webD/js/draco_decoder_gltf.wasm b/public/webD/js/draco_decoder_gltf.wasm new file mode 100644 index 0000000..ed0a621 Binary files /dev/null and b/public/webD/js/draco_decoder_gltf.wasm differ diff --git a/public/webE/asset/7lou-B.glb b/public/webE/asset/7lou-B.glb index baec02e..d01d37a 100644 Binary files a/public/webE/asset/7lou-B.glb and b/public/webE/asset/7lou-B.glb differ diff --git a/public/webE/asset/7lou-B1.glb b/public/webE/asset/7lou-B1.glb new file mode 100644 index 0000000..baec02e Binary files /dev/null and b/public/webE/asset/7lou-B1.glb differ diff --git a/public/webE/index.html b/public/webE/index.html index 1c64749..06aafbe 100644 --- a/public/webE/index.html +++ b/public/webE/index.html @@ -856,6 +856,7 @@ + diff --git a/public/webE/index.js b/public/webE/index.js index 7d65c96..aa22fdb 100644 --- a/public/webE/index.js +++ b/public/webE/index.js @@ -17,6 +17,8 @@ var showdd = 50; 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"); @@ -37,7 +39,7 @@ BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function () { this._resizeLoadingUI(); window.addEventListener("resize", this._resizeLoadingUI); document.body.appendChild(this._loadingDiv); -}; +} var movebyName = function (nodeName) { var x = scene.getTransformNodeByName(nodeName); @@ -477,6 +479,8 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () { //var v2 = scene.getTransformNodeByName("后门01"); //v2.setParent( scene.getTransformNodeByName("档案柜03"),true); //v2.position = new BABYLON.Vector3(v2.position.x,-122.479,v2.position.z); + // 给vue页面传值，加载完成之后 + parent.getIframeLoading("false") } // createScene function that creates and return the scene diff --git a/public/webE/js/draco_decoder.wasm b/public/webE/js/draco_decoder.wasm new file mode 100644 index 0000000..3f0ba9c Binary files /dev/null and b/public/webE/js/draco_decoder.wasm differ diff --git a/public/webE/js/draco_decoder_gltf.wasm b/public/webE/js/draco_decoder_gltf.wasm new file mode 100644 index 0000000..ed0a621 Binary files /dev/null and b/public/webE/js/draco_decoder_gltf.wasm differ diff --git a/public/webTotal7/asset/7lou.glb b/public/webTotal7/asset/7lou.glb index 28898f0..09bee38 100644 Binary files a/public/webTotal7/asset/7lou.glb and b/public/webTotal7/asset/7lou.glb differ diff --git a/public/webTotal7/asset/7lou_2.glb b/public/webTotal7/asset/7lou_2.glb new file mode 100644 index 0000000..28898f0 Binary files /dev/null and b/public/webTotal7/asset/7lou_2.glb differ diff --git a/public/webTotal7/index.html b/public/webTotal7/index.html index 12771c2..5e4b734 100644 --- a/public/webTotal7/index.html +++ b/public/webTotal7/index.html @@ -861,6 +861,7 @@ + diff --git a/public/webTotal7/js/draco_decoder.wasm b/public/webTotal7/js/draco_decoder.wasm new file mode 100644 index 0000000..3f0ba9c Binary files /dev/null and b/public/webTotal7/js/draco_decoder.wasm differ diff --git a/public/webTotal7/js/draco_decoder_gltf.wasm b/public/webTotal7/js/draco_decoder_gltf.wasm new file mode 100644 index 0000000..ed0a621 Binary files /dev/null and b/public/webTotal7/js/draco_decoder_gltf.wasm differ diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue index 8176e40..8ecc8ae 100644 --- a/src/views/environmentalScreen/index.vue +++ b/src/views/environmentalScreen/index.vue @@ -9,34 +9,92 @@

档案库空气质量数据

@@ -68,120 +126,66 @@
-
- - + +
    -
  • +
  • {{ topDisplayData.DAK_DIV_TOP_001.curValue }}

    温度 {{ topDisplayData.DAK_DIV_TOP_001.unit }}

    • -
  • +
  • {{ topDisplayData.DAK_DIV_TOP_002.curValue }}

    湿度 {{ topDisplayData.DAK_DIV_TOP_002.unit }}

    • -
-
- +
  • + +
    + {{ topDisplayData.XXW_DIV_TOP_001.curValue }} +

    温度 {{ topDisplayData.XXW_DIV_TOP_001.unit }}

    • -
  • -
    - -
    -
    -

    通道门

    - +
  • + +
    + {{ topDisplayData.XXW_DIV_TOP_002.curValue }} +

    湿度 {{ topDisplayData.XXW_DIV_TOP_002.unit }}

    • -
  • -
    - -
    -
    -

    漏水传感器

    - + +
  • + +
    + {{ topDisplayData.DXW_DIV_TOP_001.curValue }} +

    温度 {{ topDisplayData.DXW_DIV_TOP_001.unit }}

    • -
  • -
    - -
    -
    -

    温湿度传感器

    - +
  • + +
    + {{ topDisplayData.DXW_DIV_TOP_002.curValue }} +

    湿度 {{ topDisplayData.DXW_DIV_TOP_002.unit }}

    • -
    --> +
    -
    @@ -341,6 +345,8 @@ export default { mixins: [statisticsCrud], data() { return { + bannerRoomName: '5F 全景图', + bannerIndex: 0, nowDate: '', timer: null, className: ['readRoomContainer', 'collateRoomContainer'], @@ -386,6 +392,80 @@ export default { curValue: '', unit: '', curstatus: 0 + }, + // 7F 现行文件室 / 信息技术室 + DXW_DIV_TOP_001: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + DXW_DIV_TOP_002: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + DXW_DIV_TOP_003: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + DXW_DIV_TOP_004: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + DXW_DIV_TOP_005: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + DXW_DIV_TOP_006: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + // 7F 待销文件室 + XXW_DIV_TOP_001: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + XXW_DIV_TOP_002: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + XXW_DIV_TOP_003: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + XXW_DIV_TOP_004: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + XXW_DIV_TOP_005: { + show: false, + curValue: '', + unit: '', + curstatus: 0 + }, + XXW_DIV_TOP_006: { + show: false, + curValue: '', + unit: '', + curstatus: 0 } }, waterLeakage: { @@ -427,7 +507,9 @@ export default { } } }) + console.log('allDeviceIds', this.allDeviceIds) this.displayConfigData = this.allDisplayConfigData.filter((item) => { return item.isDisplay && item.bindState && item.deviceInfo && (item.divPosition.includes('OAO') || item.divPosition.includes('TOP') || item.divPosition.includes('LS')) }) + console.log('displayConfigData', this.displayConfigData) await this.getRealTimeData() this.getDayYearBorrowNum() this.handleLeftTableNum() @@ -444,8 +526,8 @@ export default { this.dataTimer = setInterval(async() => { _this.getDayYearBorrowNum() _this.handleLeftTableNum() - await _this.getRealTimeData() - _this.handleAQI() + // await _this.getRealTimeData() + // _this.handleAQI() }, 1000 * 30) // 每隔一分钟刷新档案借阅和档案类型的数据 this.echartsTimer = setInterval(() => { @@ -454,6 +536,8 @@ export default { _this.getBorrowerNumSta() _this.getArchivesTypeStatistics() }, this.refreshtime) + + this.$refs.carousel.$on('change', this.handleChange) }, beforeDestroy() { if (this.timer) { @@ -464,6 +548,67 @@ export default { } }, methods: { + async handleChange(index) { + this.bannerIndex = index + if (index === 0) { + this.bannerRoomName = '5F 全景图' + this.roomId = 'D6490DA3D4261E8C26D0E3' + await this.changeRoomGetDeivce() + } else if (index === 1) { + this.bannerRoomName = '5F 档案库' + this.roomId = 'D6490DA3D4261E8C26D0E3' + } else if (index === 2) { + this.bannerRoomName = '5F 整理室' + this.roomId = 'D6490DA3D4261E8C26D0E3' + } else if (index === 3) { + this.bannerRoomName = '5F 阅览室' + this.roomId = 'D6490DA3D4261E8C26D0E3' + } else if (index === 4) { + this.bannerRoomName = '7F 全景图' + this.roomId = '1B2DADD8499058954C0CAC' + await this.changeRoomGetDeivce() + } else if (index === 5) { + this.bannerRoomName = '7F 现行文件室 / 信息技术室' + this.roomId = '1B2DADD8499058954C0CAC' + await this.changeRoomGetDeivce() + } else if (index === 6) { + this.bannerRoomName = '7F 待销文件室' + this.roomId = 'D4C395BFB0A2E7C96C65A0' + await this.changeRoomGetDeivce() + } + }, + async changeRoomGetDeivce() { + this.allDeviceIds = [] + this.allDisplayConfigData = await displayConfigApi.list({ storeroomId: this.roomId }) + console.log('allDisplayConfigData2', this.allDisplayConfigData) + if (this.bannerIndex === 4 || this.bannerIndex === 5 || this.bannerIndex === 6) { + this.allDisplayConfigData.forEach(element => { + if (element.isDisplay && element.bindState && element.deviceInfo && (element.divPosition.includes('OAO') || element.divPosition.includes('TOP'))) { + this.allDeviceIds.push(element.deviceInfo.deviceId) + if (!this.url) { + this.url = 'http://' + element.deviceInfo.deviceIp + ':' + element.deviceInfo.devicePort + } + } + }) + console.log('allDeviceIds2', this.allDeviceIds) + this.displayConfigData = this.allDisplayConfigData.filter((item) => { return item.isDisplay && item.bindState && item.deviceInfo && (item.divPosition.includes('OAO') || item.divPosition.includes('TOP')) }) + console.log('displayConfigData2', this.displayConfigData) + } else { + this.allDisplayConfigData.forEach(element => { + if (element.isDisplay && element.bindState && element.deviceInfo && (element.divPosition.includes('OAO') || element.divPosition.includes('TOP') || element.divPosition.includes('LS'))) { + this.allDeviceIds.push(element.deviceInfo.deviceId) + if (!this.url) { + this.url = 'http://' + element.deviceInfo.deviceIp + ':' + element.deviceInfo.devicePort + } + } + }) + console.log('allDeviceIds1', this.allDeviceIds) + this.displayConfigData = this.allDisplayConfigData.filter((item) => { return item.isDisplay && item.bindState && item.deviceInfo && (item.divPosition.includes('OAO') || item.divPosition.includes('TOP') || item.divPosition.includes('LS')) }) + console.log('displayConfigData', this.displayConfigData) + } + await this.getRealTimeData() + this.handleAQI() + }, // 加载完成状态传值 getIframeLoading(value) { // console.log(`我是iframe传过来的参数：${value}`) @@ -1020,4 +1165,17 @@ export default { } } } +.banner-top-name{ + position: absolute; + left: 0; + top: 0; + padding: 0 15px; + height: 34px; + line-height: 32px; + font-size: 18px; + color: #fff; + background-color: #113d72; + border: 1px solid #339cff; + border-radius: 4px; +} diff --git a/src/views/storeManage/warehouse3DConfig/index.vue b/src/views/storeManage/warehouse3DConfig/index.vue index e442755..24f5a03 100644 --- a/src/views/storeManage/warehouse3DConfig/index.vue +++ b/src/views/storeManage/warehouse3DConfig/index.vue @@ -199,10 +199,10 @@ export default { deviceTypeId = this.cameraTypeId } else if (this.form.divPosition.includes('TOP')) { deviceTypeId = this.airEquipmentTypeId - } else if (this.form.divPosition.includes('LS')) { - deviceTypeId = this.waterSensorTypeId - } else { + } else if (this.form.divPosition.includes('OAO')) { deviceTypeId = this.temperaSensorTypeId + } else { + deviceTypeId = this.waterSensorTypeId } // 获取设备选项 crudDevice.getDeviceList({ storeroomId: this.room, deviceTypeId: deviceTypeId }).then((data) => {