diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 308a9acad0b14cbbf947f46a0ba963639f4b0e70..a699426e59e7cb1db046101b55967b21b464a1f4 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -710,22 +710,23 @@ body {
   z-index: 1;
   background: rgba(15, 31, 33, 0.8);
 }
-/*表格透明*/
-  .table-wrapper .el-table .el-table__cell {
-    padding: 2px!important;
-  }
-  .table-wrapper .el-table .cell {
-    white-space: nowrap!important;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    padding: 0 5px!important;
-}
-  .table-wrapper .el-table tr:hover {
-    background-color: #20a0ff;
-  }
-  .table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-    border-bottom: 0 solid!important;
-  }
-  .table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-    background-color: rgba(30, 144, 255, 0.26) !important;
-  }
+.table-wrapper .el-table .el-table__cell {
+  padding: 2px!important;
+}
+.table-wrapper .el-table .cell {
+  white-space: nowrap!important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 5px!important;
+}
+.table-wrapper .el-table tr:hover {
+  background-color: #20a0ff;
+}
+.table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  border-bottom: 0px solid!important;
+}
+.table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: rgba(30, 144, 255, 0.26) !important;
+}
+
+
diff --git a/src/router/index.js b/src/router/index.js
index f2ce336fbfecf6604bb366dbe7915ab22d2a9fc6..8f9698027284f431c41db6666fab10d93f5a2529 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,7 +19,7 @@ const routes = [
     component: () => import('../views/Login')
   },
   {
-    path: '/home',
+    path: '/home', // 后台
     component: () => import('../views/Home'),
     meta: {
       requireAuth: true // 该路由项需要权限校验
diff --git a/src/utils/config.js b/src/utils/config.js
index ec572f203046e876ca673f94985f2b77801fddb1..dd929b5be0a0c4a8252c0bbf5d23075e86521d48 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,3 +1,4 @@
 module.exports = {
-  baseUrl: 'localhost:2011'
+  // baseUrl: 'localhost:2011',
+  baseUrl: '49.234.81.196:2011'
 }
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8e7e73adc96f0215a258b9761ae9bbfe8828bd68..6abb328b847babd9ae12652c0444aab7944a4d63 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -68,7 +68,7 @@ export default {
               window.localStorage.setItem('userName', JSON.stringify(res.data.userName))
               window.localStorage.setItem('staffNumber', JSON.stringify(this.loginForm.staffNumber))
             }
-            await this.$router.replace('/mainPage')
+            await this.$router.replace('/NewMainPage')
           }, 2000)
         } else {
           this.$message.error('请正确输入用户名或密码')
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index 1e266efd84bd63f94df384ef313e75b451e551ea..39a13d9753fdb8cb426272aee858f7a2b64ad000 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -3,33 +3,48 @@
     <!-- 头部 -->
     <el-header id="new-mainpage-header">
       <div style="height: 30px" />
-      <div style="display: inline-block;width: 1%" />
-      <div class="btn btn-one">
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-left" />
+      <div class="btn btn-one btn-one-left">
         安检门
-      </div><div style="display: inline-block;width: 1%" />
-      <div class="btn btn-one">
+      </div>
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-left" />
+      <div class="btn btn-one btn-one-left">
         x射线机
-      </div><div style="display: inline-block;width: 1%" />
-      <div class="btn btn-one">
+      </div>
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-left" />
+      <div class="btn btn-one btn-one-left">
         炸探/液探
-      </div><div style="display: inline-block;width: 54%" />
-      <div class="btn btn-one">
-        设备管理
-      </div><div style="display: inline-block;width: 1%" />
-      <div class="btn btn-one">
-        系统设置
-      </div><div style="display: inline-block;width: 1%" />
-      <div class="btn btn-one">
-        后台
-      </div><div style="display: inline-block;width: 1%" />
+      </div>
+
+      <!--      <div style="display: inline-block;width: 54%" />-->
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-right" />
+      <router-link to="/home">
+        <div class="btn btn-one btn-one-right">
+          后台
+        </div>
+      </router-link>
+
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-right" />
+      <router-link to="/deviceList">
+        <div class="btn btn-one btn-one-right">
+          系统设置
+        </div>
+      </router-link>
+
+      <div style="display: inline-block;width: 1%;height: 1px" class="btn-one-right" />
+      <router-link to="/userManage">
+        <div class="btn btn-one btn-one-right">
+          设备管理
+        </div>
+      </router-link>
     </el-header>
     <!--  内容  -->
-    <el-main>
+    <el-main style="padding-left: 15px;padding-right: 15px">
       <div class="left-box">
-        <div class="left-top">
+        <div class="left-top" style="position: relative">
           <LeftTop />
         </div>
-        <div class="left-center">
+        <div class="left-center" style="position: relative">
           <LeftCenter />
         </div>
         <div class="left-bottom">
@@ -37,6 +52,9 @@
         </div>
       </div>
       <div class="center-box">
+        <div style="height: 10%;font-size: 20px;color: #ffffff;text-align: center">
+          系统总体拓扑结构
+        </div>
         <div class="center-top">
           1
         </div>
@@ -89,7 +107,7 @@ export default {
 }
 #new-mainpage-header {
   width: 100%;
-  height: 90px!important;
+  height: 80px!important;
   background-image: url("../assets/images/header-bg.png");
   background-repeat: no-repeat;
   background-size:100% 100% ;
@@ -106,12 +124,21 @@ export default {
     background-repeat: no-repeat;
     background-size:100% 100% ;
   }
+  .btn:hover {
+    color: #ffde00;
+  }
+  .btn-one-left {
+    float: left;
+  }
+  .btn-one-right {
+    float: right;
+  }
 }
 .el-main {
   font-size: 0px;
   vertical-align: top;
   width: 100%;
-  height: cale(100%-90px);
+  height: cale(100%-80px);
   background-image: url("../assets/images/main-bg.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
@@ -130,15 +157,15 @@ export default {
     background-size: 100% 100%;
     .left-top {
       height: 33%;
-      border: 1px solid #000000;
+      //border: 1px solid #000000;
     }
     .left-center {
       height: 31%;
-      border: 1px solid #000000;
+      //border: 1px solid #000000;
     }
     .left-bottom {
       height: 35%;
-      border: 1px solid #000000;
+      //border: 1px solid #000000;
     }
   }
 
@@ -148,8 +175,8 @@ export default {
     height: 98%;
     .center-top {
       margin: 0 50px;
-      height: 50%;
-      border: 1px solid #000000;
+      height: 40%;
+      //border: 1px solid #000000;
       background-image: url("../assets/images/center-box-bg.png");
       background-repeat: no-repeat;
       background-size: 100% 100%;
@@ -157,32 +184,32 @@ export default {
     .center-center,
     .center-bottom {
       height: 25%;
-      border: 1px solid #000000;
+      //border: 1px solid #000000;
     }
   }
 
   .right-box {
     vertical-align: top;
-    width: 26%;
+    width: 27%;
     height: 98%;
     background-image: url("../assets/images/right-box-bg.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
 
     .right-top{
-      height: 33%;
-      border: 1px solid #000000;
+      height: 34%;
+      //border: 1px solid #000000;
     }
 
     .right-center {
       position: relative;
-      height: 37%;
-      border: 1px solid #000000;
+      height: 36%;
+      //border: 1px solid #000000;
     }
 
     .right-bottom {
       height: 30%;
-      border: 1px solid #000000;
+      //border: 1px solid #000000;
     }
   }
 }
diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue
index 21dc8816263ff106044e74614f9a047ff44f7c8a..36813689955dd2581a39f3eee880c7f6e9764235 100644
--- a/src/views/NewMainPageComponents/LeftCenter.vue
+++ b/src/views/NewMainPageComponents/LeftCenter.vue
@@ -1,20 +1,24 @@
 <template>
-  <div style="width:25%;height: 26%;position: absolute;left: 8px;top: 40%;">
-    <div style="height: 30px;font-size: 18px;color: white;line-height: 30px">
+  <div style="width:100%;height: 100%;">
+    <!--    style="width:25%;height: 27%;position: absolute;left: 10px;top: 39%;border: 1px solid #ffffff"-->
+    <div style="height: 30px;font-size: 16px;color: white;line-height: 30px;padding-left: 15px;padding-bottom: 2px">
       报警Top10
     </div>
-    <div class="infinite-list-wrapper" style="overflow:auto;width:100%;height: 100%">
+    <div class="infinite-list-wrapper">
       <div class="table-wrapper">
         <el-table
           id="playList"
           :data="tableData"
-          style="width: 100%;color: rgb(160, 165, 178);"
+          style="width: 100%;color: rgb(160, 165, 178);font-size: 12px;text-align: center;margin-left: 10px"
           :show-header="true"
           :row-class-name="tableRowClassName"
         >
-          <el-table-column prop="index" label="序号" min-width="10px" />
-          <el-table-column prop="name" label="区域" min-width="20px" />
-          <el-table-column prop="address" label="日期" min-width="20px" />
+          <el-table-column prop="index" label="序号" min-width="15px" />
+          <el-table-column prop="address" label="区域" min-width="15px" />
+          <el-table-column prop="number" label="编号" min-width="15px" />
+          <el-table-column prop="error" label="报警率" min-width="15px" />
+          <el-table-column prop="operate" label="操作" min-width="15px" />
+
           <p v-if="loading">
             加载中...
           </p>
@@ -33,21 +37,66 @@ export default {
   data() {
     return {
       tableData: [{
-        date: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '01',
+        address: '01',
+        number: '0001',
+        error: '85%',
+        operate: '查看'
+      }, {
+        index: '02',
+        address: '02',
+        number: '0002',
+        error: '83%',
+        operate: '查看'
+      }, {
+        index: '03',
+        address: '03',
+        number: '0003',
+        error: '83%',
+        operate: '查看'
+      }, {
+        index: '04',
+        address: '04',
+        number: '0004',
+        error: '83%',
+        operate: '查看'
+      },
+      {
+        index: '05',
+        address: '05',
+        number: '0005',
+        error: '83%',
+        operate: '查看'
       }, {
-        date: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '06',
+        address: '06',
+        number: '0006',
+        error: '83%',
+        operate: '查看'
       }, {
-        date: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '07',
+        address: '07',
+        number: '0007',
+        error: '83%',
+        operate: '查看'
       }, {
-        date: '2',
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1516 弄'
+        index: '08',
+        address: '08',
+        number: '0008',
+        error: '83%',
+        operate: '查看'
+      }, {
+        index: '09',
+        address: '09',
+        number: '0009',
+        error: '83%',
+        operate: '查看'
+      }, {
+        index: '10',
+        address: '10',
+        number: '0010',
+        error: '83%',
+        operate: '查看'
       }]
     }
   }
@@ -55,8 +104,10 @@ export default {
 </script>
 
 <style scoped lang="less">
-.el-table,
-.el-table__expanded-cell{
+.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped
+
+  /*最外层透明*/
+.el-table, .el-table__expanded-cell{
   background-color: transparent;
 }
 /* 表格内背景颜色 */
@@ -75,9 +126,20 @@ export default {
 /deep/ .el-table td {
   background-color: transparent;
 }
+/* 删除表格下最底层的横线 */
+.el-table::before {
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 0px;
+}
+/deep/ .el-table__header {
+  border: 0;
+}
+
 /* 表格表头字体颜色 */
-.el-table thead {
-  color: #40b4fc!important;
+/deep/.el-table thead {
+  color: #00fff6;
   font-weight: 500;
 }
 ::-webkit-scrollbar {
@@ -87,23 +149,45 @@ export default {
 ::-webkit-scrollbar {
   width: 0px !important;height: 5px;
 }
-/*表格透明*/
-.table-wrapper .el-table .el-table__cell {
-  padding: 2px!important;
+/deep/.table-wrapper .el-table .el-table__cell {
+  padding: 0px!important;
 }
-.table-wrapper .el-table .cell {
+/deep/.table-wrapper .el-table .cell {
   white-space: nowrap!important;
   overflow: hidden;
   text-overflow: ellipsis;
   padding: 0 5px!important;
 }
-.table-wrapper .el-table tr:hover {
-  background-color: #20a0ff;
+/deep/.table-wrapper .el-table tr:hover {
+  background-color: rgba(32, 160, 255, 0.37);
 }
-.table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-  border-bottom: 0 solid!important;
+/deep/.table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  border-bottom: 0px solid!important;
 }
-.table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+/deep/.table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
   background-color: rgba(30, 144, 255, 0.26) !important;
 }
+/deep/ .cell {
+  height: 17px;
+}
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  border: 0px solid #ffffff;
+}
+/deep/ .el-table__cell {
+  border: 0px solid #ffffff;
+}
+.infinite-list-wrapper {
+  width:90%;
+  height: cale(100%-30px);
+  padding-left: 10px;
+  // border: 1px solid #883535;
+}
+// 去掉所有的横线
+/deep/.el-table__row>td{ border: none!important; }
+/deep/.el-table::before { height: 0px!important; }
+//透明化行、单元格,删除表头下横线
+.table-wrapper /deep/ tr, .table-wrapper /deep/ th, .table-wrapper /deep/ td {
+  background: #1439391c !important;
+  border-bottom: 0px!important; //删除表头下横线
+}
 </style>
diff --git a/src/views/NewMainPageComponents/LeftTop.vue b/src/views/NewMainPageComponents/LeftTop.vue
index 2bb7a7a70fe5052cf40d1988ee612c89ad4940f2..a25e80ade416ff0e63439eaa6d96d98c61630121 100644
--- a/src/views/NewMainPageComponents/LeftTop.vue
+++ b/src/views/NewMainPageComponents/LeftTop.vue
@@ -1,30 +1,30 @@
 <template>
-  <div style="width:25%;height: 28%;position: absolute;left: 8px;top:11%;">
-    <div style="height: 30px;font-size: 18px;color: white;line-height: 30px">
+  <div style="width:100%;height: 100%;">
+    <div style="height: 28px;font-size: 16px;color: white;line-height: 28px;padding-left: 15px">
       设备概况
     </div>
     <div style="height: 65px" />
     <div class="num" style="width: 5%;" />
     <div class="num" style="width: 23%;">
-      100
+      120
     </div>
     <div class="num" style="width: 33%;">
-      1
+      118
     </div>
-    <div class="num" style="width: 35%;">
-      1
+    <div class="num" style="width: 30%;">
+      2
     </div>
-    <div class="num" style="height: 88px" />
+    <div class="num" style="height: 85px" />
 
-    <div class="num" style="width: 5%;" />
-    <div class="num" style="width: 21%;">
-      100
+    <div class="num" style="width: 10%;" />
+    <div class="num" style="width: 14%;">
+      210
     </div>
-    <div class="num" style="width: 35%;">
-      1
+    <div class="num" style="width: 40%;">
+      105
     </div>
-    <div class="num" style="width: 35%;">
-      1
+    <div class="num" style="width: 25%;">
+      35%
     </div>
   </div>
 </template>
@@ -41,7 +41,7 @@ export default {
  /* border: 1px solid #ffffff;*/
   height: 20px;
   font-size: 12px;
-  color: #099acd;
+  color: #ffffff;
   vertical-align: top;text-align: center;
 }
 </style>
diff --git a/src/views/NewMainPageComponents/LowerLeft.vue b/src/views/NewMainPageComponents/LowerLeft.vue
index 569d0173d827470a53717c124c4d1739ae621583..37f2a5443945eed1fa892a6ddaeb32371f9447d3 100644
--- a/src/views/NewMainPageComponents/LowerLeft.vue
+++ b/src/views/NewMainPageComponents/LowerLeft.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--左下-->
-    <div id="lowerLeft" class="lowerLeft_echarts" style="width:24%;height: 30%;position: absolute;left: 8px;top: 68%" />
+    <div id="lowerLeft" class="lowerLeft_echarts" style="width:24%;height: 30%;position: absolute;left: 20px;top: 68%" />
   </div>
 </template>
 
@@ -34,7 +34,7 @@ export default {
         },
         legend: {
           textStyle: { color: '#a9ddee' },
-          x: 'right'
+          x: 'centers'
         },
         grid: {
           top: '12%',
@@ -66,13 +66,13 @@ export default {
         series: [
           {
             name: '当前通过人数',
-            color: '#55a0a1',
+            color: '#ff9d1f',
             type: 'bar',
             data: [18203, 23489, 29034, 104970, 131744, 630230, 29034, 104970, 131744, 630230]
           },
           {
             name: '当前报警人数',
-            color: '#cfc844',
+            color: '#14abec',
             type: 'bar',
             data: [19325, 23438, 31000, 121594, 134141, 681807, 31000, 121594, 134141, 681807]
           }
diff --git a/src/views/NewMainPageComponents/RightBottom.vue b/src/views/NewMainPageComponents/RightBottom.vue
index d3ca31346fdfa0f8f6d978f33fb1d4b15f855666..bc3bb75f999036975b83966243433b585b8310ad 100644
--- a/src/views/NewMainPageComponents/RightBottom.vue
+++ b/src/views/NewMainPageComponents/RightBottom.vue
@@ -1,25 +1,25 @@
 <template>
   <div style="display: flex;justify-content: space-between;width:100%;height: 100%;">
-    <div style="width: 50%;height: 100%">
-      <div style="height: 30px;font-size: 18px;color: white;line-height: 35px">
+    <div style="width: 46%;height: 100%">
+      <div style="height: 40px;font-size: 16px;color: white;line-height: 40px;padding-left: 15px">
         异常提醒
       </div>
       <div style="height: 10px" />
       <div style="height: 20px;font-size: 14px;color:#976c27;text-align: center">
         报警率超阈值
       </div>
-      <div class="infinite-list-wrapper" style="overflow:auto;width:100%;height: 60%;">
+      <div class="infinite-list-wrapper" style="overflow:auto;width:100%;height: 70%;">
         <div class="table-wrapper">
           <el-table
             id="playList"
             :data="tableData"
-            style="width: 100%;color: rgb(160, 165, 178);font-size: 12px"
+            style="width: 100%;color: rgb(160, 165, 178);font-size: 12px;margin-left: 10px"
             :show-header="true"
             :row-class-name="tableRowClassName"
           >
             <el-table-column prop="index" label="序号" min-width="20px" />
-            <el-table-column prop="name" label="区域" min-width="20px" />
-            <el-table-column prop="address" label="编号" min-width="20px" />
+            <el-table-column prop="address" label="区域" min-width="20px" />
+            <el-table-column prop="number" label="编号" min-width="20px" />
             <p v-if="loading">
               加载中...
             </p>
@@ -30,24 +30,25 @@
         </div>
       </div>
     </div>
-    <div style="width: 50%;height: 100%;">
+    <div style="width: 20px" />
+    <div style="width: 45%;height: 100%;">
       <div style="height: 30px" />
       <div style="height: 10px" />
       <div style="height: 20px;font-size: 14px;color:#976c27;text-align: center">
         离线天数超阈值
       </div>
-      <div class="infinite-list-wrapper" style="overflow:auto;width:100%;height: 60%;">
+      <div class="infinite-list-wrapper" style="overflow:auto;width:100%;height: 70%;">
         <div class="table-wrapper">
           <el-table
             id="playList"
             :data="tableData"
-            style="width: 100%;color: rgb(160, 165, 178);"
+            style="width: 100%;color: rgb(160, 165, 178);;margin-left: 8px"
             :show-header="true"
             :row-class-name="tableRowClassName"
           >
             <el-table-column prop="index" label="序号" min-width="20px" />
-            <el-table-column prop="name" label="区域" min-width="20px" />
-            <el-table-column prop="address" label="编号" min-width="20px" />
+            <el-table-column prop="address" label="区域" min-width="20px" />
+            <el-table-column prop="number" label="编号" min-width="20px" />
             <p v-if="loading">
               加载中...
             </p>
@@ -67,30 +68,53 @@ export default {
   data() {
     return {
       tableData: [{
-        index: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '01',
+        address: '01',
+        number: '0001',
+        error: '85%',
+        operate: '查看'
       }, {
-        index: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '02',
+        address: '02',
+        number: '0002',
+        error: '83%',
+        operate: '查看'
       }, {
-        index: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '03',
+        address: '03',
+        number: '0003',
+        error: '83%',
+        operate: '查看'
       }, {
-        index: '2',
-        name: '王小虎',
-        address: '上海'
+        index: '04',
+        address: '04',
+        number: '0004',
+        error: '83%',
+        operate: '查看'
+      },
+      {
+        index: '05',
+        address: '05',
+        number: '0005',
+        error: '83%',
+        operate: '查看'
+      }, {
+        index: '06',
+        address: '06',
+        number: '0006',
+        error: '83%',
+        operate: '查看'
       }]
     }
   }
 }
 </script>
 
-<style scoped>
-.el-table,
-.el-table__expanded-cell{
+<style scoped lang="less">
+.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped
+
+/*最外层透明*/
+.el-table, .el-table__expanded-cell{
   background-color: transparent;
 }
 /* 表格内背景颜色 */
@@ -109,9 +133,16 @@ export default {
 /deep/ .el-table td {
   background-color: transparent;
 }
+/* 删除表格下最底层的横线 */
+.el-table::before {
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 0px;
+}
 /* 表格表头字体颜色 */
-.el-table thead {
-  color: #40b4fc!important;
+/deep/.el-table thead {
+  color: #00fff6;
   font-weight: 500;
 }
 ::-webkit-scrollbar {
@@ -121,4 +152,27 @@ export default {
 ::-webkit-scrollbar {
   width: 0px !important;height: 5px;
 }
+/deep/.table-wrapper .el-table .el-table__cell {
+  padding: 0px!important;
+}
+/deep/.table-wrapper .el-table .cell {
+  white-space: nowrap!important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 0 5px!important;
+}
+/deep/.table-wrapper .el-table tr:hover {
+  background-color: rgba(32, 160, 255, 0.37);
+}
+/deep/.table-wrapper .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  border-bottom: 0px solid!important;
+}
+/deep/.table-wrapper .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: rgba(30, 144, 255, 0.26) !important;
+}
+//透明化行、单元格,删除表头下横线
+.table-wrapper /deep/ tr, .table-wrapper /deep/ th, .table-wrapper /deep/ td {
+    background: #1439391c !important;
+    border-bottom: 0px!important; //删除表头下横线
+  }
 </style>
diff --git a/src/views/NewMainPageComponents/RightMiddle.vue b/src/views/NewMainPageComponents/RightMiddle.vue
index f09510182beb9c39603d3b8ec9476410d9ea1e4c..700c19994fe6f138980e04d013ca8eb480fc5ab9 100644
--- a/src/views/NewMainPageComponents/RightMiddle.vue
+++ b/src/views/NewMainPageComponents/RightMiddle.vue
@@ -1,26 +1,37 @@
 <template>
   <!--右中-->
   <div style="width:100%;height: 100%;">
-    <div style="height: 35px;font-size: 18px;color: white;line-height: 35px">
+    <div style="height: 30px;font-size: 16px;color: white;line-height: 30px;padding-left: 15px;position: relative;">
       数据环比
+      <div style="position: absolute;width: 150px;height: 20px;border: 1px solid #ffffff;right: 10px;bottom: -28px;font-size: 0">
+        <div class="btn" style="display: inline-block;height: 19px;width: 49px;border-right: 1px solid #ffffff;font-size: 8px;text-align: center;line-height: 19px">
+          当月
+        </div>
+        <div class="btn" style="display: inline-block;height: 19px;width: 49px;border-right: 1px solid #ffffff;font-size: 8px;text-align: center;line-height: 19px">
+          当年
+        </div>
+        <div class="btn" style="display: inline-block;height: 19px;width: 49px;font-size: 8px;text-align: center;line-height: 19px">
+          指定
+        </div>
+      </div>
     </div>
     <div style="display: flex;justify-content: space-between;width:100%;height: 80%;">
       <div style="width: 50%;height: 100%">
         <div id="rightMiddle1" class="rightMiddle_echarts" style="width: 100%;height:75%;" />
         <div
           class="right-center-btn"
-          style="border: 0;color: #eeeeee;font-size: 16px;text-align: center;line-height: 30px;margin-left:65px;width: 95px;height: 30px"
+          style="border: 0;color: #eeeeee;font-size: 16px;text-align: center;line-height: 30px;margin-left:58px;width: 95px;height: 30px"
         >
           报警率
         </div>
-        <div style="display: flex;font-size: 8px;background-color: #0c1426;margin:6px 0 0 50px;width: 130px">
+        <div style="display: flex;font-size: 8px;background-color: #0c1426;margin:6px 0 0 50px;width: 130px;height: 32px">
           <div style="color:#c0ae14;border: 1px solid #083770;width: 60px;text-align: center">
-            <span>本周期</span><br>
-            <span style="font-size: 15px">56%</span>
+            <span style="font-size: 8px">本周期</span><br>
+            <span style="font-size: 10px">56%</span>
           </div>
-          <div style="color:#04b464;margin-left: 10px;width: 50px;text-align: center">
-            <span>上周期</span><br>
-            <span style="font-size: 15px">56%</span>
+          <div style="color:#04b464;margin-left: 10px;width: 50px;text-align: center;border: 1px solid #083770">
+            <span style="font-size: 8px">上周期</span><br>
+            <span style="font-size: 10px">56%</span>
           </div>
         </div>
       </div>
@@ -28,18 +39,18 @@
         <div id="rightMiddle2" class="rightMiddle_echarts" style="width: 100%;height:75%" />
         <div
           class="right-center-btn"
-          style="border: 0;color: #eeeeee;font-size: 16px;text-align: center;line-height: 30px;margin-left:65px;width: 95px;height: 30px"
+          style="border: 0;color: #eeeeee;font-size: 16px;text-align: center;line-height: 30px;margin-left:58px;width: 95px;height: 30px"
         >
           离线率
         </div>
-        <div style="display: flex;font-size: 8px;background-color: #0c1426;margin:6px 0 0 50px;width: 130px">
-          <div style="color:#c0ae14;border: 1px solid #083770;width: 60px;text-align: center">
-            <span>本周期</span><br>
-            <span style="font-size: 15px">56%</span>
+        <div style="display: flex;font-size: 8px;background-color: #0c1426;margin:6px 0 0 50px;width: 130px;height: 32px">
+          <div style="color:#c0ae14;border: 1px solid #083770;width: 60px;text-align: center;">
+            <span style="font-size: 8px">本周期</span><br>
+            <span style="font-size: 10px">56%</span>
           </div>
-          <div style="color:#04b464;margin-left: 10px;width: 50px;text-align: center">
-            <span>上周期</span><br>
-            <span style="font-size: 15px">56%</span>
+          <div style="color:#04b464;margin-left: 10px;width: 50px;text-align: center;border: 1px solid #083770">
+            <span style="font-size: 8px">上周期</span><br>
+            <span style="font-size: 10px">56%</span>
           </div>
         </div>
       </div>
@@ -103,7 +114,7 @@ export default {
               icon: 'image://http://ldjy.asc.jx.cn/f9f9f665-43c9-4628-b06a-f8c4fc1872d0.png',
               showAbove: false,
               offsetCenter: [0, '-35%'],
-              size: 25,
+              size: 20,
               keepAspect: true,
               itemStyle: {
                 color: '#707177'
@@ -126,7 +137,7 @@ export default {
               lineHeight: 40,
               borderRadius: 8,
               offsetCenter: [0, '10%'],
-              fontSize: 20,
+              fontSize: 18,
               fontWeight: 'bolder',
               formatter: '{value}%',
               color: '#21ee8b'
@@ -205,7 +216,7 @@ export default {
               icon: 'image://http://ldjy.asc.jx.cn/efedef9e-197a-4220-b99e-23b21caa8cfc.png',
               showAbove: false,
               offsetCenter: [0, '-35%'],
-              size: 25,
+              size: 20,
               keepAspect: true,
               itemStyle: {
                 color: '#707177'
@@ -222,7 +233,7 @@ export default {
               lineHeight: 40,
               borderRadius: 8,
               offsetCenter: [0, '10%'],
-              fontSize: 20,
+              fontSize: 18,
               fontWeight: 'bolder',
               formatter: '{value}%',
               color: '#f70b0b'
@@ -276,4 +287,7 @@ export default {
   background-repeat: no-repeat;
   background-size:100% 100% ;
 }
+.btn:hover {
+  color: #20a0ff!important;
+}
 </style>
diff --git a/src/views/NewMainPageComponents/RightTop.vue b/src/views/NewMainPageComponents/RightTop.vue
index 530d8e74594d7a01ee24204a30a0e9441bcfaf43..84e9cf3e5e0cd40b06ed87cb56ecc7cfb90943b4 100644
--- a/src/views/NewMainPageComponents/RightTop.vue
+++ b/src/views/NewMainPageComponents/RightTop.vue
@@ -1,8 +1,19 @@
 <template>
   <div>
     <!--右上-->
-    <div style="height: 30px;font-size: 18px;color: white;line-height: 30px">
+    <div style="height: 30px;font-size: 16px;color: white;line-height: 30px;padding-left: 15px;position: relative">
       数据统计
+      <div style="position: absolute;width: 150px;height: 20px;border: 1px solid #ffffff;right: 10px;bottom: -28px;font-size: 0">
+        <div style="display: inline-block;height: 19px;width: 49px;border-right: 1px solid #ffffff;font-size: 8px;text-align: center;line-height: 19px">
+          当月
+        </div>
+        <div style="display: inline-block;height: 19px;width: 49px;border-right: 1px solid #ffffff;font-size: 8px;text-align: center;line-height: 19px">
+          当年
+        </div>
+        <div style="display: inline-block;height: 19px;width: 49px;font-size: 8px;text-align: center;line-height: 19px">
+          指定
+        </div>
+      </div>
     </div>
     <div id="rightTop" class="rightTop_echarts" style="width:26%;height: 30%;position: absolute;right: 20px;top:12%;" />
   </div>
@@ -53,11 +64,16 @@ export default {
             splitLine: {
               show: false // 不显示网格线
             },
+            axisLabel: {
+              textStyle: {
+                fontSize: '10'
+              }
+            },
             lineStyle: {
               type: 'dashed' // 设置网格线类型 dotted：虚线   solid:实线
             },
             type: 'category',
-            data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月', 'Sat', 'Sun'],
             axisPointer: {
               type: 'shadow'
             }
@@ -72,14 +88,14 @@ export default {
               type: 'dashed' // 设置网格线类型 dotted：虚线   solid:实线
             },
             type: 'value',
-            name: '数据统计',
+            name: '',
             axisLabel: {
               formatter: '{value}'
             }
           },
           {
             type: 'value',
-            name: '报警率',
+            name: '',
             splitLine: {
               show: false // 不显示网格线
             },
@@ -92,7 +108,7 @@ export default {
         series: [
           {
             name: '通行人次',
-            color: 'rgb(85, 160, 161)',
+            color: '#ff9d1f',
             type: 'bar',
             tooltip: {
               valueFormatter: function(value) {
@@ -105,7 +121,7 @@ export default {
           },
           {
             name: '报警人次',
-            color: 'rgb(207, 200, 68)',
+            color: '#14abec',
             type: 'bar',
             tooltip: {
               valueFormatter: function(value) {