zhangjie 4 роки тому
батько
коміт
3db28dbbfd

+ 1 - 1
src/assets/styles/adaptive.scss

@@ -195,7 +195,7 @@
       padding: 10px 0;
     }
     .nav-item-icon {
-      top: 15px;
+      top: 10px;
     }
   }
   .home-main {

+ 18 - 0
src/assets/styles/home.scss

@@ -216,6 +216,24 @@
       }
     }
   }
+
+  .menu-logout {
+    padding: 10px;
+    width: 52px;
+    height: 52px;
+    margin: 0 auto;
+    border: 1px solid $--color-text-secondary;
+    border-radius: 50%;
+    font-size: 30px;
+    text-align: center;
+    color: $--color-text-secondary;
+    cursor: pointer;
+
+    &:hover {
+      border-color: $--color-danger;
+      color: $--color-danger;
+    }
+  }
 }
 
 // home-breadcrumb

+ 2 - 1
src/modules/exam-center/views/CardManage.vue

@@ -244,7 +244,8 @@ export default {
         await updateCardDetail(datas);
         this.$message({
           type: "warning",
-          message: "复制成功!当前系统题卡规则有修改,请重新编辑新复制的题卡!",
+          message:
+            "复制成功!题卡规则有变动,将默认应用当前最新规则,请仔细核实题卡板式!",
           duration: 4000
         });
       } else {

+ 6 - 2
src/modules/exam-center/views/PrintManage.vue

@@ -63,7 +63,7 @@
           prop="revokeStatusName"
           label="撤回申请"
         ></el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" v-if="!IS_PRINTER">
           <template slot-scope="scope">
             <el-button
               class="btn-table-icon"
@@ -111,7 +111,8 @@ export default {
       REVOKE_STATUS,
       exams: [],
       dataList: [],
-      setT: ""
+      setT: "",
+      IS_PRINTER: false
     };
   },
   created() {
@@ -121,6 +122,9 @@ export default {
   },
   methods: {
     init() {
+      this.IS_PRINTER = this.$ls
+        .get("user", { roleCode: "" })
+        .roleCode.includes("PRINT");
       this.getExamList();
       this.getList();
     },

+ 2 - 0
src/modules/login/views/Login.vue

@@ -86,6 +86,8 @@ export default {
       this.isSubmit = false;
       if (!data) return;
 
+      data.account.roleCode = data.roles.map(item => item.roleCode).join();
+
       this.$ls.set("token", data.token, this.GLOBAL.authTimeout);
       this.$ls.set("schoolId", data.account.schoolId, this.GLOBAL.authTimeout);
       this.$ls.set("user", data.account, this.GLOBAL.authTimeout);

+ 3 - 0
src/views/Home.vue

@@ -157,6 +157,9 @@
           </li>
         </ul>
       </div>
+      <div class="menu-logout" @click="toLogout">
+        <i class="el-icon-switch-button"></i>
+      </div>
     </el-dialog>
     <!-- 修改密码 -->
     <reset-pwd @modified="logoutAction" ref="ResetPwd"></reset-pwd>