From 3d034a859b200482d68a45324ee09422291195e7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 3 Apr 2024 21:51:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=8E=92=E6=94=BE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E6=A0=87=E9=A2=98=E5=8A=A0=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_enp_blue.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index 38658635..50d0911f 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -1114,6 +1114,7 @@ header { width: 100%; text-align: center; line-height: 6.3vh; + font-weight: bold; color: #ffffff; position: absolute; top: 0; @@ -1123,7 +1124,7 @@ header { .sysName { color: #ffffff; padding-left: 1vw; - font-size: 2vh; + font-size: 2.6vh; } .bottom_enp { left: 0; From 891a5b5ec7b4b57bf2809f7b064d20012eca5d78 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 4 Apr 2024 01:09:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E7=95=8C=E9=9D=A2=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/enpComponents/cems.vue | 4 ++-- src/views/bigScreen/enpComponents/orgwryList.vue | 4 ++-- src/views/bigScreen/enpComponents/pollutant.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index b49127da..bd36168b 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -28,12 +28,12 @@ diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index d1257d30..223a24ea 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -282,7 +282,7 @@ export default { biquery: { end_time: '2024-02-01', start_time: '2024-01-29', - time_bucket: "5 minute", + time_bucket: "1 minute", equipment_id: "3491356310052896768", }, basicOption: { @@ -392,7 +392,7 @@ export default { getDetailData() { var now = new Date(); var start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + start.setTime(start.getTime() - 3600 * 1000 * 24); var that = this; var chartDom = document.getElementById('dataChart'); var chartDom2 = document.getElementById('dataChart2'); diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index bd1e116f..e3405a69 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -205,7 +205,7 @@ export default { biquery: { end_time: '2024-02-01', start_time: '2024-01-29', - time_bucket: "5 minute", + time_bucket: "1 minute", equipment_id: "3491356310052896768", }, basicOption: { @@ -271,7 +271,7 @@ export default { initTimeNow() { var now = new Date(); var start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + start.setTime(start.getTime() - 3600 * 1000 * 24); this.biquery['start_time'] = this.$TOOL.dateFormat(start, 'yyyy-MM-dd hh:mm:00') this.biquery['end_time'] = this.$TOOL.dateFormat(now, 'yyyy-MM-dd hh:mm:00') }, From d452eea5b63fb56e5a00659d799d907d09766c72 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 4 Apr 2024 01:29:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=85=B3=E9=97=AD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AF=B9=E6=A8=A1=E5=9E=8B=E6=98=8E=E6=9A=97=E7=9A=84?= =?UTF-8?q?=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/cesiumtest.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index 7550eeee..2fa682b1 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -403,6 +403,10 @@ export default { navigationInstructionsInitiallyVisible: false, }); this.viewer = viewer; + // 关闭时间对模型明暗的影响 + viewer.scene.light = new Cesium.DirectionalLight({ + direction: new Cesium.Cartesian3(0.354925, -0.890918, -0.283358) +}) if (Cesium.FeatureDetection.supportsImageRenderingPixelated()) { //判断是否支持图像渲染像素化处理 viewer.resolutionScale = window.devicePixelRatio; From d1e9fd5a2d3d1799fdd06943f584de27d9a5e0a2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sun, 7 Apr 2024 19:26:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=B7=A5=E8=89=BA=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E4=BA=A7=E5=93=81=E5=88=97=E6=98=BE=E7=A4=BAfull=5Fna?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route.vue b/src/views/mtm/route.vue index 3760dc5b..e1c15904 100644 --- a/src/views/mtm/route.vue +++ b/src/views/mtm/route.vue @@ -182,7 +182,7 @@ export default { getProducts() { this.$API.mtm.material.list.req({ page: 0, need_route: true }).then(res => { res.forEach(m => { - m.label = m.name+'|'+m.specification+'|'+m.model; + m.label = m.full_name; }) this.productOptions = res })