diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue index f5eef396..4e5279a1 100644 --- a/src/views/bigScreen/index_enm_ly.vue +++ b/src/views/bigScreen/index_enm_ly.vue @@ -9,7 +9,7 @@
- 枣庄 + 凌源 {{ currentDay }}{{ currentWeek }}{{ currentTime }} kwh/tkwh @@ -503,8 +503,16 @@ export default { { name: "余热发电" }, { name: "煤磨" }, ], + name: { + textStyle: { + padding: [-20, -20], // 控制文字padding + }, + }, + nameGap: 2, + radius: 63, //缩放 + center: ["50%", "50%"], //位置 // shape: "circle", - splitNumber: 5, + splitNumber: 4, axisName: { color: "#2adbbc", }, @@ -514,8 +522,7 @@ export default { "rgba(238, 197, 102, 0.1)", "rgba(238, 197, 102, 0.2)", "rgba(238, 197, 102, 0.4)", - "rgba(238, 197, 102, 0.6)", - "rgba(238, 197, 102, 0.8)", + "rgba(238, 197, 102, 0.7)", "rgba(238, 197, 102, 1)", ].reverse(), }, @@ -643,6 +650,13 @@ export default { } } }, 5000); + // that.timerTime = setInterval(() => { + // that.productNum(); + // that.eqRate(); + // that.generation(); + // that.proceElec(); + // that.dataCollect(); + // }, 3600000); that.initChart(); }); }, @@ -783,8 +797,12 @@ export default { params.month_s = that.currentMonth; params.type = "month_s"; params.mgroup = that.yurefadianId; - this.$API.enm.enstat.req(params).then((res2) => { - that.hotData = res2[0]; + this.$API.enm.enstat.req(params).then((ress) => { + that.hotData.total_production = + ress[0].total_production; + that.hotData.production_elec_unit = + ress[0].production_elec_unit; + that.hotData.elec_consume = ress[0].elec_consume; }); }); //环保数据 @@ -795,10 +813,10 @@ export default { query: " { id, name, code, last_data, gather_state }", }) .then((res0) => { - console.log("环保数据", res0[0]); - that.hotData.NOx = res0[0].last_data.last_val - ? res0[0].last_data.last_val - : 0.0; + if (res0[0].last_data.last_val) { + that.hotData.NOx = + res0[0].last_data.last_val.toFixed(2); + } }); this.$API.enm.mpoint.list .req({ @@ -807,10 +825,10 @@ export default { query: "{ id, name, code, last_data, gather_state }", }) .then((res1) => { - console.log("环保数据", res1[0]); - that.hotData.SO2 = res1[0].last_data.last_val - ? res1[0].last_data.last_val - : 0.0; + if (res1[0].last_data.last_val) { + that.hotData.SO2 = + res1[0].last_data.last_val.toFixed(2); + } }); this.$API.enm.mpoint.list .req({ @@ -819,10 +837,10 @@ export default { query: "{ id, name, code, last_data, gather_state }", }) .then((res2) => { - console.log("环保数据", res2[0]); - that.hotData.klw = res2[0].last_data.last_val - ? res2[0].last_data.last_val - : 0.0; + if (res2[0].last_data.last_val) { + that.hotData.klw = + res2[0].last_data.last_val.toFixed(2); + } }); }, //工序电耗 @@ -867,10 +885,14 @@ export default { enabled: true, type: 10, page: 0, + query: "{ id, name, code, last_data, gather_state }", }; + that.tableData = []; + function getTypeof(variable) { + return typeof variable; + } that.$API.enm.mpoint.list.req(params).then((res) => { - // console.log("数据采集", res); - that.tableData = res; + console.log("数据采集", res); let success_num = 0; let error_num = 0; res.forEach((item, index) => { @@ -879,8 +901,15 @@ export default { } else { error_num++; } + if (item.last_data.last_val) { + if (getTypeof(item.last_data.last_val) == "number") { + item.last_data.last_val.toFixed(2); + } + } + that.tableData.push(item); }); - //右1---工序电耗---雷达图 + console.log("数据采集tableData", that.tableData); + let chartDom6 = document.getElementById("pieChart"); let myChart6 = echarts.init(chartDom6); let option6 = { @@ -982,7 +1011,7 @@ export default { } elTable.style.height = itemBodyHeight - 20 + "px"; let pieWidth = Math.round(windowWidth / 100) * 22 - 180; - let radarWidth = Math.round(windowWidth / 100) * 22 - 200; + let radarWidth = Math.round(windowWidth / 100) * 22 - 130; pieChart.style.width = pieWidth + "px"; radarChart.style.width = radarWidth + "px"; } else { @@ -1086,7 +1115,7 @@ export default { var control_main = new BABYLON_GUI.StackPanel(); control_main.isVertical = false; control_main.top = "40%"; - control_main.left = "-20%"; + control_main.left = "-15%"; advancedTexture.addControl(control_main); var button_main = BABYLON_GUI.Button.CreateSimpleButton( @@ -1117,8 +1146,9 @@ export default { mesh_name.color = "white"; mesh_name.fontSize = "14px"; mesh_rect.addControl(mesh_name); - var remoteGlbUrl = config.HOST_URL + "/media/model/lyx2.glb"; + var remoteGlbUrl = config.HOST_URL + "/media/model/ly.glb"; // var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb"; + BABYLON.SceneLoader.Append( remoteGlbUrl, "", @@ -1593,9 +1623,9 @@ export default { focus: "series", }, data: [ - 190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290, - 240, 232, 251, 264, 320, 310, 250, 232, 240, 270, 280, - 264, 290, 300, 250, 240, 232, 201, 250, + 0.5, 0.31, 0.6, 0.1, 0.6, 0.5, 0.4, 0.2, 0.2, 0.64, 0.9, + 0.4, 0.32, 0.51, 0.64, 0.91, 0.3, 0.5, 0.32, 0.4, 0.7, + 0.8, 0.4, 0.9, 0.56, 0.5, 0.4, 0.32, 0.2, 0.25, ], }, { @@ -1615,9 +1645,9 @@ export default { focus: "series", }, data: [ - 190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290, - 240, 232, 251, 264, 320, 310, 250, 232, 240, 270, 280, - 264, 290, 300, 250, 240, 232, 201, 250, + 0.9, 0.0, 0.45, 0.65, 0.6, 0.55, 0.4, 1.22, 0.2, 0.4, + 0.0, 0.4, 0.32, 0.51, 0.64, 0.92, 0.1, 0.5, 0.32, 0.4, + 0.7, 0.8, 1.4, 0.8, 0.0, 1.0, 0.4, 0.32, 0.01, 0.5, ], }, { @@ -1637,9 +1667,9 @@ export default { focus: "series", }, data: [ - 190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290, - 240, 232, 251, 264, 320, 310, 250, 232, 240, 270, 280, - 264, 290, 300, 250, 240, 232, 201, 250, + 0.5, 1, 0.6, 1.1, 0.6, 0.5, 0.4, 0.2, 0.2, 0.64, 0.9, + 0.4, 0.32, 0.51, 0.64, 0.91, 0.83, 0.5, 0.32, 0.4, 0.7, + 0.8, 0.4, 0.9, 1.56, 0.5, 0.4, 0.32, 0.2, 0.25, ], }, ]; @@ -1842,11 +1872,11 @@ export default { font-size: 1.1vh; } .bodyListItem_name { - width: 70px; + width: 60px; padding: 0.5vh 0; } .bodyListItem_num { - width: 80px; + width: 65px; } .itemBodyFlex { display: flex;