Merge remote-tracking branch 'origin/main'

zfipc-server/zfipc-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.inspur</groupId>
             <artifactId>zfipc-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.inspur</groupId>
+            <artifactId>zfipc-system</artifactId>
+        </dependency>
 
     </dependencies>
 

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());
+    }
+}

zfipc-ui/src/views/zf/cydg/yxjk.vue

@@ -2,7 +2,7 @@
   <div class="test-screen-wrapper background-frame">
     <el-row class="first-row">
       <el-col
-        :span="10"
+        :span="11"
         class="second-col"
       >
         <el-container class="container">
@@ -182,22 +182,26 @@
                 :span="8"
                 style="height: 100%;"
               >
+                <el-col :span="10" style="height: 90%;">
                   <div
                     id="xtywei"
-                  style="height: 100%;position:relative;z-index: 99;"
+                    style="height: 100%;width: 100%;margin-left:40%"
                   ></div>
-                <div
+                </el-col>
+                <el-col :span="14" style="height: 90%;">
+<!--                  <div
                     class="dataCol1"
-                  style="font-size:12px;height:100%;position:relative;z-index: 999;top:-100%;left:20%;width: 80%;"
+                  >-->
-                >
+                    <div style="position: absolute;top: 12%;">
-                  <div>
+                      <div class="font-size-10">当前值<span class="yeweiSpan font-size-16">{{ xtywei }}</span></div>
-                    <div>当前值<span class="yeweiSpan">{{ xtywei }}</span></div>
+                      <div class="font-size-10">初始值<span class="yeweiSpan font-size-16">{{ xtyweicsz }}</span></div>
-                    <div>初始值<span class="yeweiSpan">{{ xtyweicsz }}</span></div>
+                      <div class="font-size-10">最小值<span class="yeweiSpan font-size-16">{{ xtyweimin }}</span></div>
-                    <div>最小值<span class="yeweiSpan">{{ xtyweimin }}</span></div>
+                      <div class="font-size-10">最大值<span class="yeweiSpan font-size-16">{{ xtyweimax }}</span></div>
-                    <div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
                     </div>
-                </div>
+<!--                  </div>-->
-                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
+                </el-col>
+
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:revert;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
                       ,'系统液位','cP')">系统液位(CP)</span></div>
               </el-col>
 
@@ -244,7 +248,7 @@
         </el-container>
       </el-col>
       <el-col
-        :span="7"
+        :span="6"
         class="third-col"
       >
         <el-container class="container">
@@ -277,7 +281,7 @@
     </el-row>
     <el-row class="second-row">
       <el-col
-        :span="10"
+        :span="11"
         class="first-col"
       >
         <el-container class="container">
@@ -459,7 +463,7 @@
         </el-container>
       </el-col>
       <el-col
-        :span="7"
+        :span="6"
         class="third-col"
       >
         <el-container class="container">
@@ -542,15 +546,15 @@
               <el-row class="device-card-content-item ">
                 <div style="background-color: #0b2d57;height: 70%;">
                   <el-col
-                    :span="6"
+                    :span="9"
                     class="middle-class"
                   >
-                    <div style="padding-left: 33%;">
+                    <div style="padding-left: 20%;">
                       <span style="color: #ccc;">有效开机率</span>
                     </div>
                   </el-col>
                   <el-col
-                    :span="15"
+                    :span="12"
                     class="middle-class"
                   >
                     <div class="my-progress-background">
@@ -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;
 }