Merge branch 'master' of http://124.70.43.205:3000/sunzehao/fd_dwgz_zhyw_nx

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -4,17 +4,7 @@
       <div class="cardLine">
         <div
           class="lineItem card"
-          :style="isFullScreen ? 'height: 45vh' : 'height: 47vh'"
-        >
-          <Safecom
-            title="风机报警"
-            deviceType="windturbine"
-            alarmType="windturbine"
-          />
-        </div>
-        <div
-          class="lineItem card"
-          :style="isFullScreen ? 'height: 45vh' : 'height: 47vh'"
+          :style="isFullScreen ? 'height: 90vh' : 'height: 95vh'"
         >
           <Safecom
             title="风机预警"
@@ -23,45 +13,6 @@
           />
         </div>
       </div>
-      <div class="cardLine" v-if="$store.state.showGf">
-        <div class="lineItem card">
-          <Safecom
-            title="光伏报警"
-            deviceType="inverter"
-            alarmType="inverter"
-          />
-        </div>
-
-        <div class="lineItem card">
-          <Safecom title="光伏预警" deviceType="inverter" alarmType="custom" />
-        </div>
-        <!-- <div class="lineItem card">
-          <Safecom
-            title="升压站事件"
-            deviceType="booststation"
-            alarmType="custom"
-          />
-        </div> -->
-      </div>
-      <div class="cardLine">
-        <div
-          class="lineItem card"
-          :style="isFullScreen ? 'height: 90vh' : 'height: 95vh'"
-        >
-          <Safecom
-            title="升压站报警"
-            deviceType="booststation"
-            alarmType="booststation"
-          />
-        </div>
-        <!-- <div class="lineItem card">
-          <Safecom
-            title="升压站事件"
-            deviceType="booststation"
-            alarmType="custom"
-          />
-        </div> -->
-      </div>
     </div>
   </div>
 </template>
@@ -112,9 +63,10 @@ export default {
     justify-content: space-around;
     .cardLine {
       // width: calc(100% / 3 - 15px);
-      width: calc(100% / 2 - 15px);
-      //   height: 100%;
-      height: 95vh;
+    //   width: calc(100% / 2 - 15px);
+    width: 100%;
+        height: 100%;
+    //   height: 95vh;
       display: flex;
       flex-direction: column;
       //   justify-content: space-between;