From ba85e370570c918a23c7e60a8841dd678054151c Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Thu, 2 Sep 2021 11:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pollutantdata/utils/WeatherUtil.java        |  4 ++--
 .../route/bigdatamain/bendanweirenwu.html       |  2 +-
 .../static/route/bigdatamain/chaobiaoqiye.html  |  2 +-
 .../static/route/bigdatamain/enterpriseof.html  |  2 +-
 .../servicecity/userlocation/map_summary.html   | 15 ++++++---------
 .../templates/alarmlog/list-enterprise.html     | 17 +++++++++++++----
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/cm/tenlion/pollutantdata/utils/WeatherUtil.java b/src/main/java/com/cm/tenlion/pollutantdata/utils/WeatherUtil.java
index e4a6a36..e256938 100644
--- a/src/main/java/com/cm/tenlion/pollutantdata/utils/WeatherUtil.java
+++ b/src/main/java/com/cm/tenlion/pollutantdata/utils/WeatherUtil.java
@@ -23,7 +23,7 @@ public class WeatherUtil {
             return weather.get(id + "_" + date);
         }
         Map<String, Object> params = new HashMap<String, Object>();
-        params.put("key", "Sk1Gt66B1Z-ZsEJP5");
+        params.put("key", "SVDDjcHSNQMU_3CRt");
         params.put("location", id);
         params.put("language", "zh-Hans");
         params.put("unit", "c");
@@ -49,7 +49,7 @@ public class WeatherUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        WeatherUtil.getWeather("WRR2Q2Z7CXWM");
+        WeatherUtil.getWeather("cangzhou");
     }
 
 }
diff --git a/src/main/resources/static/route/bigdatamain/bendanweirenwu.html b/src/main/resources/static/route/bigdatamain/bendanweirenwu.html
index f651002..16cae91 100644
--- a/src/main/resources/static/route/bigdatamain/bendanweirenwu.html
+++ b/src/main/resources/static/route/bigdatamain/bendanweirenwu.html
@@ -952,7 +952,7 @@
 <script type="text/javascript">
     var systemUrl = 'http://117.161.31.148:8098/dataview';
     var inspectionUrl = "http://106.12.218.237:8001/inspection/"
-   /* var inspectionUrl = "http://192.168.0.120/inspection/"*/
+    //var inspectionUrl = "http://192.168.0.120/inspection/"
     var globalData = {
         W0001_0:{
             loopInterval:null,            linkParams:{},
diff --git a/src/main/resources/static/route/bigdatamain/chaobiaoqiye.html b/src/main/resources/static/route/bigdatamain/chaobiaoqiye.html
index 1fd4920..37e72fa 100644
--- a/src/main/resources/static/route/bigdatamain/chaobiaoqiye.html
+++ b/src/main/resources/static/route/bigdatamain/chaobiaoqiye.html
@@ -713,7 +713,7 @@
 <script type="text/javascript">
     var systemUrl = 'http://117.161.31.148:8098/dataview';
     var pollutantUrl = 'http://106.12.218.237:8001/pollutant/';
-   /* var pollutantUrl = 'http://192.168.0.120/pollutant/';*/
+    //var pollutantUrl = 'http://192.168.0.120/pollutant/';
     var globalData = {
         W0001_0:{
             loopInterval:null,            linkParams:{},
diff --git a/src/main/resources/static/route/bigdatamain/enterpriseof.html b/src/main/resources/static/route/bigdatamain/enterpriseof.html
index 41db3ab..d5af538 100644
--- a/src/main/resources/static/route/bigdatamain/enterpriseof.html
+++ b/src/main/resources/static/route/bigdatamain/enterpriseof.html
@@ -779,7 +779,7 @@
 <script type="text/javascript">
     var systemUrl = 'http://117.161.31.148:8098/dataview';
     var inspectionPath = "http://106.12.218.237:8001/inspection/"
-    /*var inspectionPath = "http://192.168.0.120/inspection/"*/
+    //var inspectionPath = "http://192.168.0.120/inspection/"
     var globalData = {
         C0001_0:{
             loopInterval:null,            linkParams:{},
diff --git a/src/main/resources/static/route/bigdatamain/servicecity/userlocation/map_summary.html b/src/main/resources/static/route/bigdatamain/servicecity/userlocation/map_summary.html
index 5e37bc2..124e52c 100644
--- a/src/main/resources/static/route/bigdatamain/servicecity/userlocation/map_summary.html
+++ b/src/main/resources/static/route/bigdatamain/servicecity/userlocation/map_summary.html
@@ -50,6 +50,8 @@
             background:url('http://106.12.218.237:8001/servicecity/assets/images/city/icon-department.png') no-repeat !important;
             background-size: 16px !important;
         }
+        .shadows{background-color: transparent !important;box-shadow: 0 0 0 rgba(0,0,0,0) !important;}
+        .anchorBL{display:none} /** 去除百度地图Logo */
     </style>
 </head>
 <body>
@@ -185,17 +187,12 @@
                         self.map.setCenterAndZoom({
                             lng: data.mapLng,
                             lat: data.mapLat
-                        }, 13);
+                        }, 11);
                         var mapTypeControl = new BMap.MapTypeControl({
                             mapTypes: [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP, BMAP_HYBRID_MAP],
                         });
                         self.map.getMap().addControl(mapTypeControl);
-                        var areaBounds = new BMap.Bounds(new BMap.Point(109.591583, 40.458812),new BMap.Point(110.505699, 40.826688));
-                        try {
-                            BMapLib.AreaRestriction.setBounds(self.map.getMap(), areaBounds);
-                        } catch (e) {
-                            console.log(e);
-                        }
+                        //var areaBounds = new BMap.Bounds(new BMap.Point(109.591583, 40.458812),new BMap.Point(110.505699, 40.826688));
                         // 必须
                         self.map.setDefaultConfig();
                     }, function(code, data) {
@@ -372,7 +369,7 @@
                             }
                         },
                         onLoadSuccess: function() {
-                            var node = $('#areaTree').tree('find', 'areaLevel3');
+                            var node = $('#areaTree').tree('find', 'areaLevel1');
                             $('#areaTree').tree('select', node.target);
                             $("#areaTree").tree("collapseAll");
                         }
@@ -617,7 +614,7 @@
                     $('.menu-content').removeClass('content-active');
                     $('#'+ this.id +'Content').addClass('content-active');
                     if(this.id == 'menuBtn1') {
-                        var node = $('#areaTree').tree('find', 'areaLevel3');
+                        var node = $('#areaTree').tree('find', 'areaLevel1');
                         $('#areaTree').tree('select', node.target);
                     }
                 });
diff --git a/src/main/resources/templates/alarmlog/list-enterprise.html b/src/main/resources/templates/alarmlog/list-enterprise.html
index ad2ec3c..00dcf87 100644
--- a/src/main/resources/templates/alarmlog/list-enterprise.html
+++ b/src/main/resources/templates/alarmlog/list-enterprise.html
@@ -18,7 +18,7 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-200" placeholder="输入污染因子、采集器名称">
                         </div>
                         <div class="layui-inline">
                             <input type="text" id="startTime" class="layui-input search-item search-item-width-100" placeholder="开始时间" readonly>
@@ -77,16 +77,25 @@
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="color: green">'+rowData+'</span>';
                             }
                         },
-                        {field: 'alarmValue', width: 100, title: '报警值', align:'center', fixed: 'left',
+                        {field: 'alarmValue', width: 100, title: '默认报警值', align:'center', fixed: 'left',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
                                     return '-';
                                 }
-                                return rowData;
+                                return '<span style="color: red">'+rowData+'</span>';
+                            }
+                        },
+                        {field: 'enterprisePollBeyond', width: 100, title: '企业报警值', align:'center', fixed: 'left',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return '<span style="color: red">'+rowData+'</span>';
                             }
                         },
                         {field: 'pollId', width: 180, title: '污染因子编码', align:'center',