From 96da92e9056c9c02e77867998424d623261daab0 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 25 七月 2024 15:09:32 +0800 Subject: [PATCH] 1. 添加地图罗盘的显隐 2. 修复数据表格中O3数据列实际显示NO2的值的问题 3. 优化风向的中文描述 --- src/main.js | 1 + src/constant/checkbox-options.js | 12 ++++++------ src/constant/wind-dir.js | 16 ++++++++-------- src/constant/radio-options.js | 10 +++++----- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/constant/checkbox-options.js b/src/constant/checkbox-options.js index 86b1a78..6f1178d 100644 --- a/src/constant/checkbox-options.js +++ b/src/constant/checkbox-options.js @@ -39,7 +39,7 @@ }, { label: 'O3', - name: 'NO2', + name: 'O3', value: '5' }, { @@ -88,22 +88,22 @@ const option2 = [ { label: '娓╁害', - name: '娓╁害', + name: 'TMP', value: '1' }, { label: '鐢靛鐜�', - name: '鐢靛鐜�', + name: 'spC', value: '2' }, { label: '娴婂害', - name: '娴婂害', + name: 'tur', value: '3' }, { label: '婧惰В姘�', - name: '婧惰В姘�', + name: 'DO', value: '4' }, { @@ -136,7 +136,7 @@ }, { label: 'O3', - name: 'NO2', + name: 'O3', value: '5' }, { diff --git a/src/constant/radio-options.js b/src/constant/radio-options.js index 28df36d..9cf3509 100644 --- a/src/constant/radio-options.js +++ b/src/constant/radio-options.js @@ -34,7 +34,7 @@ }, { label: 'O3', - name: 'NO2', + name: 'O3', value: '5' }, { @@ -57,22 +57,22 @@ const option2 = [ { label: '娓╁害', - name: '娓╁害', + name: 'TMP', value: '1' }, { label: '鐢靛鐜�', - name: '鐢靛鐜�', + name: 'spC', value: '2' }, { label: '娴婂害', - name: '娴婂害', + name: 'tur', value: '3' }, { label: '婧惰В姘�', - name: '婧惰В姘�', + name: 'DO', value: '4' }, { diff --git a/src/constant/wind-dir.js b/src/constant/wind-dir.js index f7a24c3..a3729de 100644 --- a/src/constant/wind-dir.js +++ b/src/constant/wind-dir.js @@ -2,21 +2,21 @@ * 椋庡悜涓枃杞瘧 */ export function windDir(angle) { - if (angle == 0) { + if ((angle > 337.5 && angle <= 360) || (angle >= 0 && angle < 22.5)) { return '鍖楅'; - } else if (angle > 0 && angle < 90) { + } else if (angle >= 22.5 && angle <= 67.5) { return '涓滃寳椋�'; - } else if (angle == 90) { + } else if (angle > 67.5 && angle < 112.5) { return '涓滈'; - } else if (angle > 90 && angle < 180) { + } else if (angle >= 112.5 && angle <= 157.5) { return '涓滃崡椋�'; - } else if (angle == 180) { + } else if (angle > 157.5 && angle < 202.5) { return '鍗楅'; - } else if (angle > 180 && angle < 270) { + } else if (angle >= 202.5 && angle <= 247.5) { return '瑗垮崡椋�'; - } else if (angle == 270) { + } else if (angle > 247.5 && angle < 292.5) { return '瑗块'; - } else if (angle > 270 && angle < 360) { + } else if (angle >= 292.5 && angle <= 337.5) { return '瑗垮寳椋�'; } } diff --git a/src/main.js b/src/main.js index 625b331..a67936a 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ import './assets/main.css'; +import './lib/jquery-3.5.1.min'; import { createApp } from 'vue'; import { createPinia } from 'pinia'; -- Gitblit v1.9.3