From 53effa48e7fd15ceef2f05b38cb5a22a8cedbf43 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 28 May 2024 22:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                       | 2 +-
 src/views/main/water-quality/components/FormDrawer.vue | 2 ++
 src/views/main/water-quality/index.vue                 | 7 +++++++
 src/views/visualization/RightModal.vue                 | 5 +++++
 src/views/visualization/components/SZJCSJ.vue          | 5 +++++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 96ff7a4d..13863fda 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = /
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # http://36.133.205.221:81
-VITE_PROXY = [["/basic-api","https://lcny.sk797.cn"],["/upload","https://lcny.sk797.cn/api/web/upload"],['/live','https://open.ys7.com']]
+VITE_PROXY = [["/basic-api","http://36.133.205.221:81"],["/upload","http://36.133.205.221:81/api/web/upload"],['/live','https://open.ys7.com']]
 
 # Delete console
 VITE_DROP_CONSOLE = false
diff --git a/src/views/main/water-quality/components/FormDrawer.vue b/src/views/main/water-quality/components/FormDrawer.vue
index 028e5642..716589cc 100644
--- a/src/views/main/water-quality/components/FormDrawer.vue
+++ b/src/views/main/water-quality/components/FormDrawer.vue
@@ -48,6 +48,7 @@
     chlorine: '氯',
     conductivity: '电导率',
     oxygen: '氧气',
+    nh3n: '氨氮',
     ph: 'PH',
     temperature: '温度',
     turbidity: '浊度',
@@ -58,6 +59,7 @@
     turbidity: 'NTU',
     chlorine: 'mg/L',
     oxygen: 'mg/L',
+    nh3n: 'mg/L',
     ph: '',
   }
   const enumName1 = {
diff --git a/src/views/main/water-quality/index.vue b/src/views/main/water-quality/index.vue
index fccbaccc..10de8baf 100644
--- a/src/views/main/water-quality/index.vue
+++ b/src/views/main/water-quality/index.vue
@@ -236,6 +236,13 @@
       icon1: uicon1,
       unit: 'mg/L',
     },
+    {
+      lable: '氨氮',
+      value: 'nh3n',
+      icon: icon1,
+      icon1: uicon1,
+      unit: 'mg/L',
+    },
     {
       lable: 'PH',
       value: 'ph',
diff --git a/src/views/visualization/RightModal.vue b/src/views/visualization/RightModal.vue
index d8a4995a..07f77849 100644
--- a/src/views/visualization/RightModal.vue
+++ b/src/views/visualization/RightModal.vue
@@ -107,6 +107,11 @@
         unit: 'mg/L',
         name: '溶解氧',
       },
+      {
+        key: 'nh3n',
+        unit: 'mg/L',
+        name: '氨氮',
+      },
       {
         key: 'conductivity',
         unit: 'uS/cm',
diff --git a/src/views/visualization/components/SZJCSJ.vue b/src/views/visualization/components/SZJCSJ.vue
index 33a75ba3..40173541 100644
--- a/src/views/visualization/components/SZJCSJ.vue
+++ b/src/views/visualization/components/SZJCSJ.vue
@@ -94,6 +94,11 @@
       unit: 'mg/L',
       name: '溶解氧',
     },
+    {
+      key: 'nh3n',
+      unit: 'mg/L',
+      name: '氨氮',
+    },
     {
       key: 'conductivity',
       unit: 'uS/cm',