diff --git a/src/assets/images/center-bottom-box-bgc.png b/src/assets/images/center-bottom-box-bgc.png
index 4a200eb0835cf4d826657ae85751b48b4a3b1bde..c86f46dbe12c0a96fb128d6cd204d56a2c7ce6f1 100644
Binary files a/src/assets/images/center-bottom-box-bgc.png and b/src/assets/images/center-bottom-box-bgc.png differ
diff --git a/src/assets/images/center-center-box-bgc.png b/src/assets/images/center-center-box-bgc.png
index be9f5550ed840c43c10f2770623f272bb3279003..4c0c79bdb0aeaf19b3fec6b32ed6180f883c9bfa 100644
Binary files a/src/assets/images/center-center-box-bgc.png and b/src/assets/images/center-center-box-bgc.png differ
diff --git a/src/assets/images/center-top-box-bgc.png b/src/assets/images/center-top-box-bgc.png
index 0e1fd57fb85212ca3a6111aae7387aa227083ac3..01d487661532d95275ff304f14f8b1bbb3425cac 100644
Binary files a/src/assets/images/center-top-box-bgc.png and b/src/assets/images/center-top-box-bgc.png differ
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index 26e6ba94afe2d85170592bb69cd3371a8437cf10..4a5ac0e82178ab5532d07d690dc4f797dfd76746 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -51,13 +51,178 @@
           设备状态总览
         </div>
         <div class="center-top">
-          1
+          <div style="height: 100%;width: 15%;display: inline-block;vertical-align: top">
+            1
+          </div>
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 17%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 40px 0 10px 0">
+              服务器
+            </h5>
+            <span>
+              IP地址:192.168.0.100
+            </span><br>
+            <span>
+              端口号:1001
+            </span>
+          </div>
+          <!--     服务器文字     -->
+
+          <div style="height: 100%;width: 17%;display: inline-block;vertical-align: top">
+            1
+          </div>
+          <!--     主交换机文字     -->
+          <div style="height: 100%;width: 16%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 40px 0 10px 0">
+              主交换机
+            </h5>
+            <span>
+              型号:RG-S2628G
+            </span><br>
+            <span>
+              端口号:8
+            </span><br>
+            <span>
+              数量:1
+            </span>
+          </div>
+          <!--     服务器文字     -->
+
+          <div style="height: 100%;width: 17%;display: inline-block;vertical-align: top">
+            1
+          </div>
+          <!--     无线路由器文字     -->
+          <div style="height: 100%;width: 16%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 40px 0 10px 0">
+              无线路由器
+            </h5>
+            <span>
+              型号:RG-S2628G
+            </span><br>
+            <span>
+              端口号:8
+            </span><br>
+            <span>
+              数量:1
+            </span>
+          </div>
+          <!--     服务器文字     -->
         </div>
         <div class="center-center">
-          1
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 25%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 35px 0 5px 45px">
+              01区
+            </h5>
+            <span style="padding-left: 25px">
+              位置:1号厂房入口
+            </span><br>
+            <span style="padding-left: 25px">
+              设备:20台
+            </span><br>
+            <span style="padding-left: 25px">
+              维护:王小明
+            </span>
+          </div>
+          <!--     服务器文字     -->
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
+              安检门
+            </h5>
+            <span>
+              通行:5020
+            </span><br>
+            <span>
+              报警:2011
+            </span><br>
+            <span>
+              报警率:40.1%
+            </span>
+          </div>
+          <!--     服务器文字     -->
+
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 26%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
+              人脸ESD
+            </h5>
+            <span>
+              通行:5020
+            </span><br>
+            <span>
+              报警:2011
+            </span><br>
+            <span>
+              报警率:40.1%
+            </span>
+          </div>
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
+              X射线机
+            </h5>
+            <span>
+              通行:5020
+            </span><br>
+            <span>
+              报警:2011
+            </span><br>
+            <span>
+              报警率:40.1%
+            </span>
+          </div>
         </div>
         <div class="center-bottom">
-          1
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 25%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 35px 0 5px 45px">
+              02区
+            </h5>
+            <span style="padding-left: 25px">
+              位置:2号厂房入口
+            </span><br>
+            <span style="padding-left: 25px">
+              设备:15台
+            </span><br>
+            <span style="padding-left: 25px">
+              维护:张小东
+            </span>
+          </div>
+          <!--     服务器文字     -->
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
+              安检门
+            </h5>
+            <span>
+              通行:5020
+            </span><br>
+            <span>
+              报警:2011
+            </span><br>
+            <span>
+              报警率:40.1%
+            </span>
+          </div>
+          <!--     服务器文字     -->
+
+          <!--     服务器文字     -->
+          <div style="height: 100%;width: 26%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
+            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
+              人脸ESD
+            </h5>
+            <span>
+              通行:5020
+            </span><br>
+            <span>
+              报警:2011
+            </span><br>
+            <span>
+              报警率:40.1%
+            </span>
+          </div>
+          <!--     服务器文字     -->
         </div>
       </div>
       <div class="right-box">
@@ -144,7 +309,8 @@ export default {
   //height: 100%;
   min-width: 1920px;
   width: 100%;
-  height: 980px;
+  height: 100%;
+  min-height: 980px;
 }
 #new-mainpage-header {
   width: 100%;
diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue
index c740f23639a88a2e9426ab73229a7fe297b5b13f..f0d3aab716825f4c3599f8e2e5b8e7386ca8fadc 100644
--- a/src/views/NewMainPageComponents/LeftCenter.vue
+++ b/src/views/NewMainPageComponents/LeftCenter.vue
@@ -12,12 +12,11 @@
           style="width: 100%;color: rgb(160, 165, 178);font-size: 16px;text-align: right;margin-left: 0px"
           :show-header="true"
         >
-          <el-table-column min-width="3px" />
-          <el-table-column prop="index" label="序号" min-width="15px" />
-          <el-table-column prop="areaId" label="区域" min-width="15px" />
-          <el-table-column prop="deviceId" label="编号" min-width="15px" />
-          <el-table-column prop="policeRate" label="报警率" min-width="15px" />
-          <el-table-column label="操作" min-width="15px">
+          <el-table-column prop="index" label="序号" min-width="25px" align="center" />
+          <el-table-column prop="areaId" label="区域" min-width="25px" align="center" />
+          <el-table-column prop="deviceId" label="编号" min-width="25px" align="center" />
+          <el-table-column prop="policeRate" label="报警率" min-width="25px" align="center" />
+          <el-table-column label="操作" min-width="17px">
             <template slot-scope="scope">
               <el-button style="margin-top: 0" type="text" size="mini" @click="editOperation(scope.row)">
                 查看
@@ -39,9 +38,9 @@
       :visible.sync="operationDialogVisible"
       width="1350px"
       center
-      :close-on-click-modal="false"
+      :close-on-click-modal="true"
     >
-      <div v-loading="operationDialogLoading" style="max-height: 450px;overflow: auto" class="operationDialog">
+      <div v-loading="operationDialogLoading" style="max-height: 450px;overflow: auto;" class="operationDialog">
         <el-form
           ref="EquipmentOperation"
           :model="EquipmentOperation"
@@ -829,7 +828,8 @@ export default {
   background-color: rgba(30, 144, 255, 0.26) !important;
 }
 /deep/ .cell {
-  height: 21px;
+  height: 20px;
+  line-height: 20px;
 }
 /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
   border: 0px solid #ffffff;
diff --git a/src/views/NewMainPageComponents/LeftTop.vue b/src/views/NewMainPageComponents/LeftTop.vue
index c0ce7cd4fa765372fcefd3618ecb30d263b1545d..e4b12ccced17aba261d2d2c92e74674f690e7f50 100644
--- a/src/views/NewMainPageComponents/LeftTop.vue
+++ b/src/views/NewMainPageComponents/LeftTop.vue
@@ -3,7 +3,7 @@
     <div style="height: 40px;font-size: 16px;color: white;line-height: 40px;padding-left: 15px">
       设备概况
     </div>
-    <div style="height: 82px" />
+    <div style="height: 28%" />
     <div class="num" style="width: 5%;" />
     <div class="num" style="width: 23%;">
       {{ leftTopVO.equipmentNumber }}
@@ -14,7 +14,7 @@
     <div class="num" style="width: 30%;">
       {{ leftTopVO.offLineNumber }}
     </div>
-    <div class="num" style="height: 102px" />
+    <div class="num" style="height: 36%" />
 
     <div class="num" style="width: 10%;" />
     <div class="num" style="width: 14%;">
diff --git a/src/views/NewMainPageComponents/RightBottom.vue b/src/views/NewMainPageComponents/RightBottom.vue
index 75c3ecc6ee2666000b333193ccc618703fc4ed29..ed07d4ca1565564500b17706bc1eacac3cbee345 100644
--- a/src/views/NewMainPageComponents/RightBottom.vue
+++ b/src/views/NewMainPageComponents/RightBottom.vue
@@ -16,10 +16,9 @@
             style="width: 100%;color: rgb(160, 165, 178);margin-left: 0px"
             :show-header="true"
           >
-            <el-table-column min-width="5px" />
-            <el-table-column prop="index" label="序号" min-width="20px" />
-            <el-table-column prop="areaId" label="区域" min-width="20px" />
-            <el-table-column prop="deviceId" label="编号" min-width="20px" />
+            <el-table-column prop="index" label="序号" min-width="20px" align="center" />
+            <el-table-column prop="areaId" label="区域" min-width="20px" align="center" />
+            <el-table-column prop="deviceId" label="编号" min-width="20px" align="center" />
             <p v-if="loading">
               加载中...
             </p>
@@ -44,10 +43,9 @@
             style="width: 100%;color: rgb(160, 165, 178);;margin-left: 0px"
             :show-header="true"
           >
-            <el-table-column min-width="5px" />
-            <el-table-column prop="index" label="序号" min-width="20px" />
-            <el-table-column prop="areaId" label="区域" min-width="20px" />
-            <el-table-column prop="deviceId" label="编号" min-width="20px" />
+            <el-table-column prop="index" label="序号" min-width="20px" align="center" />
+            <el-table-column prop="areaId" label="区域" min-width="20px" align="center" />
+            <el-table-column prop="deviceId" label="编号" min-width="20px" align="center" />
             <p v-if="loading">
               加载中...
             </p>
diff --git a/src/views/NewMainPageComponents/RightMiddle.vue b/src/views/NewMainPageComponents/RightMiddle.vue
index 247a77d37d9dae288aeb37c8665465d2161aeda1..8fea51179006a50fbbcd42682398814534d221dd 100644
--- a/src/views/NewMainPageComponents/RightMiddle.vue
+++ b/src/views/NewMainPageComponents/RightMiddle.vue
@@ -5,7 +5,7 @@
       数据环比
       <div style="position: absolute;width: 150px;height: 25px;line-height: 25px;border: 1px solid rgb(0, 240, 255);right: 10px;bottom: -25px;z-index: 999">
         <div class="btnone btn" :style="{color: leftBtnColor[0]}" @click="changeLeftBtnStyle(0)">
-          以周
+          以天
         </div>
         <div class="btnone btn" :style="{color: leftBtnColor[1]}" @click="changeLeftBtnStyle(1)">
           以月
diff --git a/src/views/NewMainPageComponents/RightTop.vue b/src/views/NewMainPageComponents/RightTop.vue
index 842eab43ef2259d21f507bc75ab907b70149bf53..7a8f700d238d3997f4d097114b2c6959cb74cf28 100644
--- a/src/views/NewMainPageComponents/RightTop.vue
+++ b/src/views/NewMainPageComponents/RightTop.vue
@@ -5,7 +5,7 @@
       数据统计
       <div style="position: absolute;width: 150px;height: 25px;line-height: 25px;border: 1px solid rgb(0, 240, 255);right: 10px;bottom: -25px;z-index: 999">
         <div class="btnone btn" :style="{color: leftBtnColor[0]}" @click="changeLeftBtnStyle(0)">
-          以周
+          以天
         </div>
         <div class="btnone btn" :style="{color: leftBtnColor[1]}" @click="changeLeftBtnStyle(1)">
           以月