diff --git a/zfipc-server/zfipc-quartz/pom.xml b/zfipc-server/zfipc-quartz/pom.xml index d4a67bf..32d992e 100644 --- a/zfipc-server/zfipc-quartz/pom.xml +++ b/zfipc-server/zfipc-quartz/pom.xml @@ -34,6 +34,10 @@ com.inspur zfipc-common + + com.inspur + zfipc-system + diff --git a/zfipc-server/zfipc-quartz/src/main/java/com/inspur/quartz/task/ExpDataDeletionTask.java b/zfipc-server/zfipc-quartz/src/main/java/com/inspur/quartz/task/ExpDataDeletionTask.java new file mode 100644 index 0000000..6eb9220 --- /dev/null +++ b/zfipc-server/zfipc-quartz/src/main/java/com/inspur/quartz/task/ExpDataDeletionTask.java @@ -0,0 +1,25 @@ +package com.inspur.quartz.task; + +import com.inspur.common.utils.spring.SpringUtils; +import com.inspur.system.service.influx.InfluxDBService; +import org.springframework.stereotype.Component; +import java.time.LocalDate; + +@Component("expDataDeletionTask") +public class ExpDataDeletionTask { + + public void deleteExpDataByDate(Integer params) + { + System.out.println("执行有参方法:" + params); + InfluxDBService i = SpringUtils.getBean(InfluxDBService.class); + StringBuffer sql1 = new StringBuffer(""); + StringBuffer sql2 = new StringBuffer(""); + StringBuffer sql3 = new StringBuffer(""); + sql1.append("SELECT * FROM ").append("zfipc_industrial_monitor_data1").append(" where isAlarm = '0' and time < '").append(LocalDate.now().toString()).append("T00:00:00Z' -8h -").append(params.toString()).append("d"); + sql2.append("SELECT * FROM ").append("zfipc_industrial_monitor_data2").append(" where isAlarm = '0' and time < '").append(LocalDate.now().toString()).append("T00:00:00Z' -8h -").append(params.toString()).append("d"); + sql3.append("SELECT * FROM ").append("zfipc_industrial_monitor_data3").append(" where isAlarm = '0' and time < '").append(LocalDate.now().toString()).append("T00:00:00Z' -8h -").append(params.toString()).append("d"); + i.query(sql1.toString()); + i.query(sql2.toString()); + i.query(sql3.toString()); + } +} diff --git a/zfipc-ui/src/views/zf/cydg/yxjk.vue b/zfipc-ui/src/views/zf/cydg/yxjk.vue index 1365c3f..b9b5c31 100644 --- a/zfipc-ui/src/views/zf/cydg/yxjk.vue +++ b/zfipc-ui/src/views/zf/cydg/yxjk.vue @@ -2,7 +2,7 @@
@@ -182,22 +182,26 @@ :span="8" style="height: 100%;" > -
-
-
-
当前值{{ xtywei }}
-
初始值{{ xtyweicsz }}
-
最小值{{ xtyweimin }}
-
最大值{{ xtyweimax }}
-
-
-
+
+ + + +
+
当前值{{ xtywei }}
+
初始值{{ xtyweicsz }}
+
最小值{{ xtyweimin }}
+
最大值{{ xtyweimax }}
+
+ +
+ +
系统液位(CP)
@@ -244,7 +248,7 @@ @@ -277,7 +281,7 @@ @@ -459,7 +463,7 @@ @@ -542,15 +546,15 @@
-
+
有效开机率
@@ -1535,7 +1539,7 @@ export default { let yMax = 1; let option = { grid: { - bottom: "20%", + bottom: "10%", top: "20%", }, title: { @@ -2895,7 +2899,7 @@ export default { font-family: "DS-Digital"; background-color: #0a2e4b; border: 1px #1482d2 dashed; - margin: 5px; + margin: 2px; display: inline-block; width: 50px; }