From 8542baf7471fc360ddf24484a4626b1b4d9ee8b0 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Wed, 31 Mar 2021 21:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=A1=E6=9F=93=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/instrument/instrument-mapper.xml   | 24 ++++++++++++++-----
 .../static/route/bigdata/style1/index.html    | 19 ++++++++-------
 .../list-collector.html                       |  0
 3 files changed, 28 insertions(+), 15 deletions(-)
 rename src/main/resources/templates/{dataMinute => dataminute}/list-collector.html (100%)

diff --git a/src/main/resources/mybatis/mapper/instrument/instrument-mapper.xml b/src/main/resources/mybatis/mapper/instrument/instrument-mapper.xml
index ea6ab9a..fb9f913 100644
--- a/src/main/resources/mybatis/mapper/instrument/instrument-mapper.xml
+++ b/src/main/resources/mybatis/mapper/instrument/instrument-mapper.xml
@@ -175,10 +175,14 @@
             pollute_instrument t1
         WHERE
             t1.is_delete = 0
-            <if test="instrumentId != null and instrumentId != ''">
+        <if test="instrumentId != null and instrumentId != ''">
         AND
             t1.instrument_id = #{instrumentId}
-            </if>
+        </if>
+        <if test="instrumentMn != null and instrumentMn != ''">
+        AND
+            t1.instrument_mn = #{instrumentMn}
+        </if>
     </select>
 
     <!-- 数采仪详情 -->
@@ -203,10 +207,14 @@
             pollute_instrument t1
         WHERE
             t1.is_delete = 0
-            <if test="instrumentId != null and instrumentId != ''">
+        <if test="instrumentId != null and instrumentId != ''">
         AND
             t1.instrument_id = #{instrumentId}
-            </if>
+        </if>
+        <if test="instrumentMn != null and instrumentMn != ''">
+        AND
+            t1.instrument_mn = #{instrumentMn}
+        </if>
     </select>
 
     <!-- 数采仪详情 -->
@@ -231,10 +239,14 @@
             pollute_instrument t1
         WHERE
             t1.is_delete = 0
-            <if test="instrumentId != null and instrumentId != ''">
+        <if test="instrumentId != null and instrumentId != ''">
         AND
             t1.instrument_id = #{instrumentId}
-            </if>
+        </if>
+        <if test="instrumentMn != null and instrumentMn != ''">
+            AND
+            t1.instrument_mn = #{instrumentMn}
+        </if>
     </select>
 
     <!-- 数采仪列表 -->
diff --git a/src/main/resources/static/route/bigdata/style1/index.html b/src/main/resources/static/route/bigdata/style1/index.html
index 29b8cdf..b53187e 100755
--- a/src/main/resources/static/route/bigdata/style1/index.html
+++ b/src/main/resources/static/route/bigdata/style1/index.html
@@ -503,21 +503,22 @@
         },
         mounted: function() {
             var self = this;
-            self.initCount();
             self.initSocket();
-            // setInterval(function() {
-            //     self.initCount();
-            // }, 10000);
+            self.initCount();
+            setInterval(function() {
+                self.initCount();
+            }, 10000);
             setTimeout(function() {
                 self.initPollIds();
-                // self.initHistoryValue();
                 self.initRealTimeValue();
                 self.initPollChart();
+                setInterval(function() {
+                    self.initPollIds();
+                    self.initRealTimeValue();
+                    self.initPollChart();
+                }, 3000);
             }, 500);
-            // setInterval(function() {
-            //     self.initHistoryValue();
-            //     self.initRealTimeValue();
-            // }, 3000);
+
         }
     })
 </script>
diff --git a/src/main/resources/templates/dataMinute/list-collector.html b/src/main/resources/templates/dataminute/list-collector.html
similarity index 100%
rename from src/main/resources/templates/dataMinute/list-collector.html
rename to src/main/resources/templates/dataminute/list-collector.html