UI调整

card/components/PagePropEdit.vue

@@ -42,14 +42,14 @@
       <!-- <el-form-item label-width="0px">
         <el-checkbox v-model="form.aOrB" disabled>启用A/B卷</el-checkbox>
       </el-form-item> -->
-      <el-form-item label-width="0px">
+      <el-form-item label="禁答区域">
         <el-checkbox
           v-model="form.showForbidArea"
           @change="showForbidAreaChange"
-          >启用禁答区</el-checkbox
+          >启用</el-checkbox
         >
       </el-form-item>
-      <el-form-item label="大题数">
+      <el-form-item label="大题序号">
         <ul class="topicno-list" v-if="topicSeries.length">
           <li>{{ topicSeries.length }}</li>
         </ul>

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

@@ -1,3 +1,7 @@
+/*
+* element-ui不管是自行构建的主题还是动态设置的主题，
+* 产生的css文件中存在近乎1/3的冗余样式，过于累赘，不如直接覆盖样式简洁。
+*/
 // dialog
 .el-dialog {
   border-radius: 8px;
@@ -292,12 +296,33 @@
   .el-checkbox__label {
     color: $--color-text-gray-2 !important;
   }
+  .el-checkbox__inner::after {
+    border-width: 2px;
+  }
+}
+.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: $--color-primary;
+  border-color: $--color-primary;
 }
 .el-radio {
   .el-radio__label {
     color: $--color-text-gray-2 !important;
   }
 }
+.el-radio__input.is-checked .el-radio__inner {
+  background-color: $--color-primary;
+  border-color: $--color-primary;
+}
+
+// el-switch
+.el-switch {
+  &.is-checked {
+    .el-switch__core {
+      background-color: $--color-primary;
+      border-color: $--color-primary;
+    }
+  }
+}
 
 // el-pagination
 .el-pagination-li {
@@ -338,6 +363,7 @@
       @extend .el-pagination-li;
       &:not(.disabled).active {
         color: #fff;
+        background-color: $--color-primary;
       }
     }
   }

src/constants/enumerate.js

@@ -126,7 +126,11 @@ export const DATA_TASK_TYPE = {
   EXAMINATION_IMPORT: "考务数据导入",
   EXAMINATION_EXPORT: "考务数据导出",
   PRINT_PDF_DOWNLOAD: "批量下载pdf",
-  CREATE_PDF: "生成pdf"
+  CREATE_PDF: "生成pdf",
+  USER_IMPORT: "用户导入",
+  STUDENT_IMPORT: "学生导入",
+  COURSE_IMPORT: "课程导入",
+  PAPER_AND_CARD_PDF_DOWNLOAD: "卷库查询管理试卷、空白题卡批量下载pdf"
 };
 export const DATA_TASK_RESULT = {
   SUCCESS: "成功",

src/modules/base/components/ModifyCampus.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="campusName" label="校区名称：">
         <el-input

src/modules/base/components/ModifyCourse.vue

@@ -45,7 +45,7 @@
           placeholder="请输入授课班级"
           clearable
         ></el-input>
-        <p class="tips-info">多个班级请用英文逗号分隔</p>
+        <p class="tips-info">提示：多个班级请用英文逗号分隔</p>
       </el-form-item>
     </el-form>
     <div slot="footer">

src/modules/base/components/ModifyField.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     title="新增扩展字段"
     top="10vh"
-    width="500px"
+    width="448px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -14,11 +14,10 @@
       ref="modalFormComp"
       :model="modalForm"
       :rules="rules"
-      label-width="100px"
+      label-position="top"
     >
       <el-form-item prop="name" label="字段名称：">
         <el-input
-          style="width:282px;"
           v-model.trim="modalForm.name"
           placeholder="请输入字段名称"
           clearable
@@ -26,7 +25,6 @@
       </el-form-item>
       <el-form-item prop="code" label="字段变量名：">
         <el-input
-          style="width:282px;"
           v-model.trim="modalForm.code"
           placeholder="请输入字段变量名"
           clearable

src/modules/base/components/ModifyStudent.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
@@ -41,6 +41,7 @@
       <el-form-item prop="campusId" label="校区：">
         <campus-select
           v-model.trim="modalForm.campusId"
+          style="width: 100%"
           clearable
         ></campus-select>
       </el-form-item>

src/modules/base/components/SelectOrgs.vue

@@ -12,7 +12,7 @@
       node-key="id"
       ref="MenuTree"
       :props="defaultProps"
-      check-strictly
+      :check-strictly="checkStrictly"
       check-on-click-node
       :expand-on-click-node="false"
       @check="checkClick"
@@ -41,6 +41,10 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    checkStrictly: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/modules/base/views/ApproveRecordManage.vue

@@ -50,7 +50,11 @@
         </el-table-column>
         <el-table-column prop="secondApproveRemark" label="审核意见">
         </el-table-column>
-        <el-table-column prop="statusStr" label="状态"></el-table-column>
+        <el-table-column
+          prop="statusStr"
+          label="状态"
+          width="80"
+        ></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
             <el-button

src/modules/base/views/CardRuleManage.vue

@@ -80,7 +80,7 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="120px">
+        <el-table-column class-name="action-column" label="操作" width="140">
           <template slot-scope="scope">
             <el-button
               v-if="checkPrivilege('link', 'preview')"

src/modules/base/views/OrganizationManage.vue

@@ -158,7 +158,9 @@ export default {
       }
       this.curOrg = {
         ...data,
-        parentName: node.parent.data.name
+        parentName: data.parentId
+          ? node.parent.data.name
+          : this.$ls.get("schoolName")
       };
       this.$refs.ModifyOrganization.open();
     },

src/modules/base/views/TemplateManage.vue

@@ -5,9 +5,8 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="模板名称：">
             <el-input
-              style="width: 200px;"
               v-model.trim="filter.name"
-              placeholder="请输入内容"
+              placeholder="模板名称"
               clearable
             ></el-input>
           </el-form-item>
@@ -17,8 +16,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
+              start-placeholder="创建开始时间"
+              end-placeholder="创建结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -28,8 +27,8 @@
           <el-form-item label="启用/禁用：" label-width="90px">
             <el-select
               v-model="filter.enable"
-              style="width: 100px;"
-              placeholder="请选择"
+              style="width: 110px;"
+              placeholder="启用/禁用"
               clearable
             >
               <el-option

src/modules/exam/components/ApplyContent.vue

@@ -411,7 +411,7 @@ export default {
     IS_PREVIEW() {
       return this.editType
         ? this.editType === "PREVIEW"
-        : this.curTaskApply.setup <= 0;
+        : this.curTaskApply.setup !== null && this.curTaskApply.setup <= 0;
     },
     IS_AUDIT() {
       return this.editType
@@ -470,7 +470,7 @@ export default {
     async buildSteps() {
       if (
         !this.curTaskApply.flowId ||
-        (this.curTaskApply.setup && this.curTaskApply.setup <= 0)
+        (this.curTaskApply.setup !== null && this.curTaskApply.setup <= 0)
       )
         return;
 

src/modules/exam/components/CreatePrintTask.vue

@@ -50,6 +50,7 @@
           placeholder="请选择"
           multiple
           clearable
+          style="width: 100%"
           @change="classChange"
         >
           <el-option

src/modules/exam/components/ModifyTaskPaper.vue

@@ -58,7 +58,7 @@
         </el-form>
       </div>
 
-      <div class="part-box part-box-pad part-box-border">
+      <div>
         <div v-if="IS_EDIT" class="mb-2 text-right">
           <el-button
             type="primary"
@@ -76,11 +76,12 @@
           </tr>
           <tr v-for="(attachment, index) in paperAttachments" :key="index">
             <td>{{ attachment.name }}卷</td>
-            <td class="td-link">
-              <span
+            <td>
+              <el-button
                 v-if="attachment.editable && IS_EDIT"
+                type="text"
+                class="btn-primary"
                 @click="toUpload(attachment)"
-                title="点击上传试卷"
               >
                 <i
                   :class="[
@@ -93,41 +94,45 @@
                     ? attachment.filename
                     : "点击上传试卷文件"
                 }}
-              </span>
-              <span
+              </el-button>
+              <el-button
                 v-else
+                type="text"
+                class="btn-primary"
                 @click="downloadPaper(attachment)"
-                title="点击查看试卷"
               >
                 <i
-                  class="icon icon-download-act"
+                  class="el-icon-download mr-1"
                   v-if="attachment.attachmentId"
                 ></i>
                 <i>{{ attachment.filename }}</i>
-              </span>
+              </el-button>
             </td>
-            <td
-              class="td-link"
-              :rowspan="paperAttachments.length"
-              v-if="index === 0"
-            >
-              <span v-if="CAN_EDIT_CARD" @click="toCreateOrViewCard"
-                ><i class="icon icon-plus-act"></i>{{ cardTodoName }}</span
+            <td :rowspan="paperAttachments.length" v-if="index === 0">
+              <el-button
+                v-if="CAN_EDIT_CARD"
+                type="text"
+                class="btn-primary"
+                @click="toCreateOrViewCard"
+                >{{ cardTodoName }}</el-button
+              >
+              <el-button
+                v-else
+                type="text"
+                class="btn-primary"
+                @click="toViewCard"
               >
-              <span v-else @click="toViewCard">
-                <i class="icon icon-circle-right"></i>
-                <i>查看题卡</i>
-              </span>
+                查看题卡
+              </el-button>
             </td>
             <td v-if="IS_EDIT">
               <el-button
                 v-if="attachment.editable"
-                class="btn-primary"
+                class="btn-danger"
                 type="text"
-                icon="icon icon-delete"
-                title="删除"
                 @click="deleteAttachment(index)"
-              ></el-button>
+                >删除</el-button
+              >
             </td>
           </tr>
         </table>

src/modules/exam/components/PrintTaskStudents.vue

@@ -2,7 +2,7 @@
   <el-dialog
     class="print-task-students"
     :visible.sync="modalIsShow"
-    title="考生名细"
+    title="考生明细"
     top="10vh"
     width="700px"
     :close-on-click-modal="false"

src/modules/exam/components/PublishPrintTask.vue

@@ -69,7 +69,7 @@
           {{ scope.row.extends[item.code] }}
         </div>
       </el-table-column>
-      <el-table-column label="操作" width="120px">
+      <el-table-column label="操作" width="160">
         <template slot-scope="scope">
           <el-button
             class="btn-primary"
@@ -225,7 +225,7 @@ export default {
       this.getList();
     },
     printPlanChange(val) {
-      this.filter.printPlanName = val.name;
+      this.filter.printPlanName = val && val.name;
       this.getList();
     },
     timeChange() {
@@ -276,7 +276,7 @@ export default {
       this.$refs.CreatePrintTask.open();
     },
     toEdit(row) {
-      this.curRow = { ...row, ...this.filter.printPlanName };
+      this.curRow = { ...row, ...this.filter };
       this.$refs.CreatePrintTask.open();
     },
     toPreview(row) {

src/modules/print/components/ModifyPlanPaper.vue

@@ -109,17 +109,18 @@
       </tr>
       <tr v-for="(attachment, index) in paperAttachments" :key="index">
         <td>{{ attachment.name }}卷</td>
-        <td class="td-link">
-          <span @click="downloadPaper(attachment)" title="点击查看试卷">
+        <td>
+          <el-button
+            type="text"
+            class="btn-primary"
+            @click="downloadPaper(attachment)"
+            title="点击查看试卷"
+          >
             <i class="el-icon-download mr-1" v-if="attachment.attachmentId"></i
             >{{ attachment.filename }}
-          </span>
+          </el-button>
         </td>
-        <td
-          class="td-link"
-          :rowspan="paperAttachments.length"
-          v-if="index === 0"
-        >
+        <td :rowspan="paperAttachments.length" v-if="index === 0">
           <el-button type="text" class="btn-primary" @click="toViewCard"
             >查看答题卡</el-button
           >

src/modules/print/components/PreviewBusinessDetail.vue

@@ -4,7 +4,7 @@
       :visible.sync="modalIsShow"
       title="详情数据"
       top="10px"
-      width="900px"
+      width="940px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       append-to-body
@@ -82,7 +82,7 @@
           <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="操作" width="70">
+          <el-table-column class-name="action-column" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
                 class="btn-primary"