From c88411f9c204a7b470153eb5a52592684365ec92 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 28 May 2024 23:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E8=B4=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |  2 +-
 src/pages/index/water-quality.vue | 39 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 182dbd7..00f27d2 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
 ENV = 'development'
 
-VUE_APP_BASE_API = 'https://lcny.sk797.cn'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://36.133.205.221:81'
\ No newline at end of file
diff --git a/src/pages/index/water-quality.vue b/src/pages/index/water-quality.vue
index 88d7db9..40ec0a1 100644
--- a/src/pages/index/water-quality.vue
+++ b/src/pages/index/water-quality.vue
@@ -164,6 +164,24 @@
             />
           </view>
         </view>
+        <!-- 氨氮 -->
+        <view class="chart_section" v-if="chart_nh3n">
+          <view class="top_box">
+            <view class="tit">氨氮<text class="unit">mg/L</text></view>
+            <view class="name">{{ addressName }}</view>
+          </view>
+          <view class="mb-20rpx">
+            <u-line></u-line>
+          </view>
+          <view class="cart_box">
+            <qiun-data-charts
+              :loadingType="loadingType"
+              type="area"
+              :opts="opts"
+              :chartData="chart_nh3n"
+            />
+          </view>
+        </view>
         <!-- PH -->
         <view class="chart_section" v-if="chart_ph">
           <view class="top_box">
@@ -237,6 +255,7 @@
         </view>
         <scroll-view class="scroll-y" scroll-y="true">
           <view class="form_cont">
+  
             <u-form v-for="(info, k) in formInfo" :key="k">
               <view class="title2 u-border-bottom">{{ keyToName[k] }}</view>
               <u-form-item
@@ -334,6 +353,7 @@ export default {
       chart_conductivity: {}, //电导率
       chart_chlorine: {}, //氯
       chart_oxygen: {}, //氧气
+      chart_nh3n: {}, //氨氮
       chart_ph: {}, //PH
       chart_temperature: {}, //温度
       chart_turbidity: {}, //浊度
@@ -368,6 +388,7 @@ export default {
         conductivity: '电导率',
         chlorine: '氯',
         oxygen: '氧气',
+        nh3n: '氨氮',
         ph: 'PH',
         turbidity: '浊度',
       },
@@ -376,6 +397,7 @@ export default {
         conductivity: 'us/cm',
         chlorine: 'mg/L',
         oxygen: 'mg/L',
+        nh3n: 'mg/L',
         ph: '',
         turbidity: 'NTU',
       },
@@ -677,6 +699,23 @@ export default {
             }else{
 							this.chart_oxygen = null
 						}
+            //start 氨氮 nh3n
+            if (chartInfo.nh3n) {
+              let res7 = {
+                categories: chartInfo.nh3n.categories,
+                series: [
+                  {
+                    name: '氨氮',
+                    legendShape: 'circle',
+                    data: chartInfo.nh3n.data,
+                  },
+                ],
+              }
+
+              this.chart_nh3n = JSON.parse(JSON.stringify(res7))
+            }else{
+							this.chart_nh3n = null
+						}
             //end 氧气
             //start PH
             if (chartInfo.ph) {