bug fix

src/assets/styles/common-comp.scss

@@ -182,8 +182,9 @@
 // import-file
 .cc-import-file {
   &-tips {
-    height: 20px;
+    max-height: 200px;
     line-height: 20px;
+    overflow: hidden;
   }
   &-footer {
     padding: 10px 0;

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

@@ -663,3 +663,13 @@
     margin: 3px;
   }
 }
+
+.el-notification {
+  .el-notification__content {
+    p {
+      word-break: break-all;
+      max-height: 300px;
+      overflow: hidden;
+    }
+  }
+}

src/modules/base/components/ModifyUser.vue

@@ -168,6 +168,11 @@ export default {
             message: "用户名不能超过50",
             trigger: "change",
           },
+          {
+            pattern: /^[a-zA-Z0-9_-]{2,50}$/,
+            message: "用户名只能包含字母、数字、下划线以及短横线",
+            trigger: "change",
+          },
         ],
         realName: [
           {

src/modules/base/views/SystemSetting.vue

@@ -34,6 +34,11 @@
                   placeholder="请输入"
                   clearable
                 ></el-input>
+                <div
+                  v-if="field.remark"
+                  class="tips-info"
+                  v-html="getRemarkHtml(field.remark)"
+                ></div>
               </el-form-item>
             </template>
           </div>
@@ -69,6 +74,12 @@ export default {
     checkValueIsBoolean(val) {
       return ["true", "false"].includes(val);
     },
+    getRemarkHtml(remark) {
+      return remark
+        .split("\n")
+        .map((cont) => `<p>${cont}</p>`)
+        .join("");
+    },
     async getSysSet() {
       const data = await systemSettingQuery(this.$attrs.isSystem);
       this.setList = data;
@@ -77,13 +88,13 @@ export default {
       data.forEach((item) => {
         item.data.forEach((field) => {
           modalForm[field.code] = field.value;
-          rules[field.code] = [
-            {
-              required: true,
-              message: `请设置${field.name}`,
-              trigger: "change",
-            },
-          ];
+          // rules[field.code] = [
+          //   {
+          //     required: true,
+          //     message: `请设置${field.name}`,
+          //     trigger: "change",
+          //   },
+          // ];
         });
       });
       this.modalForm = modalForm;

src/modules/record/components/ArchivesDetailStudentDialog.vue

@@ -15,6 +15,7 @@
           <el-carousel
             height="100%"
             :autoplay="false"
+            :loop="false"
             arrow="always"
             @change="imageChange"
           >

src/modules/record/components/DocumentDetailDialog.vue

@@ -69,6 +69,13 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="考场：">
+            <el-input
+              v-model.trim="filter.examRoom"
+              placeholder="考场"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item label="姓名/学号：">
             <el-input
               style="width: 142px"
@@ -166,6 +173,7 @@
           <el-table-column prop="collegeName" label="学院"></el-table-column>
           <el-table-column prop="majorName" label="专业"></el-table-column>
           <el-table-column prop="className" label="班级"></el-table-column>
+          <el-table-column prop="examRoom" label="考场"></el-table-column>
           <el-table-column
             prop="score"
             label="成绩"
@@ -238,6 +246,7 @@ export default {
         isBind: "",
         teacher: "",
         teachClass: "",
+        examRoom: "",
         param: "",
         minScore: undefined,
         maxScore: undefined,

src/modules/record/views/ScanTaskManage.vue

@@ -8,14 +8,6 @@
             defaultSelectExam
             @exam-default="toPage(1)"
           ></sec-select>
-          <el-form-item label="班级：">
-            <el-input
-              v-model.trim="filter.className"
-              placeholder="请选择班级"
-              clearable
-            >
-            </el-input>
-          </el-form-item>
         </template>
 
         <el-form-item label-width="0px">
@@ -71,6 +63,18 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          prop="storeTypeDisplay"
+          label="图片存储方式"
+          width="110"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="recognitionTypeDisplay"
+          label="识别模式"
+          width="110"
+        >
+        </el-table-column>
         <el-table-column prop="studentCount" label="考生总数" width="110">
         </el-table-column>
         <el-table-column prop="scanStudentCount" label="已扫人数" width="110">