From 22743fc330cd6a9eb6dd253e3574b1dbd830c439 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 17 Jun 2024 10:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=20=E5=8F=8A=E7=AE=A1=E6=8E=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/operEnvironment/operEnvironment.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/operEnvironment/operEnvironment.js b/js/operEnvironment/operEnvironment.js
index 7f87300..7f207d2 100644
--- a/js/operEnvironment/operEnvironment.js
+++ b/js/operEnvironment/operEnvironment.js
@@ -102,12 +102,12 @@ function DaylightDisplacementList(deviceId){
             {field: 'changeVal', title: '变化值'},
             {field: 'createTime', title: '检测时间'},
             {field: 'isWarn', title: '状态', templet: function (d) {
-                    if (d.isWarn == 0) {
+                    if (d.isWarn == 1) {
                         return '<span style="color: #FF5722;">告警</span>';
-                    } else if (d.isWarn == 1) {
+                    } else if (d.isWarn == 0) {
                         return '<span style="color: #5FB878;">正常</span>';
                     }else{
-                        return '<span></span>';
+                        return '<span style="color: #5FB878;">正常</span>';
                     }
                 }
             }
@@ -204,10 +204,11 @@ function zephyrineWeather() {
     //     navigator.geolocation.getCurrentPosition(function (position) {
     //         let latitude = position.coords.latitude;
     //         let longitude = position.coords.longitude;
-            let latitude = '31.93566198931321';
-            let longitude = '117.16010067578883';
+
+            let latitude = '34.007143';
+            let longitude = '116.884782';
             console.log("经度：" + longitude + ", 纬度：" + latitude);
-            let latLon = longitude + ',' + latitude;
+            let latLon = '116.747321,33.934215';
 
             // 百度地图API
             // 创建一个点坐标