diff --git a/src/App.vue b/src/App.vue
index c0bb9fb65..69aeb1c26 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -180,8 +180,16 @@ export default {
   }
 }
 
-/* 列表-操作栏-更多的poppover样式 */
+/* 操作栏-更多的poppover样式 */
 .el-popover.btn-popper {
+  min-width: 150px !important;
+  margin-top: 5px !important;
+  padding: 6px !important;
+  background-color: rgb(247, 250, 253);
+}
+
+/* 列表-操作栏-更多的poppover样式 */
+.el-popover.btn-popper-table {
   min-width: 80px !important;
   margin-top: 5px !important;
   padding: 6px !important;
@@ -199,19 +207,18 @@ export default {
   // display: none;
   width: 8px;
   height: 8px;
-  background-color: #EBEEF5;
+  background-color: #ebeef5;
 }
 ::-webkit-scrollbar-thumb {
-  box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-  -webkit-box-shadow: inset 0 0  6px rgba(243, 236, 236, 0.3);
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: inset 0 0 6px rgba(243, 236, 236, 0.3);
   background-color: #ccc;
   border-radius: 8px;
 }
 ::-webkit-scrollbar-track {
-  box-shadow: inset 0 0 6px rgba(0,0,0, .2);
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.2);
   /*滚动条的轨道*/
   border-radius: 8px;
   background: rgba(255, 255, 255, 1);
 }
-
 </style>
diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 7a60a21be..ad6d1f080 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -1,3 +1,121 @@
+//新版
+
+//紫色
+.diy-button--purple {
+  background: linear-gradient(0deg, #7A58D1 0%, #8C91FF 100%) !important;
+  // border-radius: 3px !important;
+  color: #fff !important;
+  font-size: 14px !important;
+  border-color: #8C91FF !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+}
+
+//绿色
+.diy-button--green {
+  background:  linear-gradient(0deg, #33A8A6 0%, #29D2CE 100%) !important;
+  border-color: #29D2CE !important;
+  font-size: 14px !important;
+  color: #fff !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+
+ 
+}
+
+//蓝色
+.diy-button--blue {
+  background:  linear-gradient(0deg, #0062BB 0%, #0081EC 100%) !important;
+  border-color: #0081EC !important;
+  font-size: 14px !important;
+  color: #fff !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+  
+  
+}
+
+//黄色
+.diy-button--yellow {
+  background:  linear-gradient(0deg, #FAA700 0%, #FFBF28 100%) !important;
+  color: #fff !important;
+  font-size: 14px !important;
+  color: #fff !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+}
+
+//橙色
+.diy-button--orange {
+  background:  linear-gradient(0deg, #EE6436 1%, #FC8C6B 100%) !important;
+  border-color: #FC8C6B !important;
+  font-size: 14px !important;
+  color: #fff !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+  
+  
+}
+//红色
+.diy-button--red {
+  background:  linear-gradient(0deg, #DB3B3B 1%, #FF8080 100%) !important;
+  border-color: #FF8080 !important;
+  font-size: 14px !important;
+  color: #fff !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+  
+  
+}
+//灰色
+.diy-button--gray {
+  background:  linear-gradient(0deg, #A6C3D0, #FFFFFF) !important;
+  border-color: #A6C3D0 !important;
+  color: #002765 !important;
+  font-size: 14px !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+ 
+}
+//白色
+.diy-button--white {
+  background-color:#fff!important;
+  border: 1px solid #3D77FF !important;
+  color: #0153B2 !important;
+  font-size: 14px !important;
+  min-width: 83px !important;
+  height: 29px !important;
+  line-height: 2px !important;
+  padding:0 8px  !important;
+}
+  
+//操作栏更多
+.diy-button--other {
+  text-decoration: underline !important;
+  color: #002765 !important;
+  font-size: 14px !important;
+  // min-width: 83px !important;
+  // height: 29px !important;
+  // line-height: 2px !important;
+  // padding:0 8px  !important;
+  
+}
+
+//旧版--------弃用
 //查询、确定
 .diy-button--search {
   color: #fff !important;
diff --git a/src/assets/scss/common1.scss b/src/assets/scss/common1.scss
new file mode 100644
index 000000000..07c632590
--- /dev/null
+++ b/src/assets/scss/common1.scss
@@ -0,0 +1,853 @@
+*,
+*:before,
+*:after {
+  box-sizing: border-box;
+}
+body {
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial,
+    sans-serif;
+  font-size: $--font-size-base;
+  line-height: $base--line-height;
+  color: $--color-text-primary;
+  // background-color: #fff;
+}
+a {
+  color: mix(#fff, $--color-primary, 20%);
+  text-decoration: none;
+  &:focus,
+  &:hover {
+    color: $--color-primary;
+    text-decoration: underline;
+  }
+}
+img {
+  vertical-align: middle;
+}
+:focus,
+:hover {
+  outline: none;
+}
+
+/* Utils
+------------------------------ */
+[v-cloak] {
+  display: none;
+}
+.clearfix:before,
+.clearfix:after {
+  content: " ";
+  display: table;
+}
+.clearfix:after {
+  clear: both;
+}
+.fr {
+  float: right !important;
+}
+.fl {
+  float: left !important;
+}
+.fi {
+  float: initial !important;
+}
+.m-auto {
+  margin: auto !important;
+}
+.mt-auto {
+  margin-top: auto !important;
+}
+.mr-auto {
+  margin-right: auto !important;
+}
+.mb-auto {
+  margin-bottom: auto !important;
+}
+.ml-auto {
+  margin-left: auto !important;
+}
+.text-right {
+  text-align: right !important;
+}
+.text-center {
+  text-align: center !important;
+}
+.text-left {
+  text-align: left !important;
+}
+.w-percent-100 {
+  width: 100% !important;
+}
+.base-line-height {
+  line-height: $base--line-height !important;
+}
+
+/* Reset element-ui
+------------------------------ */
+.aui-wrapper {
+  .el-card + .el-card {
+    margin-top: 15px;
+  }
+  .el-input__prefix .el-input__icon {
+    display: inline-block;
+    vertical-align: middle;
+  }
+  .el-date-editor .el-range-separator {
+    width: 8%;
+  }
+  .el-table th {
+    color: $--color-text-primary;
+    background-color: $--background-color-base;
+  }
+  .el-pagination {
+    margin-top: 15px;
+    text-align: right;
+  }
+  .el-table__expand-icon {
+    display: inline-block;
+    width: 14px;
+    vertical-align: middle;
+    margin-right: 5px;
+  }
+}
+
+/* Common
+------------------------------ */
+// 图标
+.icon-svg {
+  width: 1em;
+  height: 1em;
+  fill: currentColor;
+  vertical-align: middle;
+  overflow: hidden;
+}
+// 卡片
+.aui-card--fill .el-card__header {
+  height: $content--card-header-height;
+  line-height: $content--card-header-height - 36px;
+}
+.aui-card__title {
+  font-size: 16px;
+}
+// 表单
+.aui-form__label-icon {
+  display: inline-block;
+  margin: 0 3px;
+  vertical-align: middle;
+  font-size: 18px;
+  color: $--color-text-secondary;
+}
+// 按钮
+.aui-button--dashed {
+  border-style: dashed;
+  &:focus,
+  &:hover {
+    background-color: transparent;
+  }
+  &-add {
+    > span > *[class*="el-icon-"],
+    > span > *[class*="icon"] {
+      vertical-align: middle;
+      font-size: 18px;
+      margin-right: 5px;
+    }
+  }
+}
+// 主题工具
+.aui-theme-tools {
+  position: fixed;
+  top: $navbar--height + $content--tabs-header-height + 15px;
+  right: -210px;
+  bottom: 0;
+  z-index: 1010;
+  width: 210px;
+  transition: right 0.3s;
+  &--open {
+    right: 0;
+  }
+  &__toggle {
+    position: absolute;
+    top: 80px;
+    left: -40px;
+    width: 40px;
+    padding: 10px 8px;
+    text-align: center;
+    font-size: 20px;
+    border-right: 0;
+    border-radius: $--border-radius-base 0 0 $--border-radius-base;
+    color: #fff;
+    background-color: $--color-primary;
+    cursor: pointer;
+  }
+  &__content {
+    height: 100%;
+    padding: 5px 20px 20px;
+    border: 1px solid $--border-color-lighter;
+    border-radius: $--border-radius-base 0 0 $--border-radius-base;
+    background-color: #fff;
+    .el-radio {
+      display: block;
+      margin-left: 0 !important;
+      line-height: 28px;
+    }
+  }
+  &__item + &__item {
+    margin-top: 15px;
+    border-top: 1px solid $--border-color-lighter;
+  }
+}
+
+/* Layout
+------------------------------ */
+.aui-wrapper {
+  position: relative;
+  padding-top: $navbar--height;
+  &.z-iframe {
+    padding-top: 0;
+    .aui-content--tabs {
+      padding-top: 0;
+    }
+  }
+}
+
+/* Sidebar fold
+------------------------------ */
+.aui-sidebar--fold {
+  .aui-navbar {
+    &__header,
+    &__brand {
+      width: $sidebar--width-fold;
+    }
+    &__brand {
+      &-lg {
+        display: none;
+      }
+      &-mini {
+        display: inline-block;
+      }
+    }
+    &__icon-menu--switch {
+      transform: rotateZ(180deg);
+    }
+  }
+  .aui-sidebar {
+    &__inner {
+      width: $sidebar--width-fold + 20px;
+    }
+    &,
+    &__menu {
+      width: $sidebar--width-fold;
+    }
+    &__menu > li > .el-submenu__title {
+      text-align: center;
+    }
+    &__menu-icon {
+      margin-right: 0;
+      font-size: 18px;
+    }
+  }
+  .aui-content {
+    &__wrapper {
+      margin-left: $sidebar--width-fold;
+    }
+    &--tabs > .el-tabs > .el-tabs__header {
+      left: $sidebar--width-fold;
+    }
+  }
+}
+
+.aui-sidebar--noside {
+  .aui-sidebar {
+    display: none !important;
+  }
+  .aui-content {
+    &__wrapper {
+      margin-left: 0 !important;
+    }
+    &--tabs > .el-tabs > .el-tabs__header {
+      left: 0 !important;
+    }
+  }
+}
+
+/* Navbar
+------------------------------ */
+.aui-navbar {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  display: flex;
+  align-items: stretch;
+  height: $navbar--height;
+  background-color: $--color-primary;
+  box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05);
+  &--colorful {
+    .aui-navbar__body {
+      background-color: transparent;
+    }
+    .aui-navbar__menu {
+      > .el-menu-item,
+      > .el-submenu > .el-submenu__title {
+        color: #fff;
+        &:focus,
+        &:hover {
+          color: #fff;
+          background-color: mix(#000, $--color-primary, 15%);
+        }
+      }
+      > .el-menu-item.is-active,
+      > .el-submenu.is-active > .el-submenu__title {
+        color: #fff;
+        &:focus,
+        &:hover {
+          color: #fff;
+        }
+      }
+      .el-menu-item i,
+      .el-submenu__title i,
+      .el-menu-item svg,
+      .el-submenu__title svg,
+      .el-menu-item .el-dropdown {
+        color: #fff !important;
+      }
+      .el-button {
+        color: #fff;
+        background-color: transparent;
+      }
+    }
+    .aui-navbar__search {
+      &-txt {
+        .el-input__inner {
+          color: #fff;
+          border-color: #fff;
+          &::-webkit-input-placeholder {
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+  &__header {
+    position: relative;
+    width: $sidebar--width;
+    height: $navbar--height;
+    transition: width 0.3s;
+  }
+  &__brand {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 5px;
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    font-size: 20px;
+    text-transform: uppercase;
+    white-space: nowrap;
+    color: #fff;
+    overflow: hidden;
+    transition: width 0.3s;
+    &-lg,
+    &-mini {
+      max-width: 100%;
+      color: #fff;
+      cursor: pointer;
+      &:focus,
+      &:hover {
+        color: #fff;
+        text-decoration: none;
+      }
+    }
+    &-mini {
+      display: none;
+    }
+  }
+  &__body {
+    position: relative;
+    display: flex;
+    flex: 1;
+    background-color: #fff;
+    overflow: hidden;
+  }
+  &__menu {
+    background-color: transparent;
+    border-bottom: 0 !important;
+    a:focus,
+    a:hover {
+      text-decoration: none;
+    }
+    &.z-div {
+      .el-menu-item {
+        position: relative;
+
+        &:last-child {
+          &::after {
+            display: none;
+          }
+        }
+
+        &::after {
+          position: absolute;
+          content: "";
+          right: 0;
+          top: 0;
+          bottom: 0;
+          margin: auto 0;
+          width: 1px;
+          height: 18px;
+          background-color: rgba(#ffffff, 0.6);
+        }
+      }
+    }
+    .el-menu-item,
+    .el-submenu > .el-submenu__title {
+      height: $navbar--height;
+      padding: 0 15px;
+      line-height: $navbar--height;
+      border-color: transparent !important;
+    }
+    .el-menu-item.is-active,
+    .el-submenu.is-active > .el-submenu__title {
+      color: $--color-text-secondary;
+      &:focus,
+      &:hover {
+        color: $--color-text-primary;
+      }
+    }
+    .el-menu-item {
+      &:focus,
+      &:hover {
+        .aui-navbar__icon-menu {
+          color: $--color-text-primary;
+        }
+        .el-dropdown {
+          color: $--color-text-primary;
+          .el-icon-arrow-down {
+            transform: rotateZ(180deg);
+          }
+        }
+      }
+      * {
+        vertical-align: initial;
+      }
+      .aui-navbar__icon-menu {
+        vertical-align: middle;
+        font-size: 16px;
+      }
+      .el-dropdown {
+        color: $--color-text-secondary;
+        .el-icon-arrow-down {
+          width: auto;
+          font-size: 12px;
+          margin: 0 0 0 5px;
+          transition: transform 0.3s;
+        }
+      }
+    }
+    .el-badge {
+      display: inline;
+      z-index: 2;
+      &__content {
+        line-height: 16px;
+      }
+    }
+  }
+  &__search {
+    > *[class*="el-icon-"],
+    > *[class*="icon"] {
+      display: inline-block;
+      vertical-align: middle;
+    }
+    &-txt {
+      width: 0;
+      transition: width 0.3s, margin-left 0.3s;
+      &.is-show {
+        width: 210px;
+        margin-left: 8px;
+      }
+      .el-input__inner {
+        height: $navbar--height - 20px;
+        padding: 0;
+        line-height: $navbar--height - 20px;
+        border-color: $--color-text-primary;
+        border-top: 0;
+        border-right: 0;
+        border-left: 0;
+        border-radius: 0;
+        background: transparent;
+      }
+    }
+  }
+  &__avatar {
+    .el-dropdown-link {
+      > img {
+        width: 36px;
+        height: auto;
+        margin-right: 5px;
+        border-radius: 100%;
+        vertical-align: middle;
+      }
+    }
+  }
+}
+
+/* Sidebar
+------------------------------ */
+.aui-sidebar {
+  position: fixed;
+  top: $navbar--height;
+  left: 0;
+  bottom: 0;
+  z-index: 1020;
+  width: $sidebar--width;
+  background-color: #fff;
+  box-shadow: 1px 0 2px 0 rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+  transition: width 0.3s;
+  &--dark {
+    background-color: $sidebar--background-color-dark;
+    .aui-sidebar__menu,
+    > .el-menu--popup {
+      background-color: $sidebar--background-color-dark;
+      .el-menu-item,
+      .el-submenu > .el-submenu__title {
+        color: $sidebar--text-color-dark;
+        &:focus,
+        &:hover {
+          color: mix(#fff, $sidebar--text-color-dark, 50%);
+          background-color: mix(#fff, $sidebar--background-color-dark, 2.5%);
+        }
+      }
+      .el-menu,
+      .el-submenu.is-opened {
+        background-color: mix(#000, $sidebar--background-color-dark, 15%);
+      }
+      .el-menu-item.is-active,
+      .el-submenu.is-active > .el-submenu__title {
+        color: mix(#fff, $sidebar--text-color-dark, 80%);
+      }
+    }
+  }
+  &__inner {
+    position: relative;
+    z-index: 1;
+    width: $sidebar--width + 20px;
+    height: 100%;
+    padding-bottom: 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    transition: width 0.3s;
+  }
+  &__menu {
+    width: $sidebar--width;
+    border-right: 0;
+    transition: width 0.3s;
+    .el-menu-item,
+    .el-submenu__title {
+      height: $sidebar--menu-item-height;
+      line-height: $sidebar--menu-item-height;
+    }
+  }
+  &__menu-icon {
+    display: inline-block;
+    vertical-align: middle;
+    width: 24px !important;
+    margin-right: 5px;
+    text-align: center;
+    font-size: 16px;
+    color: inherit !important;
+    transition: font-size 0.3s;
+  }
+}
+
+/* Content
+------------------------------ */
+.aui-content {
+  position: relative;
+  padding: $content--padding;
+  // min-height: calc(100vh - #{$navbar--height});
+  &__wrapper {
+    position: relative;
+    margin-left: $sidebar--width;
+    min-height: calc(100vh - #{$navbar--height});
+    background-color: $content--background-color;
+    transition: margin-left 0.3s;
+  }
+  > .aui-card--fill > .el-card__body {
+    min-height: calc(#{$content--fill-height} - 2px);
+  }
+  > .aui-card--fill > .el-card__header + .el-card__body {
+    min-height: calc(#{$content--fill-height} - #{$content--card-header-height} - 2px);
+  }
+  &--tabs {
+    padding: $content--tabs-header-height 0 0;
+  }
+  &--tabs-tools {
+    position: fixed;
+    top: $navbar--height;
+    right: 0;
+    z-index: 931;
+    min-width: $content--tabs-header-height;
+    height: $content--tabs-header-height;
+    padding: 0 12px;
+    text-align: center;
+    font-size: 16px;
+    line-height: $content--tabs-header-height;
+    background-color: $--background-color-base;
+    cursor: pointer;
+  }
+  &--tabs-icon-nav {
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 16px;
+  }
+  > .el-tabs {
+    > .el-tabs__header {
+      position: fixed;
+      top: $navbar--height;
+      left: $sidebar--width;
+      right: 0;
+      z-index: 930;
+      padding: 0 55px 0 15px;
+      margin: 0;
+      box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+      background-color: #fff;
+      transition: left 0.3s;
+      > .el-tabs__nav-wrap {
+        margin-bottom: 0;
+        &:after {
+          display: none;
+        }
+        > .el-tabs__nav-next,
+        > .el-tabs__nav-prev {
+          line-height: $content--tabs-header-height;
+        }
+        > .el-tabs__nav-scroll > .el-tabs__nav {
+          & > .el-tabs__active-bar {
+            display: none;
+          }
+          & > .el-tabs__item {
+            height: $content--tabs-header-height;
+            padding: 0 15px;
+            line-height: $content--tabs-header-height;
+            border: 0;
+            color: $--color-text-regular;
+            &:focus,
+            &:hover,
+            &.is-active {
+              color: $--color-text-primary;
+              background-color: $--background-color-base;
+              &:after {
+                display: block;
+              }
+              > .el-icon-close {
+                color: $--color-text-primary;
+              }
+            }
+            &:after {
+              display: none;
+              position: absolute;
+              bottom: 0;
+              left: 0;
+              content: "";
+              width: 100%;
+              height: 2px;
+              background-color: $--color-primary;
+            }
+            + .el-tabs__item {
+              margin-left: 1px;
+            }
+            > .el-icon-close {
+              width: 14px;
+              margin-left: 15px;
+              color: $--color-text-secondary;
+            }
+            > i.icon {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 18px;
+            }
+          }
+        }
+      }
+    }
+    > .el-tabs__content {
+      padding: $content--padding;
+      .el-loading-mask {
+        z-index: 830;
+      }
+      > .el-tab-pane {
+        min-height: calc(#{$content--fill-height-tabs});
+        > .aui-card--fill > .el-card__body {
+          min-height: calc(#{$content--fill-height-tabs} - 2px);
+        }
+        > .aui-card--fill > .el-card__header + .el-card__body {
+          min-height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
+        }
+        &.is-iframe {
+          height: calc(#{$content--fill-height-tabs} + #{$content--padding * 2});
+          margin: -$content--padding;
+          min-height: auto;
+          > .aui-card--fill {
+            background-color: transparent;
+          }
+          > .aui-card--fill > .el-card__header {
+            background-color: #fff;
+          }
+          > .aui-card--fill > .el-card__body {
+            height: calc(#{$content--fill-height-tabs} - 2px);
+            margin: $content--padding;
+            min-height: auto;
+            border: $--border-base;
+            border-color: $--border-color-lighter;
+            border-radius: $--border-radius-base;
+            background-color: #fff;
+          }
+          > .aui-card--fill > .el-card__header + .el-card__body {
+            height: calc(#{$content--fill-height-tabs} - #{$content--card-header-height} - 2px);
+          }
+        }
+      }
+    }
+  }
+  // quill富文本编辑器
+  .ql-toolbar {
+    line-height: 20px;
+    &.ql-snow {
+      border-color: $--border-color-base;
+    }
+    .ql-formats {
+      margin: 0 5px;
+    }
+  }
+  .ql-container {
+    height: 150px;
+    &.ql-snow {
+      border-color: $--border-color-base;
+    }
+  }
+}
+
+.el-loading-mask {
+  z-index: 5001 !important;
+}
+
+/* Page
+------------------------------ */
+*[class*="aui-page__"] {
+  padding-top: 0;
+  .aui-content {
+    min-height: auto;
+    &__wrapper {
+      min-height: 100vh;
+      margin-left: 0;
+    }
+    > .aui-card--fill > .el-card__body {
+      min-height: calc(100vh - #{$content--padding * 2} - 2px);
+    }
+    > .aui-card--fill > .el-card__header + .el-card__body {
+      min-height: calc(100vh - #{$content--padding * 2} - #{$content--card-header-height} - 2px);
+    }
+  }
+}
+
+.el-button--green {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+.el-button--green:hover {
+  color: #fff;
+  background-color: #05b1b4;
+  border-color: #05b1b4;
+}
+.el-button--green:focus {
+  color: #fff;
+  background-color: #22c1c3;
+  border-color: #22c1c3;
+}
+
+.el-button--yellow:hover {
+  color: #fff;
+  background-color: #fa9200;
+  border-color: #fa9200;
+}
+.el-button--yellow:focus {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--yellow {
+  color: #fff;
+  background-color: #feb349;
+  border-color: #feb349;
+}
+.el-button--blue:focus {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--blue:hover {
+  color: #fff;
+  background-color: #0083fd;
+  border-color: #0083fd;
+}
+.el-button--blue {
+  color: #fff;
+  background-color: #2195fe;
+  border-color: #2195fe;
+}
+.el-button--red:focus {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
+.el-button--red:hover {
+  color: #fff;
+  background-color: #fd341e;
+  border-color: #fd341e;
+}
+.el-button--red {
+  color: #fff;
+  background-color: #fe6252;
+  border-color: #fe6252;
+}
+
+// 修改表格不换行的问题
+div.el-table div.cell {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+input[type="number"] {
+  -moz-appearance: textfield;
+}
+
+// 默认输入框placeholder样式
+html .el-input.is-disabled .el-input__inner,
+html .el-textarea.is-disabled textarea.el-textarea__inner {
+  color: #333;
+  background-color: rgba(#000, 0.01);
+  border-color: rgba(#000, 0.02);
+  resize: none;
+  &::placeholder {
+    // color: rgba(#fff, 0);
+  }
+}
+html .el-checkbox.is-disabled.is-checked .el-checkbox__label {
+  color: #333;
+}
+html .el-form-item__label {
+  &::after {
+    content: " :";
+    display: inline;
+    color: #333;
+  }
+}
diff --git a/src/assets/scss/modules/visual/communityManage.scss b/src/assets/scss/modules/visual/communityManage.scss
index a7a7499a1..8c8fbb1a0 100644
--- a/src/assets/scss/modules/visual/communityManage.scss
+++ b/src/assets/scss/modules/visual/communityManage.scss
@@ -50,11 +50,22 @@
 .div_btn {
   display: flex;
   margin-top: 10px;
+  justify-content: space-between;
 
-  .btn_upload {
-    margin-left: 10px;
+  .div_btn_left{
     display: flex;
+
+    .btn_upload {
+      margin-left: 10px;
+      display: flex;
+    }
   }
+
+  .div_btn_right{
+    
+  }
+
+ 
 }
 
 .el-row {
diff --git a/src/main.js b/src/main.js
index a5f04b0b1..f5f3634b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import Vue from "vue";
 import Element from "element-ui";
-import Mint from "mint-ui";
-import "mint-ui/lib/style.css";
+// import Mint from "mint-ui";
+// import "mint-ui/lib/style.css";
 
 import App from "@/App";
 import i18n from "@/i18n";
@@ -60,7 +60,7 @@ Vue.config.productionTip = false;
 // Vue.use(renProcessRunning);
 // Vue.use(renProcessDetail);
 // Vue.use(Element);
-Vue.use(Mint);
+// Vue.use(Mint);
 
 Vue.use(Element, {
   size: "default",
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 4507abb30..25cda09c0 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -190,11 +190,11 @@
 
             <el-button style="margin-left:30px"
                        size="small"
-                       class="diy-button--search"
+                       class="diy-button--blue"
                        @click="handleSearch">查询</el-button>
             <el-button style="margin-left:10px"
                        size="small"
-                       class="diy-button--reset"
+                       class="diy-button--gray"
                        @click="resetSearch">重置</el-button>
           </div>
         </el-form>
@@ -775,13 +775,6 @@ export default {
   color: #2195fe;
 }
 </style>
-<style lang="scss" scoped>
-.div_tree {
-  /deep/ .el-scrollbar__wrap {
-    overflow-x: hidden !important;
-  }
-}
-</style>
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManage.scss";
@@ -794,17 +787,46 @@ export default {
 }
 .scrollar {
   margin-top: 10px;
+  /deep/
+    .el-tree--highlight-current
+    .el-tree-node.is-current
+    > .el-tree-node__content {
+    background-color: #e1ecff;
+    border-radius: 3px;
+  }
+
+  /deep/ .el-tree-node:focus > .el-tree-node__content {
+    color: #0043c8;
+  }
+  /deep/ .el-tree-node__expand-icon {
+    color: #0043c8;
+    border: 1px solid #e1ecff;
+    background-color: #e1ecff;
+    padding: 0px;
+    margin-right: 8px;
+    font-size: 9px;
+  }
 }
 
 .div_tree {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
+  /deep/ .el-input--medium .el-input__inner {
+    height: 27px;
+    border-radius: 0;
+  }
   flex: 0 0 280px;
-  background-color: #ffffff;
-  border-radius: 5px;
-  padding: 10px;
+  background-color: #f6f6f6;
+  border: 1px solid #d3dce6;
+  // border-radius: 5px;
+  padding: 19px 15px;
   overflow-y: hidden;
 }
 .filter_tree {
   overflow-x: auto;
+  background-color: #f6f6f6;
+  margin-top: 5px;
 }
 
 // .div_table {
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 252ee6529..776657d98 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -2,105 +2,138 @@
   <div>
 
     <div class="div_btn">
-      <el-button v-if="showYhymInfo && customerId!=='1535072605621841922'"
-                 style=""
-                 class="diy-button--reset"
-                 size="small"
-                 :loading="yhymLoading"
-                 @click="handleYhymInfo">补全一房一码信息</el-button>
-      <el-button v-if="showYhymInfo && customerId!=='1535072605621841922'"
-                 style=""
-                 class="diy-button--export"
-                 size="small"
-                 :loading="xcxmLoading"
-                 @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
-      <el-button style=""
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增小区</el-button>
 
-      <div class="btn_upload"
-           v-if="showImportBtn">
+      <div class="div_btn_left">
         <el-button style=""
-                   class="diy-button--export"
                    size="small"
-                   @click="handleExportModule('community')">下载小区模板</el-button>
-
-        <el-upload :headers="$getElUploadHeaders()"
-                   ref="upload_community"
-                   style=""
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'community')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'community')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入小区数据</el-button>
-        </el-upload>
-
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
+                   class="diy-button--purple"
+                   @click="handleAdd">新增小区</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--green"
                    size="small"
-                   @click="handleExportModule('building')">下载楼栋模板</el-button>
-
-        <el-upload :headers="$getElUploadHeaders()"
-                   style=""
-                   ref="upload_building"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'building')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入楼栋数据</el-button>
-        </el-upload>
-        <el-button style=";margin-left:10px"
-                   class="diy-button--export"
+                   @click="handleExportOpen">导出</el-button>
+        <div class="btn_upload"
+             v-if="showImportBtn">
+
+          <el-upload :headers="$getElUploadHeaders()"
+                     ref="upload_community"
+                     style=""
+                     :multiple='false'
+                     :show-file-list='false'
+                     :before-upload="((file)=>{beforeUpload(file, 'community')})"
+                     action=""
+                     accept=".xls,.xlsx"
+                     :http-request="(()=>{uploadFile( 'community')})">
+            <el-button size="small"
+                       class="diy-button--blue">导入小区数据</el-button>
+          </el-upload>
+
+          <el-upload :headers="$getElUploadHeaders()"
+                     style=""
+                     ref="upload_building"
+                     :multiple='false'
+                     :show-file-list='false'
+                     :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                     action=""
+                     accept=".xls,.xlsx"
+                     :http-request="(()=>{uploadFile( 'building')})">
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--yellow">导入楼栋数据</el-button>
+          </el-upload>
+
+          <el-upload :headers="$getElUploadHeaders()"
+                     style=""
+                     ref="upload_room"
+                     :multiple='false'
+                     :show-file-list='false'
+                     :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                     action=""
+                     accept=".xls,.xlsx"
+                     :http-request="(()=>{uploadFile( 'room')})">
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--orange">导入房屋数据</el-button>
+          </el-upload>
+
+        </div>
+
+        <el-button style="margin-left:10px"
+                   class="diy-button--red"
                    size="small"
-                   @click="handleExportModule('room')">下载房屋模板</el-button>
-
-        <el-upload :headers="$getElUploadHeaders()"
-                   style=""
-                   ref="upload_room"
-                   :multiple='false'
-                   :show-file-list='false'
-                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :http-request="(()=>{uploadFile( 'room')})">
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
-        </el-upload>
+                   @click="deleteBatch">批量删除</el-button>
 
-      </div>
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExportOpen">导出</el-button>
-      <el-button v-if="agencyObj.level == 'community'"
-                 style="margin-left:10px"
-                 class="diy-button--qrcode"
-                 size="small"
-                 @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
-      <el-button style="float:left;margin-left:10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-      <!-- <el-button style=";margin-left:10px"
+        <!-- <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button> -->
+      </div>
+      <div class="div_btn_right">
+        <el-popover popper-class="btn-popper"
+                    placement="bottom"
+                    style="margin-left: 10px"
+                    width="20"
+                    trigger="hover">
+          <div v-if="showImportBtn"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       @click="handleExportModule('community')">下载小区模板</el-button>
+          </div>
+
+          <div v-if="showImportBtn"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       @click="handleExportModule('building')">下载楼栋模板</el-button>
+          </div>
+          <div v-if="showImportBtn"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       @click="handleExportModule('room')">下载房屋模板</el-button>
+          </div>
+          <div v-if="showYhymInfo && customerId!=='1535072605621841922'"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       :loading="yhymLoading"
+                       @click="handleYhymInfo">补全一房一码信息</el-button>
 
-      <el-button size="small"
-                 v-if="displayedBaobiaoBtn"
-                 class="diy-button--add"
-                 @click="reportForm">智能填报</el-button>
+          </div>
+          <div v-if="showYhymInfo && customerId!=='1535072605621841922'"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       :loading="xcxmLoading"
+                       @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
+          </div>
+          <div v-if="displayedBaobiaoBtn"
+               class="table-more-btn">
+            <el-button size="small"
+                       type="text"
+                       class="diy-button--other"
+                       @click="reportForm">智能填报</el-button>
+          </div>
+          <div v-if="agencyObj.level == 'community'"
+               class="table-more-btn">
+            <el-button class="diy-button--other"
+                       size="small"
+                       type="text"
+                       @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
+          </div>
+          <el-button size="small"
+                     style="float:right"
+                     class="diy-button--white"
+                     slot="reference">更多操作<i class="el-icon-caret-bottom"></i></el-button>
+        </el-popover>
+      </div>
     </div>
 
     <div class="div_table_item">
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 4c5f3e83d..9bb3ef7ce 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -336,7 +336,7 @@
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left: 10px"
                         width="20"
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index ff1f92040..25302ea91 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -288,7 +288,7 @@
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left: 10px"
                         width="20"
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index 4cd3b4c15..e21d0b4eb 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -262,7 +262,7 @@
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <!-- <el-popover popper-class="btn-popper"
+            <!-- <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index d154a53ee..4c81e46b8 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -266,7 +266,7 @@
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left: 10px"
                         width="20"
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index 7b5dff515..6fb68e1a8 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -180,7 +180,7 @@
                        size="small"
                        @click="handleReview(scope.row)">添加回顾</el-button>
 
-            <!-- <el-popover popper-class="btn-popper"
+            <!-- <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index bc61e38c6..31b67586f 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -210,7 +210,7 @@
                        @click="handleEdit(scope.row)">修改</el-button>
 
             <el-popover v-if="agencyId===scope.row.agencyId"
-                        popper-class="btn-popper"
+                        popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 936672819..c58e228a8 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -184,7 +184,7 @@
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-popover popper-class="btn-popper"
+            <el-popover popper-class="btn-popper-table"
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"