diff --git a/src/assets/img/modules/visual/fenlei-box.png b/src/assets/img/modules/visual/fenlei-box.png
new file mode 100644
index 000000000..531f8a811
Binary files /dev/null and b/src/assets/img/modules/visual/fenlei-box.png differ
diff --git a/src/assets/img/shuju/fiveLayer/ep_qt.png b/src/assets/img/shuju/fiveLayer/ep_qt.png
new file mode 100644
index 000000000..ec5bfbf20
Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_qt.png differ
diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 092ff7964..a74a552f5 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -1,15 +1,18 @@
 @import "~@/element-ui/theme-variables.scss";
-@import "./variables.scss";
+@import "./shuju-variables.scss";
+@import "./c/config";
+@import "./c/function";
+@import "./modules/visual/c/common.scss";
 
-// $navbar--height: 60px;
-body {
+.g-main {
+  padding: 10px 20px 10px;
 }
 
 .m-iframe {
   position: relative;
-  width: 100vw;
-  height: calc(100vh - 55px);
-  margin: -10px;
+  box-sizing: content-box;
+  width: calc(100% + 20px);
+  margin: -10px -20px -10px;
   z-index: 100;
 }
 
@@ -19,6 +22,8 @@ body {
   background-image: url(../img/shuju/bg.jpg);
   background-size: cover;
   background-position: center 0;
+  height: 100%;
+  @include scrollBar;
 
   .el-card + .el-card {
     margin-top: 15px;
@@ -171,6 +176,10 @@ body {
   // box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05);
   background: linear-gradient(180deg, #00023f, #176dec);
   box-shadow: 0px 3px 16px 0px rgba(187, 187, 227, 0.35);
+  font-size: 19px;
+  .el-menu-item {
+    font-size: 19px;
+  }
 
   .navbar--colorful {
     .navbar__body {
@@ -229,17 +238,17 @@ body {
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 5px;
+    padding: 10px 20px;
     margin: 0;
     width: 100%;
     height: 100%;
-    font-size: 24px;
+    font-size: 28px;
+    font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     // overflow: hidden;
     transition: width 0.3s;
     font-family: FZZCHJW;
-    font-weight: normal;
     color: #ffffff;
     background: linear-gradient(0deg, #03c7ff 24.609375%, #ffffff 81.0791015625%);
     -webkit-background-clip: text;
@@ -288,6 +297,7 @@ body {
   .navbar__menu {
     background-color: transparent;
     border-bottom: 0 !important;
+
     a:focus,
     a:hover {
       text-decoration: none;
@@ -349,7 +359,7 @@ body {
         position: absolute;
         display: none;
         padding: 0 10px;
-        width: 120px;
+        width: 160px;
         left: -100px;
         right: -100px;
         margin: 0 auto;
@@ -360,6 +370,9 @@ body {
           border-top: 1px dashed rgba(#fff, 0.4);
           color: rgba(#fff, 0.7);
           transition: all ease 0.5s;
+          padding: 10px 0;
+          line-height: $navbar--height * 0.5;
+
           &.z-on {
             font-weight: bold;
           }
@@ -409,13 +422,14 @@ body {
       }
       .navbar__icon-menu {
         vertical-align: middle;
-        font-size: 16px;
+        font-size: 20px;
       }
       .el-dropdown {
         color: #fff;
+        font-size: 16px;
         .el-icon-arrow-down {
           width: auto;
-          font-size: 12px;
+          font-size: 16px;
           margin: 0 0 0 5px;
           transition: transform 0.3s;
         }
@@ -459,9 +473,9 @@ body {
   .navbar__avatar {
     .el-dropdown-link {
       > img {
-        width: 36px;
+        width: 42px;
         height: auto;
-        margin-right: 5px;
+        margin-right: 7px;
         border-radius: 100%;
         vertical-align: middle;
       }
diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 819f2df36..af79b78a1 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -3,7 +3,8 @@
 @import "./c/common";
 .div_top {
   margin-left: 10px;
-  height: 35px;
+  height: 40px;
+  line-height: 35px;
   .router_line {
     width: 212px;
     height: 1px;
@@ -12,8 +13,8 @@
     /* opacity: 0.09; */
   }
   .div_router {
-    margin-top: 5px;
     font-size: 16px;
+    font-weight: bold;
 
     .router_parents {
       color: #a0c3d9;
@@ -40,7 +41,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh - 15px);
+    height: calc(825px - 15px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -109,10 +110,9 @@
       box-sizing: border-box;
       width: 100%;
 
-      height: calc(88vh - 10px);
+      height: calc(825px - 10px);
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
+      background: url("../../../img/modules/visual/fenlei-box.png") no-repeat center;
       background-size: 100% 100%;
       // padding: 45px 21px 35px 24px;
 
@@ -208,13 +208,12 @@
 
 .div_community_info {
   box-sizing: border-box;
-  flex: 0 0 calc(100vw - 620px);
-  // width: calc(100vw - 560px);
+  flex: 0 0 calc(1919px - 620px);
+  // width: calc(1919px - 560px);
 
-  height: calc(88vh - 10px);
+  height: calc(825px - 10px);
   color: #fff;
-  background: url('../../../img/modules/visual/warning-box.png') no-repeat
-    center;
+  background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
 
   .div_select {
@@ -253,11 +252,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(88vh - 120px);
+    height: calc(825px - 120px);
   }
 
   .div_room {
-    // height: calc(88vh - 40px);
+    // height: calc(825px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
@@ -271,15 +270,19 @@
       box-shadow: 0 0 10px inset #1a5afd;
     }
     .item {
-      background-color: #011168;
       margin-top: 12px;
-      width: 244px;
+      width: 242px;
       height: 190px;
       border: 1px solid #037ddc;
       border-radius: 8px;
       text-align: center;
       margin-left: 11px;
       position: relative;
+      background-color: rgba(#000, 0.3);
+
+      &:nth-child(5n + 1) {
+        margin-left: 0;
+      }
 
       // &:first-child {
       //   margin-left: 0;
@@ -317,19 +320,18 @@
         justify-content: flex-start;
         // margin-left: 7px;
 
-        .div_icon_item{
-          .icon_img{
+        .div_icon_item {
+          .icon_img {
             margin-left: 5px;
             width: 21px;
             height: 20px;
           }
-          .icon_name{
+          .icon_name {
             text-align: center;
             display: flex;
             justify-content: center;
           }
         }
-       
       }
       .div_user:hover {
         cursor: pointer;
@@ -362,7 +364,7 @@
   }
 
   .div_room::after {
-    content: '';
+    content: "";
     flex: 1;
   }
 }
@@ -424,6 +426,7 @@
   width: 370px;
   height: 470px;
   overflow: hidden;
+  pointer-events: none;
 
   .wrap {
     display: flex;
@@ -433,6 +436,7 @@
     transform: translateX(-5px);
     transition: all ease 1s;
     border-radius: 4px;
+    pointer-events: auto;
   }
 
   .wrap-hidden {
@@ -443,7 +447,7 @@
     width: 320px;
     height: 470px;
     color: #fff;
-    background: url('../../../img/modules/visual/box-2.png') no-repeat center;
+    background: url("../../../img/modules/visual/box-2.png") no-repeat center;
     background-size: 100% 100%;
     padding: 45px 20px 35px 20px;
 
@@ -578,7 +582,5 @@
         }
       }
     }
-
-
   }
 }
diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index e341f70fa..fff1af839 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -1,9 +1,10 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .title {
-  padding: 10px;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   font-size: 22px;
   font-family: PingFang SC;
   font-weight: 800;
@@ -37,7 +38,7 @@
       color: #fff;
     }
     .second-title-label::after {
-      content: '';
+      content: "";
       position: absolute;
       top: 50%;
       left: 20px;
@@ -63,7 +64,7 @@
         }
 
         .el-icon-arrow-up:before {
-          content: '\e78f';
+          content: "\e78f";
         }
         // .el-select__caret:before {
         //   content: '\E790'
@@ -117,11 +118,11 @@
   flex-direction: row;
   // flex-wrap: wrap;
   justify-content: space-between;
-  height: calc(100vh - 190px);
+  height: calc(988px - 190px);
 
   .g-l {
     width: 40%;
-    height: calc(100vh - 200px);
+    height: calc(988px - 200px);
 
     .echart-line {
       margin-left: 30px;
@@ -149,11 +150,11 @@
 
   .g-r {
     width: 55%;
-    height: calc(100vh - 210px);
+    height: calc(988px - 210px);
 
     .r-map {
       position: relative;
-      height: calc(100vh - 210px - 50px);
+      height: calc(988px - 210px - 50px);
       width: 100%;
 
       .map {
diff --git a/src/assets/scss/modules/visual/duoyuanfenxi.scss b/src/assets/scss/modules/visual/duoyuanfenxi.scss
index 12032815a..da5ae4d1b 100644
--- a/src/assets/scss/modules/visual/duoyuanfenxi.scss
+++ b/src/assets/scss/modules/visual/duoyuanfenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 40px;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index ed0ffedde..abe74a6b8 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -3,7 +3,8 @@
 @import "./c/common";
 .div_top {
   margin-left: 10px;
-  height: 35px;
+  height: 40px;
+  line-height: 35px;
   .router_line {
     width: 212px;
     height: 1px;
@@ -12,8 +13,8 @@
     /* opacity: 0.09; */
   }
   .div_router {
-    margin-top: 5px;
     font-size: 16px;
+    font-weight: bold;
 
     .router_parents {
       color: #a0c3d9;
@@ -37,10 +38,10 @@
 
   .div_map {
     box-sizing: border-box;
-    width: 100%;
+    width: 1920px - 630px - 20px;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh - 15px);
+    height: calc(810px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -49,17 +50,14 @@
   }
 
   .div_data {
-    flex: 0 0 610px;
+   width: 630px;
     margin-left: 12px;
 
     .div_tips{
       box-sizing: border-box;
       width: 100%;
-      height: 302px;
+      height: 300px;
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
-      background-size: 100% 100%;
 
       .div_coverage{
         padding: 30px 10px 32px 10px;
@@ -89,9 +87,12 @@
       }
 
       .div_category {
+        @include scrollBar;
         box-sizing: border-box;
-        height:238px;
-        padding:0 10px 20px;  
+        height:176px;
+        padding:0 10px 0;  
+        overflow-y: auto;
+        overflow-x: hidden;
   
         .category_item {
          
@@ -159,17 +160,14 @@
       box-sizing: border-box;
       width: 100%;
       margin-top:10px;
-      height: calc(88vh - 302px - 10px);
+      height: calc(810px - 302px - 10px);
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
-      background-size: 100% 100%;
-      padding: 32px 21px 20px 20px;
+      overflow-x: hidden;
 
       .div_search_list {
-        margin: 0 auto;
+        margin: 6px auto;
         text-align: center;
-        width: 559px;
+        width: 570px;
         height: 48px;
         background-color: #011168;
         border-radius: 4px;
@@ -194,14 +192,14 @@
         .btn {
           text-align: center;
           flex: 0 0 113px;
-          height: 48px;
+          height: 52px;
           background: linear-gradient(90deg, #1A5AFD, #26C4FF);
           border-radius: 0px 4px 4px 0px;
           font-size: 20px;
           font-family: PingFang SC;
           font-weight: 400;
           color: #ffffff;
-          line-height: 48px;
+          line-height: 52px;
         }
         .btn:hover {
           cursor: pointer;
@@ -210,17 +208,16 @@
      
      
       .tb {
-        height: calc(88vh - 302px - 10px - 150px);
+        height: calc(810px - 302px - 20px - 150px);
         overflow-y: auto;
         @include scrollBar;
         margin-top:20px;
       }
   
       .m-pagination {
-        position: absolute;
+        // position: absolute;
         box-sizing: border-box;
-        right: 5px;
-        bottom: 5px;
+        margin-top: 2px;
         width: 100%;
         height: 40px;
         display: flex;
@@ -252,10 +249,10 @@
 
 .div_community_info {
   box-sizing: border-box;
-  flex: 0 0 calc(100vw - 620px);
-  // width: calc(100vw - 560px);
+  flex: 0 0 calc(1919px - 620px);
+  // width: calc(1919px - 560px);
 
-  height: calc(88vh - 10px);
+  height: calc(810px - 10px);
   color: #fff;
   background: url('../../../img/modules/visual/warning-box.png') no-repeat
     center;
@@ -297,11 +294,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(88vh - 120px);
+    height: calc(810px - 120px);
   }
 
   .div_room {
-    // height: calc(88vh - 40px);
+    // height: calc(810px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
diff --git a/src/assets/scss/modules/visual/heart.scss b/src/assets/scss/modules/visual/heart.scss
index f0c964cb6..536a22b3a 100644
--- a/src/assets/scss/modules/visual/heart.scss
+++ b/src/assets/scss/modules/visual/heart.scss
@@ -47,7 +47,8 @@
 .m-tb {
     width: 33%;
     .title {
-        padding: 10px;
+        margin-bottom: 10px;
+        padding: 4px 2px;
         font-size: 22px;
         font-family: PingFang SC;
         font-weight: 800;
@@ -64,7 +65,7 @@
         }
     }
     .tb {
-        height: calc(100vh - 230px);
+        height: calc(988px - 230px);
         overflow-y: auto;
         @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index fb6f31ae6..f89104834 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -1,5 +1,5 @@
 .warning-box{
-  padding: 0 21px 20px 24px
+  padding: 0 ;
 }
 .no-data{
   margin-top:50px;
@@ -11,6 +11,9 @@
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
+
   .title-icon {
     display: block;
     width: 46px;
@@ -60,7 +63,7 @@
     }
   }
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
@@ -107,23 +110,25 @@
     flex-grow:0;
     flex-shrink:0;
     width:50%;
-  
     height: 100%;
+
     .div-chart{
       display: flex;
       width: 100%;
+      flex-wrap: wrap;
       .echart-wr{
+        position: relative;
         flex-shrink: 0;
         height: 420px;
         width: 70%;
       }
       .div-tip{
         flex-shrink: 0;
-        width: 30%;
+        width: 25%;
         display: flex;
         flex-direction: column;
         justify-content: center;
-        margin-left:20px;
+        margin-left:5%;
         margin-top: -23px;
 
         display: flex;
@@ -151,11 +156,11 @@
 
       .div-tip2{
         flex-shrink: 0;
-        width: 30%;
+        width: 25%;
         display: flex;
         flex-direction: column;
         justify-content: center;
-        margin-left:20px;
+        margin-left:5%;
         margin-top: -23px;
 
         display: flex;
diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
index ed3aacad8..c305a4c4d 100644
--- a/src/assets/scss/modules/visual/incident-info.scss
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -1,6 +1,6 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .m-pop {
   @include shield;
@@ -103,7 +103,18 @@
   .info-content {
     margin: 20px 0;
   }
- 
+
+  .info-pics {
+    display: flex;
+    margin: 20px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
+    }
+  }
 
   .info-prop {
     position: relative;
@@ -123,7 +134,7 @@
     }
 
     &::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       top: 9px;
@@ -134,18 +145,6 @@
       border-radius: 3px;
       margin-right: 10px;
     }
-
-    .info-pics {
-      display: flex;
-      margin: 20px 0;
-      img {
-        display: block;
-        width: 32%;
-        height: 90px;
-        margin-right: 9px;
-        object-fit: cover;
-      }
-    }
   }
 }
 
@@ -265,7 +264,7 @@
     padding-right: 10px;
 
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       z-index: 1;
       display: block;
@@ -290,7 +289,7 @@
       padding-top: 1px;
 
       &::before {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: -5px;
diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss
index e4672951d..dc3fe2fdb 100644
--- a/src/assets/scss/modules/visual/issue-info.scss
+++ b/src/assets/scss/modules/visual/issue-info.scss
@@ -1,6 +1,6 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .m-pop {
   @include shield;
@@ -68,6 +68,18 @@
     line-height: 30px;
   }
 
+  .info-pics {
+    display: flex;
+    margin: 10px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
+    }
+  }
+
   .info-prop {
     position: relative;
     margin: 10px 0;
@@ -78,17 +90,6 @@
       flex: 0 0 1;
       font-size: 14px;
     }
-    .info-pics {
-      display: flex;
-      margin: 10px 0;
-      img {
-        display: block;
-        width: 32%;
-        height: 90px;
-        margin-right: 9px;
-        object-fit: cover;
-      }
-    }
     > span,
     > div {
       display: block;
@@ -96,7 +97,7 @@
     }
 
     &::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       top: 9px;
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index f9379e7f8..747b9218c 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -24,7 +24,8 @@
   position: relative;
 
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -187,7 +188,8 @@
     width: 1180px;
 
     .title {
-      padding: 10px;
+      margin-bottom: 10px;
+      padding: 4px 2px;
       font-size: 22px;
       font-family: PingFang SC;
       font-weight: 800;
@@ -294,7 +296,8 @@
   margin-top: 10px;
 
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -447,7 +450,8 @@
 
 .m-tb {
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -479,7 +483,8 @@
     width: calc(50% - 3px);
 
     .title {
-      padding: 10px;
+      margin-bottom: 10px;
+      padding: 4px 2px;
       font-size: 22px;
       font-family: PingFang SC;
       font-weight: 800;
diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss
index a756b8c18..77d9988fe 100644
--- a/src/assets/scss/modules/visual/personCategory.scss
+++ b/src/assets/scss/modules/visual/personCategory.scss
@@ -8,7 +8,7 @@
   color: #fff;
   // background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
-  padding: 15px 21px 15px 24px;
+  // padding: 15px 21px 15px 24px;
 
 
 
@@ -159,7 +159,7 @@
   &-bottom {
     box-sizing: border-box;
     width: 100%;
-    // height: calc(100vh - 535px);
+    // height: calc(988px - 535px);
     min-height: 300px;
     margin-top: 60px;
   }
diff --git a/src/assets/scss/modules/visual/processAnalyze.scss b/src/assets/scss/modules/visual/processAnalyze.scss
index ba44dbfaa..1a4b3f3db 100644
--- a/src/assets/scss/modules/visual/processAnalyze.scss
+++ b/src/assets/scss/modules/visual/processAnalyze.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -24,7 +24,7 @@
       }
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 20px;
     }
   }
@@ -32,8 +32,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -119,7 +119,7 @@
 .g-r {
   .r-map {
     position: relative;
-    height: calc(100vh - 180px - 20px - 70px);
+    height: calc(988px - 180px - 20px - 70px);
     width: 100%;
 
     .map {
diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss
index 6d43913ed..049be1804 100644
--- a/src/assets/scss/modules/visual/resibuzz.scss
+++ b/src/assets/scss/modules/visual/resibuzz.scss
@@ -9,19 +9,19 @@
   flex-direction: row;
   // flex-wrap: wrap;
   // justify-content: center;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 600px;
-    height: calc(100vh - 180px);
+    height: calc(988px - 180px);
   }
 
   .g-r {
     text-align: center;
     margin: 40px 0 0 19px;
-    width: calc(100vw - 60px - 600px);
-    // height: calc(100vh - 170px - 20px);
+    width: calc(1919px - 60px - 600px);
+    // height: calc(988px - 170px - 20px);
   }
 }
 
@@ -30,7 +30,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/searchPerson.scss b/src/assets/scss/modules/visual/searchPerson.scss
index 6be528e10..fe9489fd0 100644
--- a/src/assets/scss/modules/visual/searchPerson.scss
+++ b/src/assets/scss/modules/visual/searchPerson.scss
@@ -1,5 +1,5 @@
-.div_people_search{
-  min-height:100%;
+.div_people_search {
+  min-height: 100%;
   box-sizing: border-box;
 }
 
@@ -36,6 +36,7 @@
     font-weight: 400;
     color: #ffffff;
     line-height: 53px;
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
   }
   .btn:hover {
     cursor: pointer;
@@ -51,8 +52,7 @@
   // height: calc(88vh - 200px);
   height: 485px;
   color: #fff;
-  background: url('../../../img/modules/visual/warning-box.png') no-repeat
-    center;
+  background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
 }
 
@@ -123,16 +123,15 @@
       }
 
       &-tr:hover {
-        background: url('../../../img/modules/visual/hover-bac.png') no-repeat
-          center;
+        background: url("../../../img/modules/visual/hover-bac.png") no-repeat center;
         background-size: 100% 100%;
       }
     }
 
-    &-status{
-      margin-top:20px;
+    &-status {
+      margin-top: 20px;
 
-      .no-data{
+      .no-data {
         display: flex;
         justify-content: center;
       }
@@ -159,7 +158,7 @@
 }
 .pagination {
   box-sizing: border-box;
-  padding-right:180px;
+  padding-right: 180px;
   padding-bottom: 20px;
 
   margin-top: 40px;
diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss
index ffb46b67f..b7606f26c 100644
--- a/src/assets/scss/modules/visual/search_1.scss
+++ b/src/assets/scss/modules/visual/search_1.scss
@@ -3,7 +3,8 @@
 @import './c/common';
 
 .title {
-  padding: 10px;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   font-size: 22px;
   font-family: PingFang SC;
   font-weight: 800;
diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss
index ca099bed4..79dfe912c 100644
--- a/src/assets/scss/modules/visual/shijianchulifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 355px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 200px - 365px);
+      height: calc(988px - 200px - 365px);
       margin-top: 0;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -74,7 +74,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/shijianfenleifenxi.scss b/src/assets/scss/modules/visual/shijianfenleifenxi.scss
index c4f19da31..6d0bcedce 100644
--- a/src/assets/scss/modules/visual/shijianfenleifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianfenleifenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 20px;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -80,7 +80,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/typeAnalyze.scss b/src/assets/scss/modules/visual/typeAnalyze.scss
index 0d1accf74..f1f31dffd 100644
--- a/src/assets/scss/modules/visual/typeAnalyze.scss
+++ b/src/assets/scss/modules/visual/typeAnalyze.scss
@@ -8,19 +8,19 @@
   flex-direction: row;
   // flex-wrap: wrap;
   // justify-content: center;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 600px;
-    height: calc(100vh - 180px);
+    height: calc(988px - 180px);
   }
 
   .g-r {
     text-align: center;
     margin: 40px 0 0 19px;
-    width: calc(100vw - 60px - 600px);
-    // height: calc(100vh - 140px - 20px);
+    width: calc(1919px - 60px - 600px);
+    // height: calc(988px - 140px - 20px);
   }
 }
 
@@ -29,7 +29,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss
index 265c38895..bfb320658 100644
--- a/src/assets/scss/modules/visual/warning.scss
+++ b/src/assets/scss/modules/visual/warning.scss
@@ -8,7 +8,7 @@
   color: #fff;
   // background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
-  padding: 45px 21px 35px 24px;
+  padding-top: 40px;
 
   &-top {
     display: flex;
@@ -26,8 +26,7 @@
       border: 1px solid #1043c0;
       box-shadow: 0px 83px 150px 0px #002790;
       border-radius: 8px;
-      margin-right: 15px;
-      margin-bottom: 15px;
+      margin: 10px 12px;
 
       &-img {
         display: flex;
diff --git a/src/assets/scss/shuju-card.scss b/src/assets/scss/shuju-card.scss
index 4af07fd81..f331fd282 100644
--- a/src/assets/scss/shuju-card.scss
+++ b/src/assets/scss/shuju-card.scss
@@ -1,5 +1,6 @@
 @import "c/config";
 @import "c/function";
+@import "./modules/visual/c/common";
 
 .m-card {
     position: relative;
@@ -37,6 +38,7 @@
 
         &.card-line-t {
             background-image: url(../img/shuju/card/line-t.png);
+            background-size: auto 22px;
             left: 22px;
             right: 240px;
             top: 0;
@@ -44,6 +46,7 @@
         }
         &.card-line-r {
             background-image: url(../img/shuju/card/line-r.png);
+            background-size: 22px auto;
             top: 22px;
             bottom: 22px;
             right: 0;
@@ -51,6 +54,7 @@
         }
         &.card-line-b {
             background-image: url(../img/shuju/card/line-b.png);
+            background-size: auto 22px;
             left: 22px;
             right: 240px;
             bottom: 0;
@@ -58,6 +62,7 @@
         }
         &.card-line-l {
             background-image: url(../img/shuju/card/line-l.png);
+            background-size: 22px auto;
             top: 22px;
             bottom: 22px;
             left: 0;
@@ -69,5 +74,7 @@
         min-height: 200px;
         background-image: url(../img/shuju/card/bg.png);
         background-repeat: repeat;
+        overflow-y: auto;
+        @include scrollBar;
     }
 }
diff --git a/src/assets/scss/shuju-variables.scss b/src/assets/scss/shuju-variables.scss
new file mode 100644
index 000000000..70ce5241b
--- /dev/null
+++ b/src/assets/scss/shuju-variables.scss
@@ -0,0 +1,24 @@
+// Base
+$base--line-height: 1.15;
+
+// Navbar
+$navbar--height: 75px;
+
+// Sidebar
+$sidebar--width: 230px;
+$sidebar--width-fold: 100px;
+$sidebar--background-color-dark: #263238;
+$sidebar--text-color-dark: #8a979e;
+$sidebar--menu-item-height: 48px;
+
+// Content
+$content--padding: 10px;
+$content--background-color: #f1f4f5;
+$content--card-header-height: 60px;
+$content--tabs-header-height: 38px;
+// Content, 填充整屏高度(非tabs状态) = 整屏高度 - 导航条高度 - aui-content上下内边距高度
+$content--fill-height: calc(100vh - #{$navbar--height} - #{$content--padding * 2});
+// Content, 填充整屏高度(是tabs状态) = 整屏高度 - 导航条高度 - tabs组件header高度 - tabs组件content上下内边距高度
+$content--fill-height-tabs: calc(
+    100vh - #{$navbar--height} - #{$content--tabs-header-height} - #{$content--padding * 2}
+);
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 276c7f83c..7ebb31e94 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -8,7 +8,7 @@ import { requestPost } from "@/js/dai/request";
 import { dateFormats } from "@/utils/index";
 
 Vue.use(Vuex);
-let interTimer = null
+let interTimer = null;
 export default new Vuex.Store({
   namespaced: true,
   state: {
@@ -42,6 +42,9 @@ export default new Vuex.Store({
     tipsList: [],
     tipsTime: [],
     inIframe: window.self !== window.top,
+    fixed1920: {
+      height: document.documentElement.clientHeight,
+    },
   },
   modules: {
     user,
@@ -56,69 +59,71 @@ export default new Vuex.Store({
       });
     },
     SET_TIPS_LIST(state, tipsList) {
-      let _list = state.tipsList
+      let _list = state.tipsList;
       // state.tipsList = _list.concat(tipsList)
-      state.tipsList = tipsList
+      state.tipsList = tipsList;
     },
     SET_TIPS_TIME(state, time) {
-      state.tipsTime = time
-    }
+      state.tipsTime = time;
+    },
   },
   actions: {
     clearInter() {
-      clearInterval(interTimer)
+      clearInterval(interTimer);
     },
     setInterval({ commit, dispatch, state }) {
       interTimer = setInterval(() => {
-        const _t = dateFormats('YYYY-mm-dd HH:MM', (new Date(new Date().toLocaleDateString()).getTime()))
-        const _tt = new Date(_t).getTime()
-        console.log('230000---', _t)
-        const t =  dateFormats('YYYY-mm-dd HH:MM', (new Date().getTime()))
-        const nt = new Date(t).getTime()
+        const _t = dateFormats(
+          "YYYY-mm-dd HH:MM",
+          new Date(new Date().toLocaleDateString()).getTime()
+        );
+        const _tt = new Date(_t).getTime();
+        console.log("230000---", _t);
+        const t = dateFormats("YYYY-mm-dd HH:MM", new Date().getTime());
+        const nt = new Date(t).getTime();
         // 判断当前时间是否为 00：00
         if (nt == _tt) {
-          dispatch('setTipsTime')
-          return
+          dispatch("setTipsTime");
+          return;
         }
-        let times = state.tipsTime
-        console.log('nt---000', nt)
+        let times = state.tipsTime;
+        console.log("nt---000", nt);
         state.tipsTime.forEach((item, index) => {
-          const _t = new Date(item).getTime()
+          const _t = new Date(item).getTime();
           if (_t == nt) {
-            clearInterval(interTimer)
-            dispatch('setTipsList', item)
-            times.splice(index, 1)
-            commit('SET_TIPS_TIME', times)
+            clearInterval(interTimer);
+            dispatch("setTipsList", item);
+            times.splice(index, 1);
+            commit("SET_TIPS_TIME", times);
           }
-        })
-      }, 60000) 
+        });
+      }, 60000);
     },
     setTipsList({ commit }, time) {
       return new Promise(async (resolve, reject) => {
-        const url = '/gov/project/memoAttr/memosToRemind'
+        const url = "/gov/project/memoAttr/memosToRemind";
         const params = {
-          remindTime: time || ''
-        }
-        const { data, code, msg } = await requestPost(url, params)
+          remindTime: time || "",
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
-          commit('SET_TIPS_LIST', data)
-          resolve()
-        } else reject(msg)
-      })
+          commit("SET_TIPS_LIST", data);
+          resolve();
+        } else reject(msg);
+      });
     },
     setTipsTime({ commit, dispatch }) {
       return new Promise(async (resolve, reject) => {
-        if (interTimer) clearInterval(interTimer)
-        const url = '/gov/project/memoAttr/memoTime'
-        
-        const { data, code, msg } = await requestPost(url)
+        if (interTimer) clearInterval(interTimer);
+        const url = "/gov/project/memoAttr/memoTime";
+
+        const { data, code, msg } = await requestPost(url);
         if (code === 0) {
-          
-          commit('SET_TIPS_TIME', data)
-          if (data.length > 0) dispatch('setInterval')
-          resolve()
-        } else reject(msg)
-      })
-    }
-  }
+          commit("SET_TIPS_TIME", data);
+          if (data.length > 0) dispatch("setInterval");
+          resolve();
+        } else reject(msg);
+      });
+    },
+  },
 });
diff --git a/src/views/components/fixed1920.vue b/src/views/components/fixed1920.vue
new file mode 100644
index 000000000..e98ab3115
--- /dev/null
+++ b/src/views/components/fixed1920.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="g-app">
+    <div class="g-bd" :style="bdStyle">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      clientHeight: document.documentElement.clientHeight,
+      clientWidth: document.documentElement.clientWidth,
+    };
+  },
+
+  components: {},
+  computed: {
+    bdStyle() {
+      const { clientHeight, clientWidth } = this;
+      console.log("clientHeight", clientHeight);
+      const scale = clientWidth / 1920;
+      const height = clientHeight / scale;
+      const top = (clientHeight - height) / 2;
+      const left = (clientWidth - 1920) / 2;
+      this.$store.state.fixed1920.height = height;
+      return {
+        transform: `scale(${scale})`,
+        height: `${height}px`,
+        left: `${left}px`,
+        top: `${top}px`,
+      };
+    },
+  },
+  created() {},
+  mounted() {
+    window.addEventListener("resize", () => {
+      this.clientHeight = document.documentElement.clientHeight;
+      this.clientWidth = document.documentElement.clientWidth;
+    });
+  },
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.g-app {
+  position: absolute;
+  // width: 1920px;
+  width: 100%;
+  height: 100vh;
+  overflow: hidden;
+}
+
+.g-bd {
+  position: absolute;
+  width: 1920px;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+</style>
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index 4d6a73a3e..b9914005e 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -1,5 +1,5 @@
 <template>
-  <main :class="['aui-content']">
+  <main class="g-main">
     <!-- tab展示内容 -->
     <template>
       <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
@@ -18,6 +18,7 @@
           height="100%"
           frameborder="0"
           scrolling="yes"
+          :style="{ height: $store.state.fixed1920.height - 100 + 'px' }"
         />
       </template>
       <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index 4abb6808f..d6d29c1b6 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,25 +1,28 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
-      'g-bd',
-      { 'z-sidebar--fold': $store.state.sidebarFold },
-      {
-        'z-sidebar--noside': true,
-      },
-    ]"
-  >
-    <template v-if="!loading">
-      <main-navbar ref="ref_navbar" />
-      <div class="g-cnt">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
-      </div>
-    </template>
-  </div>
+  <fixed1920>
+    <div
+      v-loading.fullscreen.lock="loading"
+      :element-loading-text="$t('loading')"
+      :class="[
+        'g-bd',
+        { 'z-sidebar--fold': $store.state.sidebarFold },
+        {
+          'z-sidebar--noside': true,
+        },
+      ]"
+    >
+      <template v-if="!loading">
+        <main-navbar ref="ref_navbar" />
+
+        <div class="g-cnt">
+          <main-content
+            v-if="!$store.state.contentIsNeedRefresh"
+            @changeCustomerName="changeCustomerName"
+          />
+        </div>
+      </template>
+    </div>
+  </fixed1920>
 </template>
 
 <script>
@@ -29,6 +32,7 @@ import debounce from "lodash/debounce";
 import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
+import fixed1920 from "@/views/components/fixed1920.vue";
 
 export default {
   provide() {
@@ -51,6 +55,7 @@ export default {
   components: {
     MainNavbar,
     MainContent,
+    fixed1920,
   },
 
   watch: {
@@ -133,7 +138,7 @@ export default {
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
 <style lang="scss">
 .info-h {
-  height: calc(100vh - 320px);
+  height: calc(100% - 320px);
   // overflow: auto;
 }
 .info-scroll {
@@ -145,7 +150,8 @@ export default {
   &::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
-  &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+  &::-webkit-scrollbar-track {
+    /*滚动条的轨道*/
     border-radius: 4px;
   }
 
@@ -153,13 +159,13 @@ export default {
   &::-webkit-scrollbar-track {
     /* 滚动条轨道 */
 
-    background: rgba(12, 129, 254, .24);
+    background: rgba(12, 129, 254, 0.24);
     // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
   }
 
   &::-webkit-scrollbar-thumb {
     /* 滚动条手柄 */
-    background: linear-gradient(270deg, #1257c9, #0095FF);
+    background: linear-gradient(270deg, #1257c9, #0095ff);
   }
 }
 </style>
diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index cdeaf9688..276d1eb46 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -1,10 +1,10 @@
-<template>
+ <template>
   <div>
     <div v-show="currentPage == 'chaxun'">
       <div v-show="!showedFuncPanel">
         <div class="m-info">
           <div class="wrap">
-            <div class="search">
+            <div class="search house-search">
               <div class="input">
                 <!-- <el-dropdown
                   class="select"
@@ -634,6 +634,10 @@ export default {
 
 <style lang="scss" src="@/assets/scss/modules/search.scss" scoped></style>
 <style lang="scss" scoped>
+.house-search{
+  width: 100% !important;
+  // min-width: 750px;
+}
 .logo {
   font-size: 35px;
   font-weight: bold;
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
index d33f449a2..ed8684a6f 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue
@@ -320,20 +320,20 @@ export default {
           this.afterTime = null;
           return false;
         }
-        if (hour_0 == 12) {
-          if (minute_0 == 0 && second_0 == 0) {
-            this.$message.error("请选择12:01-23:59时间段的时间");
-            this.afterTime = null;
-            return false;
-          }
-        }
-        if (hour_1 == 12) {
-          if (minute_1 == 0 && second_1 == 0) {
-            this.$message.error("请选择12:01-23:59时间段的时间");
-            this.afterTime = null;
-            return false;
-          }
-        }
+        // if (hour_0 == 12) {
+        //   if (minute_0 == 0 && second_0 == 0) {
+        //     this.$message.error("请选择12:01-23:59时间段的时间");
+        //     this.afterTime = null;
+        //     return false;
+        //   }
+        // }
+        // if (hour_1 == 12) {
+        //   if (minute_1 == 0 && second_1 == 0) {
+        //     this.$message.error("请选择12:01-23:59时间段的时间");
+        //     this.afterTime = null;
+        //     return false;
+        //   }
+        // }
         this.dataForm.afStartTime = this.afterTime[0];
         this.dataForm.afEndTime = this.afterTime[1];
       }
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index e270ce25c..dba68e172 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -412,8 +412,8 @@ export default {
           this.demand = this.$refs.ref_processinfo_add.demand
           this.demand.gridId = this.eventInfoData.gridId
           //需求的属性同事件一样
-          this.eventInfoData.categoryList = []
-          this.eventInfoData.categoryList.push(this.demand.categoryId)
+          // this.eventInfoData.categoryList = []
+          // this.eventInfoData.categoryList.push(this.demand.categoryId)
           console.log('demond', this.demand)
         }
 
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index b8672a240..5490b0cec 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -5,7 +5,7 @@
              :model="formData"
              :rules="dataRule"
              label-width="100px">
-      <el-form-item label="事件分类"
+      <!-- <el-form-item label="事件分类"
                     label-width="150px"
                     prop="categoryId">
         <el-cascader class="cell-width-2"
@@ -16,7 +16,7 @@
                      :props="optionProps"
                      :show-all-levels="false"
                      @change="handleChangeCate"></el-cascader>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="服务内容"
                     label-width="150px"
                     prop="content">
@@ -197,7 +197,7 @@ function iniFmData () {
     serviceLocation: '',//事件地址	
     latitude: '',//	经度	
     longitude: '',//维度	
-    categoryId: ''
+    // categoryId: ''
   };
 }
 export default {
@@ -236,9 +236,9 @@ export default {
     dataRule () {
 
       return {
-        categoryId: [
-          { required: true, message: "请填写事件分类", trigger: "blur" },
-        ],
+        // categoryId: [
+        //   { required: true, message: "请填写事件分类", trigger: "blur" },
+        // ],
         content: [
           { required: true, message: "服务内容不能为空", trigger: "blur" },
         ],
@@ -330,15 +330,15 @@ export default {
       this.formData.demandUserMobile = this.eventDetailCopy.mobile
 
       if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-        this.selCategoryArray = []
-        this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
-        this.selCategoryArray.push(this.eventDetailCopy.categoryId)
-        this.formData.categoryId = this.eventDetailCopy.categoryId
-
-        this.selCateObj = {
-          name: this.eventDetailCopy.categoryName,
-          id: this.eventDetailCopy.categoryId
-        }
+        // this.selCategoryArray = []
+        // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+        // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+        // this.formData.categoryId = this.eventDetailCopy.categoryId
+
+        // this.selCateObj = {
+        //   name: this.eventDetailCopy.categoryName,
+        //   id: this.eventDetailCopy.categoryId
+        // }
       }
 
     } else {
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 893f8c5bb..462110fa1 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -12,7 +12,7 @@
         <span class="router_child">{{orgName}}</span>
       </div>
     </div>
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon"
              src="@/assets/img/shuju/title-tip.png" />
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index e0a9cea6f..2fe8caee8 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -330,7 +330,7 @@
               ></cpt-tb>
 
               <div class="m-pagination" v-if="demand.total > demand.pageSize">
-                <el-pagination
+                <el-pagination hide-on-single-page
                   :current-page="demand.pageNo"
                   :page-size="demand.pageSize"
                   :total="demand.total"
@@ -380,7 +380,7 @@
                   class="m-pagination"
                   v-if="incident.total > incident.pageSize"
                 >
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="incident.pageNo"
                     :page-size="incident.pageSize"
                     :total="incident.total"
@@ -413,7 +413,7 @@
                 </div>
 
                 <div class="m-pagination" v-if="topic.total > topic.pageSize">
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="topic.pageNo"
                     :page-size="topic.pageSize"
                     :total="topic.total"
@@ -462,7 +462,7 @@
                 </div>
 
                 <div class="m-pagination" v-if="point.total > point.pageSize">
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="point.pageNo"
                     :page-size="point.pageSize"
                     :total="point.total"
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index abad7f683..837582511 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -69,7 +69,7 @@
 
         </div>
         <div class="pagination">
-          <el-pagination background
+          <el-pagination hide-on-single-page background
                         layout="prev, pager, next, total"
                         :current-page="pageNo"
                         :page-size="pageSize"
@@ -226,9 +226,9 @@ export default {
   }
 }
 .list_box {
-  width: 96%;
+  width: 100%;
   height: 780px;
-  margin: 20px auto;
+  margin: 0 auto;
 }
 .warning-table {
   height: 640px;
@@ -239,7 +239,7 @@ export default {
   text-align: right;
 }
 .g-bread {
-    padding: 10px 20px;
+    padding: 10px 10px 15px;
     ::v-deep .el-breadcrumb__item {
       font-size: 16px;
       .el-breadcrumb__inner {
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index 8193f9f1d..160afc19d 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -85,7 +85,7 @@
 
       </div>
       <div class="pagination">
-        <el-pagination background
+        <el-pagination hide-on-single-page background
                        layout="prev, pager, next"
                        :current-page="pageNo"
                        :page-size="pageSize"
@@ -223,7 +223,8 @@ export default {
     border-radius: 8px 0 0 8px;
     height: 53px;
     background-color: #01106800;
-    border: 2px solid #0082fb;
+    border: 3px solid #0082fb;
+    border-right: 0;
     padding-left: 70px;
     font-size: 18px;
     font-family: PingFang SC;
diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
index 0d36a46cc..ba5183d6a 100644
--- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
@@ -71,7 +71,7 @@
       </div>
     </div>
     <div class="pagination-record">
-      <el-pagination :current-page="pageNo"
+      <el-pagination hide-on-single-page :current-page="pageNo"
                      :page-size="pageSize"
                      background
                      layout="prev, pager, next"
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5cc619961..f4b1669fb 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <div class="card-title">
         <img src="@/assets/img/shuju/title-tip.png" />
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 1f646b050..293161946 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>多元主体分析</span>
@@ -35,7 +35,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
@@ -695,8 +695,9 @@ export default {
     box-sizing: border-box;
     margin-right: 3px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
 
     ::v-deep .el-input {
@@ -739,14 +740,14 @@ export default {
   border-radius: 50%;
 }
 .card-wr-map {
-  // height: calc(100vh - 120px);
+  // height: calc(988px - 120px);
   text-align: center;
 
   .card-map {
     margin-top: 30px;
     width: 100%;
-    // height: calc(100vh - 285px);
-    height: calc(100vh - 335px);
+    // height: calc(988px - 285px);
+    height: calc(988px - 335px);
     padding-left: 20px;
     .map {
       width: 100%;
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index 7ee8f5f85..050beb36c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index efc340ebf..f2834df4d 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 049037cdb..6d7d9141b 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 35664c135..0128dd051 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -26,32 +26,29 @@
       </div>
 
       <div class="div_data">
-
         <div class="div_tips">
-
-          <div class="div_coverage">
-
-            <div class="coverage_item"
-                 @click="handleClickCoverage(index)"
-                 v-for="(item,index) in coverageTypesList"
-                 :key="index">
-              <img :src="item.select?selImg:noSelImg" />
-              <span>{{item.label}}</span>
+          <cpt-card>
+            <div class="div_coverage">
+
+              <div class="coverage_item"
+                  @click="handleClickCoverage(index)"
+                  v-for="(item,index) in coverageTypesList"
+                  :key="index">
+                <img :src="item.select?selImg:noSelImg" />
+                <span>{{item.label}}</span>
+              </div>
             </div>
-          </div>
-          <div class="div_category">
-            <el-scrollbar style="height:98%">
-
+            <div class="div_category">
               <div v-for="(item,index) in categoryListshow"
-                   :key="index"
-                   class="category_item">
+                    :key="index"
+                    class="category_item">
 
                 <div v-for="(colItem,colIndex) in item"
-                     :key="colIndex"
-                     class="list_item"
-                     @click="handleClickCategory(index,colIndex)">
+                      :key="colIndex"
+                      class="list_item"
+                      @click="handleClickCategory(index,colIndex)">
                   <img :src="colItem.dataIcon"
-                       alt />
+                        alt />
                   <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
 
                   </div>
@@ -59,49 +56,50 @@
                 </div>
 
               </div>
-
-            </el-scrollbar>
-          </div>
+            </div>
+          </cpt-card>
         </div>
 
         <div class="div_info">
-          <div class="div_search_list">
-            <el-input size="mini"
-                      WarningColor='warning'
-                      placeholder="请输入搜索内容"
-                      v-model="search">
-              <i slot="prefix"
-                 class="icon">
-                <img src="../../../../../assets/img/modules/visual/sousuo.png"
-                     alt />
-              </i>
-            </el-input>
-
-            <div class="btn"
-                 @click="handleSearch">搜索</div>
+          <cpt-card>
+            <div class="div_search_list">
+              <el-input size="mini"
+                        WarningColor='warning'
+                        placeholder="请输入搜索内容"
+                        v-model="search">
+                <i slot="prefix"
+                  class="icon">
+                  <img src="../../../../../assets/img/modules/visual/sousuo.png"
+                      alt />
+                </i>
+              </el-input>
+
+              <div class="btn"
+                  @click="handleSearch">搜索</div>
 
-          </div>
-          <div class="m-tb">
+            </div>
+            <div class="m-tb">
 
-            <div class="tb">
-              <cpt-tb :col-list="demand.colList"
-                      :loading="demand.loading"
-                      :header="demand.header"
-                      :list="demand.list"
-                      @handleClickRow="handleClickRow"></cpt-tb>
+              <div class="tb">
+                <cpt-tb :col-list="demand.colList"
+                        :loading="demand.loading"
+                        :header="demand.header"
+                        :list="demand.list"
+                        @handleClickRow="handleClickRow"></cpt-tb>
 
+              </div>
+              <div class="m-pagination">
+                <el-pagination hide-on-single-page :current-page="demand.pageNo"
+                              :page-size="demand.pageSize"
+                              :total="demand.total"
+                              background
+                              layout="prev, pager, next,total"
+                              @current-change="handlePageNoChange_demand">
+                </el-pagination>
+              </div>
             </div>
-            <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
-                             :page-size="demand.pageSize"
-                             :total="demand.total"
-                             background
-                             layout="prev, pager, next,total"
-                             @current-change="handlePageNoChange_demand">
-              </el-pagination>
-            </div>
-          </div>
 
+          </cpt-card>
         </div>
 
       </div>
@@ -638,6 +636,7 @@ const vueGis = {
         'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
         'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
         'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
+        'ep_qt': require('../../../../../assets/img/shuju/fiveLayer/ep_qt.png'),
 
         'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
         'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 86b46c880..6b3ea9c4b 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>居民热议分析</span>
@@ -54,7 +54,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
index 301a60a96..c73db8d08 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
@@ -103,7 +103,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 301a60a96..40467b1f5 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件处理分析</span>
@@ -103,7 +103,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index f3af070c8..59a707c4e 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件分类分析</span>
@@ -90,7 +90,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index b607c082d..b1987c481 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件分类分析</span>
@@ -55,7 +55,7 @@
           </div>
 
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 34cff4b25..8b3dc562f 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -70,7 +70,7 @@
                           :operate="true"
                           @look="handleUnitLook"></screen-table>
             <div class="pagination">
-              <el-pagination :current-page="unitpageNo"
+              <el-pagination hide-on-single-page :current-page="unitpageNo"
                              :page-size="unitpageSize"
                              background
                              layout="prev, pager, next"
@@ -162,7 +162,7 @@
                           :operate="true"
                           @look="handleLook"></screen-table>
             <div class="pagination">
-              <el-pagination :current-page="pageNo"
+              <el-pagination hide-on-single-page :current-page="pageNo"
                              :page-size="pageSize"
                              background
                              layout="prev, pager, next"
@@ -1078,7 +1078,7 @@ export default {
     flex: 1;
   }
   .card-wr:last-child {
-    margin-left: 20px;
+    // margin-left: 20px;
   }
   ::v-deep .table-body {
     overflow: auto;
@@ -1113,6 +1113,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -1120,8 +1122,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
@@ -1305,10 +1308,10 @@ export default {
   }
 }
 .table-h {
-  height: calc(100vh - 630px);
+  height: calc(988px - 630px);
 }
 .calc-h {
-  height: calc(100vh - 240px);
+  height: calc(988px - 240px);
   padding-bottom: 20px;
 }
 .wd50 {
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index 01d721e83..2e9741293 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card class="card-wr">
+    <cpt-card :min-full-screen="true" class="card-wr">
       <div class="card-title">
         <img class="title-icon"
              src="../../../../assets/img/shuju/title-tip.png" />
@@ -54,7 +54,7 @@
         
       </div>
       <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
@@ -358,6 +358,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -365,8 +367,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
@@ -566,6 +569,7 @@ export default {
         display: block;
         width: 100%;
         height: 100%;
+        object-fit: cover;
       }
     }
     .item-user {
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 4ea08dbe4..c70b00eae 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -36,7 +36,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
@@ -605,6 +605,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -654,8 +656,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 534391913..826333519 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
@@ -67,7 +67,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="agePageNo"
                 :page-size="agePageSize"
                 background
@@ -114,7 +114,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
@@ -843,6 +843,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -892,8 +894,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
index be0c958c1..6e3581082 100644
--- a/src/views/modules/visual/communityParty/partyOld.vue
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -56,7 +56,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="agePageNo"
                 :page-size="agePageSize"
                 background
@@ -103,7 +103,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
@@ -854,6 +854,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -903,8 +905,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/cpts/card.vue b/src/views/modules/visual/cpts/card.vue
index 9dcb89713..4516d8b3b 100644
--- a/src/views/modules/visual/cpts/card.vue
+++ b/src/views/modules/visual/cpts/card.vue
@@ -1,15 +1,27 @@
 <template>
   <div class="m-card">
     <div class="card-wrap">
-      <img src="@/assets/img/shuju/card/l-t.png" class="card-corner card-corner-1" />
-      <img src="@/assets/img/shuju/card/r-t.png" class="card-corner card-corner-2" />
-      <img src="@/assets/img/shuju/card/r-b.png" class="card-corner card-corner-3" />
-      <img src="@/assets/img/shuju/card/l-b.png" class="card-corner card-corner-4" />
+      <img
+        src="@/assets/img/shuju/card/l-t.png"
+        class="card-corner card-corner-1"
+      />
+      <img
+        src="@/assets/img/shuju/card/r-t.png"
+        class="card-corner card-corner-2"
+      />
+      <img
+        src="@/assets/img/shuju/card/r-b.png"
+        class="card-corner card-corner-3"
+      />
+      <img
+        src="@/assets/img/shuju/card/l-b.png"
+        class="card-corner card-corner-4"
+      />
       <div class="card-line card-line-t"></div>
       <div class="card-line card-line-l"></div>
       <div class="card-line card-line-r"></div>
       <div class="card-line card-line-b"></div>
-      <div class="card-cnt">
+      <div class="card-cnt" :style="tbStyle">
         <slot></slot>
       </div>
     </div>
@@ -19,17 +31,36 @@
 <script>
 export default {
   name: "shuju-card",
-  data() {
-    return {
 
-    };
-  },
   props: {
+    isFullScreen: {
+      type: Boolean,
+      default: false,
+    },
+    minFullScreen: {
+      type: Boolean,
+      default: false,
+    },
   },
 
-  methods: {
+  data() {
+    return {};
+  },
 
+  computed: {
+    tbStyle() {
+      let style = {};
+      if (this.isFullScreen) {
+        style.height = this.$store.state.fixed1920.height - 180 + "px";
+      }
+      if (this.minFullScreen) {
+        style.minHeight = this.$store.state.fixed1920.height - 180 + "px";
+      }
+      return style;
+    },
   },
+
+  methods: {},
 };
 </script>
 
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 2920ee649..a847ede20 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -1,75 +1,89 @@
 <template>
   <div class="m-table">
-    <table class="table"
-           border="0"
-           cellspacing="0"
-           cellpadding="0">
-      <col :align="item.align"
-           :width="item.width"
-           :key="'col' + index"
-           v-for="(item, index) in colList" />
+    <table class="table" border="0" cellspacing="0" cellpadding="0">
+      <col
+        :align="item.align"
+        :width="item.width"
+        :key="'col' + index"
+        v-for="(item, index) in colList"
+      />
 
       <thead>
         <tr class="table-header">
-          <th class="table-header-th"
-              v-for="item in header"
-              :key="item">
+          <th class="table-header-th" v-for="item in header" :key="item">
             {{ item }}
           </th>
         </tr>
       </thead>
       <tbody class="table-body">
-        <tr class="table-body-tr"
-            v-for="(value, index) in list"
-            :key="index"
-            @click="handleClickRow(index)">
-          <td class="td"
-              v-for="(item, indexs) in value"
-              :key="indexs">
-            <div v-if="typeof item === 'string' || typeof item === 'number'">
+        <tr
+          class="table-body-tr"
+          v-for="(value, index) in list"
+          :key="index"
+          @click="handleClickRow(index)"
+        >
+          <td class="td" v-for="(item, indexs) in value" :key="indexs">
+            <div
+              v-if="typeof item === 'string' || typeof item === 'number'"
+              :title="item"
+            >
               {{ item }}
             </div>
 
-            <div v-if="typeof item === 'object'&& item.type === 'img'">
+            <div v-if="typeof item === 'object' && item.type === 'img'">
               <!-- <span>{{  item.type+  item.src}}</span> -->
-              <img style="width:18px;height:18px"
-                   :src="item.src"
-                   alt="" />
-
+              <img style="width: 18px; height: 18px" :src="item.src" alt="" />
             </div>
-            <div v-if="typeof item === 'object' && item && item.type == 'index'">
-              <img v-if="highlightTop3 && index == 0"
-                   src="@/assets/img/shuju/top/1.png"
-                   alt="" />
-              <img v-else-if="highlightTop3 && index == 1"
-                   src="@/assets/img/shuju/top/2.png"
-                   alt="" />
-              <img v-else-if="highlightTop3 && index == 2"
-                   src="@/assets/img/shuju/top/3.png"
-                   alt="" />
+
+            <div
+              v-if="typeof item === 'object' && item && item.type == 'index'"
+            >
+              <img
+                v-if="highlightTop3 && index == 0"
+                src="@/assets/img/shuju/top/1.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 1"
+                src="@/assets/img/shuju/top/2.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 2"
+                src="@/assets/img/shuju/top/3.png"
+                alt=""
+              />
               <span v-else>{{ index + 1 }}</span>
             </div>
-            <a v-else-if="typeof item === 'object' && item  && item.type == 'operate'"
-               v-for="btn in item.list"
-               :key="'operate' + index + btn"
-               @click="handleClickBtn(index, btn)">{{ btn }}</a>
-            <a v-else-if="typeof item === 'object' && item && item.type == 'people'"
-               @click="handleClickPeople(item)">{{ item.name }}</a>
+
+            <a
+              v-else-if="
+                typeof item === 'object' && item && item.type == 'operate'
+              "
+              v-for="btn in item.list"
+              :key="'operate' + index + btn"
+              @click="handleClickBtn(index, btn)"
+              >{{ btn }}</a
+            >
+            <a
+              v-else-if="
+                typeof item === 'object' && item && item.type == 'people'
+              "
+              @click="handleClickPeople(item)"
+              >{{ item.name }}</a
+            >
           </td>
         </tr>
       </tbody>
     </table>
 
-    <div class="table-status"
-         v-if="loading">
+    <div class="table-status" v-if="loading">
       <screen-loading>加载中</screen-loading>
     </div>
 
-    <div class="table-status"
-         v-if="list.length == 0 && !loading">
+    <div class="table-status" v-if="list.length == 0 && !loading">
       <div class="no-data">
-        <img src="@/assets/img/modules/visual/noData.png"
-             class="no-data-img" />
+        <img src="@/assets/img/modules/visual/noData.png" class="no-data-img" />
       </div>
     </div>
   </div>
@@ -77,7 +91,6 @@
 
 <script>
 import ScreenLoading from "./loading";
-import Vue from "vue";
 
 export default {
   name: "table",
@@ -138,24 +151,24 @@ export default {
       default: false,
     },
   },
-  data () {
+  data() {
     return {};
   },
   watch: {},
 
-  mounted () { },
+  mounted() {},
 
-  created () { },
+  created() {},
 
   methods: {
     //点击某一行
-    handleClickRow (index) {
+    handleClickRow(index) {
       this.$emit("handleClickRow", index);
     },
-    handleClickBtn (index, type) {
+    handleClickBtn(index, type) {
       this.$emit("operate", index, type);
     },
-    handleClickPeople (item) {
+    handleClickPeople(item) {
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people/${item.uid}`,
       });
@@ -180,10 +193,12 @@ export default {
       font-size: 16px;
       font-weight: 400;
       color: #ffffff;
+      line-height: 50px;
 
       &-th {
         text-align: center;
         border: none;
+        font-weight: normal;
         // width: calc(100% / 5);
       }
     }
@@ -191,9 +206,10 @@ export default {
     &-body {
       box-sizing: border-box;
       width: 100%;
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #ffffff;
+      line-height: 40px;
 
       &-tr {
         box-sizing: border-box;
@@ -214,7 +230,7 @@ export default {
           }
 
           a {
-            font-size: 16px;
+            font-size: 18px;
             font-weight: 400;
             color: #e4dc00;
             position: relative;
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index 9e7d4177d..5c0ca936c 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -2,12 +2,14 @@
   <div>
     <div class="m-sizer">
       <span>时间：</span>
-      <el-date-picker v-model="monthId"
-                      type="month"
-                      :clearable="false"
-                      prefix-icon="el-icon-caret-bottom"
-                      placeholder="选择日期"
-                      value-format="yyyyMM">
+      <el-date-picker
+        v-model="monthId"
+        type="month"
+        :clearable="false"
+        prefix-icon="el-icon-caret-bottom"
+        placeholder="选择日期"
+        value-format="yyyyMM"
+      >
       </el-date-picker>
     </div>
 
@@ -19,12 +21,14 @@
             <span>公益达人</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb3.colList"
-                    :loading="tb3.loading"
-                    :header="tb3.header"
-                    :list="tb3.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb3.colList"
+              :loading="tb3.loading"
+              :header="tb3.header"
+              :list="tb3.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -36,12 +40,14 @@
             <span>党员先锋</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb2.colList"
-                    :loading="tb2.loading"
-                    :header="tb2.header"
-                    :list="tb2.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb2.colList"
+              :loading="tb2.loading"
+              :header="tb2.header"
+              :list="tb2.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -53,12 +59,14 @@
             <span>动力网格</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb1.colList"
-                    :loading="tb1.loading"
-                    :header="tb1.header"
-                    :list="tb1.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb1.colList"
+              :loading="tb1.loading"
+              :header="tb1.header"
+              :list="tb1.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -76,7 +84,7 @@ import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
   name: "heart",
-  data () {
+  data() {
     return {
       agencyId: this.$store.state.user.agencyId,
       areaCode: "",
@@ -171,7 +179,13 @@ export default {
 
   props: {},
 
-  computed: {},
+  computed: {
+    tbStyle() {
+      return {
+        height: this.$store.state.fixed1920.height - 260 + "px",
+      };
+    },
+  },
 
   components: {
     cptCard,
@@ -179,33 +193,33 @@ export default {
   },
 
   watch: {
-    monthId () {
+    monthId() {
       this.getApiData();
     },
   },
 
-  async mounted () {
+  async mounted() {
     this.userId = this.uid;
     await nextTick(100);
     this.getApiData();
   },
 
   methods: {
-    handleSearch () { },
+    handleSearch() {},
 
-    async getApiData () {
+    async getApiData() {
       //await this.getAgencyInfo();
       this.getTb1();
       this.getTb2();
       this.getTb3();
     },
 
-    toUserInfo (uid) {
+    toUserInfo(uid) {
       this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
 
     // 获取当前组织信息
-    async getAgencyInfo () {
+    async getAgencyInfo() {
       const { data, code, msg } = await requestPost(
         "/data/report/screen/agency/agencydetail-multic",
         {
@@ -219,7 +233,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb1 () {
+    async getTb1() {
       const { agencyId, areaCode } = this;
 
       const url =
@@ -248,7 +262,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb2 () {
+    async getTb2() {
       const { agencyId, areaCode } = this;
       const url = "/data/report/screen/user/partypointrank";
       let params = {
@@ -279,7 +293,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb3 () {
+    async getTb3() {
       const { agencyId, areaCode } = this;
       const url = "/data/report/screen/user/userpointrank/withoutpartymember";
       let params = {
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 6126199b5..6929b4855 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
@@ -129,7 +129,7 @@
           @look="handleLook"
         ></screen-table>
         <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
@@ -578,12 +578,15 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
+
   .title-icon {
     display: block;
-    width: 46px;
-    height: 34px;
+    // width: 46px;
+    // height: 34px;
     box-sizing: border-box;
-    margin-right: 6px;
+    margin-right: 5px;
   }
   ::v-deep .el-dropdown {
     font-size: 16px;
@@ -629,7 +632,8 @@ export default {
   }
 
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index a5db22cc7..186806dd5 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -627,22 +627,23 @@ export default {
   .card-wr:last-child {
     margin-left: 20px;
   }
-  padding: 25px 21px 15px 24px;
 }
 .card-title {
   display: flex;
   align-items: center;
   cursor: pointer;
   margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
-    width: 36px;
-    height: 29px;
+    // width: 36px;
+    // height: 29px;
     box-sizing: border-box;
-    margin-right: 3px;
+    margin-right: 5px;
   }
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
 
     ::v-deep .el-input {
@@ -782,14 +783,14 @@ export default {
 }
 
 .card-wr-map {
-  // height: calc(100vh - 120px);
+  // height: calc(988px - 120px);
   text-align: center;
 
   .card-map {
     margin-top: 30px;
     width: 100%;
-    // height: calc(100vh - 285px);
-    height: calc(100vh - 335px);
+    // height: calc(988px - 285px);
+    height: calc(988px - 335px);
     padding-left: 20px;
     .map {
       width: 100%;
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
index 9cf8ef066..fac6686cb 100644
--- a/src/views/modules/visual/plugin/power/components/house-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -119,8 +119,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
@@ -138,7 +139,7 @@ export default {
 }
 .dialog-bg {
   width: 100vw;
-  height: 100vh;
+  height: 988px;
   position: fixed;
   left: 0;
   top: 0;
diff --git a/src/views/modules/visual/plugin/power/components/info-dialog.vue b/src/views/modules/visual/plugin/power/components/info-dialog.vue
index eff5c9410..e5d0003dc 100644
--- a/src/views/modules/visual/plugin/power/components/info-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/info-dialog.vue
@@ -90,8 +90,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 0fcc6130f..1d4ad26d2 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -10,15 +10,17 @@
       <div class="title">
         <img src="../../../../../assets/img/shuju/title-tip.png" />
         <span>动力主轴</span>
-        <div class="second-select cascader">
-          <el-cascader  class="customer_cascader"
-                        ref="myCascader"
-                        placeholder="请选择所属组织"
-                        :options="agencytree"
-                        v-model="agencyId"
-                        :show-all-levels="false"
-                        @change="handleChangeAgencytree"
-                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+        <div class="search">
+          <div class="second-select cascader">
+            <el-cascader  class="customer_cascader"
+                          ref="myCascader"
+                          placeholder="请选择所属组织"
+                          :options="agencytree"
+                          v-model="agencyId"
+                          :show-all-levels="false"
+                          @change="handleChangeAgencytree"
+                          :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+          </div>
         </div>
         <!-- <div class="second-select ">
 
@@ -448,6 +450,11 @@ export default {
   src="@/assets/scss/modules/visual/warning.scss"
   scoped
 ></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/search_1.scss"
+  scoped
+></style>
 <style lang="scss" scoped>
 .second-select {
     margin: 0 10px 0 40px !important;
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index b0e0df0d6..bc25aff0b 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -1,45 +1,56 @@
 <template>
-  <div class="warning-table">
-    <div class="table">
-      <div class="table-header">
-        <div
-          class="table-header-th"
-          v-for="(item, index) in headerList"
-          :key="item.title"
-          :style="headerStyle[index]"
-        >
-          {{ item.title }}
+  <div>
+    <!-- <div class="warning-table">
+      <div class="table">
+        <div class="table-header">
+          <div
+            class="table-header-th"
+            v-for="(item, index) in headerList"
+            :key="item.title"
+            :style="headerStyle[index]"
+          >
+            {{ item.title }}
+          </div>
         </div>
-      </div>
-      <div class="table-body">
-        <div
-          class="table-body-tr"
-          v-for="(value, index) in tableData"
-          :key="index"
-        >
+        <div class="table-body">
           <div
-            class="td"
-            v-for="(item, indexs) in value"
-            :key="indexs"
-            :style="tableContentStyle[indexs]"
+            class="table-body-tr"
+            v-for="(value, index) in tableData"
+            :key="index"
           >
-            <div v-if="item.type && item.type == 'btn'">
-              <a @click="handleClickBtn(item)">{{ item.name }}</a>
+            <div
+              class="td"
+              v-for="(item, indexs) in value"
+              :key="indexs"
+              :style="tableContentStyle[indexs]"
+            >
+              <div v-if="item.type && item.type == 'btn'">
+                <a @click="handleClickBtn(item)">{{ item.name }}</a>
+              </div>
+              <span v-else>{{ item }}</span>
             </div>
-            <span v-else>{{ item }}</span>
           </div>
-        </div>
-        <screen-loading v-if="visibleLoading">加载中</screen-loading>
-        <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
-          <img
-            src="../../../../../../assets/img/modules/visual/noData.png"
-            alt=""
-            srcset=""
-            class="no-data-img"
-          />
+          <screen-loading v-if="visibleLoading">加载中</screen-loading>
+          <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
+            <img
+              src="../../../../../../assets/img/modules/visual/noData.png"
+              alt=""
+              srcset=""
+              class="no-data-img"
+            />
+          </div>
         </div>
       </div>
-    </div>
+    </div> -->
+
+    <cpt-tb
+      :highlight-top3="true"
+      :col-list="tableContentStyle"
+      :loading="visibleLoading"
+      :header="headerList.map((item) => item.title)"
+      :list="cptTbData"
+      @operate="handleOperate"
+    ></cpt-tb>
 
     <people-list
       v-if="showedPeopleList && buildingId"
@@ -53,14 +64,15 @@
 
 <script>
 import ScreenLoading from "../screen-loading/index";
-import Vue from "vue";
 import peopleList from "./people-list";
+import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
   name: "warning-table",
   components: {
     ScreenLoading,
     peopleList,
+    cptTb,
   },
   props: {
     headerList: {
@@ -133,22 +145,8 @@ export default {
       type: Boolean,
       default: true,
     },
-    // // 表格平均分的份数
-    // ava: {
-    //   type: Number,
-    //   default: 8
-    // },
-    // // 表头高度--默认占比10%
-    // headerHeightAva: {
-    //   type: String,
-    //   default: '10%'
-    // },
-    // // 表格主体平均分成的份数
-    // tableContentAva: {
-    //   type: Number,
-    //   default: 5
-    // },
   },
+
   data() {
     return {
       // 显示人员详情
@@ -158,6 +156,22 @@ export default {
       gridName: "",
     };
   },
+
+  computed: {
+    cptTbData() {
+      return this.tableData.map((item) => {
+        return item.map((subitem) => {
+          if (subitem.type && subitem.type == "btn") {
+            subitem.type = "operate";
+            subitem.list = [subitem.name];
+          }
+          console.log(subitem);
+          return subitem;
+        });
+      });
+    },
+  },
+
   watch: {},
 
   mounted() {},
@@ -165,6 +179,11 @@ export default {
   created() {},
 
   methods: {
+    handleOperate(index) {
+      let item = this.tableData[index];
+      this.handleClickBtn(item[item.length - 1]);
+    },
+
     handleClickBtn(item) {
       this.showedPeopleList = true;
       this.buildingId = item.buildingId;
diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
index 0cc25b6b9..742e13c72 100644
--- a/src/views/modules/visual/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -22,7 +22,7 @@
             </div>
 
             <div class="m-pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 6be5ddbcd..310e68873 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="warning-box-top">
         <div class="top-item" v-for="(item, index) in warningList" :key="index">
           <div class="top-item-img">
@@ -53,7 +53,7 @@
           :visibleLoading="visibleLoading"
         ></screen-table>
         <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
diff --git a/src/views/modules/warning/index.vue b/src/views/modules/warning/index.vue
index aa668dc81..bb693617d 100644
--- a/src/views/modules/warning/index.vue
+++ b/src/views/modules/warning/index.vue
@@ -52,7 +52,7 @@
         :visibleLoading="visibleLoading"
       ></screen-table>
       <div class="pagination">
-        <el-pagination
+        <el-pagination hide-on-single-page
           :current-page="pageNo"
           :page-size="pageSize"
           background