Tenlion/pollutant-data
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改污染情况

Browse Source
This commit is contained in:
wanggeng888 2021-03-31 21:44:01 +08:00
parent a8a6a3da88
commit 8542baf747
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/resources/mybatis/mapper/instrument/instrument-mapper.xml
View File

@ -175,10 +175,14 @@
pollute_instrument t1 pollute_instrument t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="instrumentId != null and instrumentId != ''"> <if test="instrumentId != null and instrumentId != ''">
AND AND
t1.instrument_id = #{instrumentId} t1.instrument_id = #{instrumentId}
</if> </if>
<if test="instrumentMn != null and instrumentMn != ''">
AND
t1.instrument_mn = #{instrumentMn}
</if>
</select> </select>
<!-- 数采仪详情 --> <!-- 数采仪详情 -->
@ -203,10 +207,14 @@
pollute_instrument t1 pollute_instrument t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="instrumentId != null and instrumentId != ''"> <if test="instrumentId != null and instrumentId != ''">
AND AND
t1.instrument_id = #{instrumentId} t1.instrument_id = #{instrumentId}
</if> </if>
<if test="instrumentMn != null and instrumentMn != ''">
AND
t1.instrument_mn = #{instrumentMn}
</if>
</select> </select>
<!-- 数采仪详情 --> <!-- 数采仪详情 -->
@ -231,10 +239,14 @@
pollute_instrument t1 pollute_instrument t1
WHERE WHERE
t1.is_delete = 0 t1.is_delete = 0
<if test="instrumentId != null and instrumentId != ''"> <if test="instrumentId != null and instrumentId != ''">
AND AND
t1.instrument_id = #{instrumentId} t1.instrument_id = #{instrumentId}
</if> </if>
<if test="instrumentMn != null and instrumentMn != ''">
AND
t1.instrument_mn = #{instrumentMn}
</if>
</select> </select>
<!-- 数采仪列表 --> <!-- 数采仪列表 -->

19
src/main/resources/static/route/bigdata/style1/index.html
View File

@ -503,21 +503,22 @@
}, },
mounted: function() { mounted: function() {
var self = this; var self = this;
self.initCount();
self.initSocket(); self.initSocket();
// setInterval(function() { self.initCount();
// self.initCount(); setInterval(function() {
// }, 10000); self.initCount();
}, 10000);
setTimeout(function() { setTimeout(function() {
self.initPollIds(); self.initPollIds();
// self.initHistoryValue();
self.initRealTimeValue(); self.initRealTimeValue();
self.initPollChart(); self.initPollChart();
setInterval(function() {
self.initPollIds();
self.initRealTimeValue();
self.initPollChart();
}, 3000);
}, 500); }, 500);
// setInterval(function() {
// self.initHistoryValue();
// self.initRealTimeValue();
// }, 3000);
} }
}) })
</script> </script>

0
src/main/resources/templates/dataMinute/list-collector.html → src/main/resources/templates/dataminute/list-collector.html
View File