基础管理UI调整

src/assets/styles/adaptive.scss

@@ -1,13 +1,9 @@
-@media screen and (max-width: 1100px) {
+@media screen and (max-width: 1400px) {
   .home-header {
-    .head-logo {
-      width: 180px;
-      padding: 5px 10px;
-    }
+    padding-left: 200px;
     .menu-list {
       li {
-        padding: 10px;
-
+        padding: 10px 15px;
         span {
           margin-left: 6px;
         }
@@ -15,213 +11,49 @@
     }
   }
   .home-navs {
-    width: 180px;
-
-    .nav-head {
-      padding: 10px 8px;
-      > i {
-        margin-right: 0;
-      }
+    width: 200px;
+    padding: 24px 15px;
+    .head-logo {
+      margin-bottom: 20px;
     }
 
-    .nav-list {
-      padding: 0 10px 0 28px;
+    .nav-part {
+      margin-bottom: 20px;
     }
-    .nav-item {
-      &-main {
-        padding: 8px 0;
-      }
+    .nav-item-main {
+      padding: 4px 0;
     }
   }
   .home-main {
-    padding-left: 180px;
+    padding: 15px 20px 50px 220px;
   }
   .home-breadcrumb {
-    padding: 10px 15px;
+    margin-bottom: 15px;
     .el-breadcrumb {
       line-height: 24px;
     }
   }
-  .home-view {
-    padding: 0 15px;
-  }
-  // part
-  .part-box {
+  .page-head {
     margin-bottom: 15px;
 
-    &-filter {
-      padding: 10px 10px 0;
-      .el-form-item {
-        margin-bottom: 10px;
-      }
-    }
-
-    &-action {
-      padding-bottom: 10px;
-    }
-  }
-
-  // rule-warning
-  .rule-warning {
-    .el-form {
-      margin: 0 auto;
-      width: 400px;
-    }
-    .rule-btns {
-      margin: 26px 0 0;
-      text-align: center;
-    }
-  }
-}
-@media screen and (max-width: 768px) {
-  .home-header {
-    .head-logo {
-      width: auto;
-    }
-    .menu-list {
-      display: none;
-    }
-    .head-menu-btn {
-      display: block;
-      padding: 7px 10px;
-      cursor: pointer;
-
-      &:hover {
-        opacity: 0.9;
-      }
-    }
-  }
-  .home-navs {
-    display: none;
-  }
-  .home-navs-full {
-    display: block;
-    position: relative;
-    top: 0;
-    width: 100%;
-    background: transparent;
-    font-size: 14px;
-    &::before {
-      display: none;
-    }
-
-    .nav-part {
-      margin-bottom: 15px;
+    > h2 {
+      font-size: 18px;
     }
   }
-  .home-main {
-    padding-left: 0;
-  }
-  // el-dialog
-  .el-dialog {
-    width: 100% !important;
-  }
-  // .el-pagination
-  .el-pagination {
-    > button {
-      margin: 0 !important;
-    }
-  }
-  // .part-box
+  // part
   .part-box {
-    &-flex {
-      display: block;
-    }
-  }
-}
-
-@media screen and (max-width: 576px) {
-  .login-home {
-    overflow: hidden;
-  }
-  .login-box {
-    width: 100%;
-  }
-  .login-body {
-    width: auto;
-    margin: 0 10px;
-    padding: 50px 20px;
-  }
-  .home-breadcrumb {
-    padding: 10px;
-  }
-  .home-view {
-    padding: 0 10px;
-  }
-
-  .part-box-pad {
-    padding: 10px;
-  }
-  // .rule-warning
-  .rule-warning {
-    border-radius: 0;
-    border: none;
-    padding: 0;
-    .rule-tips {
-      line-height: 1.2;
-      padding: 10px 0;
-    }
-    .el-form {
-      padding: 10px;
-    }
-  }
-
-  // .table
-  .table {
-    th,
-    td {
-      font-size: 14px !important;
-      padding: 5px !important;
-    }
-  }
-  // .upload-file-view
-  .upload-file-view {
-    display: block !important;
-    > .el-input {
-      width: 100% !important;
-
-      + div {
-        width: 50%;
-        margin: 5px 5px 5px 0 !important;
-      }
-    }
-    .el-upload {
-      .el-button {
-        width: 100%;
-      }
-    }
-
-    + .el-button {
-      width: 50%;
-      margin: 0 !important;
-    }
-  }
+    margin-bottom: 15px;
 
-  // le-form
-  .el-form {
-    width: 100% !important;
-    box-sizing: border-box;
-    min-width: 0 !important;
-    .el-form-item {
-      display: block;
-      margin-right: 0;
+    &-pad {
+      padding: 24px;
     }
-    .el-form-item__label {
-      float: none;
-      display: block;
-      line-height: 30px;
-      text-align: left;
+    &-filter {
+      margin-bottom: 5px;
     }
-    .el-form-item__content {
-      display: block;
-      margin: 0 !important;
-      > div[class^="el"] {
-        width: 100% !important;
+    &-head {
+      > h3 {
+        font-size: 16px;
       }
     }
   }
-  // el-table
-  .el-table__header thead {
-    font-size: 14px;
-  }
 }

src/assets/styles/base.scss

@@ -45,7 +45,7 @@ input:-ms-input-placeholder,
 input:-moz-placeholder {
   font-size: 12px;
   font-weight: bold;
-  color: $--color-text-placeholder;
+  color: $--color-text-gray-4;
 }
 button,
 textarea {
@@ -70,7 +70,7 @@ abbr {
 a {
   text-decoration: none;
   color: inherit;
-  *color: $--color-text-secondary;
+  *color: $--color-text-gray-3;
 }
 img {
   vertical-align: middle;
@@ -115,7 +115,7 @@ body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   font-size: $--font-size-base;
-  color: $--color-text-primary;
+  color: $--color-text-dark-1;
 }
 
 /* part */
@@ -128,16 +128,18 @@ body {
     border: 1px solid $--color-border;
   }
   &-pad {
-    padding: 15px;
+    padding: 20px;
   }
 
   &-filter {
-    padding: 15px 15px 0;
-    border: 1px solid $--color-border;
+    padding: 20px 20px 5px 20px;
 
     .el-form-item {
       margin-bottom: 15px;
     }
+    .el-form-item__label {
+      display: none;
+    }
   }
 
   &-flex {
@@ -155,9 +157,32 @@ body {
   &-tips {
     font-size: 16px;
     line-height: 25px;
-    color: $--color-text-regular;
+    color: $--color-text-gray-2;
     margin-bottom: 15px;
   }
+
+  &-head {
+    display: flex;
+    align-items: stretch;
+    justify-content: space-between;
+    min-height: 30px;
+    margin: -10px 0 10px -10px;
+    color: $--color-text-dark;
+
+    > h3 {
+      font-size: 17px;
+    }
+    .el-icon-question {
+      margin-left: 10px;
+      font-size: 16px;
+      color: $--color-text-gray-5;
+      cursor: pointer;
+
+      &:hover {
+        color: #fe8652;
+      }
+    }
+  }
 }
 .part-title {
   font-size: 16px;
@@ -183,66 +208,73 @@ body {
 .part-none {
   padding: 100px;
   font-size: 20px;
-  color: $--color-text-secondary;
+  color: $--color-text-gray-3;
   text-align: center;
 }
-.flex-between {
+// box-justify
+.box-justify {
   display: flex;
-  align-items: stretch;
+  align-items: center;
   justify-content: space-between;
 }
 
+// page-head
+.page-head {
+  margin-bottom: 20px;
+  color: $--color-text-dark;
+  &-flex {
+    display: flex;
+    align-items: stretch;
+    justify-content: space-between;
+  }
+
+  > h2 {
+    font-size: 20px;
+  }
+  .el-icon-question {
+    margin-left: 10px;
+    font-size: 16px;
+    color: $--color-text-gray-5;
+    cursor: pointer;
+
+    &:hover {
+      color: #fe8652;
+    }
+  }
+}
+
 /* table */
 .table {
   width: 100%;
   border-spacing: 0;
   border-collapse: collapse;
-  text-align: center;
-  margin-bottom: 25px;
-  border-radius: 20px;
+  text-align: left;
 
   th {
-    padding: 10px;
-    line-height: 20px;
+    padding: 8px 5px 8px 10px;
+    line-height: 1.2;
     letter-spacing: 1px;
-    border: 1px solid $--border-color-light;
+    color: $--color-text-gray;
+    border: 1px solid $--color-border;
   }
   td {
-    padding: 10px;
-    line-height: 20px;
-    border: 1px solid $--border-color-light;
+    padding: 8px 5px 8px 10px;
+    line-height: 1.2;
+    color: $--color-text-dark;
+    border: 1px solid $--color-border;
 
     &.td-link {
       span {
         cursor: pointer;
         &:hover {
-          color: $--color-text-primary;
+          color: $--color-text-gray;
         }
       }
     }
   }
   .td-th {
     font-weight: 600;
-    color: $--color-text-primary;
-  }
-
-  &-striped {
-    tr:nth-of-type(odd) {
-      background-color: $--color-white;
-    }
-  }
-
-  &.table-white {
-    background-color: #fff;
-  }
-  &.table-narrow {
-    border-radius: 0;
-    margin: 0;
-
-    td,
-    th {
-      padding: 8px;
-    }
+    color: $--color-text-gray;
   }
 }
 
@@ -280,11 +312,18 @@ body {
   color: $--color-danger;
 }
 .color-info {
-  color: $--color-info;
+  color: $--color-text-gray-1;
 }
 .color-dark {
   color: $--color-dark;
 }
+.color-gray {
+  color: $--color-text-gray;
+}
+.color-white {
+  color: #fff;
+}
+
 // text
 .text-center {
   text-align: center;
@@ -297,11 +336,26 @@ body {
 }
 
 // other
-.btn--danger {
+.btn-danger {
   &.el-button--text {
     color: $--color-danger !important;
+
+    &:hover {
+      font-weight: 600;
+      color: mix(#000, $--color-danger, 20%) !important;
+    }
+  }
+}
+.btn-primary {
+  &.el-button--text {
+    color: $--color-text-dark-1 !important;
+    &:hover {
+      font-weight: 600;
+      color: $--color-primary !important;
+    }
   }
 }
+
 .btn-white {
   background-color: #fff !important;
   color: #999 !important;
@@ -312,7 +366,7 @@ body {
 .table-head-bg {
   th {
     background-color: #f6f6f6;
-    color: $--color-text-primary;
+    color: $--color-text-gray;
   }
 }
 .btn-act {
@@ -342,6 +396,9 @@ body {
 .mr-4 {
   margin-right: 20px;
 }
+.mb-0 {
+  margin-bottom: 0;
+}
 .mb-2 {
   margin-bottom: 10px;
 }
@@ -351,12 +408,12 @@ body {
 
 // other
 .tips-info {
-  font-size: 14px;
+  font-size: 12px;
   line-height: 25px;
-  color: $--color-text-secondary;
+  color: $--color-text-gray-3;
 }
 .tips-dark {
-  color: $--color-text-primary;
+  color: $--color-text-gray;
 }
 .tips-error {
   color: $--color-danger;
@@ -364,18 +421,13 @@ body {
 .tips-icon {
   display: inline-block;
   vertical-align: middle;
-  color: $--color-text-secondary;
+  color: $--color-text-gray-3;
   font-size: 18px;
   margin: 0 10px;
   cursor: pointer;
 }
 .form-item-content {
-  color: $--color-text-regular;
-}
-.action-column {
-  .cell {
-    overflow: visible;
-  }
+  color: $--color-text-gray-2;
 }
 .inline-block {
   display: inline-block;

src/assets/styles/common-comp.scss

@@ -96,7 +96,7 @@ $--cc-list-upload-pre: cc-list-upload;
     display: inline-block;
     vertical-align: top;
     margin: 20px 10px;
-    border: 1px solid $--border-color-light;
+    border: 1px solid $--color-text-gray-6;
     height: 150px;
     width: 150px;
     position: relative;
@@ -323,7 +323,7 @@ $--cc-list-upload-pre: cc-list-upload;
     top: 0;
     left: 50%;
     margin: 0 0 0 -30px;
-    color: $--border-color-base;
+    color: $--color-border;
     font-size: 50px;
     text-align: center;
     line-height: 60px;

src/assets/styles/element-ui-costom.scss

@@ -3,24 +3,20 @@
   border-radius: 8px;
   overflow: hidden;
   border: 1px solid #c8c8ca;
-  background-color: #f6f6f6;
-
   box-shadow: 5px 5px 4px 0px rgba(0, 0, 0, 0.1);
 }
 .el-dialog__header {
   padding: 15px 20px;
-  background-color: #f6f6f6;
   .el-dialog__title {
-    color: #666666;
+    color: $--color-text-dark-1;
     font-size: 16px;
     line-height: 19px;
   }
 }
 .el-dialog__body {
-  padding: 20px;
-  background-color: #f6f6f6;
+  padding: 30px 40px;
   position: relative;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid $--color-border;
 
   .el-form-item__label {
     color: #545454;
@@ -32,8 +28,7 @@
   }
 }
 .el-dialog__footer {
-  background-color: #f6f6f6;
-  text-align: center;
+  text-align: right;
   .el-button {
     width: 100px;
     border-radius: 8px;
@@ -43,26 +38,7 @@
     color: #999;
   }
 }
-.el-popup-close {
-  height: 20px;
-  width: 20px;
-  background-image: url(../images/icon-close.png);
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  &::before {
-    content: "";
-  }
-  &:hover {
-    background-image: url(../images/icon-close-act.png);
-  }
-}
-.el-dialog__headerbtn {
-  top: 14px;
-  right: 14px;
-  .el-dialog__close {
-    @extend .el-popup-close;
-  }
-}
+
 // .opacity-dialog
 .opacity-dialog {
   .el-dialog {
@@ -96,21 +72,23 @@
       }
     }
   }
-  &--inline {
-    .el-form-item {
-      margin-right: 20px;
-    }
-  }
   // form-info
   &.form-info {
     .el-form-item {
       margin-bottom: 0;
 
       .el-form-item__label {
-        color: $--color-text-regular;
+        color: $--color-text-gray-2;
       }
     }
   }
+  &--label-top {
+    .el-form-item__label {
+      line-height: 20px;
+      padding-bottom: 5px;
+      font-size: 12px;
+    }
+  }
 }
 // input
 .el-input {
@@ -121,20 +99,24 @@
   }
   &.is-disabled {
     .el-input__inner {
-      color: $--color-text-regular;
+      color: $--color-text-gray-2;
     }
   }
   .el-input__inner {
-    border-radius: 7px;
+    border-radius: 8px;
     border-color: #ddd;
     background-color: #fff;
   }
+  // .el-input__suffix {
+  //   right: 0;
+  //   border-left: 1px solid #ddd;
+  // }
 }
 // textarea
 .el-textarea {
   &.is-disabled {
     .el-textarea__inner {
-      color: $--color-text-regular;
+      color: $--color-text-gray-2;
     }
   }
 }
@@ -172,86 +154,9 @@
     display: inline-block;
   }
   &.is-disabled {
-    color: $--color-text-secondary !important;
-    background: $--color-background !important;
-    border: 1px solid $--color-border !important;
-  }
-}
-.el-button--default {
-  color: $--color-text-regular;
-  background: $--color-white;
-  border: 1px solid $--color-border;
-  &:hover,
-  &:focus {
-    color: $--color-text-regular;
-    background: $--color-background;
-    border: 1px solid $--color-border;
-  }
-  &.el-button--default-act {
-    color: $--color-text-regular !important;
+    color: $--color-text-gray-3 !important;
     background: $--color-background !important;
     border: 1px solid $--color-border !important;
-    &:hover,
-    &:focus {
-      color: $--color-text-regular !important;
-      background: $--color-white !important;
-      border: 1px solid $--color-border !important;
-    }
-  }
-}
-.el-button--primary {
-  color: $--color-white;
-  border-color: $--color-primary;
-  background: $--color-primary;
-  background-image: linear-gradient(
-    -90deg,
-    $--color-success 0%,
-    $--color-primary 100%
-  );
-
-  &:hover,
-  &:focus {
-    color: $--color-white;
-    border-color: $--color-primary;
-    background: $--color-primary;
-    background-image: linear-gradient(
-      -90deg,
-      mix($--color-white, $--color-success, 20%) 0%,
-      mix($--color-white, $--color-primary, 20%) 100%
-    );
-  }
-}
-.el-button--warning {
-  color: $--color-white;
-  border-color: $--color-warning-lighter;
-  background: $--color-warning-lighter;
-  background-image: linear-gradient(
-    -90deg,
-    $--color-warning-lighter 0%,
-    $--color-warning 100%
-  );
-
-  &:hover,
-  &:focus {
-    color: $--color-white;
-    border-color: $--color-warning-lighter;
-    background: $--color-warning-lighter;
-    background-image: linear-gradient(
-      -90deg,
-      mix($--color-white, $--color-warning-lighter, 20%) 0%,
-      mix($--color-white, $--color-warning, 20%) 100%
-    );
-  }
-}
-
-.el-button--info {
-  background-color: $--color-cyan;
-  border-color: $--color-cyan;
-
-  &:hover,
-  &:focus {
-    background-color: $--color-cyan-light;
-    border-color: $--color-cyan-light;
   }
 }
 
@@ -266,11 +171,12 @@
   margin-left: 5px;
 }
 .el-button--text {
-  color: $--color-text-regular;
+  color: $--color-text-gray-2;
 
-  &.btn-table-icon {
+  &.btn-primary {
     padding: 0;
     min-width: 10px;
+    color: $--color-blue;
     > i {
       width: 20px;
       height: 20px;
@@ -278,34 +184,54 @@
 
     &:hover {
       transform: scale(1.2);
+      color: mix($--color-dark, $--color-primary, 50%);
     }
   }
+  & + .el-button--text {
+    margin-left: 10px;
+  }
 }
+.el-button--info {
+  background-color: $--color-cyan;
+  border-color: $--color-cyan;
+
+  &:hover,
+  &:focus {
+    background-color: $--color-cyan-light;
+    border-color: $--color-cyan-light;
+  }
+}
+.el-button--primary {
+  background-color: $--color-primary;
+  border-color: $--color-primary;
+
+  &:hover,
+  &:focus {
+    background-color: $--color-primary-light;
+    border-color: $--color-primary-light;
+  }
+}
+
 // table
 .el-table {
-  color: $--color-text-primary;
+  color: $--color-text-dark-1;
 
-  &--border {
-    border-radius: $--border-radius;
-    border: 1px solid $--color-border;
+  thead th {
+    color: $--color-text-gray-2;
   }
 
-  &__header thead {
-    // font-size: 16px;
-    color: $--color-text-primary;
-    font-weight: bold;
+  thead.is-group th {
+    background-color: $--color-white;
   }
+
   tr.el-table__row {
-    background-color: $--color-background;
-    &.el-table__row--striped {
-      td {
-        background-color: $--color-white;
-      }
-    }
+    color: $--color-text-dark;
   }
   td,
   th {
-    border-color: $--color-border-light !important;
+    border-color: $--color-border !important;
+    padding: 14px 0;
+    font-weight: 500;
   }
   .el-table__row.row-danger {
     color: $--color-danger;
@@ -315,85 +241,45 @@
       background-color: $--color-white;
     }
   }
-}
-// el-checkbox
-.el-checkbox {
-  .el-checkbox__input {
-    .el-checkbox__inner {
-      width: 18px;
-      height: 18px;
-      border-color: $--color-border;
-      &::after {
-        display: none;
-      }
-    }
-    &.is-checked {
-      .el-checkbox__inner {
-        border: none;
-        background-color: transparent;
-        background-image: url(../images/icon-checked.png);
-        background-repeat: no-repeat;
-        background-size: 100% 100%;
-      }
-    }
-    &.is-focus {
-      .el-checkbox__inner {
-        border-color: $--color-border;
+
+  .cell-head {
+    display: inline-block;
+    vertical-align: middle;
+    line-height: 1.3;
+  }
+  // caret-wrapper
+  .caret-wrapper {
+    width: 20px;
+    height: 20px;
+    top: -1px;
+    .sort-caret {
+      &.ascending {
+        top: -1px;
       }
-    }
-    &.is-indeterminate {
-      .el-checkbox__inner {
-        background-color: $--color-primary;
+      &.descending {
+        bottom: -1px;
       }
     }
-    &.is-disabled.is-checked {
-      .el-checkbox__inner {
-        opacity: 0.8;
+  }
+  // action-column
+  .action-column {
+    .el-button--text {
+      padding: 0;
+      &:hover {
+        transform: scale(1.1, 1.1);
       }
     }
   }
+}
+// el-checkbox
+.el-checkbox {
   .el-checkbox__label {
-    color: $--color-text-regular !important;
+    color: $--color-text-gray-2 !important;
   }
 }
 .el-radio {
-  .el-radio__input {
-    .el-radio__inner {
-      width: 18px;
-      height: 18px;
-      border-color: $--color-border;
-
-      &::after {
-        display: none;
-      }
-    }
-    &.is-checked {
-      .el-radio__inner {
-        border: none;
-        background-color: transparent;
-        background-image: url(../images/icon-radio-checked.png);
-        background-repeat: no-repeat;
-        background-size: 100% 100%;
-      }
-    }
-    &.is-focus {
-      .el-radio__inner {
-        border-color: $--color-border;
-      }
-    }
-    &.is-disabled.is-checked {
-      .el-radio__inner {
-        opacity: 0.8;
-      }
-    }
-  }
   .el-radio__label {
-    color: $--color-text-regular !important;
-  }
-  &.is-disabled {
-    .el-radio__label {
-      color: $--color-text-secondary !important;
-    }
+    color: $--color-text-gray-2 !important;
   }
 }
 
@@ -401,26 +287,34 @@
 .el-pagination-li {
   min-width: 32px;
   height: 32px;
-  border-radius: 32px;
+  border-radius: 8px;
   overflow: hidden;
   background-color: $--color-white;
-  border: 1px solid $--color-border;
+  border: 1px solid #e1e3eb;
 }
 .el-pagination {
+  padding: 0;
+  .el-pagination__total {
+    float: left;
+  }
+  span:not([class*="suffix"]) {
+    line-height: 32px;
+    height: 32px;
+  }
   &.is-background {
     .btn-prev,
     .btn-next {
-      color: $--color-text-regular;
-      margin: 0 13px;
+      color: $--color-text-gray-2;
+      margin: 0 5px;
       @extend .el-pagination-li;
     }
     .btn-prev:disabled,
     .btn-next:disabled {
-      background-color: $--color-background;
+      opacity: 0.7;
     }
 
     .el-pager li {
-      color: $--color-text-regular;
+      color: $--color-text-gray-2;
       margin: 0 5px;
       padding: 0 8px;
       line-height: 32px;
@@ -428,7 +322,6 @@
       @extend .el-pagination-li;
       &:not(.disabled).active {
         color: #fff;
-        @extend .el-button--primary;
       }
     }
   }
@@ -445,9 +338,6 @@
     top: 10px;
     right: 10px;
   }
-  &__close.el-icon-close {
-    @extend .el-popup-close;
-  }
   &__content {
     text-align: center;
 
@@ -543,3 +433,43 @@
     }
   }
 }
+// el-popover
+.el-popper-dark {
+  background-color: $--color-text-dark-1;
+  color: #fff;
+  font-size: 12px;
+  line-height: 18px;
+  padding: 16px;
+  border: none;
+}
+.el-popper-dark {
+  box-shadow: 0px 10px 10px 0px rgba(54, 61, 89, 0.2);
+}
+.el-popper-dark[x-placement^="right"] .popper__arrow {
+  border-right-color: $--color-text-dark-1;
+
+  &::after {
+    border-right-color: $--color-text-dark-1;
+  }
+}
+.el-popper-dark[x-placement^="top"] .popper__arrow {
+  border-top-color: $--color-text-dark-1;
+
+  &::after {
+    border-top-color: $--color-text-dark-1;
+  }
+}
+.el-popper-dark[x-placement^="bottom"] .popper__arrow {
+  border-bottom-color: $--color-text-dark-1;
+
+  &::after {
+    border-bottom-color: $--color-text-dark-1;
+  }
+}
+.el-popper-dark[x-placement^="left"] .popper__arrow {
+  border-left-color: $--color-text-dark-1;
+
+  &::after {
+    border-left-color: $--color-text-dark-1;
+  }
+}

src/assets/styles/home.scss

@@ -12,31 +12,29 @@
   right: 0;
   bottom: 0;
   overflow: auto;
-  background: $--color-white;
+  background: $--color-background;
   z-index: 98;
 }
 .home-main {
   position: relative;
-  padding: 0 0 50px 220px;
+  padding: 20px 30px 50px 250px;
   min-height: 100%;
-  transition: padding-left 0.2s ease;
 }
 
 /* navs */
 .home-navs {
   position: absolute;
   width: 220px;
-  top: 50px;
+  top: 0;
   left: 0;
   bottom: 0;
-  z-index: 99;
+  z-index: 100;
   overflow: auto;
   font-size: 14px;
-  background: linear-gradient(
-    90deg,
-    rgba(247, 247, 247, 1) 0%,
-    rgba(238, 238, 238, 1) 100%
-  );
+  padding: 30px 40px;
+  background: $--color-white;
+  border-top-right-radius: $--border-radius-huge;
+  border-bottom-right-radius: $--border-radius-huge;
 
   &::before {
     content: "";
@@ -50,41 +48,63 @@
     background: rgba(229, 229, 229, 1);
   }
 
-  .nav-part {
+  .head-logo {
+    font-size: 20px;
+    line-height: 40px;
+    border-radius: $--border-radius;
+    // background-color: $--color-background;
+    text-align: center;
     margin-bottom: 30px;
+
+    img {
+      display: block;
+      max-width: 160px;
+      height: 40px;
+    }
+  }
+
+  .nav-part {
+    padding: 20px 0;
+    border-top: 1px solid $--color-border;
   }
 
   .nav-head {
-    padding: 15px 10px;
-    color: $--color-text-secondary;
-    font-size: 16px;
+    padding: 10px 0;
+    color: $--color-text-gray-2;
+    font-size: $--font-size-base;
     line-height: 20px;
-    border-bottom: 1px solid #e9e9e9;
-    > i {
-      margin-right: 6px;
-      width: 20px;
-      height: 20px;
-    }
+    position: relative;
+    font-weight: 500;
     > span {
       display: inline-block;
       vertical-align: top;
+      font-weight: 600;
+    }
+    &-right-icon {
+      position: absolute;
+      right: -10px;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #d3d5e0;
+      font-size: 12px;
     }
   }
 
-  .nav-list {
-    padding: 0 10px 0 36px;
-  }
+  // .nav-list {
+  //   padding: 0 0 0 23px;
+  // }
   .nav-item {
     overflow: hidden;
-
-    border-bottom: 1px solid $--color-border;
+    color: $--color-text-dark-1;
     &-main {
-      padding: 12px 0;
+      padding: 10px 0;
       line-height: 20px;
       position: relative;
+      font-weight: 500;
       cursor: pointer;
       &-act,
       &:hover {
+        font-weight: 600;
         color: $--color-primary;
       }
     }
@@ -126,24 +146,12 @@
   height: 50px;
   top: 0;
   left: 0;
-  z-index: 100;
+  z-index: 99;
   color: #fff;
-  background-color: $--color-blue;
+  padding-left: 220px;
+  background-color: $--color-text-dark;
   overflow: hidden;
 
-  .head-logo {
-    width: 220px;
-    float: left;
-    padding: 5px 30px;
-    font-size: 20px;
-    line-height: 40px;
-
-    img {
-      display: block;
-      max-width: 160px;
-      height: 40px;
-    }
-  }
   .head-menu {
     float: left;
   }
@@ -162,7 +170,7 @@
       padding: 10px 25px;
       height: 50px;
       line-height: 30px;
-      opacity: 0.7;
+      opacity: 0.4;
       font-size: 16px;
       position: relative;
       text-align: center;
@@ -173,26 +181,17 @@
       }
 
       &.menu-item-act {
-        background-color: $--color-blue-white;
         opacity: 1;
       }
 
-      &::before {
-        content: "";
-        display: block;
-        position: absolute;
-        left: 0;
-        top: 50%;
-        margin-top: -10px;
-        height: 20px;
-        border-left: 1px solid rgba(255, 255, 255, 0.1);
-      }
-
       span {
         display: inline-block;
         vertical-align: top;
         margin-left: 8px;
       }
+      .icon {
+        margin-top: -3px;
+      }
       .menu-item-account {
         white-space: nowrap;
         span {
@@ -242,11 +241,11 @@
     width: 52px;
     height: 52px;
     margin: 0 auto;
-    border: 1px solid $--color-text-secondary;
+    border: 1px solid $--color-text-gray-3;
     border-radius: 50%;
     font-size: 30px;
     text-align: center;
-    color: $--color-text-secondary;
+    color: $--color-text-gray-3;
     cursor: pointer;
 
     &:hover {
@@ -258,36 +257,36 @@
 
 // home-breadcrumb
 .home-breadcrumb {
-  padding: 15px 20px;
+  margin-bottom: 18px;
+  font-size: 12px;
+  font-weight: 500;
+
+  .breadcrumb-tips {
+    display: inline-block;
+    vertical-align: middle;
+    > i {
+      margin-top: -2px;
+      margin-right: 8px;
+    }
+  }
   .el-breadcrumb {
-    line-height: 30px;
+    line-height: 16px;
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 12px;
 
     .el-breadcrumb__item {
       .el-breadcrumb__inner {
-        color: #aaaaaa;
-      }
-
-      &:last-child {
-        .el-breadcrumb__inner {
-          color: $--color-text-primary;
-          font-weight: bold;
-        }
-      }
-
-      &:first-child {
-        margin-right: 12px;
-        .el-breadcrumb__separator {
-          display: none;
-        }
+        color: $--color-text-gray-2;
       }
     }
+    .el-breadcrumb__separator {
+      margin: 0 5px;
+    }
   }
 }
 
 // home-view
-.home-view {
-  padding: 0 20px;
-}
 
 /* view-footer */
 .home-footer {
@@ -299,13 +298,13 @@
   z-index: auto;
   padding: 20px 0;
   line-height: 20px;
-  color: $--color-text-secondary;
+  color: $--color-text-gray-3;
   text-align: center;
   font-size: 13px;
   a {
-    color: $--color-text-secondary;
+    color: $--color-text-gray-3;
   }
   a:hover {
-    color: $--color-text-primary;
+    color: $--color-text-gray;
   }
 }

src/assets/styles/icons.scss

@@ -7,6 +7,12 @@
   background-repeat: no-repeat;
   background-size: 100% 100%;
 
+  &-location {
+    background-image: url(../images/icon-location.png);
+    width: 10px;
+    height: 10px;
+  }
+
   &-user {
     background-image: url(../images/icon-user.png);
     width: 16px;

src/assets/styles/index.scss

@@ -4,7 +4,6 @@
 @import "./home.scss";
 
 @import "./login.scss";
-@import "./account.scss";
 @import "./pages.scss";
 
 @import "./element-ui-costom.scss";

src/assets/styles/pages.scss

@@ -2,7 +2,7 @@
 .task-detail {
   .table {
     border-radius: $--border-radius;
-    color: $--color-text-primary;
+    color: $--color-text-dark;
     border: 1px solid $--color-border;
     border-bottom: 0;
     border-right: 0;
@@ -12,7 +12,7 @@
     th {
       border-left: 0;
       border-top: 0;
-      color: $--color-text-regular;
+      color: $--color-text-dark-1;
       padding: 10px;
     }
     td {
@@ -91,10 +91,10 @@
     padding: 19px;
     text-align: center;
     cursor: pointer;
-    color: $--border-color-base;
+    color: $--color-text-gray-4;
 
     &:hover {
-      color: $--color-text-secondary;
+      color: $--color-text-gray;
     }
   }
 }
@@ -121,7 +121,7 @@
       line-height: 1.5;
       margin-bottom: 5px;
       > span:first-child {
-        color: $--color-text-regular;
+        color: $--color-text-dark-1;
       }
     }
   }
@@ -161,13 +161,13 @@
       cursor: not-allowed;
 
       &:hover {
-        color: $--color-text-primary;
+        color: $--color-text-dark;
       }
     }
   }
   .field-textarea {
     border-radius: $--border-radius;
-    border: 1px solid $--border-color-base;
+    border: 1px solid $--color-text-gray-4;
     min-height: 60px;
     padding: 2px;
     overflow: hidden;
@@ -202,7 +202,7 @@
   .label-item {
     display: inline-block;
     vertical-align: top;
-    border: 1px solid $--border-color-light;
+    border: 1px solid $--color-text-gray-6;
     border-radius: $--border-radius;
     padding: 8px 40px 8px 10px;
     position: relative;
@@ -223,7 +223,7 @@
     margin-top: -10px;
     z-index: 99;
     font-size: 20px;
-    color: $--color-text-secondary;
+    color: $--color-text-gray-5;
     cursor: pointer;
     &:hover {
       color: $--color-danger;
@@ -259,3 +259,45 @@
     padding-left: 20px;
   }
 }
+// organization-manage
+.organization-manage {
+  .org-tree-head {
+    height: 40px;
+    line-height: 40px;
+    color: $--color-text-gray-2;
+    border-bottom: 1px solid $--color-border;
+    padding: 0 8px;
+
+    > div {
+      float: right;
+      font-weight: 500;
+      &:first-child {
+        float: left;
+      }
+
+      &:nth-of-type(2) {
+        width: 200px;
+        text-align: right;
+      }
+      &:nth-of-type(3) {
+        width: 100px;
+      }
+    }
+  }
+  .el-tree-node__content {
+    height: auto;
+    padding: 4px 0;
+    border-bottom: 1px solid $--color-border;
+  }
+  .org-edit {
+    .org-type {
+      width: 100px;
+      display: inline-block;
+    }
+    .org-actions {
+      width: 200px;
+      display: inline-block;
+      text-align: right;
+    }
+  }
+}

src/assets/styles/variables.scss

@@ -1,38 +1,40 @@
 // color ------------------->
-$--color-text-primary: #545454 !default;
-$--color-text-regular: #878787 !default;
-$--color-text-secondary: #aaa !default;
-$--color-text-placeholder: #ccc !default;
-$--border-color-base: #dcdfe6 !default;
-$--border-color-light: #e4e7ed !default;
-$--border-color-lighter: #ebeef5 !default;
-$--border-color-extra-light: #f2f6fc !default;
+$--color-text-dark: #1f2230 !default;
+$--color-text-dark-1: #434656 !default;
+$--color-text-gray: #6f7482 !default;
+$--color-text-gray-1: #7a7c87 !default;
+$--color-text-gray-2: #8b8fa1 !default;
+$--color-text-gray-3: #aaa !default;
+$--color-text-gray-4: #ccc !default;
+$--color-text-gray-5: #d3d5e0 !default;
+$--color-text-gray-6: #e0e1eb !default;
+$--color-border: #eff0f5;
+$--color-background: #eff0f5;
 // status
-$--color-primary: rgba(35, 196, 185, 1) !default;
-$--color-success: rgba(28, 208, 161, 1) !default;
-$--color-warning: rgba(255, 159, 69, 1) !default;
-$--color-warning-lighter: rgba(253, 203, 90, 1) !default;
-$--color-danger: rgba(254, 108, 105, 1) !default;
-$--color-info: #909399 !default;
+$--color-primary: #3a5ae5 !default;
+$--color-primary-light: mix(#fff, $--color-primary, 20%) !default;
+$--color-success: #32cf8a !default;
+$--color-warning: #feca57 !default;
+$--color-danger: #fe5d4e !default;
 $--color-cyan: #2abcff !default;
 $--color-cyan-light: #5fc9fa !default;
 $--color-blue: #556dff !default;
-$--color-blue-white: #667cff !default;
+$--color-blue-white: #4f79ff !default;
+$--color-blue-dark: #172666 !default;
+$--color-purple: #9877ff !default;
 $--color-white: #ffffff;
-$--color-dark: #21252b;
-// skin
-$--color-background: #f5f5f5;
-// border
-$--color-border: #e2e2e2;
-$--color-border-light: #e8e8e8;
+$--color-dark: #1f2230;
+
 // shadow
 $--shadow-light: 0 0 1px rgba(0, 0, 0, 0.15) !default;
 
 // size ------------------->
 $--font-size-base: 14px !default;
-$--font-size-large: 18px !default;
 $--font-size-medium: 16px !default;
+$--font-size-large: 18px !default;
 $--border-radius: 8px;
-
+$--border-radius-large: 12px;
+$--border-radius-huge: 20px;
+// font-family
 $--font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
   "Microsoft YaHei", Arial, sans-serif;

src/components/base/CampusSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="campus-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "campus-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true }

src/components/base/CardRuleSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="card-rule-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -28,6 +28,7 @@ export default {
   name: "card-rule-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true }

src/components/base/CourseSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="course-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -27,6 +27,7 @@ export default {
   name: "course-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/PaperNumberSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="paper-number-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -22,6 +22,7 @@ export default {
   name: "paper-number-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/PlaceSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="place-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "place-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/PrintPlanSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="print-plan-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :multiple="multiple"
@@ -27,6 +27,7 @@ export default {
   name: "print-plan-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String, Array], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/PrintRoomSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="print-room-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "print-room-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true }

src/components/base/QuestionTeacherSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="question-teacher-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -25,6 +25,7 @@ export default {
   name: "question-teacher-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/QuestionTeacherUserSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="question-teacher-user-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -25,6 +25,7 @@ export default {
   name: "question-teacher-user-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/RoomSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="room-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "room-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/components/base/SchoolSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="school-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "school-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true }

src/components/base/TeachingRoomSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="teaching-room-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -26,6 +26,7 @@ export default {
   name: "teaching-room-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true }

src/components/base/TypeOrgSelect.vue

@@ -2,7 +2,7 @@
   <el-select
     v-model="selected"
     class="type-org-select"
-    placeholder="请选择"
+    :placeholder="placeholder"
     :style="styles"
     filterable
     :clearable="clearable"
@@ -27,6 +27,7 @@ export default {
   name: "type-org-select",
   props: {
     disabled: { type: Boolean, default: false },
+    placeholder: { type: String, default: "请选择" },
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },

src/constants/enumerate.js

@@ -93,12 +93,11 @@ export const PAPER_TYPE = {
 
 // 命题任务状态
 export const EXAM_TASK_STATUS = {
-  NEW: "新建",
-  READY: "待命题",
-  STAGE: "进行中",
-  SUBMIT: "待审核",
+  DRAFT: "新建",
+  STAGE: "待命题",
+  AUDITING: "审核中",
+  REJECT: "驳回",
   FINISH: "已完成"
-  // CANCEL: "撤回"
 };
 
 // 题卡创建方式

src/main.js

@@ -14,7 +14,7 @@ import "element-ui/lib/theme-chalk/index.css";
 import "./assets/styles/index.scss";
 import "../card/assets/styles/module.scss";
 
-Vue.use(ElementUI, { size: "medium" });
+Vue.use(ElementUI, { size: "small" });
 
 Vue.use(VueLocalStorage, { storage: "session" });
 Vue.use(globalVuePlugins);

src/modules/admin/components/ModifyPrivilege.vue

@@ -19,7 +19,6 @@
       >
         <el-form-item prop="name" label="菜单名称：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.name"
             placeholder="请输入菜单名称"
             clearable
@@ -27,18 +26,13 @@
         </el-form-item>
         <el-form-item prop="url" label="URL地址：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.url"
             placeholder="请输入URL地址"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="上级菜单：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.parentName"
-            disabled
-          ></el-input>
+          <el-input v-model.trim="modalForm.parentName" disabled></el-input>
         </el-form-item>
         <el-form-item label="菜单类型：">
           <el-select
@@ -55,10 +49,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.remark"
-          ></el-input>
+          <el-input v-model.trim="modalForm.remark"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -66,7 +57,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/admin/components/ModifySystemRole.vue

@@ -18,7 +18,6 @@
       >
         <el-form-item prop="name" label="角色名称：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.name"
             placeholder="请输入角色名称"
             clearable
@@ -36,7 +35,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/admin/components/ModifyUser.vue

@@ -19,7 +19,6 @@
       >
         <el-form-item prop="loginName" label="用户名：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.loginName"
             placeholder="请输入用户名"
             :disabled="isEdit"
@@ -27,7 +26,6 @@
         </el-form-item>
         <el-form-item prop="realName" label="姓名：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.realName"
             placeholder="请输入姓名"
             clearable
@@ -35,7 +33,6 @@
         </el-form-item>
         <el-form-item prop="mobileNumber" label="手机号：">
           <el-input
-            style="width:100%;"
             v-model.trim="modalForm.mobileNumber"
             placeholder="请输入手机号"
             clearable
@@ -63,7 +60,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/admin/views/AdminUserManage.vue

@@ -27,9 +27,7 @@
         </el-form-item>
 
         <el-form-item label-width="0px">
-          <el-button type="primary" icon="el-icon-search" @click="toPage(1)"
-            >查询</el-button
-          >
+          <el-button type="primary" @click="toPage(1)">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">
@@ -43,12 +41,11 @@
     </div>
 
     <div class="part-box">
-      <el-table ref="TableList" :data="users" border stripe>
+      <el-table ref="TableList" :data="users">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="loginName" label="用户名"></el-table-column>
@@ -64,22 +61,17 @@
             {{ scope.row.enable | enableFilter }}
           </template>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"
               title="编辑"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               :icon="
                 scope.row.enable
@@ -90,7 +82,7 @@
               :title="scope.row.enable ? '禁用' : '启用'"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-lock"
               @click="toResetPwd(scope.row)"

src/modules/admin/views/PrivilegeManage.vue

@@ -21,21 +21,21 @@
           <span>
             <el-button
               v-if="data.type === 'MENU'"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-plus-act"
               @click="() => append(data)"
               title="新增"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="() => edit(node, data)"
               title="修改"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-delete"
               @click="() => remove(node, data)"

src/modules/admin/views/SystemRoleManage.vue

@@ -9,24 +9,18 @@
       >
     </div>
     <div class="part-box">
-      <el-table ref="TableList" :data="roles" border stripe>
+      <el-table ref="TableList" :data="roles">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="角色名称"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"

src/modules/base/components/MergePushDialog.vue

@@ -43,7 +43,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyCampus.vue

@@ -36,7 +36,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyCardRule.vue

@@ -10,148 +10,146 @@
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        label-width="130px"
-        :rules="rules"
-        :model="modalForm"
+    <el-form
+      ref="modalFormComp"
+      label-width="130px"
+      :rules="rules"
+      :model="modalForm"
+    >
+      <el-form-item prop="name" label="题卡规则名称：">
+        <el-input
+          v-model.trim="modalForm.name"
+          placeholder="建议不超过30个字，规则名称不允许重复"
+          style="width: 100%"
+          clearable
+          :disabled="!editable"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="remark" label="备注：">
+        <el-input
+          v-model="modalForm.remark"
+          type="textarea"
+          resize="none"
+          :rows="2"
+          :maxlength="50"
+          :disabled="!editable"
+          clearable
+          show-word-limit
+          placeholder="建议不超过50个字"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        prop="examNumberStyle"
+        label="考号版式："
+        class="inline-block"
       >
-        <el-form-item prop="name" label="题卡规则名称：">
-          <el-input
-            v-model.trim="modalForm.name"
-            placeholder="建议不超过30个字，规则名称不允许重复"
-            style="width: 100%"
-            clearable
-            :disabled="!editable"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="remark" label="备注：">
-          <el-input
-            v-model="modalForm.remark"
-            type="textarea"
-            resize="none"
-            :rows="2"
-            :maxlength="50"
-            :disabled="!editable"
-            clearable
-            show-word-limit
-            placeholder="建议不超过50个字"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          prop="examNumberStyle"
-          label="考号版式："
-          class="inline-block"
+        <el-select
+          v-model="modalForm.examNumberStyle"
+          style="width: 142px;"
+          @change="numStyleChange"
+          placeholder="请选择"
+          :disabled="!editable"
         >
-          <el-select
-            v-model="modalForm.examNumberStyle"
-            style="width: 142px;"
-            @change="numStyleChange"
-            placeholder="请选择"
-            :disabled="!editable"
-          >
-            <el-option
-              v-for="(val, key) in EXAM_NUMBER_STYLE"
-              :key="key"
-              :value="key"
-              :label="val"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="paperType" label="AB卷版式：" class="inline-block">
-          <el-select
-            v-model="modalForm.paperType"
-            style="width: 142px;"
-            placeholder="请选择"
-            :disabled="!editable"
-          >
-            <el-option
-              v-for="(val, key) in PAPER_TYPE"
-              :key="key"
-              :value="key"
-              :label="val"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="inline-block" label-width="30px">
-          <el-checkbox v-model="modalForm.examAbsent" :disabled="!editable"
-            >启用“缺考填涂”</el-checkbox
+          <el-option
+            v-for="(val, key) in EXAM_NUMBER_STYLE"
+            :key="key"
+            :value="key"
+            :label="val"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="paperType" label="AB卷版式：" class="inline-block">
+        <el-select
+          v-model="modalForm.paperType"
+          style="width: 142px;"
+          placeholder="请选择"
+          :disabled="!editable"
+        >
+          <el-option
+            v-for="(val, key) in PAPER_TYPE"
+            :key="key"
+            :value="key"
+            :label="val"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="inline-block" label-width="30px">
+        <el-checkbox v-model="modalForm.examAbsent" :disabled="!editable"
+          >启用“缺考填涂”</el-checkbox
+        >
+      </el-form-item>
+      <el-form-item class="inline-block" label-width="30px">
+        <el-checkbox
+          v-model="modalForm.writeSign"
+          :disabled="modalForm.examNumberStyle === 'FILL' || !editable"
+          >启用“手写签名”</el-checkbox
+        >
+      </el-form-item>
+      <div class="part-box part-box-pad part-box-border">
+        <h4 class="part-box-tips">题卡版头变量印刷字段配置：</h4>
+        <el-form-item label="必选字段：" label-width="115px" required>
+          <el-checkbox
+            v-for="column in modalForm.requiredFields"
+            :key="column.code"
+            v-model="column.enable"
+            disabled
+            >{{ column.name }}</el-checkbox
           >
         </el-form-item>
-        <el-form-item class="inline-block" label-width="30px">
+        <el-form-item label="扩展字段：" label-width="115px">
           <el-checkbox
-            v-model="modalForm.writeSign"
-            :disabled="modalForm.examNumberStyle === 'FILL' || !editable"
-            >启用“手写签名”</el-checkbox
+            v-for="column in modalForm.extendFields"
+            :key="column.code"
+            v-model="column.enable"
+            :disabled="!editable"
+            >{{ column.name }}</el-checkbox
           >
         </el-form-item>
-        <div class="part-box part-box-pad part-box-border">
-          <h4 class="part-box-tips">题卡版头变量印刷字段配置：</h4>
-          <el-form-item label="必选字段：" label-width="115px" required>
-            <el-checkbox
-              v-for="column in modalForm.requiredFields"
-              :key="column.code"
-              v-model="column.enable"
-              disabled
-              >{{ column.name }}</el-checkbox
-            >
-          </el-form-item>
-          <el-form-item label="扩展字段：" label-width="115px">
-            <el-checkbox
-              v-for="column in modalForm.extendFields"
-              :key="column.code"
-              v-model="column.enable"
-              :disabled="!editable"
-              >{{ column.name }}</el-checkbox
-            >
-          </el-form-item>
-        </div>
-        <el-form-item prop="titleRule" label="题卡标题规则：">
-          <!-- <el-input
+      </div>
+      <el-form-item prop="titleRule" label="题卡标题规则：">
+        <!-- <el-input
             v-model="modalForm.titleRule"
             :disabled="!editable"
           ></el-input> -->
-          <card-title-rule-edit
-            v-model="modalForm.titleRule"
-            :disabled="!editable"
-            :field-sourses="fieldSourses"
-            v-if="fieldSourses.length"
-            ref="CardTitleRuleEdit"
-          ></card-title-rule-edit>
-        </el-form-item>
-        <el-form-item prop="attention" label="注意事项：">
-          <el-input
-            type="textarea"
-            :rows="4"
-            v-model="modalForm.attention"
-            :disabled="!editable"
-          ></el-input>
-          <p class="tips-info">
-            提示：换行之后，题卡注意事项会展示为多条内容，内容序号会被自动添加。
-          </p>
-        </el-form-item>
-        <el-form-item prop="objectiveAttention" label="客观题注意事项：">
-          <el-input
-            v-model="modalForm.objectiveAttention"
-            :disabled="!editable"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="subjectiveAttention" label="主观题注意事项：">
-          <el-input
-            v-model="modalForm.subjectiveAttention"
-            :disabled="!editable"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="orgIds" label="适用学院范围：">
-          <select-orgs
-            v-model="modalForm.orgIds"
-            ref="SelectOrgs"
-            :disabled="!editable"
-          ></select-orgs>
-        </el-form-item>
-      </el-form>
-    </div>
+        <card-title-rule-edit
+          v-model="modalForm.titleRule"
+          :disabled="!editable"
+          :field-sourses="fieldSourses"
+          v-if="fieldSourses.length"
+          ref="CardTitleRuleEdit"
+        ></card-title-rule-edit>
+      </el-form-item>
+      <el-form-item prop="attention" label="注意事项：">
+        <el-input
+          type="textarea"
+          :rows="4"
+          v-model="modalForm.attention"
+          :disabled="!editable"
+        ></el-input>
+        <p class="tips-info">
+          提示：换行之后，题卡注意事项会展示为多条内容，内容序号会被自动添加。
+        </p>
+      </el-form-item>
+      <el-form-item prop="objectiveAttention" label="客观题注意事项：">
+        <el-input
+          v-model="modalForm.objectiveAttention"
+          :disabled="!editable"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="subjectiveAttention" label="主观题注意事项：">
+        <el-input
+          v-model="modalForm.subjectiveAttention"
+          :disabled="!editable"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="orgIds" label="适用学院范围：">
+        <select-orgs
+          v-model="modalForm.orgIds"
+          ref="SelectOrgs"
+          :disabled="!editable"
+        ></select-orgs>
+      </el-form-item>
+    </el-form>
 
     <div slot="footer">
       <el-button
@@ -161,7 +159,7 @@
         @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyCourse.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
-    width="500px"
+    width="448px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -15,7 +15,7 @@
       :model="modalForm"
       :rules="rules"
       :key="modalForm.id"
-      label-width="100px"
+      label-position="top"
     >
       <el-form-item prop="courseName" label="课程名称：">
         <el-input
@@ -34,6 +34,7 @@
       <el-form-item prop="teachingRoomId" label="所属教研室：">
         <teaching-room-select
           v-model.trim="modalForm.teachingRoomId"
+          style="width:100%;"
           clearable
         ></teaching-room-select>
       </el-form-item>
@@ -51,7 +52,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyField.vue

@@ -10,34 +10,32 @@
     append-to-body
     @opened="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item prop="name" label="字段名称：">
-          <el-input
-            style="width:282px;"
-            v-model.trim="modalForm.name"
-            placeholder="请输入字段名称"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="code" label="字段变量名：">
-          <el-input
-            style="width:282px;"
-            v-model.trim="modalForm.code"
-            placeholder="请输入字段变量名"
-            clearable
-          ></el-input>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-width="100px"
+    >
+      <el-form-item prop="name" label="字段名称：">
+        <el-input
+          style="width:282px;"
+          v-model.trim="modalForm.name"
+          placeholder="请输入字段名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="code" label="字段变量名：">
+        <el-input
+          style="width:282px;"
+          v-model.trim="modalForm.code"
+          placeholder="请输入字段变量名"
+          clearable
+        ></el-input>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" @click="submit">确认</el-button>
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyOrgAdmin.vue

@@ -19,15 +19,10 @@
         <el-table-column prop="realName" label="工号"></el-table-column>
         <el-table-column prop="realName" label="角色"></el-table-column>
         <el-table-column prop="realName" label="部门"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               @click="setAdmin(scope.row)"
             >
@@ -67,15 +62,10 @@
         <el-table-column prop="realName" label="工号"></el-table-column>
         <el-table-column prop="realName" label="角色"></el-table-column>
         <el-table-column prop="realName" label="部门"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               @click="setAdmin(scope.row)"
             >

src/modules/base/components/ModifyOrganization.vue

@@ -4,75 +4,68 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
-    width="500px"
+    width="448px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @opened="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item label="上级机构：">
-          <el-input
-            style="width:282px;"
-            v-model.trim="modalForm.parentName"
-            disabled
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="name" label="机构名称：">
-          <el-input
-            style="width:282px;"
-            v-model.trim="modalForm.name"
-            placeholder="请输入机构名称"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="type" label="机构类型：">
-          <el-select
-            v-model="modalForm.type"
-            style="width: 282px;"
-            placeholder="请选择"
-            clearable
-          >
-            <el-option
-              v-for="item in orgTypes"
-              :key="item.type"
-              :value="item.type"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-if="modalForm.type === 'PRINTING_HOUSE'"
-          prop="campusId"
-          label="所属校区："
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item label="上级机构：">
+        <el-input v-model.trim="modalForm.parentName" disabled></el-input>
+      </el-form-item>
+      <el-form-item prop="name" label="机构名称：">
+        <el-input
+          v-model.trim="modalForm.name"
+          placeholder="请输入机构名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="type" label="机构类型：">
+        <el-select
+          v-model="modalForm.type"
+          style="width: 100%;"
+          placeholder="请选择"
+          clearable
         >
-          <campus-select
-            v-model="modalForm.campusId"
-            style="width: 282px;"
-            clearable
-          ></campus-select>
-        </el-form-item>
-        <!-- <el-form-item label="启用/禁用：">
+          <el-option
+            v-for="item in orgTypes"
+            :key="item.type"
+            :value="item.type"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="modalForm.type === 'PRINTING_HOUSE'"
+        prop="campusId"
+        label="所属校区："
+      >
+        <campus-select
+          v-model="modalForm.campusId"
+          style="width: 100%;"
+          clearable
+        ></campus-select>
+      </el-form-item>
+      <!-- <el-form-item label="启用/禁用：">
           <el-switch
             v-model="modalForm.enable"
-            active-color="#23c4b9"
+            
             inactive-color="#dcdfe6"
           >
           </el-switch>
         </el-form-item> -->
-      </el-form>
-    </div>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyRole.vue

@@ -9,34 +9,32 @@
     fullscreen
     @opened="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item prop="name" label="角色名称：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.name"
-            placeholder="请输入角色名称"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="角色权限：" required></el-form-item>
-      </el-form>
-      <privilege-set
-        v-if="menus && menus.length"
-        ref="PrivilegeSet"
-        :menus="menus"
-      ></privilege-set>
-    </div>
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item prop="name" label="角色名称：">
+        <el-input
+          style="width:282px;"
+          v-model.trim="modalForm.name"
+          placeholder="请输入角色名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="角色权限：" required></el-form-item>
+    </el-form>
+    <privilege-set
+      v-if="menus && menus.length"
+      ref="PrivilegeSet"
+      :menus="menus"
+    ></privilege-set>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyStudent.vue

@@ -15,7 +15,7 @@
       :model="modalForm"
       :rules="rules"
       :key="modalForm.id"
-      label-width="100px"
+      label-position="top"
     >
       <el-form-item prop="studentName" label="姓名：">
         <el-input
@@ -56,7 +56,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyTemplate.vue

@@ -3,82 +3,80 @@
     class="modify-template"
     :visible.sync="modalIsShow"
     :title="title"
-    top="10px"
-    width="750px"
+    top="10vh"
+    width="600px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        label-width="130px"
-        :rules="rules"
-        :model="modalForm"
+    <el-form
+      ref="modalFormComp"
+      label-position="top"
+      :rules="rules"
+      :model="modalForm"
+    >
+      <el-form-item prop="name" label="模板名称：">
+        <el-input
+          v-model.trim="modalForm.name"
+          placeholder="建议不超过30个字，规则名称不允许重复"
+          style="width: 100%"
+          clearable
+          :disabled="!editable"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="remark" label="备注：">
+        <el-input
+          v-model="modalForm.remark"
+          type="textarea"
+          resize="none"
+          :rows="2"
+          :maxlength="50"
+          :disabled="!editable"
+          clearable
+          show-word-limit
+          placeholder="建议不超过50个字"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        v-if="modalForm.type !== 'GENERIC'"
+        prop="classify"
+        label="分类："
       >
-        <el-form-item prop="name" label="模板名称：">
-          <el-input
-            v-model.trim="modalForm.name"
-            placeholder="建议不超过30个字，规则名称不允许重复"
-            style="width: 100%"
-            clearable
-            :disabled="!editable"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="remark" label="备注：">
-          <el-input
-            v-model="modalForm.remark"
-            type="textarea"
-            resize="none"
-            :rows="2"
-            :maxlength="50"
-            :disabled="!editable"
-            clearable
-            show-word-limit
-            placeholder="建议不超过50个字"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          v-if="modalForm.type !== 'GENERIC'"
-          prop="classify"
-          label="分类："
+        <el-select
+          v-model="modalForm.classify"
+          style="width: 100%;"
+          placeholder="请选择"
+          :disabled="!editable"
+          clearable
         >
-          <el-select
-            v-model="modalForm.classify"
-            style="width: 439px;"
-            placeholder="请选择"
-            :disabled="!editable"
-            clearable
-          >
-            <el-option
-              v-for="(val, key) in categories"
-              :key="key"
-              :value="key"
-              :label="val"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="attachmentId" label="上传模板文件：">
-          <upload-file-view
-            :upload-data="uploadData"
-            :upload-url="uploadUrl"
-            :disabled="!editable"
-            :format="format"
-            @upload-error="uplaodError"
-            @upload-success="uploadSuccess"
-            ref="UploadFileView"
-          ></upload-file-view>
-        </el-form-item>
-        <el-form-item prop="orgIds" label="适用学院范围：">
-          <select-orgs
-            v-model="modalForm.orgIds"
-            ref="SelectOrgs"
-            :disabled="!editable"
-          ></select-orgs>
-        </el-form-item>
-      </el-form>
-    </div>
+          <el-option
+            v-for="(val, key) in categories"
+            :key="key"
+            :value="key"
+            :label="val"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="attachmentId" label="上传模板文件：">
+        <upload-file-view
+          :upload-data="uploadData"
+          :upload-url="uploadUrl"
+          :disabled="!editable"
+          :format="format"
+          @upload-error="uplaodError"
+          @upload-success="uploadSuccess"
+          ref="UploadFileView"
+        ></upload-file-view>
+      </el-form-item>
+      <el-form-item prop="orgIds" label="适用学院范围：">
+        <select-orgs
+          v-model="modalForm.orgIds"
+          ref="SelectOrgs"
+          :disabled="!editable"
+        ></select-orgs>
+      </el-form-item>
+    </el-form>
 
     <div slot="footer">
       <el-button
@@ -88,7 +86,7 @@
         @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ModifyUser.vue

@@ -4,82 +4,76 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
-    width="600px"
+    width="500px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item prop="loginName" label="用户名：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.loginName"
-            placeholder="请输入用户名"
-            :disabled="isEdit"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="realName" label="姓名：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.realName"
-            placeholder="请输入姓名"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="code" label="工号：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.code"
-            placeholder="请输入工号"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="mobileNumber" label="手机号：">
-          <el-input
-            style="width:100%;"
-            v-model.trim="modalForm.mobileNumber"
-            placeholder="请输入手机号"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="roleIds" label="角色：">
-          <el-select
-            style="width:100%;"
-            v-model="modalForm.roleIds"
-            placeholder="请选择角色"
-            multiple
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item prop="loginName" label="用户名：">
+        <el-input
+          v-model.trim="modalForm.loginName"
+          placeholder="请输入用户名"
+          :disabled="isEdit"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="realName" label="姓名：">
+        <el-input
+          v-model.trim="modalForm.realName"
+          placeholder="请输入姓名"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="code" label="工号：">
+        <el-input
+          v-model.trim="modalForm.code"
+          placeholder="请输入工号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="mobileNumber" label="手机号：">
+        <el-input
+          v-model.trim="modalForm.mobileNumber"
+          placeholder="请输入手机号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="roleIds" label="角色：">
+        <el-select
+          style="width:100%;"
+          v-model="modalForm.roleIds"
+          placeholder="请选择角色"
+          multiple
+        >
+          <el-option
+            v-for="item in roles"
+            :key="item.id"
+            :value="item.id"
+            :label="item.name"
           >
-            <el-option
-              v-for="item in roles"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="orgId" label="所属学院：">
-          <select-orgs
-            ref="SelectOrgs"
-            v-model="modalForm.orgId"
-            :multiple="false"
-            @change="orgChange"
-          ></select-orgs>
-        </el-form-item>
-      </el-form>
-    </div>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="orgId" label="所属学院：">
+        <select-orgs
+          ref="SelectOrgs"
+          v-model="modalForm.orgId"
+          :multiple="false"
+          @change="orgChange"
+        ></select-orgs>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/RegistFlowDialog.vue

@@ -4,54 +4,43 @@
     :visible.sync="modalIsShow"
     title="新增流程"
     top="10vh"
-    width="600px"
+    width="500px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <!-- apply-customer -->
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="90px"
-      >
-        <el-form-item prop="name" label="名称：">
-          <el-input
-            style="width:300px"
-            v-model.trim="modalForm.name"
-            placeholder="请输入名称"
-          ></el-input>
-        </el-form-item>
-        <!-- <el-form-item label="是否发布：">
-          <el-switch
-            v-model="modalForm.publish"
-            active-color="#23c4b9"
-            inactive-color="#dcdfe6"
-          >
-          </el-switch>
-        </el-form-item> -->
-        <el-form-item prop="uploadData" label="上传文件：">
-          <upload-fetch-file
-            input-width="300px"
-            :format="format"
-            @valid-change="validChange"
-            @file-change="fileChange"
-            ref="UploadFetchFile"
-          ></upload-fetch-file>
-          <p class="tips-info">
-            上传的文件只支持{{ format.join(",") }}，大小不超过2M
-          </p>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item prop="name" label="名称：">
+        <el-input
+          style="width:100%"
+          v-model.trim="modalForm.name"
+          placeholder="请输入名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="uploadData" label="上传文件：">
+        <upload-fetch-file
+          input-width="320px"
+          :format="format"
+          @valid-change="validChange"
+          @file-change="fileChange"
+          ref="UploadFetchFile"
+        ></upload-fetch-file>
+        <p class="tips-info">
+          上传的文件只支持{{ format.join(",") }}，大小不超过2M
+        </p>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="confirm"
         >确定</el-button
       >
-      <el-button type="danger" @click="cancel" plain>返回</el-button>
+      <el-button @click="cancel">返回</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/ResetPwd.vue

@@ -4,53 +4,48 @@
     :visible.sync="modalIsShow"
     title="修改密码"
     top="10vh"
-    width="500px"
+    width="448px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="resetModel"
-        :rules="resetRules"
-        label-width="100px"
-      >
-        <el-form-item prop="oldPassword" label="旧密码：">
-          <el-input
-            size="large"
-            type="password"
-            v-model="resetModel.oldPassword"
-            placeholder="请输入旧密码"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="password" label="新密码：">
-          <el-input
-            size="large"
-            type="password"
-            v-model="resetModel.password"
-            placeholder="请输入新密码"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="rePassword" label="再次密码：">
-          <el-input
-            size="large"
-            type="password"
-            v-model="resetModel.rePassword"
-            placeholder="请再次输入新密码"
-            clearable
-          ></el-input>
-        </el-form-item>
-      </el-form>
-    </div>
+    <el-form
+      ref="modalFormComp"
+      :model="resetModel"
+      :rules="resetRules"
+      label-position="top"
+    >
+      <el-form-item prop="oldPassword" label="旧密码：">
+        <el-input
+          type="password"
+          v-model="resetModel.oldPassword"
+          placeholder="请输入旧密码"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="password" label="新密码：">
+        <el-input
+          type="password"
+          v-model="resetModel.password"
+          placeholder="请输入新密码"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="rePassword" label="再次密码：">
+        <el-input
+          type="password"
+          v-model="resetModel.rePassword"
+          placeholder="请再次输入新密码"
+          clearable
+        ></el-input>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/base/components/RuleExam.vue

@@ -39,30 +39,18 @@
         </div>
       </el-form-item>
       <el-form-item label="是否启用入库审核：" required>
-        <el-switch
-          v-model="modalForm.review"
-          active-color="#23c4b9"
-          inactive-color="#dcdfe6"
-        >
+        <el-switch v-model="modalForm.review" inactive-color="#dcdfe6">
         </el-switch>
       </el-form-item>
       <el-form-item label="入库强制包含试卷：" required>
-        <el-switch
-          v-model="modalForm.includePaper"
-          active-color="#23c4b9"
-          inactive-color="#dcdfe6"
-        >
+        <el-switch v-model="modalForm.includePaper" inactive-color="#dcdfe6">
         </el-switch>
         <p class="tips-info">
           注意：若入库时非强制包含试卷，适用于同时有课程要求打印试卷，有的课程不打印试卷的场景。因此，印刷计划里即使勾选了“试卷”，有试卷则打印，否则不打印。
         </p>
       </el-form-item>
       <el-form-item label="是否启用客服制卡：" required>
-        <el-switch
-          v-model="modalForm.customCard"
-          active-color="#23c4b9"
-          inactive-color="#dcdfe6"
-        >
+        <el-switch v-model="modalForm.customCard" inactive-color="#dcdfe6">
         </el-switch>
       </el-form-item>
       <el-form-item label="提交印刷方式：" required>
@@ -76,7 +64,11 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submit" :disabled="isSubmit"
+        <el-button
+          type="primary"
+          :disabled="isSubmit"
+          style="width: 140px"
+          @click="submit"
           >保存</el-button
         >
       </el-form-item>

src/modules/base/views/ApproveRecordManage.vue

@@ -16,7 +16,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -24,13 +23,12 @@
       </el-form>
     </div>
 
-    <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="flowId" label="流程ID"></el-table-column>
@@ -53,21 +51,15 @@
         <el-table-column prop="secondApproveRemark" label="审核意见">
         </el-table-column>
         <el-table-column prop="statusStr" label="状态"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-edit"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/CampusManage.vue

@@ -12,28 +12,26 @@
         >
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="dataList">
         <el-table-column prop="campusName" label="校区名称"></el-table-column>
         <el-table-column prop="campusCode" label="校区编码"></el-table-column>
-        <el-table-column label="操作" align="center" width="120px">
+        <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-delete"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/CardRuleManage.vue

@@ -5,9 +5,9 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="规则名称：">
             <el-input
-              style="width: 200px;"
+              style="width: 142px;"
               v-model.trim="filter.name"
-              placeholder="请输入内容"
+              placeholder="规则名称"
               clearable
             ></el-input>
           </el-form-item>
@@ -16,15 +16,15 @@
               v-model="filter.createTime"
               type="date"
               value-format="timestamp"
-              placeholder="选择日期时间"
+              placeholder="选择创建时间"
             >
             </el-date-picker>
           </el-form-item>
           <el-form-item label="启用/禁用：" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 100px;"
-              placeholder="请选择"
+              style="width: 110px;"
+              placeholder="启用/禁用"
               clearable
             >
               <el-option
@@ -40,7 +40,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -56,13 +55,12 @@
         >
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="rules" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="rules">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="题卡规则名称"></el-table-column>
@@ -82,41 +80,29 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toDetail(scope.row)"
-              title="查看"
-            ></el-button>
+              >查看</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'enable')"
-              class="btn-table-icon"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/CourseManage.vue

@@ -37,7 +37,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -63,13 +62,12 @@
           :format="['xls', 'xlsx']"
           @upload-error="uplaodError"
           @upload-success="uploadSuccess"
-          style="margin: 0;"
         >
         </upload-button>
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="courses" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="courses">
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="courseCode" label="课程编码"></el-table-column>
         <el-table-column
@@ -82,24 +80,22 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="120px">
+        <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-delete"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/FlowManage.vue

@@ -16,7 +16,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -32,44 +31,24 @@
         >
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="流程名称"></el-table-column>
-        <!-- <el-table-column prop="publish" label="状态">
-          <span slot-scope="scope">
-            {{ scope.row.publish ? "已发布" : "未发布" }}</span
-          >
-        </el-table-column> -->
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
-            <!-- <el-button
-              v-if="checkPrivilege('link', 'publish') && !scope.row.publish"
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-edit"
-              @click="toPublish(scope.row)"
-              title="发布"
-            ></el-button> -->
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-delete"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/OrganizationManage.vue

@@ -1,6 +1,20 @@
 <template>
   <div class="organization-manage">
+    <div class="part-box part-box-pad part-box-flex">
+      <div></div>
+      <el-button
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        @click="toAdd"
+        >新增机构</el-button
+      >
+    </div>
     <div class="part-box part-box-pad part-box-border">
+      <div class="org-tree-head">
+        <div>机构名称</div>
+        <div>操作</div>
+        <div>机构类型</div>
+      </div>
       <el-tree
         :data="orgs"
         node-key="id"
@@ -13,44 +27,43 @@
           <span v-if="data.isRoot">
             <el-button
               v-if="checkPrivilege('button', 'Add')"
-              class="btn-table-icon"
               type="text"
-              icon="icon icon-plus-act"
               @click="toAdd"
-              title="新增子机构"
-            ></el-button>
-          </span>
-          <span v-else>
-            <el-button type="text">{{ data.type | orgTypeFilter }}</el-button>
-            <el-button
-              v-if="
-                data.type !== 'PRINTING_HOUSE' &&
-                  data.type !== 'TEACHING_ROOM' &&
-                  checkPrivilege('link', 'Add')
-              "
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-plus-act"
-              @click="() => append(data)"
-              title="新增子机构"
-            ></el-button>
-            <el-button
-              v-if="checkPrivilege('link', 'Edit')"
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-edit"
-              @click="() => edit(node, data)"
-              title="修改"
-            ></el-button>
-            <el-button
-              v-if="checkPrivilege('link', 'Delete')"
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-delete"
-              @click="() => remove(node, data)"
-              title="删除"
-            ></el-button>
+              >子部门</el-button
+            >
           </span>
+          <div class="org-edit" v-else>
+            <div class="org-type">
+              {{ data.type | orgTypeFilter }}
+            </div>
+            <div class="org-actions">
+              <el-button
+                v-if="
+                  data.type !== 'PRINTING_HOUSE' &&
+                    data.type !== 'TEACHING_ROOM' &&
+                    checkPrivilege('link', 'Add')
+                "
+                class="btn-primary"
+                type="text"
+                @click="() => append(data)"
+                >子部门</el-button
+              >
+              <el-button
+                v-if="checkPrivilege('link', 'Edit')"
+                class="btn-primary"
+                type="text"
+                @click="() => edit(node, data)"
+                >修改</el-button
+              >
+              <el-button
+                v-if="checkPrivilege('link', 'Delete')"
+                class="btn-danger"
+                type="text"
+                @click="() => remove(node, data)"
+                >删除</el-button
+              >
+            </div>
+          </div>
         </span>
       </el-tree>
     </div>
@@ -91,15 +104,16 @@ export default {
     async getList() {
       if (!this.checkPrivilege("list", "LIST")) return;
       const orgs = await organizationList();
-      this.orgs = [
-        {
-          id: this.$ls.get("schoolId") + "_" + this.$randomCode(),
-          name: this.$ls.get("schoolName"),
-          isRoot: true,
-          parentId: null,
-          children: orgs
-        }
-      ];
+      this.orgs = orgs || [];
+      // this.orgs = [
+      //   {
+      //     id: this.$ls.get("schoolId") + "_" + this.$randomCode(),
+      //     name: this.$ls.get("schoolName"),
+      //     isRoot: true,
+      //     parentId: null,
+      //     children: orgs
+      //   }
+      // ];
     },
     toAdd() {
       const data = this.orgs[0];

src/modules/base/views/PrintPlanPushManage.vue

@@ -11,9 +11,7 @@
         </el-form-item>
         <el-form-item label="考试计划："> </el-form-item>
         <el-form-item label-width="0px">
-          <el-button type="primary" icon="el-icon-search" @click="search"
-            >查询</el-button
-          >
+          <el-button type="primary" @click="search">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">
@@ -78,15 +76,10 @@
         <el-table-column prop="examName" label="考试名称"></el-table-column>
         <el-table-column prop="examId" label="考试ID"></el-table-column>
         <el-table-column prop="syncStatus" label="同步状态"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
@@ -96,7 +89,7 @@
               v-if="
                 scope.row.createId === curUserId && scope.row.status === 'NEW'
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               title="推送"

src/modules/base/views/RoleManage.vue

@@ -31,7 +31,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -47,60 +46,48 @@
         >
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="roles" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="roles">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="角色名称"></el-table-column>
-        <el-table-column prop="enable" label="启用/禁用">
+        <!-- <el-table-column prop="enable" label="启用/禁用">
           <template slot-scope="scope">
             {{ scope.row.enable | enableFilter }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="createTime" label="创建时间">
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-delete"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
             <!-- <el-button
-              class="btn-table-icon"
+              v-if="checkPrivilege('link', 'enable')"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button> -->
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            > -->
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/StudentManage.vue

@@ -14,7 +14,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -40,13 +39,12 @@
           :format="['xls', 'xlsx']"
           @upload-error="uplaodError"
           @upload-success="uploadSuccess"
-          style="margin: 0;"
         >
         </upload-button>
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="dataList">
         <el-table-column prop="studentName" label="姓名"></el-table-column>
         <el-table-column prop="studentCode" label="学号"></el-table-column>
         <el-table-column prop="phoneNumber" label="手机号"></el-table-column>
@@ -57,24 +55,22 @@
             {{ scope.row.enable | enableFilter }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="120px">
+        <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-delete"
               @click="toDelete(scope.row)"
-              title="删除"
-            ></el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/TemplateManage.vue

@@ -45,7 +45,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -61,13 +60,12 @@
         >
       </div>
     </div>
-    <div class="part-box">
-      <el-table ref="TableList" :data="templates" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="templates">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="模板名称"></el-table-column>
@@ -96,41 +94,29 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toDetail(scope.row)"
-              title="查看"
-            ></el-button>
+              >查看</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'enable')"
-              class="btn-table-icon"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/UserManage.vue

@@ -7,7 +7,7 @@
             <el-input
               style="width: 142px;"
               v-model.trim="filter.loginName"
-              placeholder="请输入内容"
+              placeholder="用户名"
               clearable
             ></el-input>
           </el-form-item>
@@ -15,7 +15,7 @@
             <el-input
               style="width: 142px;"
               v-model.trim="filter.realName"
-              placeholder="请输入内容"
+              placeholder="姓名"
               clearable
             ></el-input>
           </el-form-item>
@@ -23,7 +23,7 @@
             <el-select
               v-model="filter.roleId"
               style="width: 142px;"
-              placeholder="请选择"
+              placeholder="角色"
               filterable
               clearable
             >
@@ -38,8 +38,8 @@
           <el-form-item label="启用/禁用：" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 142px;"
-              placeholder="请选择"
+              style="width: 110px;"
+              placeholder="启用/禁用"
               clearable
             >
               <el-option
@@ -56,7 +56,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -82,19 +81,17 @@
           :format="['xls', 'xlsx']"
           @upload-error="uplaodError"
           @upload-success="uploadSuccess"
-          style="margin: 0;"
         >
         </upload-button>
       </div>
     </div>
 
-    <div class="part-box">
-      <el-table ref="TableList" :data="users" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="users">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="loginName" label="用户名"></el-table-column>
@@ -120,41 +117,29 @@
             {{ scope.row.enable | enableFilter }}
           </template>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="200px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'enable')"
-              class="btn-table-icon"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'reset')"
-              class="btn-table-icon"
+              class="btn-danger"
               type="text"
-              icon="icon icon-circle-lock"
               @click="toResetPwd(scope.row)"
-              title="重置密码"
-            ></el-button>
+              >重置密码</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/customer/views/CustomerCard.vue

@@ -73,7 +73,6 @@
                 (!AUDITED && checkPrivilege('button', 'notReviewSelect'))
             "
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -105,7 +104,6 @@
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -126,16 +124,11 @@
             scope.row.updateTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="80px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
             <el-button
               v-if="AUDITED && checkPrivilege('link', 'reviewPreview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
@@ -143,7 +136,7 @@
             ></el-button>
             <el-button
               v-if="!AUDITED && checkPrivilege('link', 'notReviewDesign')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"

src/modules/exam/components/ApplyAuditHistory.vue

@@ -12,7 +12,7 @@
           >{{ latestHistory.reviewStatus | reviewStatusFilter }}</span
         >
       </p>
-      <el-table :data="auditHistory" border stripe>
+      <el-table :data="auditHistory">
         <el-table-column prop="operateTime" label="审核日期">
           <span slot-scope="scope"
             >{{ scope.row.operateTime | timestampFilter }}

src/modules/exam/components/ApplyContent.vue

@@ -105,7 +105,7 @@
             </td>
             <td v-if="IS_APPLY">
               <el-button
-                class="btn-table-icon"
+                class="btn-primary"
                 type="text"
                 icon="icon icon-delete"
                 title="删除"
@@ -249,7 +249,7 @@
           @click="toAuditApply"
           >确定</el-button
         >
-        <el-button type="danger" @click="cancel" plain>取消</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
     </div>
 
@@ -327,11 +327,6 @@ export default {
       default() {
         return {};
       }
-    },
-    editType: {
-      type: String,
-      default: "APPLY",
-      validator: val => ["APPLY", "PREVIEW", "AUDIT"].includes(val)
     }
   },
   data() {
@@ -396,13 +391,13 @@ export default {
   },
   computed: {
     IS_APPLY() {
-      return this.editType === "APPLY";
+      return this.curTaskApply.setup === 1;
     },
     IS_PREVIEW() {
-      return this.editType === "PREVIEW";
+      return this.curTaskApply.setup === 0;
     },
     IS_AUDIT() {
-      return this.editType === "AUDIT";
+      return this.curTaskApply.setup > 1;
     },
     cardTodoName() {
       let name = "创建答题卡";

src/modules/exam/components/BatchAddExamTask.vue

@@ -96,7 +96,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="toSave"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/exam/components/CreatePrintTask.vue

@@ -112,7 +112,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/exam/components/CreateTaskApply.vue

@@ -172,7 +172,7 @@
             </td>
             <td>
               <el-button
-                class="btn-table-icon"
+                class="btn-primary"
                 type="text"
                 icon="icon icon-delete"
                 title="删除"
@@ -249,7 +249,7 @@
           @click="toSave"
           >暂存</el-button
         >
-        <el-button type="danger" @click="cancel" plain>取消</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
     </div>
     <div slot="footer"></div>

src/modules/exam/components/ModifyExamTask.vue

@@ -92,7 +92,7 @@
         @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/exam/components/ModifyTaskApply.vue

@@ -76,7 +76,7 @@
                     instance.status === 'SUBMIT'
                 "
                 type="text"
-                class="btn-table-icon ml-2"
+                class="btn-primary ml-2"
                 @click="toCancel"
                 ><span class="color-danger">撤销申请</span></el-button
               >
@@ -105,7 +105,6 @@
         v-show="curMenu.id === '1'"
         ref="ApplyContent"
         :exam-task="modalForm"
-        :edit-type="editType"
         @cancel="cancel"
         @modified="modified"
       ></apply-content>
@@ -158,11 +157,6 @@ export default {
       default() {
         return {};
       }
-    },
-    editType: {
-      type: String,
-      default: "APPLY",
-      validator: val => ["APPLY", "PREVIEW", "AUDIT"].includes(val)
     }
   },
   computed: {

src/modules/exam/components/ModifyTaskPaper.vue

@@ -122,7 +122,7 @@
             <td v-if="IS_EDIT">
               <el-button
                 v-if="attachment.editable"
-                class="btn-table-icon"
+                class="btn-primary"
                 type="text"
                 icon="icon icon-delete"
                 title="删除"
@@ -141,7 +141,7 @@
           @click="submit"
           >确认提交</el-button
         >
-        <el-button type="danger" @click="cancel" plain>取消</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
     </el-dialog>
 

src/modules/exam/components/PrintTaskStudents.vue

@@ -11,12 +11,11 @@
     @open="visibleChange"
   >
     <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="studentName" label="姓名"></el-table-column>

src/modules/exam/components/PublishPrintTask.vue

@@ -41,11 +41,10 @@
       <el-button class="mb-2" type="primary" @click="toAdd"
         >增加考试对象</el-button
       >
-      <el-table ref="TableList" :data="tableData" border stripe>
+      <el-table ref="TableList" :data="tableData">
         <el-table-column
           type="index"
           width="70"
-          align="center"
           label="卷袋序号"
         ></el-table-column>
         <el-table-column prop="examRoom" label="考场"> </el-table-column>
@@ -68,21 +67,21 @@
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
               title="考生明细"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"
               title="编辑"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-delete"
               @click="toDelete(scope.row)"

src/modules/exam/views/DataTaskManage.vue

@@ -38,7 +38,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -71,7 +70,6 @@
           type="index"
           label="序号"
           width="50"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="printPlanName" label="项目"></el-table-column>
@@ -84,16 +82,11 @@
           }}</span>
         </el-table-column>
         <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="100px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="100px">
           <template slot-scope="scope">
             <el-button
               v-if="scope.row.hasReportFile && checkPrivilege('link', 'export')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-share"
               :disabled="loading"
@@ -104,7 +97,7 @@
               v-if="
                 scope.row.resetCreatePdf && checkPrivilege('link', 'createPdf')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-modify"
               :disabled="loading"
@@ -115,7 +108,7 @@
               v-if="
                 !scope.row.resetCreatePdf && checkPrivilege('link', 'download')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-download-act"
               :disabled="loading"

src/modules/exam/views/ExamTaskManage.vue

@@ -7,7 +7,7 @@
             <el-select
               v-model="filter.status"
               style="width: 142px;"
-              placeholder="请选择"
+              placeholder="命题状态"
               clearable
             >
               <el-option
@@ -22,7 +22,7 @@
             <card-rule-select
               ref="CardRuleSelect"
               v-model.trim="filter.cardRuleId"
-              placeholder="请选择"
+              placeholder="题卡规则"
               clearable
             ></card-rule-select>
           </el-form-item>
@@ -30,21 +30,21 @@
             <course-select
               ref="CourseSelect"
               v-model.trim="filter.courseCode"
-              placeholder="请选择"
+              placeholder="课程（代码）"
               clearable
             ></course-select>
           </el-form-item>
           <el-form-item label="命题老师：">
             <el-input
               v-model="filter.userName"
-              placeholder="请输入"
+              placeholder="命题老师"
               clearable
             ></el-input>
           </el-form-item>
           <el-form-item label="创建人：">
             <el-input
               v-model="filter.createName"
-              placeholder="请输入"
+              placeholder="创建人"
               clearable
             ></el-input>
           </el-form-item>
@@ -52,7 +52,7 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              placeholder="请选择"
+              placeholder="试卷编号"
               clearable
             ></paper-number-select>
           </el-form-item>
@@ -62,8 +62,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="命题开始时间"
+              end-placeholder="命题结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -74,7 +74,7 @@
             <el-select
               v-model="filter.enable"
               style="width: 142px;"
-              placeholder="请选择"
+              placeholder="启用/禁用"
               clearable
             >
               <el-option
@@ -91,7 +91,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -117,13 +116,12 @@
       </div>
     </div>
 
-    <div class="part-box">
-      <el-table ref="TableList" :data="examTasks" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="examTasks">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -160,50 +158,38 @@
           </template>
         </el-table-column>
         <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
-              title="查看"
-            ></el-button>
+              >查看</el-button
+            >
             <el-button
               v-if="
-                ((scope.row.status === 'READY' && !scope.row.enable) ||
-                  scope.row.status === 'NEW') &&
+                ((scope.row.status === 'STAGE' && !scope.row.enable) ||
+                  scope.row.status === 'DRAFT') &&
                   scope.row.createId === curUserId &&
                   checkPrivilege('link', 'edit')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              :title="scope.row.status === 'NEW' ? '指派' : '更改'"
-            ></el-button>
+              >{{ scope.row.status === "DRAFT" ? "指派" : "更改" }}</el-button
+            >
             <el-button
               v-if="
                 scope.row.status !== 'FINISH' &&
                   scope.row.createId === curUserId &&
                   checkPrivilege('link', 'cancel')
               "
-              class="btn-table-icon"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/exam/views/TaskApplyManage.vue

@@ -7,7 +7,7 @@
             <el-select
               v-model="filter.auditStatus"
               style="width: 142px;"
-              placeholder="请选择"
+              placeholder="审核状态"
               clearable
             >
               <el-option
@@ -22,7 +22,7 @@
             <el-select
               v-model="filter.reviewStatus"
               style="width: 142px;"
-              placeholder="请选择"
+              placeholder="审核结果"
               clearable
             >
               <el-option
@@ -37,7 +37,7 @@
             <card-rule-select
               ref="CardRuleSelect"
               v-model.trim="filter.cardRuleId"
-              placeholder="请选择"
+              placeholder="题卡规则"
               clearable
             ></card-rule-select>
           </el-form-item>
@@ -45,14 +45,14 @@
             <course-select
               ref="CourseSelect"
               v-model.trim="filter.courseCode"
-              placeholder="请选择"
+              placeholder="课程（代码）"
               clearable
             ></course-select>
           </el-form-item>
           <el-form-item label="命题老师：">
             <el-input
               v-model="filter.userName"
-              placeholder="请输入"
+              placeholder="命题老师"
               clearable
             ></el-input>
           </el-form-item>
@@ -60,7 +60,7 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              placeholder="请选择"
+              placeholder="试卷编号"
               clearable
             ></paper-number-select>
           </el-form-item>
@@ -70,8 +70,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="命题开始时间"
+              end-placeholder="命题结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -83,7 +83,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -92,7 +91,7 @@
       <div class="part-box-action">
         <el-button
           v-if="checkPrivilege('button', 'addTask')"
-          icon="el-icon-download"
+          icon="el-icon-circle-plus-outline"
           type="primary"
           @click="toAddApply"
         >
@@ -101,13 +100,12 @@
       </div>
     </div>
 
-    <div class="part-box">
-      <el-table ref="TableList" :data="examTasks" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="examTasks">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -142,60 +140,40 @@
             {{ scope.row.reviewStatus | reviewStatusFilter }}
           </template>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="160px">
           <template slot-scope="scope">
             <el-button
-              v-if="
-                (scope.row.auditStatus || scope.row.reviewStatus) &&
-                  checkPrivilege('link', 'preview')
-              "
-              class="btn-table-icon"
+              v-if="scope.row.setup === 0 && checkPrivilege('link', 'preview')"
+              class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
-              title="查看详情"
-            ></el-button>
+              >查看详情</el-button
+            >
             <el-button
-              v-if="
-                !scope.row.auditStatus &&
-                  !scope.row.reviewStatus &&
-                  checkPrivilege('link', 'edit')
-              "
-              class="btn-table-icon"
+              v-if="scope.row.setup === 1 && checkPrivilege('link', 'edit')"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="立即申请"
-            ></el-button>
+              >立即申请</el-button
+            >
             <el-button
               v-if="
                 scope.row.auditStatus === 'AUDITED' &&
                   scope.row.reviewStatus === 'NOT_PASS' &&
                   checkPrivilege('link', 'edit')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="重新申请"
-            ></el-button>
+              >重新申请</el-button
+            >
             <el-button
-              v-if="
-                scope.row.auditStatus === 'NOT_AUDITED' &&
-                  scope.row.status === 'SUBMIT' &&
-                  checkPrivilege('link', 'end')
-              "
-              class="btn-table-icon"
+              v-if="scope.row.setup === 0 && checkPrivilege('link', 'end')"
+              class="btn-danger"
               type="text"
-              icon="icon icon-close-act"
               @click="toCancel(scope.row)"
-              title="撤销申请"
-            ></el-button>
+              >撤销申请</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/exam/views/TaskPaperManage.vue

@@ -7,7 +7,7 @@
             <course-select
               ref="CourseSelect"
               v-model.trim="filter.courseCode"
-              placeholder="请选择"
+              placeholder="课程（代码）"
               clearable
             ></course-select>
           </el-form-item>
@@ -15,21 +15,21 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              placeholder="请选择"
+              placeholder="试卷编号"
               clearable
             ></paper-number-select>
           </el-form-item>
           <el-form-item label="题卡规则：">
             <card-rule-select
               v-model="filter.cardRuleId"
-              placeholder="请选择"
+              placeholder="题卡规则"
               clearable
             ></card-rule-select>
           </el-form-item>
           <el-form-item label="题卡创建类型：">
             <el-select
               v-model="filter.makeMethod"
-              placeholder="请选择"
+              placeholder="题卡创建类型"
               clearable
             >
               <el-option
@@ -47,8 +47,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="入库开始时间"
+              end-placeholder="入库结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -60,7 +60,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -79,13 +78,12 @@
       </div>
     </div>
 
-    <div class="part-box">
-      <el-table ref="TableList" :data="papers" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="papers">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -130,58 +128,44 @@
             {{ scope.row.enable | enableFilter }}
           </template>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="180px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
-              title="查看"
-            ></el-button>
+              >查看</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="修改"
-            ></el-button>
+              >修改</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'enable')"
-              class="btn-table-icon"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'download')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-download-act"
               :disabled="loading"
               @click="toDownload(scope.row)"
-              title="下载"
-            ></el-button>
+              >下载</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'publish')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
-              icon="icon icon-download-act"
               @click="toPublishPrintTask(scope.row)"
-              title="发布印刷任务"
-            ></el-button>
+              >发布印刷任务</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/exam/views/TaskReviewManage.vue

@@ -108,7 +108,6 @@
                 (!AUDITED && checkPrivilege('button', 'notReviewSelect'))
             "
             type="primary"
-            icon="el-icon-search"
             @click="toPage(1)"
             >查询</el-button
           >
@@ -161,7 +160,6 @@
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -192,16 +190,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="80px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
             <el-button
               v-if="AUDITED && checkPrivilege('link', 'reviewPreview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
@@ -209,7 +202,7 @@
             ></el-button>
             <el-button
               v-if="!AUDITED && checkPrivilege('link', 'notReviewEdit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"

src/modules/exam/views/WaitTask.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="wait-task">
-    <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+    <div class="part-box part-box-pad">
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="50"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
@@ -22,18 +21,9 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="100px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="100px">
           <template slot-scope="scope">
-            <el-button
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-download-act"
-              @click="toDo(scope.row)"
+            <el-button class="btn-primary" type="text" @click="toDo(scope.row)"
               >立即处理</el-button
             >
           </template>

src/modules/login/views/Login.vue

@@ -176,14 +176,14 @@ export default {
         this.$ls.set("schoolId", data.schoolInfo.id, this.GLOBAL.authTimeout);
       this.$ls.set("user", data, this.GLOBAL.authTimeout);
 
-      // 强制修改密码
-      // if (!data.pwdCount) {
-      //   this.$refs.ResetPwd.open();
-      //   return;
-      // }
-
       this.$ls.set("token", data.accessToken, this.GLOBAL.authTimeout);
 
+      // 强制修改密码
+      if (!data.pwdCount) {
+        this.$refs.ResetPwd.open();
+        return;
+      }
+
       if (data.roleList && data.roleList.includes("ADMIN")) {
         this.$router.push({
           name: "SelectSchool"

src/modules/print/components/ModifyPlanPaper.vue

@@ -134,7 +134,7 @@
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/print/components/ModifyPrintPlan.vue

@@ -238,7 +238,7 @@
         @click="submit"
         >确认</el-button
       >
-      <el-button type="danger" @click="cancel" plain>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
 </template>

src/modules/print/components/PreviewBusinessDetail.vue

@@ -64,12 +64,11 @@
       </div>
 
       <div class="part-box">
-        <el-table ref="TableList" :data="dataList" border stripe>
+        <el-table ref="TableList" :data="dataList">
           <el-table-column
             type="index"
             label="序号"
             width="50"
-            align="center"
             :index="indexMethod"
           ></el-table-column>
           <el-table-column prop="courseNameCode" label="课程（代码）">
@@ -83,15 +82,10 @@
           <el-table-column prop="ticketNumber" label="考号"> </el-table-column>
           <el-table-column prop="studentCode" label="学号"> </el-table-column>
           <el-table-column prop="studentName" label="姓名"> </el-table-column>
-          <el-table-column
-            class-name="action-column"
-            label="操作"
-            align="center"
-            width="70"
-          >
+          <el-table-column class-name="action-column" label="操作" width="70">
             <template slot-scope="scope">
               <el-button
-                class="btn-table-icon"
+                class="btn-primary"
                 type="text"
                 icon="icon icon-circle-right"
                 @click="toPreview(scope.row)"

src/modules/print/components/PreviewPrintTaskTemplate.vue

@@ -10,12 +10,11 @@
       append-to-body
       @open="initData"
     >
-      <el-table :data="templates" border stripe>
+      <el-table :data="templates">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="type" label="印品名称">
@@ -23,10 +22,10 @@
             {{ scope.row.type | templateClassifyFilter }}
           </span>
         </el-table-column>
-        <el-table-column class-name="action-column" label="操作" align="center">
+        <el-table-column class-name="action-column" label="操作">
           <div slot-scope="scope">
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toViewTemplate(scope.row)"

src/modules/print/views/BusinessDataDetail.vue

@@ -71,7 +71,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="search"
             >查询</el-button
           >
@@ -80,12 +79,11 @@
     </div>
 
     <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column
@@ -105,16 +103,11 @@
         </el-table-column>
         <el-table-column prop="studentName" label="姓名" width="120">
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="70"
-        >
+        <el-table-column class-name="action-column" label="操作" width="70">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"

src/modules/print/views/BusinessDataExport.vue

@@ -71,7 +71,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="search"
             >查询</el-button
           >
@@ -107,12 +106,11 @@
     </div>
 
     <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column
@@ -129,16 +127,11 @@
         <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
         <el-table-column prop="totalSubjects" label="科次" width="80">
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="70"
-        >
+        <el-table-column class-name="action-column" label="操作" width="70">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"

src/modules/print/views/PlanLinkPaper.vue

@@ -64,7 +64,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="search"
             >查询</el-button
           >
@@ -73,12 +72,11 @@
     </div>
 
     <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column
@@ -112,16 +110,11 @@
         </el-table-column>
         <el-table-column prop="totalSubjects" label="总科次" width="80">
         </el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="80px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'edit')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"

src/modules/print/views/PrintPlanManage.vue

@@ -45,7 +45,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="search"
             >查询</el-button
           >
@@ -64,12 +63,11 @@
     </div>
 
     <div class="part-box">
-      <el-table ref="TableList" :data="dataList" border stripe>
+      <el-table ref="TableList" :data="dataList">
         <el-table-column
           type="index"
           label="序号"
           width="70"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="印刷计划"></el-table-column>
@@ -100,23 +98,18 @@
           }}</span>
         </el-table-column>
         <el-table-column prop="createName" label="创建人"></el-table-column>
-        <el-table-column
-          class-name="action-column"
-          label="操作"
-          align="center"
-          width="120px"
-        >
+        <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
               title="查看"
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-edit"
               @click="toEdit(scope.row)"
@@ -128,7 +121,7 @@
               "
             ></el-button>
             <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-delete"
               @click="toDelete(scope.row)"

src/modules/print/views/PrintTaskManage.vue

@@ -92,7 +92,6 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            icon="el-icon-search"
             @click="search"
             >查询</el-button
           >
@@ -159,7 +158,6 @@
           type="index"
           label="序号"
           width="60"
-          align="center"
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="packageCode" label="卷袋编号"></el-table-column>
@@ -223,14 +221,13 @@
         <el-table-column
           class-name="action-column"
           label="操作"
-          align="center"
           width="120px"
           fixed="right"
         >
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'download')"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-download-act"
               @click="toViewPdf(scope.row)"
@@ -240,7 +237,7 @@
               v-if="
                 scope.row.status === 'READY' && checkPrivilege('link', 'submit')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-share"
               @click="toSubmit(scope.row)"
@@ -248,7 +245,7 @@
             ></el-button>
             <!-- <el-button
               v-if="scope.row.status === 'PRINTING'"
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-share"
               @click="toResubmit(scope.row)"
@@ -258,14 +255,14 @@
               v-if="
                 scope.row.status === 'WAITING' && checkPrivilege('link', 'end')
               "
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-close-act"
               @click="toCancel(scope.row)"
               title="撤回提交"
             ></el-button>
             <!-- <el-button
-              class="btn-table-icon"
+              class="btn-primary"
               type="text"
               icon="icon icon-circle-right"
               @click="toPreview(scope.row)"

src/views/Home.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="home">
     <div class="home-header">
-      <div class="head-logo">
-        <img v-if="schoolLogo" :src="schoolLogo" alt="分布式印刷" />
-        <h1 v-else>分布式印刷</h1>
-      </div>
       <div class="head-menu menu-list">
         <ul>
           <li
@@ -46,14 +42,18 @@
     </div>
 
     <div class="home-navs" v-if="curMenu.children">
+      <div class="head-logo">
+        <img v-if="schoolLogo" :src="schoolLogo" alt="分布式印刷" />
+        <h1 v-else>分布式印刷</h1>
+      </div>
       <div
         v-for="(submenu, sindex) in curMenu.children"
         :key="sindex"
         class="nav-part"
       >
         <div class="nav-head">
-          <i :class="submenu.icon"></i>
           <span>{{ submenu.name }}</span>
+          <i class="nav-head-right-icon el-icon-caret-bottom"></i>
         </div>
         <ul class="nav-list">
           <li
@@ -69,16 +69,6 @@
               @click="toNav(nav)"
             >
               <p class="nav-item-cont">{{ nav.name }}</p>
-              <span class="nav-item-icon nav-item-icon-right">
-                <i
-                  :class="[
-                    'icon',
-                    curActNav === nav.url
-                      ? 'icon-arrow-right-act'
-                      : 'icon-arrow-right'
-                  ]"
-                ></i>
-              </span>
               <span
                 class="nav-item-info"
                 v-if="nav.url === 'WaitTask' && waitTaskCount"
@@ -93,10 +83,11 @@
     <div class="home-body">
       <div class="home-main">
         <div class="home-breadcrumb" v-if="breadcrumbs.length">
-          <el-breadcrumb separator=">">
-            <el-breadcrumb-item>
-              <i class="el-icon-s-home" style="margin-top: -2px;"></i>
-            </el-breadcrumb-item>
+          <span class="breadcrumb-tips">
+            <i class="icon icon-location"></i>
+            <span>当前所在位置：</span>
+          </span>
+          <el-breadcrumb separator="/">
             <el-breadcrumb-item
               v-for="(bread, index) in breadcrumbs"
               :key="index"