From f2df4ddbb0aa19ea26ca578dfc3b76fd786ec41f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 10:47:09 +0800 Subject: [PATCH 1/3] fix: wpm_gx handoverform getuserlist2 bug --- src/views/wpm_gx/handover_form.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index e191fbc8..17503778 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -287,7 +287,7 @@ export default { //获取工段列表 getMgroupOptions() { this.$API.mtm.mgroup.list - .req({ page: 0, type__in: "dept" }) + .req({ page: 0}) .then((res) => { this.mgroupOptions = res; }); @@ -338,12 +338,12 @@ export default { this.mgroupOptions.forEach(item => { if(item.id==that.form.recive_mgroup){ deptID = item.belong_dept; + this.$API.system.user.list + .req({ depts: deptID, page: 0 }) + .then((res) => { + that.userList2 = res; + }); } - this.$API.system.user.list - .req({ depts: deptID, page: 0 }) - .then((res) => { - that.userList2 = res; - }); }); }, //获取接收部门人员 From e38d1d3eef0afc7ea45026b1ed8728447722fb64 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 14:27:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=85=89=E5=AD=90=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?light=20intensity=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_photon.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index 1020ddd3..f44f7dd2 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -1301,7 +1301,7 @@ export default { "light", new BABYLON.Vector3(1, 1, 0) ); - light.intensity = 3; + light.intensity = 1.5; // 全屏GUI const advancedTexture = BABYLON_GUI.AdvancedDynamicTexture.CreateFullscreenUI( From 4371a5dff005cf3d261c73ebd1703df7554996e8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 14 Aug 2024 16:25:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=8E=AF=E4=BF=9D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigScreen/enpComponents/orgwryList.vue | 10 ++- .../bigScreen/enpComponents/pollutant.vue | 70 ++++++++++++++++--- 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 868dd389..b5e02dc9 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -69,13 +69,13 @@
排放口及关联设备静态信息
-
+
{{ detailItem.name }} @@ -478,6 +478,7 @@ export default { }) }, resizeChart(name) { + console.log(name) var myChart = echarts.getInstanceByDom( document.getElementById(name) ); @@ -487,10 +488,7 @@ export default { }, addListener() { var that = this; - if (this.resizeTimeout) { - clearTimeout(this.resizeTimeout); - } - this.resizeTimeout = setTimeout(function () { + setTimeout(function () { that.resizeChart("dataChart"); that.resizeChart("dataChart2"); that.resizeChart("dataChart3"); diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 08c2181f..70dad411 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -27,15 +27,63 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -188,9 +236,11 @@