部分UI修改

src/assets/styles/adaptive.scss

@@ -3,7 +3,8 @@
   .part-box {
     margin-bottom: 15px;
     border-radius: 15px;
-    padding: 20px;
+    // padding: 20px;
+    padding: 8px;
   }
   .el-form.part-filter-form {
     padding: 15px 0 0;
@@ -36,111 +37,111 @@
   }
 
   // login
-  .login {
-    .login-main {
-      width: 864px;
-      height: 544px;
-      transform: translate(-50%, -51%);
-      background-size: 100% 100%;
-    }
-    .login-title {
-      left: 125px;
-      top: 72px;
-      font-size: 36px;
-      line-height: 54px;
-    }
-    .login-footer {
-      left: 145px;
-      bottom: 90px;
-    }
-    .login-body {
-      width: 350px;
-      right: 100px;
-      top: 70px;
-      padding: 45px;
-      border-radius: 15px;
+  // .login {
+  //   .login-main {
+  //     width: 864px;
+  //     height: 544px;
+  //     transform: translate(-50%, -51%);
+  //     background-size: 100% 100%;
+  //   }
+  //   .login-title {
+  //     left: 125px;
+  //     top: 72px;
+  //     font-size: 36px;
+  //     line-height: 54px;
+  //   }
+  //   .login-footer {
+  //     left: 145px;
+  //     bottom: 90px;
+  //   }
+  //   .login-body {
+  //     width: 350px;
+  //     right: 100px;
+  //     top: 70px;
+  //     padding: 45px;
+  //     border-radius: 15px;
 
-      &-title {
-        height: 26px;
-        line-height: 26px;
-        font-size: 18px;
-        margin-bottom: 30px;
-      }
-      .el-input__inner {
-        height: 40px !important;
-        padding-top: 6px;
-        padding-bottom: 6px;
-        padding-left: 36px;
-      }
-      .el-input__prefix {
-        top: 11px;
-        left: 14px;
-      }
-    }
-    .login-submit-btn {
-      height: 42px;
-      box-shadow: 0px 16px 16px 0px rgba(254, 114, 61, 0.3);
-      font-size: 16px;
-    }
-  }
+  //     &-title {
+  //       height: 26px;
+  //       line-height: 26px;
+  //       font-size: 18px;
+  //       margin-bottom: 30px;
+  //     }
+  //     .el-input__inner {
+  //       height: 40px !important;
+  //       padding-top: 6px;
+  //       padding-bottom: 6px;
+  //       padding-left: 36px;
+  //     }
+  //     .el-input__prefix {
+  //       top: 11px;
+  //       left: 14px;
+  //     }
+  //   }
+  //   .login-submit-btn {
+  //     height: 42px;
+  //     box-shadow: 0px 16px 16px 0px rgba(254, 114, 61, 0.3);
+  //     font-size: 16px;
+  //   }
+  // }
   // home
-  .home {
-    &::before {
-      width: 560px;
-      height: 160px;
-      left: 160px;
-    }
-    &-body {
-      top: 50px;
-    }
-    &-main {
-      padding: 0 15px 40px 235px;
-    }
-    &-header {
-      height: 50px;
-      left: 215px;
-      padding: 13px 15px;
-    }
-    .header-menu-item {
-      line-height: 24px;
-      height: 24px;
-      min-width: 24px;
-      border-radius: 12px;
-      padding: 0 12px;
-    }
-    &-footer {
-      height: 40px;
-      padding: 10px 0;
-    }
-    &-side {
-      width: 220px;
-    }
-    &-logo {
-      padding: 0 30px;
-      font-size: 18px;
-      line-height: 40px;
-      a {
-        padding: 20px 0;
-      }
-    }
-    .el-menu-vertical-demo {
-      padding-top: 15px;
+  // .home {
+  //   &::before {
+  //     width: 560px;
+  //     height: 160px;
+  //     left: 160px;
+  //   }
+  //   &-body {
+  //     top: 50px;
+  //   }
+  //   &-main {
+  //     padding: 0 15px 40px 235px;
+  //   }
+  //   &-header {
+  //     height: 50px;
+  //     left: 215px;
+  //     padding: 13px 15px;
+  //   }
+  //   .header-menu-item {
+  //     line-height: 24px;
+  //     height: 24px;
+  //     min-width: 24px;
+  //     border-radius: 12px;
+  //     padding: 0 12px;
+  //   }
+  //   &-footer {
+  //     height: 40px;
+  //     padding: 10px 0;
+  //   }
+  //   &-side {
+  //     width: 220px;
+  //   }
+  //   &-logo {
+  //     padding: 0 30px;
+  //     font-size: 18px;
+  //     line-height: 40px;
+  //     a {
+  //       padding: 20px 0;
+  //     }
+  //   }
+  //   .el-menu-vertical-demo {
+  //     padding-top: 15px;
 
-      .el-submenu__title {
-        padding: 0 30px !important;
-        height: 40px;
-        line-height: 40px;
-      }
-      .el-submenu .el-menu-item {
-        padding-left: 54px !important;
-        height: 36px;
-        line-height: 36px;
-      }
-      .el-submenu__icon-arrow {
-        right: 30px;
-      }
-    }
-  }
+  //     .el-submenu__title {
+  //       padding: 0 30px !important;
+  //       height: 40px;
+  //       line-height: 40px;
+  //     }
+  //     .el-submenu .el-menu-item {
+  //       padding-left: 54px !important;
+  //       height: 36px;
+  //       line-height: 36px;
+  //     }
+  //     .el-submenu__icon-arrow {
+  //       right: 30px;
+  //     }
+  //   }
+  // }
   // pages
   .data-privilege {
     .privilege-part {

src/assets/styles/base.scss

@@ -123,7 +123,8 @@ body {
 .part-box {
   margin-bottom: 20px;
   background-color: $--color-white;
-  border-radius: 20px;
+  // border-radius: 20px;
+  border-radius: 8px;
   padding: 30px;
 }
 .part-box-border {

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

@@ -329,3 +329,6 @@
   height: auto;
   padding: 3px 10px;
 }
+.el-menu{
+  border-color:transparent;
+}

src/assets/styles/element-variables.scss

@@ -3,11 +3,12 @@ Write your variables here. All available variables can be
 found in element-ui/packages/theme-chalk/src/common/var.scss.
 For example, to overwrite the theme color:
 */
-$--color-primary: #705eff;
+// $--color-primary: #705eff;
+$--color-primary: #6D5FF6;
 $--color-success: #1fb46f;
 $--color-danger: #ff7240;
 
-$--border-radius-base: 10px;
+// $--border-radius-base: 10px;
 
 /* icon font path, required */
 $--font-path: "~element-ui/lib/theme-chalk/fonts";

src/assets/styles/home.scss

@@ -4,24 +4,25 @@
   height: 100%;
   z-index: auto;
 
-  &::before {
-    content: "";
-    display: block;
-    position: absolute;
-    width: 700px;
-    height: 200px;
-    left: 200px;
-    z-index: 1;
-    background: $--color-primary;
-    border-bottom-left-radius: 140px;
-    border-top-right-radius: 80px;
-    transform: skew(15deg, 0);
-  }
+  // &::before {
+  //   content: "";
+  //   display: block;
+  //   position: absolute;
+  //   width: 700px;
+  //   height: 200px;
+  //   left: 200px;
+  //   z-index: 1;
+  //   background: $--color-primary;
+  //   border-bottom-left-radius: 140px;
+  //   border-top-right-radius: 80px;
+  //   transform: skew(15deg, 0);
+  // }
 }
 .home-body {
   position: absolute;
   left: 0;
-  top: 70px;
+  // top: 70px;
+  top: 110px;
   right: 0;
   bottom: 0;
   overflow: auto;
@@ -29,14 +30,15 @@
 }
 .home-main {
   position: relative;
-  padding: 0 20px 50px 260px;
+  padding: 0 16px 50px 234px;
   min-height: 100%;
 }
 .home-header {
   position: absolute;
-  height: 70px;
+  // height: 70px;
+  height: 56px;
   top: 0;
-  left: 240px;
+  left: 220px;
   right: 0;
   z-index: 99;
   overflow: hidden;
@@ -44,9 +46,19 @@
 
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: flex-end;
+  background-color:#fff;
+  border-bottom:1px solid #e5e5e5;
+}
+.header-breadcrumb{
+  position:absolute;
+  top:56px;
+  left:220px;
+  height:54px;
+  padding:0 16px;
+  display:flex;
+  align-items: center;
 }
-
 .header-menu {
   font-size: 0;
   margin: 0;
@@ -110,35 +122,43 @@
 // home-side
 .home-side {
   position: fixed;
-  width: 240px;
+  // width: 240px;
+  width: 220px;
   left: 0;
   top: 0;
   bottom: 0;
   z-index: 99;
-  overflow-y: auto;
-  overflow-x: hidden;
+  // overflow-y: auto;
+  // overflow-x: hidden;
   background: #fff;
-  border-top-right-radius: 32px;
-  border-bottom-right-radius: 32px;
+  // border-top-right-radius: 32px;
+  // border-bottom-right-radius: 32px;
+
 }
 .home-logo {
-  padding: 0 40px;
+  // padding: 0 40px;
   font-size: 20px;
-  line-height: 40px;
-  text-align: center;
+  // line-height: 40px;
+  // text-align: center;
+  height:56px;
   a {
-    display: block;
-    padding: 30px 0;
-    border-bottom: 1px solid #eff0f5;
+    display: flex;
+    height:100%;
+    padding: 0 20px;
+    border-bottom: 1px solid #e5e5e5;
+    align-items: center;
   }
   img {
     display: block;
-    max-width: 160px;
-    height: 40px;
+    // max-width: 160px;
+    height: 22px;
   }
 }
 .el-menu-vertical-demo {
   padding-top: 20px;
+  .el-menu-item:hover, .el-menu-item:focus{
+    background-color:#F0EFFE !important;
+  }
   .el-submenu {
     margin-bottom: 10px;
   }
@@ -159,6 +179,7 @@
   }
   .el-submenu .el-menu-item.is-active {
     font-weight: 600;
+    color:$--color-primary !important;
   }
   .el-submenu__icon-arrow {
     right: 40px;
@@ -168,7 +189,7 @@
 .breadcrumb-tips {
   display: inline-block;
   vertical-align: middle;
-  color: #fff;
+  color: #8c8c8c;
   i {
     margin-top: -2px;
     margin-right: 8px;
@@ -177,12 +198,12 @@
 .breadcrumb-list {
   display: inline-block;
   vertical-align: middle;
-  color: #fff;
+  color: #8c8c8c;
 
   .el-breadcrumb__inner,
   .el-breadcrumb__inner a,
   .el-breadcrumb__inner.is-link,
   .el-breadcrumb__item:last-child .el-breadcrumb__inner {
-    color: #fff;
+    color: #8c8c8c;
   }
 }

src/assets/styles/icons.scss

@@ -35,6 +35,11 @@
     width: 10px;
     height: 10px;
   }
+  &-bread {
+    background-image: url(../images/icon-bread.png);
+    width: 16px;
+    height: 16px;
+  }
   // action
   &-set {
     background-image: url(../images/icon-set.png);
@@ -132,23 +137,33 @@
   }
   // menu
   &-base {
-    background-image: url(../images/icon-base.png);
+    // background-image: url(../images/icon-base.png);
+    background-image: url(../images/icon-base2.png);
   }
   &-course {
-    background-image: url(../images/icon-course.png);
+    // background-image: url(../images/icon-course.png);
+    background-image: url(../images/icon-course2.png);
   }
   &-create-paper {
     background-image: url(../images/icon-create-paper.png);
   }
   &-question-book {
-    background-image: url(../images/icon-question-book.png);
+    // background-image: url(../images/icon-question-book.png);
+    background-image: url(../images/icon-question-book2.png);
   }
   &-paper-book {
-    background-image: url(../images/icon-paper-book.png);
+    // background-image: url(../images/icon-paper-book.png);
+    background-image: url(../images/icon-paper-book2.png);
   }
   &-question {
     background-image: url(../images/icon-question.png);
   }
+  &-safe{
+    background-image: url(../images/icon-safe.png);
+  }
+  &-fast{
+    background-image: url(../images/icon-fast.png);
+  }
   // other
   &-right {
     background-image: url(../images/icon-right.png);

src/assets/styles/index.scss

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

src/assets/styles/variables.scss

@@ -6,7 +6,8 @@ $--color-text-secondary: #9a9dab !default;
 $--color-text-placeholder: #9a9dab !default;
 
 // status
-$--color-primary: #705eff !default;
+// $--color-primary: #705eff !default;
+$--color-primary: #6D5FF6 !default;
 $--color-success: #1fb46f !default;
 $--color-danger: #ff7240 !default;
 $--color-warning-lighter: rgba(253, 203, 90, 1) !default;
@@ -16,7 +17,8 @@ $--color-blue: #29abff;
 $--color-white: #ffffff;
 $--color-dark: #21252b;
 // skin
-$--color-background: #e9edf9;
+// $--color-background: #e9edf9;
+$--color-background: #F2F3F5;
 // border
 $--color-border: #f0f2f6;
 $--color-border-dark: #e2e4ec;

src/modules/card/assets/styles/card-design.scss

@@ -609,13 +609,16 @@
 
 // design-preview-frame
 .design-preview-frame {
-  position: absolute;
+  // position: absolute;
+  position: fixed;
   width: 1000px;
   height: 600px;
-  left: -9999px;
-  top: 0;
-  z-index: 1001;
-  visibility: hidden;
+  // left: -9999px;
+  // left: 0;
+  left: 240px;
+  top: 80px;
+  z-index: 100001;
+  // visibility: hidden;
 }
 // card-build-frame
 .card-build-frame {

src/modules/card/views/CardHeadManage.vue

@@ -21,7 +21,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleCurrentChange(1)">
+          <el-button type="primary" @click="handleCurrentChange(1)">
             查询
           </el-button>
         </el-form-item>

src/modules/card/views/CardManage.vue

@@ -35,7 +35,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleCurrentChange(1)">
+          <el-button type="primary" @click="handleCurrentChange(1)">
             查询
           </el-button>
         </el-form-item>

src/modules/paper-export/views/PaperTemplateManage.vue

@@ -12,7 +12,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleCurrentChange(1)">
+          <el-button type="primary" @click="handleCurrentChange(1)">
             查询
           </el-button>
         </el-form-item>

src/modules/paper/components/AuditPaperApply.vue

@@ -16,7 +16,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/paper/components/AuditPaperAudited.vue

@@ -14,7 +14,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/paper/components/AuditPaperUnsubmit.vue

@@ -14,7 +14,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/paper/components/AutoBuildPaperStructManage.vue

@@ -24,7 +24,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="danger" @click="toPage(1)">查询</el-button>
+            <el-button type="primary" @click="toPage(1)">查询</el-button>
           </el-form-item>
         </el-form>
         <div class="part-box-action">

src/modules/paper/components/SelectQuestionDialog.vue

@@ -53,7 +53,7 @@
               </el-form-item>
 
               <el-form-item>
-                <el-button type="danger" @click="toPage(1)">查询</el-button>
+                <el-button type="primary" @click="toPage(1)">查询</el-button>
               </el-form-item>
             </el-form>
           </div>

src/modules/portal/views/Login-old.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="login">
+    <main class="login-main">
+      <div class="login-title">
+        <p>欢迎登录</p>
+        <p>题库管理系统</p>
+      </div>
+      <div class="login-footer">
+        Copyright &copy; 2021
+        <a href="https://www.qmth.com.cn" target="_block">启明泰和</a>.<a
+          href="https://beian.miit.gov.cn/"
+          target="_blank"
+          >鄂ICP备12000033号-13</a
+        >
+        <span v-if="version" class="margin-left-10">v{{ version }}</span>
+      </div>
+      <div class="login-body" @keyup.enter="submit">
+        <h1 class="login-body-title">题库管理系统</h1>
+        <el-form ref="loginForm" :model="loginInfo" :rules="loginRules">
+          <el-form-item prop="accountValue">
+            <el-input
+              v-model.trim="loginInfo.accountValue"
+              placeholder="请输入账号"
+              clearable
+            >
+              <i slot="prefix" class="icon icon-username"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input
+              v-model.trim="loginInfo.password"
+              type="password"
+              placeholder="请输入密码"
+              clearable
+            >
+              <i slot="prefix" class="icon icon-password"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="dialogVisible" prop="smsCode">
+            <el-input
+              v-model.trim="loginInfo.smsCode"
+              placeholder="请输入短信验证码"
+              clearable=""
+            >
+              <i slot="prefix" class="icon icon-code"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              class="login-submit-btn"
+              type="danger"
+              :disabled="isSubmit"
+              @click="submit"
+              >登录</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </main>
+  </div>
+</template>
+
+<script>
+import { mapActions, mapState } from "vuex";
+import { USER_SIGNIN } from "../store/user";
+import { QUESTION_API } from "@/constants/constants";
+
+export default {
+  name: "Login",
+  data() {
+    return {
+      isSubmit: false,
+      dialogVisible: false,
+      loginInfo: {
+        rootOrgId: "",
+        domain: "",
+        code: "",
+        accountType: "COMMON_LOGIN_NAME",
+        accountValue: "",
+        password: "",
+        smsCode: null,
+      },
+      loginRules: {
+        accountValue: [
+          {
+            required: true,
+            message: "请输入用户名",
+            trigger: "change",
+          },
+        ],
+        password: [
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (/^([0-9]+|[a-z]+|[A-Z]+)$/.test(value) ||
+                  !/^[a-zA-Z0-9_]+$/.test(value))
+              ) {
+                callback(
+                  new Error("密码只能大写字母、小写字母、数字至少两种组成")
+                );
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+          {
+            required: true,
+            min: 8,
+            max: 16,
+            message: "密码只能8-16个字符",
+            trigger: "change",
+          },
+        ],
+        // password: [
+        //   {
+        //     required: true,
+        //     pattern: /^[a-zA-Z0-9_]{1,20}$/,
+        //     message: "密码只能由数字、字母和下划线组成，长度1-20个字符",
+        //     trigger: "change",
+        //   },
+        // ],
+        smsCode: [
+          {
+            required: true,
+            message: "请输入短信验证码",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapState(["version"]),
+  },
+  watch: {
+    $route(to) {
+      this.loginInfo.rootOrgId = to.query.orgId;
+      this.loginInfo.code = to.query.code;
+    },
+  },
+  created() {
+    if (this.$route.hash && this.$route.hash.startsWith("#/access?")) {
+      this.$router.push(this.$route.hash.slice(1));
+      return;
+    }
+    this.loginInfo.domain = window.location.hostname.split(".")[0];
+    sessionStorage.clear();
+    var params = this.$route.query;
+
+    this.loginInfo.rootOrgId = params.orgId;
+    this.loginInfo.code = params.code;
+  },
+  methods: {
+    ...mapActions([USER_SIGNIN]),
+    async submit() {
+      const valid = await this.$refs.loginForm.validate().catch(() => {});
+      if (!valid) return;
+
+      var url = QUESTION_API + "/auth/login";
+      this.$httpWithMsg
+        .post(url, this.loginInfo)
+        .then((response) => {
+          var user = response.data;
+          user.questionUnlock = false;
+          this.USER_SIGNIN(user);
+          this.$router.replace({ path: "/questions/tips" });
+          this.$notify({
+            message: "登录成功",
+            type: "success",
+            duration: 1000,
+          });
+        })
+        .catch((error) => {
+          if (error.response.data.code === "UQ-003100") {
+            this.dialogVisible = true;
+          }
+        });
+    },
+    loginWithSms() {
+      this.dialogVisible = false;
+      this.submit();
+    },
+  },
+};
+</script>

src/modules/portal/views/Login.vue

@@ -1,6 +1,75 @@
 <template>
   <div class="login">
-    <main class="login-main">
+    <div class="login-box">
+      <div class="login-card">
+        <img class="login-logo" src="../../../assets/images/login-logo.png" />
+        <div class="middle-text">
+          <h1>欢迎登录</h1>
+          <h1>题库管理系统</h1>
+        </div>
+        <div class="bottom-text">
+          <p>Copyright &copy; 2021</p>
+          <p>
+            <a href="https://www.qmth.com.cn" target="_block">启明泰和</a>.<a
+              href="https://beian.miit.gov.cn/"
+              target="_blank"
+              >鄂ICP备12000033号-13</a
+            >
+            <span v-if="version" class="margin-left-10">v{{ version }}</span>
+          </p>
+        </div>
+      </div>
+      <div class="login-form-box">
+        <div class="login-title">输入信息</div>
+        <div class="login-sub-title">请输入账号与密码</div>
+        <el-form
+          ref="loginForm"
+          :model="loginInfo"
+          :rules="loginRules"
+          size="large"
+        >
+          <el-form-item prop="accountValue">
+            <el-input
+              v-model.trim="loginInfo.accountValue"
+              placeholder="请输入账号"
+              clearable
+            >
+              <!-- <i slot="prefix" class="icon icon-username"></i> -->
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input
+              v-model.trim="loginInfo.password"
+              type="password"
+              placeholder="请输入密码"
+              show-password
+            >
+              <!-- <i slot="prefix" class="icon icon-password"></i> -->
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="dialogVisible" prop="smsCode">
+            <el-input
+              v-model.trim="loginInfo.smsCode"
+              placeholder="请输入短信验证码"
+              clearable=""
+            >
+              <i slot="prefix" class="icon icon-code"></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              :disabled="isSubmit"
+              @click="submit"
+              style="width: 100%"
+              >登录</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+
+    <!-- <main class="login-main">
       <div class="login-title">
         <p>欢迎登录</p>
         <p>题库管理系统</p>
@@ -56,7 +125,7 @@
           </el-form-item>
         </el-form>
       </div>
-    </main>
+    </main> -->
   </div>
 </template>
 
@@ -185,3 +254,64 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.login {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: url("../../../assets/images/login-bg.png") 0 0 no-repeat;
+  background-size: 100% 100%;
+  .login-box {
+    width: 800px;
+    height: 500px;
+    display: flex;
+    border-radius: 30px;
+    overflow: hidden;
+    .login-card {
+      width: 400px;
+      height: 100%;
+      background: url("../../../assets/images/login-card.png") 0 0 no-repeat;
+      background-size: 100% 100%;
+      padding: 48px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .login-logo {
+        width: 78px;
+      }
+      .middle-text {
+        font-size: 42px;
+        font-weight: bold;
+        color: #fff;
+        line-height: 56px;
+      }
+      .bottom-text {
+        p {
+          color: #e5e5e5;
+          line-height: 22px;
+          font-size: 14px;
+        }
+      }
+    }
+    .login-form-box {
+      flex: 1;
+      background-color: #fff;
+      padding: 40px;
+      .login-title {
+        font-size: 24px;
+        color: #262626;
+        font-weight: bold;
+        margin-top: 66px;
+      }
+      .login-sub-title {
+        font-size: 16px;
+        color: #8c8c8c;
+        margin-top: 10px;
+        margin-bottom: 25px;
+      }
+    }
+  }
+}
+</style>

src/modules/portal/views/home/Home.vue

@@ -3,9 +3,6 @@
     <HomeSide v-if="ifShowHomeSide" />
 
     <div class="home-header">
-      <div v-if="ifShowHomeSide" class="header-breadcrumb">
-        <LinkTitles :key="Math.random()" />
-      </div>
       <ul class="header-menu">
         <li class="header-menu-item header-menu-org" title="机构名称">
           <i class="icon icon-users"></i>{{ user.rootOrgName }}
@@ -26,7 +23,9 @@
         </li>
       </ul>
     </div>
-
+    <div v-if="ifShowHomeSide" class="header-breadcrumb">
+      <LinkTitles :key="Math.random()" />
+    </div>
     <div class="home-body">
       <div class="home-main">
         <router-view class="main-content"></router-view>

src/modules/portal/views/home/HomeSide.vue

@@ -2,37 +2,55 @@
   <div class="home-side">
     <div class="home-logo">
       <router-link to="/questions/tips">
-        <img src="@/assets/images/system-icon.png" />
+        <!-- <img src="@/assets/images/system-icon.png" /> -->
+        <img src="@/assets/images/menu-icon.png" />
       </router-link>
     </div>
-    <el-menu
-      v-if="menuList.length > 0"
-      class="el-menu-vertical-demo"
-      active-text-color="#705eff"
-      text-color="#383b4a"
-      router
-      :default-active="curRoutePath"
-    >
-      <el-submenu
-        v-for="menu1 in menuList1"
-        :key="menu1.id"
-        :index="menu1.nodeCode"
+    <div class="menu-wrap">
+      <el-menu
+        v-if="menuList.length > 0"
+        class="el-menu-vertical-demo"
+        active-text-color="#705eff"
+        text-color="#383b4a"
+        router
+        :default-active="curRoutePath"
       >
-        <template slot="title">
-          <!-- <i class="el-icon-menu"></i> <span>{{ menu1.name }}</span> -->
-          <i :class="menu1.icon"></i> <span>{{ menu1.name }}</span>
-        </template>
-
-        <el-menu-item
-          v-for="menu2 in menuList2(menu1)"
-          :key="menu2.id"
-          :index="menu2.ext5"
-          :route="{ path: menu2.ext5 }"
+        <el-submenu
+          v-for="menu1 in menuList1"
+          :key="menu1.id"
+          :index="menu1.nodeCode"
         >
-          <span style="margin-left: 9px">{{ menu2.name }}</span>
-        </el-menu-item>
-      </el-submenu>
-    </el-menu>
+          <template slot="title">
+            <!-- <i class="el-icon-menu"></i> <span>{{ menu1.name }}</span> -->
+            <i :class="menu1.icon" style="color: red"></i>
+            <span>{{ menu1.name }}</span>
+          </template>
+
+          <el-menu-item
+            v-for="menu2 in menuList2(menu1)"
+            :key="menu2.id"
+            :index="menu2.ext5"
+            :route="{ path: menu2.ext5 }"
+          >
+            <span style="margin-left: 9px">{{ menu2.name }}</span>
+          </el-menu-item>
+        </el-submenu>
+      </el-menu>
+    </div>
+    <div class="other-menus">
+      <div class="el-menu-item">
+        <i class="icon icon-safe"></i>
+        <span>安全设置</span>
+      </div>
+      <div class="el-menu-item">
+        <i class="icon icon-fast"></i>
+        <span>快捷路径</span>
+      </div>
+      <div class="el-menu-item red">
+        <i class="el-icon-delete" style="font-size: 16px"></i>
+        <span>回收站</span>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -170,3 +188,44 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.home-side {
+  display: flex;
+  flex-direction: column;
+  .menu-wrap {
+    flex: 1;
+    overflow: auto;
+  }
+  .other-menus {
+    margin-top: 30px;
+    padding: 10px 0;
+    position: relative;
+    &:before {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 0;
+      height: 1px;
+      width: calc(100% - 48px);
+      margin-left: 24px;
+      background: #e5e5e5;
+    }
+    .el-menu-item {
+      height: 40px;
+      line-height: 40px;
+      &:not(:last-child) {
+        i {
+          margin-right: 9px;
+          margin-left: 3px;
+        }
+      }
+      &.red {
+        color: #f76560;
+        i {
+          color: #f76560;
+        }
+      }
+    }
+  }
+}
+</style>

src/modules/portal/views/home/LinkTitles.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="currentPaths.length > 0" class="link-titles">
     <span class="breadcrumb-tips">
-      <i class="icon icon-home"></i>
+      <i class="icon icon-bread"></i>
       <span>当前所在位置：</span>
     </span>
     <el-breadcrumb class="breadcrumb-list">

src/modules/question/components/AuditQuestionApply.vue

@@ -10,7 +10,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/question/components/AuditQuestionAudited.vue

@@ -8,7 +8,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/question/components/AuditQuestionUnsubmit.vue

@@ -8,7 +8,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/question/components/AuditQuestionWait.vue

@@ -8,7 +8,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

src/modules/question/components/FolderQuestionManageDialog.vue

@@ -39,7 +39,7 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="danger" @click="toPage(1)">查询</el-button>
+              <el-button type="primary" @click="toPage(1)">查询</el-button>
             </el-form-item>
           </el-form>
 

src/modules/question/views/QuestionManage.vue

@@ -31,7 +31,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger" @click="toPage(1)">查询</el-button>
+          <el-button type="primary" @click="toPage(1)">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/question/views/SourceDetailManage.vue

@@ -20,7 +20,7 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="danger" @click="handleCurrentChange(1)">
+            <el-button type="primary" @click="handleCurrentChange(1)">
               查询
             </el-button>
           </el-form-item>

src/modules/questions/views/BluePaperStructure.vue

@@ -30,7 +30,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/questions/views/CheckDuplicateList.vue

@@ -32,7 +32,7 @@
           </source-detail-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/questions/views/Course.vue

@@ -27,7 +27,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger" @click="handleSearchBtn">查询</el-button>
+          <el-button type="primary" @click="handleSearchBtn">查询</el-button>
           <el-button type="danger" plain @click="resetPrimaryForm">
             重置
           </el-button>

src/modules/questions/views/CourseProperty.vue

@@ -14,7 +14,7 @@
           <course-select v-model="formSearch.courseId"> </course-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/questions/views/ExamPaperPendingTrial.vue

@@ -54,7 +54,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/ExportTemplate.vue

@@ -43,7 +43,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleSearchBtn">查询</el-button>
+          <el-button type="primary" @click="handleSearchBtn">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/questions/views/GenPaper.vue

@@ -50,7 +50,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/ImportPaper.vue

@@ -51,7 +51,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
         </el-form-item>
       </el-form>
       <div class="part-box-action">

src/modules/questions/views/License.vue

@@ -1,137 +1,150 @@
 <template>
   <section class="content">
-    <!-- 正文信息 -->
     <div class="part-box">
-      <h1 class="part-box-title">授权管理</h1>
-      <div class="part-box-action">
-        <el-form
-          class="padding-tb-20 form-tight"
-          :model="info"
-          label-width="150px"
-        >
-          <el-form-item label="当前信息">
-            <span class="input">{{ info.activation }}</span>
-          </el-form-item>
-          <el-form-item label="人数限制">
-            <span class="input">{{ info.maxCount }}</span>
-          </el-form-item>
-          <el-form-item label="当前人数">
-            <span class="input">{{ info.onlineCount }}</span>
-          </el-form-item>
-          <el-form-item label="过期时间">
-            <span class="input">{{ info.expire }}</span>
-          </el-form-item>
-          <el-form-item label="授权模式">
-            <span class="input">{{ info.type }}</span>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-form
-        ref="form"
-        class="padding-tb-20 form-tight"
-        :rules="rules"
-        :model="form"
-        label-width="150px"
-      >
-        <el-form-item label="授权模式">
-          <el-select v-model="form.type" class="input">
-            <el-option label="在线激活" value="ONLINE"></el-option>
-            <el-option label="离线激活" value="OFFLINE"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-show="form.type == 'ONLINE'"
-          label="密匙"
-          class="input"
-          maxlength="255"
-          prop="accessKey"
-        >
-          <el-input v-model="form.accessKey" maxlength="255" />
-        </el-form-item>
-        <el-form-item
-          v-show="form.type == 'ONLINE'"
-          label="密钥"
-          maxlength="255"
-          class="input"
-          prop="accessSecret"
-        >
-          <el-input v-model="form.accessSecret" maxlength="255" />
-        </el-form-item>
-        <el-form-item v-show="form.type == 'OFFLINE'" label="导入授权文件">
-          <upload-button
-            ref="UploadButton"
-            accept=".lic"
-            :format="['lic']"
-            :upload-url="uploadAction"
-            :auto-upload="false"
-            btn-content="选择文件"
-            btn-type="primary"
-            @upload-success="uploadSuccess"
-            @valid-error="validError"
-          >
-          </upload-button>
-        </el-form-item>
-        <el-form-item label=" ">
-          <el-button
-            v-show="form.type == 'OFFLINE'"
-            type="primary"
-            size="small"
-            :loading="tempDownloading"
-            @click="exportFile"
-            >导出硬件信息</el-button
+      <el-tabs v-model="curTab" type="card">
+        <el-tab-pane label="授权管理" name="tab1">
+          <div class="part-box-action">
+            <el-form
+              class="padding-tb-20 form-tight"
+              :model="info"
+              label-width="150px"
+            >
+              <el-form-item label="当前信息">
+                <span class="input">{{ info.activation }}</span>
+              </el-form-item>
+              <el-form-item label="人数限制">
+                <span class="input">{{ info.maxCount }}</span>
+              </el-form-item>
+              <el-form-item label="当前人数">
+                <span class="input">{{ info.onlineCount }}</span>
+              </el-form-item>
+              <el-form-item label="过期时间">
+                <span class="input">{{ info.expire }}</span>
+              </el-form-item>
+              <el-form-item label="授权模式">
+                <span class="input">{{ info.type }}</span>
+              </el-form-item>
+            </el-form>
+          </div>
+          <el-form
+            ref="form"
+            class="padding-tb-20 form-tight"
+            :rules="rules"
+            :model="form"
+            label-width="150px"
           >
-          <el-button type="primary" size="small" @click="submitForm"
-            >保存</el-button
-          >
-        </el-form-item>
-      </el-form>
+            <el-form-item label="授权模式">
+              <el-select v-model="form.type" class="input">
+                <el-option label="在线激活" value="ONLINE"></el-option>
+                <el-option label="离线激活" value="OFFLINE"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              v-show="form.type == 'ONLINE'"
+              label="密匙"
+              class="input"
+              maxlength="255"
+              prop="accessKey"
+            >
+              <el-input v-model="form.accessKey" maxlength="255" />
+            </el-form-item>
+            <el-form-item
+              v-show="form.type == 'ONLINE'"
+              label="密钥"
+              maxlength="255"
+              class="input"
+              prop="accessSecret"
+            >
+              <el-input v-model="form.accessSecret" maxlength="255" />
+            </el-form-item>
+            <el-form-item v-show="form.type == 'OFFLINE'" label="导入授权文件">
+              <upload-button
+                ref="UploadButton"
+                accept=".lic"
+                :format="['lic']"
+                :upload-url="uploadAction"
+                :auto-upload="false"
+                btn-content="选择文件"
+                btn-type="primary"
+                @upload-success="uploadSuccess"
+                @valid-error="validError"
+              >
+              </upload-button>
+            </el-form-item>
+            <el-form-item label=" ">
+              <el-button
+                v-show="form.type == 'OFFLINE'"
+                type="primary"
+                size="small"
+                :loading="tempDownloading"
+                @click="exportFile"
+                >导出硬件信息</el-button
+              >
+              <el-button type="primary" size="small" @click="submitForm"
+                >保存</el-button
+              >
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="登录配置" name="tab2">
+          <el-form class="padding-tb-20" label-width="150px">
+            <el-form-item label="短信验证">
+              <el-radio-group v-model="setForm.properties.LOGIN_CODE_CHECK">
+                <el-radio label="true">开启</el-radio>
+                <el-radio label="false">关闭</el-radio>
+              </el-radio-group>
+              <div class="tips-info">*开启后，登录需要输入手机验证码</div>
+            </el-form-item>
+            <el-form-item label="安全U盾">
+              <el-radio-group v-model="setForm.properties.LOGIN_UD_CHECK">
+                <el-radio label="true">开启</el-radio>
+                <el-radio label="false">关闭</el-radio>
+              </el-radio-group>
+              <div class="tips-info">*开启后，需要插入安全U盾才能正常登录</div>
+            </el-form-item>
+            <template v-if="setForm.properties.LOGIN_UD_CHECK == 'true'">
+              <el-form-item>
+                <el-radio-group
+                  v-model="setForm.properties.LOGIN_UD_CHECK_ONECE"
+                >
+                  <el-radio label="rule1"
+                    >安全策略1
+                    <span class="tips-info margin-left-10"
+                      >使用期间均会检测安全U盾是否正常，如果出现异常，会强制踢出用户进入异常提示页面</span
+                    ></el-radio
+                  >
+
+                  <div class="margin-top-20"></div>
+                  <el-radio label="rule2"
+                    >安全策略2
+                    <span class="tips-info margin-left-10"
+                      >仅对登录阶段进行检测，如果未检测到安全U盾，无法登录</span
+                    ></el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </template>
+            <el-form-item label=" ">
+              <el-button type="primary" size="small" @click="submitSetForm"
+                >保存</el-button
+              >
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
     </div>
 
+    <!-- 正文信息 -->
+    <!-- <div class="part-box">
+      <h1 class="part-box-title">授权管理</h1>
+
+    </div> -->
+
     <!-- 登录配置 -->
-    <div class="part-box">
+    <!-- <div class="part-box">
       <h1 class="part-box-title">登录配置</h1>
-      <el-form class="padding-tb-20" label-width="150px">
-        <el-form-item label="短信验证">
-          <el-radio-group v-model="setForm.properties.LOGIN_CODE_CHECK">
-            <el-radio label="true">开启</el-radio>
-            <el-radio label="false">关闭</el-radio>
-          </el-radio-group>
-          <div class="tips-info">*开启后，登录需要输入手机验证码</div>
-        </el-form-item>
-        <el-form-item label="安全U盾">
-          <el-radio-group v-model="setForm.properties.LOGIN_UD_CHECK">
-            <el-radio label="true">开启</el-radio>
-            <el-radio label="false">关闭</el-radio>
-          </el-radio-group>
-          <div class="tips-info">*开启后，需要插入安全U盾才能正常登录</div>
-        </el-form-item>
-        <template v-if="setForm.properties.LOGIN_UD_CHECK == 'true'">
-          <el-form-item>
-            <el-radio-group v-model="setForm.properties.LOGIN_UD_CHECK_ONECE">
-              <el-radio label="rule1"
-                >安全策略1
-                <span class="tips-info margin-left-10"
-                  >使用期间均会检测安全U盾是否正常，如果出现异常，会强制踢出用户进入异常提示页面</span
-                ></el-radio
-              >
 
-              <div class="margin-top-20"></div>
-              <el-radio label="rule2"
-                >安全策略2
-                <span class="tips-info margin-left-10"
-                  >仅对登录阶段进行检测，如果未检测到安全U盾，无法登录</span
-                ></el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-        </template>
-        <el-form-item label=" ">
-          <el-button type="primary" size="small" @click="submitSetForm"
-            >保存</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </div>
+    </div> -->
   </section>
 </template>
 <script>
@@ -144,6 +157,7 @@ export default {
   components: { UploadButton },
   data() {
     return {
+      curTab: "tab1",
       uploadAction: QUESTION_API + "/system/auth/offline",
       uploadHeaders: {},
       uploadData: {},

src/modules/questions/views/PaperPendingTrial.vue

@@ -55,7 +55,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/PaperStorage.vue

@@ -50,7 +50,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/PaperStructure.vue

@@ -37,7 +37,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/Question.vue

@@ -127,7 +127,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/School.vue

@@ -20,7 +20,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleSearchBtn">查询</el-button>
+          <el-button type="primary" @click="handleSearchBtn">查询</el-button>
           <el-button type="danger" plain @click="resetSearchForm"
             >重置</el-button
           >

src/modules/questions/views/SynthesisPaperStorage.vue

@@ -43,7 +43,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="searchFrom">查询</el-button>
+          <el-button type="primary" @click="searchFrom">查询</el-button>
           <el-button type="danger" plain @click="resetForm">重置</el-button>
         </el-form-item>
       </el-form>

src/modules/questions/views/data_previllege_add_course.vue

@@ -32,7 +32,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="handleSearchBtn"> 查询 </el-button>
+        <el-button type="primary" @click="handleSearchBtn"> 查询 </el-button>
       </el-form-item>
     </el-form>
 

src/modules/questions/views/user.vue

@@ -78,7 +78,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="danger" @click="handleSearchBtn"> 查询 </el-button>
+          <el-button type="primary" @click="handleSearchBtn"> 查询 </el-button>
           <el-button type="danger" plain @click="resetEcsFormSearch">
             重置
           </el-button>

src/modules/statistics/views/StatisticsManage.vue

@@ -38,7 +38,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="handleCurrentChange(1)">
+          <el-button type="primary" @click="handleCurrentChange(1)">
             查询
           </el-button>
         </el-form-item>

src/plugins/element.js

@@ -3,4 +3,4 @@ import Element from "element-ui";
 // import "element-ui/lib/theme-chalk/index.css";
 import "../assets/styles/element-variables.scss";
 
-Vue.use(Element, { size: "medium" });
+Vue.use(Element, { size: "small" });