From b149cb59e7eae67c28c2c3352dacab881ec87322 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 11 Sep 2023 15:12:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E7=8F=AD=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8A=A5=E5=91=8A=E6=8A=A5=E8=A1=A8=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_enm.vue | 20 +- src/views/enm_coal/handoverLog.vue | 195 +++++++------------ src/views/enm_kiln/handoverLog.vue | 217 ++++++++------------- src/views/enm_mill/handoverLog.vue | 193 +++++++------------ src/views/enm_pack/handoverLog.vue | 157 ++++++--------- src/views/enm_rm/handoverLog.vue | 298 +++++++++++++++++------------ src/views/enm_slag/handoverLog.vue | 145 ++++---------- 7 files changed, 493 insertions(+), 732 deletions(-) diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 666ae0c8..5fb69b10 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -731,7 +731,7 @@ export default { // 高亮显示mesh名 const mesh_rect = new BABYLON_GUI.Rectangle('mesh_rect'); - mesh_rect.width = "80px"; + mesh_rect.width = "180px"; mesh_rect.height = "20px"; mesh_rect.background = 'orange' mesh_rect.alpha = 0.6 @@ -747,8 +747,13 @@ export default { var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb"; BABYLON.SceneLoader.Append(remoteGlbUrl, "", scene, function (scene) { - debugger; - console.log(scene) + // debugger; + // console.log(scene) + // console.table(scene.meshes) + let data = scene.meshes; + data.forEach(item=>{ + console.log(item.name) + }) for (let key in that.sectionNames) { var value = that.sectionNames[key]; @@ -888,14 +893,17 @@ export default { if (pickResult.hit) { const mesh = pickResult.pickedMesh; highlightLayer.removeAllMeshes(); - if (mesh.name == '柱体.024') { - // 在选中的 mesh 上添加高亮效果 - highlightLayer.addMesh(mesh, new BABYLON.Color3(1, 1, 0.5)); + if( + mesh.name=='熟料库_primitive0' + ){ + // 在选中的 mesh 上添加高亮效果 + highlightLayer.addMesh(mesh, new BABYLON.Color3(1, 1, 0.5)); that.currentLightMesh = mesh; mesh_rect.linkWithMesh(mesh); mesh_name.text = mesh.name; mesh_rect.isVisible = true; } + } }); // checkbox.isChecked = true; //默认开启自动旋转 diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue index da75e3eb..cc8a421a 100644 --- a/src/views/enm_coal/handoverLog.vue +++ b/src/views/enm_coal/handoverLog.vue @@ -63,7 +63,6 @@ @row-click="rowClick" > - +
+ 导出xlsx + + 打印 + +
@@ -109,76 +121,65 @@ {{ sflogItem.team_name }} 交接班记录
-

- 2023.06.21 - 白班 - 甲班 -

+ + + + + + + + - + - + - + - + - + - + - + + - - - - - + + + + + + + + + + + + + + + + +
日期{{sflogItem.end_time.slice(0,10)}}班次{{ sflogItem.shift_name }}班组{{ sflogItem.team_name }}
产量（t）{{value1}}{{reportItem.total_production}} 台时（t/h）{{value3}}{{reportItem.production_hour}} 运转时间（h）{{value5}}{{reportItem.run_hour}}
运转率（%）{{value1}}{{reportItem.run_rate*100}} 停机时长（h）{{value3}}{{reportItem.shut_hour}} 煤磨分布电耗（KW·h/t）{{value5}}{{reportItem.elec_consume_unit}}
煤粉细度合格率（%）{{value1}}{{reportItem.煤粉_细度_rate_pass*100}}0 煤粉水分合格率（%）{{value5}}
生产情况记录时间、类别、原因、处置措施、处置人{{reportItem.煤粉_水分_rate_pass*100}}0
生产情况记录时间类别原因处置措施处置人
{{ item.happen_time}}{{ item.cate}}{{ item.reason}}{{ item.measure}}{{ item.handler}}
- - -