left组件优化完成

zh-baseversion-web/src/assets/styles/all.scss

@@ -96,6 +96,23 @@
     }
 
     .el-table__body-wrapper {
+      .el-table__body {
+        border-spacing: 0 5px;
+        font-size: 14px;
+
+        td:nth-child(4) .cell {
+          text-align: center;
+        }
+      }
+
+      .el-table__row {
+        width: 100%;
+        // display: block;
+        vertical-align: 5px;
+        height: 36px;
+        width: 350px;
+      }
+
       .el-table__row:nth-child(2n + 1) {
         background-color: #e6e6e6;
 
@@ -195,8 +212,9 @@
       }
 
       .el-table__body-wrapper {
+
         .el-table__row:nth-child(2n + 1) {
-          background-color: rgb(11 22 37);
+          background-color: #062A45;
 
           &:hover td {
             background-color: #7bf8f430 !important;
@@ -205,13 +223,18 @@
           td {
             .cell {
               // color: #525252;
-              color: rgba(123, 248, 244, 1);
+              // color: rgba(123, 248, 244, 1);
+              line-height: 14px;
+              color: #fff;
             }
           }
         }
 
         .el-table__row:nth-child(2n) {
-          background-color: #213b52;
+          // background-color: #213b52;
+          background-color: #062A45;
+
+
 
           &:hover td {
             background-color: #7bf8f430 !important;
@@ -219,6 +242,7 @@
 
           td {
             .cell {
+              line-height: 14px;
               color: #fff;
             }
           }
@@ -621,6 +645,7 @@
       }
 
       .el-table__body-wrapper {
+
         .el-table__row:nth-child(2n + 1) {
           background-color: #e6e6e6;
 

zh-baseversion-web/src/components/bigWindow/rightBar.vue

@@ -424,8 +424,26 @@ export default {
       changeTimer: false,
 
       repeatFinshed: false,
-      tableHeight: 135,
-      tableData: [{unitName:123},{unitName:456},{unitName:45446}],
+      tableHeight: 185,
+      tableData: [
+        // {
+        //   unitName: 123,
+        //   handledStatus: 123,
+        //   statusName: 345,
+        //   alarmTime: "2014-11-11 10:10:10",
+        // },
+        // {
+        //   unitName: 456,
+        //   handledStatus: 123,
+        //   statusName: 345,
+        //   alarmTime: "2014-11-11 10:10:10",
+        // },
+        // { unitName: 45446, alarmTime: "2014-11-11 10:10:10" },
+        // { unitName: 45446, alarmTime: "2014-11-11 10:10:10" },
+        // { unitName: 45446, alarmTime: "2014-11-11 10:10:10" },
+        // { unitName: 45446, alarmTime: "2014-11-11 10:10:10" },
+        // { unitName: 45446, alarmTime: "2014-11-11 10:10:10" },
+      ],
       yujingdata: {
         unitName: "省移动",
         detectorType: "",
@@ -497,7 +515,7 @@ export default {
     cancel1() {},
     getAlarm() {
       return alarmData().then((response) => {
-        return;
+        // return;
         this.tableData = response.data.pageData;
         if (this.tableData.length > 0) {
           this.yujingdata = this.tableData[0];
@@ -550,7 +568,8 @@ export default {
       );
       clearInterval(this.timer);
       this.timer = setInterval(async () => {
-        if (selectWrap.scrollTop == this.scrollHeight) {
+        // console.log(selectWrap.scrollTop,this.scrollHeight)
+        if (selectWrap.scrollTop >= this.scrollHeight) {
           clearInterval(this.timer);
           await this.getAlarm();
           selectWrap.scrollTop = 0;
@@ -1140,7 +1159,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .rightb {
   width: 98%;
   height: 100%;
@@ -1393,8 +1412,13 @@ titletu2 {
 .left {
   margin-top: 10px;
   width: 350px;
-  height: 55%;
+  height: 75%;
   margin-left: 35px;
+
+  .right-bottom-data-left {
+    height: 100%;
+    // background: red;
+  }
 }
 .yj {
   padding: 0px 10px;