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 '告警';
- } else if (d.isWarn == 1) {
+ } else if (d.isWarn == 0) {
return '正常';
}else{
- return '';
+ return '正常';
}
}
}
@@ -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
// 创建一个点坐标