Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

src/assets/style/main.css

@@ -17,9 +17,12 @@ body,
     background-color: rgb(36,36,36) !important;
     border-color: rgb(36,36,36) !important;
   }
-  .el-table{
+/*   .el-table{
     border-color: rgb(36,36,36) !important;
   }
+  .el-table__border td{
+    border: 1px solid red !important;
+  }
   .el-table__row>td{
 	border-color: rgb(36,36,36) !important;
 }
@@ -28,7 +31,7 @@ body,
 }
 .el-table::after {
 	height: 0px !important;
-}
+} */
 .el-dialog{
   background-color: rgb(36,36,36) !important;
 }
@@ -58,4 +61,29 @@ body,
 .el-tabs__item.is-active{
   background-color: black !important;
   border-color: black !important;
-}
+}
+
+
+.el-table--border:after,.el-table--group:after,.el-table:before {
+  background-color: black;
+  
+  }
+  
+  .el-table--border,.el-table--group {
+    border-color:black;
+  
+  }
+  
+/*   .el-table td,.el-table th {
+    border-bottom:2px solid rgb(36,36,36);
+  } */
+  
+  .el-table--border th,.el-table--border th.gutter:last-of-type {
+    border-bottom:1px solid yellow;
+  
+  }
+  
+  .el-table--border td,.el-table--border th {
+    border-right:1px solid rgb(36,36,36);
+  
+  }

src/components/StatusBar.vue

@@ -33,7 +33,7 @@
               :header-cell-style="{
                 background: 'Black',
                 color: 'rgb(220,220,220)',
-                border: '0px',
+                'border-bottom':'solid 1px rgb(36,36,36)'
               }"
               :cell-style="{ background: 'Black', color: 'rgb(220,220,220)' }"
             >
@@ -75,6 +75,7 @@
               <span>{{ defectNum }}</span>
             </div>
           </template>
+          <el-scrollbar>
           <el-table
             :data="defectData"
             border
@@ -83,7 +84,7 @@
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
-              border: '0px',
+                'border-bottom':'solid 1px rgb(36,36,36)'
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)' }"
           >
@@ -106,6 +107,7 @@
               align="center"
             ></el-table-column>
           </el-table>
+          </el-scrollbar>
         </el-popover>
         <el-popover
           placement="top-start"
@@ -124,6 +126,7 @@
               <span>{{ malfunctionNum }}</span>
             </div>
           </template>
+          <el-scrollbar>
           <el-table
             :data="malfunctionData"
             border
@@ -132,7 +135,7 @@
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
-              border: '0px',
+                'border-bottom':'solid 1px rgb(36,36,36)'
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)' }"
           >
@@ -155,6 +158,7 @@
               align="center"
             ></el-table-column>
           </el-table>
+          </el-scrollbar>
         </el-popover>
         <el-popover
           placement="top-start"
@@ -173,6 +177,7 @@
               <span>{{ accidentNum }}</span>
             </div>
           </template>
+          <el-scrollbar>
           <el-table
             :data="accidentData"
             border
@@ -181,7 +186,7 @@
             :header-cell-style="{
               background: 'Black',
               color: 'rgb(220,220,220)',
-              border: '0px',
+                'border-bottom':'solid 1px rgb(36,36,36)'
             }"
             :cell-style="{ background: 'Black', color: 'rgb(220,220,220)' }"
           >
@@ -204,6 +209,7 @@
               align="center"
             ></el-table-column>
           </el-table>
+          </el-scrollbar>
         </el-popover>
       </el-col>
     </el-row>
@@ -291,6 +297,9 @@ export default {
   background-color: #292929;
   border-radius: 6px;
 }
+:deep(.el-table td,.el-table th){
+border-bottom:1px solid rgb(36,36,36);
+}
 span {
   font-size: 13px;
 }

src/components/area/AlarmArea.vue

@@ -6,7 +6,40 @@
     circle-style="green"
     content-style="25"
   >
-    <div>
+  <div style="padding-left:5px;padding-right:5px;">
+    <el-table
+      :data="values"
+      height="219px"
+      :header-cell-style="{
+                background: 'Black',
+                color: 'rgb(220,220,220)',
+                padding:'5px',
+                fontSize:'14px',
+                'border-bottom':'solid 1px black'
+              }"
+      :cell-style="{ background: '#1e1e1e', color: 'rgb(220,220,220)',padding:'3px',fontSize:'12px'}"
+      >
+      <el-table-column
+        prop="lastUpdateTime"
+        align="center"
+        label="时间"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="alertText"
+        align="center"
+        label="描述"
+        width="380">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        align="center"
+        label="确认">
+        <input type="checkbox" disabled="disabled" />
+      </el-table-column>
+    </el-table>
+    </div>
+<!--     <div>
       <table class="table-main">
         <tr>
           <td width="150px">时间</td>
@@ -19,7 +52,7 @@
           <td width="50px"><input type="checkbox" disabled="disabled" /></td>
         </tr>
       </table>
-    </div>
+    </div> -->
   </gy-card>
 </template>
 
@@ -33,7 +66,7 @@ export default {
   props: {},
   data() {
     return {
-      values: new Array(),
+      values: new Array()
     };
   },
   methods: {
@@ -58,6 +91,19 @@ export default {
 };
 </script>
 <style scoped>
+:deep(.el-table__body-wrapper::-webkit-scrollbar) {
+  width: 8px;
+  height:0px;
+  background-color: black;
+}
+
+:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
+  background-color: #292929;
+  border-radius: 6px;
+}
+:deep(.el-table td,.el-table th){
+border-bottom:2px solid black;
+}
 tr {
   line-height: 1.5;
   background: #1e1e1e;