bug md

card/components/ElementPropEdit.vue

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

src/components/UploadFileDialog.vue

@@ -23,7 +23,7 @@
     </div>
     <div slot="footer" style="text-align: right">
       <el-button type="primary" @click="confirm">保存</el-button>
-      <el-button @click="cancel">返回</el-button>
+      <el-button type="danger" @click="cancel" plain>返回</el-button>
     </div>
   </el-dialog>
 </template>

src/constants/enumerate.js

@@ -111,13 +111,12 @@ export const DATA_TASK_STATUS = {
   FINISH: "已完成"
 };
 export const DATA_TASK_TYPE = {
-  USER_IMPORT: "用户导入",
   QUESTION_MISSION_BATCH_CREATE: "批量新建命题任务",
   SAMPLE_EXPORT: "导出审核样本",
-  PAPER_DOWNLOAD: "卷库下载",
   EXAMINATION_IMPORT: "考务数据导入",
   EXAMINATION_EXPORT: "考务数据导出",
-  PRINT_PDF_DOWNLOAD: "批量下载pdf"
+  PRINT_PDF_DOWNLOAD: "批量下载pdf",
+  CREATE_PDF: "生成pdf"
 };
 export const DATA_TASK_RESULT = {
   SUCCESS: "成功",

src/modules/base/components/ResetPwd.vue

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

src/modules/base/views/UserManage.vue

@@ -2,10 +2,10 @@
   <div class="user-manage">
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
-        <el-form-item label="姓名：" label-width="75px">
+        <el-form-item label="用户名：" label-width="75px">
           <el-input
             style="width: 142px;"
-            v-model.trim="filter.realName"
+            v-model.trim="filter.loginName"
             placeholder="请输入内容"
             clearable
           ></el-input>
@@ -164,7 +164,7 @@ export default {
   data() {
     return {
       filter: {
-        realName: "",
+        loginName: "",
         roleId: "",
         enable: ""
       },

src/modules/exam/components/BatchAddExamTask.vue

@@ -246,7 +246,7 @@ export default {
       this.modalForm.batchNo = data.batchNo;
       this.batchConfirmMessage = data.errorMsg;
       this.tasks = data.tasks.map(item => {
-        item.userId = item.users.length ? item.users[0].id : "";
+        item.userId = item.users.length === 1 ? item.users[0].id : "";
         return item;
       });
       this.$refs.modalFormComp.validateField("batchNo");

src/modules/exam/views/TaskPaperManage.vue

@@ -104,6 +104,7 @@
               title="查看"
             ></el-button>
             <el-button
+              v-if="!IS_QUESTION_TEACHER"
               class="btn-table-icon"
               type="text"
               :icon="
@@ -115,6 +116,7 @@
               :title="scope.row.enable ? '禁用' : '启用'"
             ></el-button>
             <el-button
+              v-if="!IS_QUESTION_TEACHER"
               class="btn-table-icon"
               type="text"
               icon="icon icon-download-act"
@@ -169,6 +171,9 @@ export default {
       papers: [],
       curPaper: {},
       loading: false,
+      IS_QUESTION_TEACHER: this.$ls
+        .get("user", { roleList: [] })
+        .roleList.includes("QUESTION_TEACHER"),
       // date-picker
       createTime: [],
       pickerOptions

src/modules/print/views/BusinessDataDetail.vue

@@ -71,6 +71,8 @@
         <el-table-column prop="specialty" label="适用专业（方向）">
         </el-table-column>
         <el-table-column prop="paperNumber" label="试卷编码"></el-table-column>
+        <el-table-column prop="examDate" label="考试日期"> </el-table-column>
+        <el-table-column prop="examTime" label="考试时间"> </el-table-column>
         <el-table-column prop="examPlace" label="考点"> </el-table-column>
         <el-table-column prop="examRoom" label="考场"> </el-table-column>
         <el-table-column prop="ticketNumber" label="考号" width="120">
@@ -97,6 +99,7 @@
 
 <script>
 import { businessDataDetailListPage } from "../api";
+import { parseTimeRangeDateAndTime } from "@/plugins/utils";
 
 export default {
   name: "business-data-detail",
@@ -128,7 +131,15 @@ export default {
         pageSize: this.size
       };
       const data = await businessDataDetailListPage(datas);
-      this.dataList = data.records;
+      this.dataList = data.records.map(item => {
+        const { date, time } = parseTimeRangeDateAndTime(
+          item.examStartTime,
+          item.examEndTime
+        );
+        item.examDate = date;
+        item.examTime = time;
+        return item;
+      });
       this.total = data.total;
     },
     toPage(page) {

src/views/Home.vue

@@ -187,11 +187,15 @@ import localNavs from "@/constants/navs";
 import { deepCopy } from "@/plugins/utils";
 import { sysMenu, logout } from "../modules/login/api";
 import ResetPwd from "../modules/base/components/ResetPwd";
+import { SYS_ADMIN_NAME } from "@/constants/enumerate";
 
 export default {
   name: "home",
   components: { ResetPwd },
   data() {
+    const IS_SUPER_ADMIN =
+      this.$ls.get("user", { loginName: "" }).loginName === SYS_ADMIN_NAME;
+
     return {
       menus: [],
       curMenu: { name: "" },
@@ -202,7 +206,8 @@ export default {
       userRoles: this.$ls.get("user", { roleList: [] }).roleList,
       schoolLogo: this.$ls.get("schoolLogo"),
       schoolName: this.$ls.get("schoolName"),
-      menuDailogIsShow: false
+      menuDailogIsShow: false,
+      IS_SUPER_ADMIN
     };
   },
   watch: {
@@ -355,7 +360,7 @@ export default {
       this.$router.push({ name: "Login" });
     },
     toSelectSchool() {
-      this.$router.push({ name: "SelectSchool" });
+      if (this.IS_SUPER_ADMIN) this.$router.push({ name: "SelectSchool" });
     },
     // popover menu
     showMenu() {