From 05371f71aa01c3e8faac19cc8f93107e30a874f8 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Mon, 6 Dec 2021 07:35:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8F=82=E6=95=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=91=A8=E6=9C=9F=E4=B8=8A=E7=BA=BF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?7*24*60=EF=BC=9B=E4=BF=AE=E5=A4=8D=E7=BB=9F=E8=AE=A1=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=82=B9=E4=B8=8E=E6=97=B6=E9=97=B4=E4=B8=8D=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A4=AA=E9=98=B3?= =?UTF-8?q?=E8=83=BD=E6=9D=BF-=E3=80=8B=E5=85=89=E4=BC=8F=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- package.json | 4 +- .../config/function-config-applied.vue | 2 +- .../config/function-config-pending.vue | 4 +- src/components/history/device.vue | 2 +- src/components/history/local.vue | 2 +- src/utils/statistical.js | 20 +++++----- src/views/data-realtime.vue | 2 +- t | 38 ------------------- 9 files changed, 20 insertions(+), 56 deletions(-) delete mode 100644 t diff --git a/.env.production b/.env.production index ab22b6a..3556c7f 100644 --- a/.env.production +++ b/.env.production @@ -1 +1 @@ -VITE_API_URL=https://www.tall.wiki +VITE_API_URL=http://139.196.27.233:29001 diff --git a/package.json b/package.json index 12f802c..e887d2e 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "dev": "vite --mode test", "dev:prod": "vite --mode production", "dev-test": "vite --mode development", - "build": "vite build --mode test", - "build:prod": "vite build --mode production", + "build:test": "vite build --mode test", + "build": "vite build --mode production", "serve": "vite preview", "cz": "git add . && git cz", "format": "prettier --write ./src", diff --git a/src/components/config/function-config-applied.vue b/src/components/config/function-config-applied.vue index 5e80680..e7a89aa 100644 --- a/src/components/config/function-config-applied.vue +++ b/src/components/config/function-config-applied.vue @@ -26,7 +26,7 @@ {{ data.batteryHigh }} - 太阳能板电压高阈值(V)： + 光伏板电压高阈值(V)： {{ data.sunHigh }} diff --git a/src/components/config/function-config-pending.vue b/src/components/config/function-config-pending.vue index 5b9f3dc..e980bc9 100644 --- a/src/components/config/function-config-pending.vue +++ b/src/components/config/function-config-pending.vue @@ -37,7 +37,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/src/components/history/device.vue b/src/components/history/device.vue index a89316b..a3c2db7 100644 --- a/src/components/history/device.vue +++ b/src/components/history/device.vue @@ -25,7 +25,7 @@ - + diff --git a/src/components/history/local.vue b/src/components/history/local.vue index 5ecfa1d..9e22826 100644 --- a/src/components/history/local.vue +++ b/src/components/history/local.vue @@ -23,7 +23,7 @@ - + diff --git a/src/utils/statistical.js b/src/utils/statistical.js index bbb3381..3af791a 100644 --- a/src/utils/statistical.js +++ b/src/utils/statistical.js @@ -34,15 +34,17 @@ function generateParams(data) { }; data.forEach(item => { result.time.push(dayjs(new Date(+item.time)).format('YY/MM/DD HH:mm')); - !isNaN(+item.so2) ? result.so2.push(+item.so2) : ''; - !isNaN(+item.saltR) ? result.saltR.push(+item.saltR) : ''; - !isNaN(+item.saltT) ? result.saltT.push(+item.saltT) : ''; - !isNaN(+item.environmentTemperature) ? result.environmentTemperature.push(+item.environmentTemperature) : ''; - !isNaN(+item.environmentHumidity) ? result.environmentHumidity.push(+item.environmentHumidity) : ''; - !isNaN(+item.corrosion1) ? result.corrosionXIN.push(+item.corrosion1) : ''; - !isNaN(+item.corrosion2) ? result.corrosionTONG.push(+item.corrosion2) : ''; - !isNaN(+item.corrosion3) ? result.corrosionLV.push(+item.corrosion3) : ''; - !isNaN(+item.corrosion4) ? result.corrosionGANG.push(+item.corrosion4) : ''; + !isNaN(+item.so2) ? result.so2.push(+item.so2) : result.so2.push(''); + !isNaN(+item.saltR) ? result.saltR.push(+item.saltR) : result.saltR.push(''); + !isNaN(+item.saltT) ? result.saltT.push(+item.saltT) : result.saltT.push(''); + !isNaN(+item.environmentTemperature) + ? result.environmentTemperature.push(+item.environmentTemperature) + : result.environmentTemperature.push(''); + !isNaN(+item.environmentHumidity) ? result.environmentHumidity.push(+item.environmentHumidity) : result.environmentHumidity.push(''); + !isNaN(+item.corrosion1) ? result.corrosionXIN.push(+item.corrosion1) : result.corrosionXIN.push(''); + !isNaN(+item.corrosion2) ? result.corrosionTONG.push(+item.corrosion2) : result.corrosionTONG.push(''); + !isNaN(+item.corrosion3) ? result.corrosionLV.push(+item.corrosion3) : result.corrosionLV.push(''); + !isNaN(+item.corrosion4) ? result.corrosionGANG.push(+item.corrosion4) : result.corrosionGANG.push(''); }); return result; } diff --git a/src/views/data-realtime.vue b/src/views/data-realtime.vue index 47db483..14bfdf9 100644 --- a/src/views/data-realtime.vue +++ b/src/views/data-realtime.vue @@ -26,7 +26,7 @@ - + diff --git a/t b/t deleted file mode 100644 index a5221f8..0000000 --- a/t +++ /dev/null @@ -1,38 +0,0 @@ -usage: git tag [-a | -s | -u ] [-f] [-m | -F ] - [] - or: git tag -d ... - or: git tag -l [-n[]] [--contains ] [--no-contains ] [--points-at ] - [--format=] [--[no-]merged []] [...] - or: git tag -v [--format=] ... - - -l, --list list tag names - -n[] print lines of each tag message - -d, --delete delete tags - -v, --verify verify tags - -Tag creation options - -a, --annotate annotated tag, needs a message - -m, --message - tag message - -F, --file read message from file - -e, --edit force edit of tag message - -s, --sign annotated and GPG-signed tag - --cleanup how to strip spaces and #comments from message - -u, --local-user - use another key to sign the tag - -f, --force replace the tag if exists - --create-reflog create a reflog - -Tag listing options - --column[=