md

card/elements/composition/EditComposition.vue

@@ -25,6 +25,8 @@
           resize="none"
           placeholder="请输入题目名称"
           clearable
+          maxlength="100"
+          show-word-limit
         ></el-input>
       </el-form-item>
     </el-form>

card/elements/explain/EditExplain.vue

@@ -25,6 +25,8 @@
           resize="none"
           placeholder="请输入题目名称"
           clearable
+          maxlength="100"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="startEnd" label="起止题号：">

card/elements/fill-line/EditFillLine.vue

@@ -25,6 +25,8 @@
           resize="none"
           placeholder="请输入题目名称"
           clearable
+          maxlength="100"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="endNumber" label="起止题号：">

card/elements/fill-question/EditFillQuestion.vue

@@ -32,6 +32,8 @@
           resize="none"
           placeholder="请输入题目名称"
           clearable
+          maxlength="100"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="endNumber" label="起止题号：">

src/assets/styles/pages.scss

@@ -1417,3 +1417,8 @@
     margin: 0 0 10px;
   }
 }
+.modify-user {
+  .el-dialog__body {
+    padding: 20px;
+  }
+}

src/modules/base/components/ModifyUser.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
-    width="500px"
+    width="540px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -14,7 +14,7 @@
       ref="modalFormComp"
       :model="modalForm"
       :rules="rules"
-      label-position="top"
+      label-width="100px"
     >
       <el-form-item prop="loginName" label="用户名：">
         <el-input
@@ -61,7 +61,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="orgId" label="所属机构：">
+      <el-form-item prop="orgId" label="所属机构：" label-position="top">
         <select-orgs
           ref="SelectOrgs"
           v-model="modalForm.orgId"
@@ -70,7 +70,11 @@
           @change="orgChange"
         ></select-orgs>
       </el-form-item>
-      <el-form-item prop="allowManualCard" label="是否允许新增卡格式：">
+      <el-form-item
+        prop="allowManualCard"
+        label="是否允许新增卡格式："
+        label-width="160px"
+      >
         <el-radio-group v-model="modalForm.allowManualCard">
           <el-radio
             v-for="(val, key) in BOOLEAN_TYPE"

src/modules/base/components/SelectOrgs.vue

@@ -1,14 +1,15 @@
 <template>
   <div
     :class="[
-      'select-orgs part-box part-box-pad part-box-border',
+      'select-orgs part-box part-box-border',
       { 'select-orgs-disabled': disabled },
     ]"
+    style="padding: 10px; margin-bottom: 0"
   >
     <el-tree
       :data="orgs"
       show-checkbox
-      default-expand-all
+      :default-expand-all="defaultExpandAll"
       node-key="id"
       ref="MenuTree"
       :props="defaultProps"
@@ -46,6 +47,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    defaultExpandAll: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

src/modules/card/views/CardEdit.vue

@@ -246,7 +246,7 @@ export default {
       this.$ls.set("cardId", this.cardId);
     },
     async toSubmit(cardData) {
-      const res = await this.$prompt("确定要提交当前题卡吗?", "提示", {
+      const res = await this.$prompt("", "提示", {
         type: "warning",
         showInput: true,
         inputPlaceholder: "请输入题卡名称",

src/modules/exam/views/DataTaskManage.vue

@@ -151,7 +151,7 @@
               class="btn-primary"
               type="text"
               :disabled="loading"
-              @click="toDonwloadFile(scope.row.id, 'TASK_REPORT')"
+              @click="toViewLog(scope.row)"
               >导出日志</el-button
             >
             <el-button
@@ -195,6 +195,19 @@
         </el-pagination>
       </div>
     </div>
+
+    <el-dialog
+      class="log-dialog"
+      :visible.sync="modalIsShow"
+      title="日志"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      top="10vh"
+      width="800px"
+    >
+      <p v-for="(cont, cidx) in logList" :key="cidx">{{ cont }}</p>
+    </el-dialog>
   </div>
 </template>
 
@@ -242,6 +255,9 @@ export default {
       curTask: {},
       multipleSelection: [],
       loading: false,
+      // log dialog
+      modalIsShow: false,
+      logList: [],
     };
   },
   mounted() {
@@ -337,6 +353,10 @@ export default {
       this.$message.success("操作成功！");
       this.getList();
     },
+    toViewLog(row) {
+      this.logList = (row.summary || "").split("\n");
+      this.modalIsShow = true;
+    },
   },
 };
 </script>

src/modules/mark/components/ModifyMarkSetting.vue

@@ -57,22 +57,24 @@
           style="width: 125px"
           v-model="modalForm.passScore"
           :min="1"
-          :max="200"
+          :max="100"
           :step="1"
           step-strictly
           :controls="false"
         ></el-input-number>
+        <span style="margin-left: 5px">%</span>
       </el-form-item>
       <el-form-item prop="excellentScore" label="优秀分：">
         <el-input-number
           style="width: 125px"
           v-model="modalForm.excellentScore"
           :min="1"
-          :max="200"
+          :max="100"
           :step="1"
           step-strictly
           :controls="false"
         ></el-input-number>
+        <span style="margin-left: 5px">%</span>
       </el-form-item>
       <el-form-item prop="pictureConfig" label="原图遮盖：">
         <el-button class="btn-primary" type="text" @click="toSetPictureConfig"
@@ -103,8 +105,8 @@ const initModalForm = {
   sheetView: "",
   showObjectScore: "",
   autoScroll: "",
-  passScore: null,
-  excellentScore: null,
+  passScore: 60,
+  excellentScore: 80,
   pictureConfig: "",
 };
 

src/modules/mark/components/markParam/ModifyMarkGroup.vue

@@ -55,8 +55,8 @@
             step-strictly
             :controls="false"
           >
-          </el-input-number
-          >%
+          </el-input-number>
+          <span style="margin-left: 5px">%</span>
         </el-form-item>
       </template>
     </el-form>