666

backend/src/main/java/com/jiayue/pfr/service/alg/listener/AgcLockListener.java

@@ -33,8 +33,8 @@ public class AgcLockListener implements ApplicationListener<AgcEvent> {
 
     @Autowired
     BizYaoDataService bizYaoDataService;
-//    @Autowired
-//    Iec104MasterBuilder agc104MasterBuilder;
+    @Autowired
+    Iec104MasterBuilder agc104MasterBuilder;
 
     @Async
     @Override

backend/src/main/java/com/jiayue/pfr/service/alg/listener/CoreAlgListener.java

@@ -77,6 +77,10 @@ public class CoreAlgListener implements ApplicationListener<GetFmEvent> {
                             System.out.println(fmDataBeanDto.getActivePower().toString());
                             System.out.println(CacheConstants.debuggerPower.toString());
                         }
+                        else{
+                            // 判断AGC同向
+
+                        }
                         // 开启录波
                         applicationEventPublisher.publishEvent(new FaultRecorderEvent(fmDataBeanDto, FaultRecorderTypeEnum.FR1.name(),DateUtil.parse(fmDataBeanDto.getTime(),"yyyy-MM-dd HH:mm:ss.SSS").getTime()));
 

ui/src/views/largeScreen/index.vue

@@ -12,30 +12,51 @@
       <div class="data" style="height: 100%;width: 50%;left: 50%;top:0;display: inline-block;position: absolute">
         <div class="box" style="top: 3%;width: 90%;left:5%;height: 14%">
           <div class="tit">实时区</div>
-          <div >
-            <el-form ref="rtForm" :model="rtForm" label-width="40%"  size="small">
-              <el-row height="1px" width="100%">
-                <el-col :span="8">
-                  <el-form-item label="实时频率(Hz)" >
-                    <p class="rtFmFront">{{rtForm.fm}}</p>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="实时有功(MW)" >
-                    <p class="rtActFront">{{rtForm.act}}</p>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="服务端系统时间" >
-                    <div class="datac">
-                      <p class="timec" id="timeid">00:00:00</p>
-                      <p id="dateid"></p>
-                    </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
+          <table class="tabless" width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tbody>
+            <tr>
+              <th>实时频率(Hz)</th>
+              <th>实时有功(MW)</th>
+              <th>服务端系统时间</th>
+            </tr>
+            <tr>
+              <td ><p class="rtFmFront">{{rtForm.fm}}</p></td>
+              <td><p class="rtActFront">{{rtForm.act}}</p></td>
+              <td>
+                <div class="datac">
+                  <p class="timec" id="timeid">00:00:00</p>
+                  <p id="dateid"></p>
+                </div>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+
+
+<!--          <div>-->
+<!--            <el-form ref="rtForm" :model="rtForm" label-width="40%"  size="small">-->
+<!--              <el-row height="1px" width="100%">-->
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="实时频率(Hz)" >-->
+<!--                    <p class="rtFmFront">{{rtForm.fm}}</p>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="实时有功(MW)" >-->
+<!--                    <p class="rtActFront">{{rtForm.act}}</p>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--                <el-col :span="4">-->
+<!--                  <el-form-item label="服务端系统时间" >-->
+<!--                    <div class="datac">-->
+<!--                      <p class="timec" id="timeid">00:00:00</p>-->
+<!--                      <p id="dateid"></p>-->
+<!--                    </div>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--              </el-row>-->
+<!--            </el-form>-->
+<!--          </div>-->
         </div>
 
         <div class="box" style="top: 4%;width: 90%;left:5%">
@@ -858,4 +879,31 @@ export default {
 .table1 td{ border-bottom: 1px dotted#407abd;font-size: 12px; padding:6px 0;text-align: center; color: rgba(255,255,255,1)}
 .table1 tr:last-child td{border: none;}
 
+
+
+.tabless tr td:nth-child(2n+1),
+.tabless tr td:nth-child(2n+1)>p {
+  width: 3rem;
+}
+
+.tabless tr td:nth-child(2n),
+.tabless tr td:nth-child(2n)>p {
+  width: 1.8rem;
+}
+
+.tabless tr td,
+.tabless tr th {
+  height: 0.4rem;
+  line-height: 0.4rem;
+  text-align: center;
+  padding-left: 50px;
+}
+
+
+
+.tabless thead tr th {
+  text-align: center;
+  border-right: none;
+}
+
 </style>