deason 6 年 前
コミット
6599efc4bc

+ 15 - 15
src/modules/print/view/CourseStatistic.vue

@@ -84,14 +84,6 @@
           </el-form-item>
 
           <el-form-item style="padding-left: 30px">
-            <el-button
-              size="small"
-              icon="el-icon-refresh"
-              @click="resetSearchForm"
-            >
-              重置
-            </el-button>
-
             <el-button
               size="small"
               type="primary"
@@ -99,13 +91,21 @@
               @click="searchRecords(1)"
               >查询
             </el-button>
+
+            <el-button
+              size="small"
+              icon="el-icon-refresh"
+              @click="resetSearchForm"
+            >
+              重置
+            </el-button>
           </el-form-item>
         </el-form>
 
         <div style="margin-bottom: 5px;">
           批量操作:
           <el-button
-            size="mini"
+            size="small"
             type="primary"
             icon="el-icon-menu"
             @click="openAllotAllDialog"
@@ -114,7 +114,7 @@
           </el-button>
 
           <el-button
-            size="mini"
+            size="small"
             type="primary"
             icon="el-icon-download"
             @click="openExportAllDialog"
@@ -122,7 +122,7 @@
           </el-button>
 
           <el-button
-            size="mini"
+            size="small"
             type="primary"
             icon="el-icon-download"
             :disabled="selectElements.length == 0"
@@ -131,12 +131,12 @@
           </el-button>
 
           <el-button
-            size="mini"
+            size="small"
             type="primary"
             icon="el-icon-refresh"
             :disabled="selectElements.length == 0"
             @click="refreshStatistic"
-            >刷新
+            >统计刷新
           </el-button>
         </div>
 
@@ -376,7 +376,7 @@
               type="primary"
               @click="doExport"
               :disabled="exportForm.types.length == 0"
-              >确定导出</el-button
+              >确定</el-button
             >
             <el-button @click="closeExportDialog">取 消</el-button>
           </div>
@@ -454,7 +454,7 @@
               type="primary"
               @click="doExportAll"
               :disabled="exportAllForm.existNum == 0"
-              >确定导出</el-button
+              >确定</el-button
             >
             <el-button @click="closeExportAllDialog">取 消</el-button>
           </div>

+ 6 - 6
src/modules/print/view/ExamStructure.vue

@@ -308,7 +308,7 @@ export default {
         return;
       }
       if (this.addStructureForm.questionStructure.singleChoiceTotal > 1000) {
-        callback(new Error("请输入合理有效的数值!"));
+        callback(new Error("请输入合理的数值!"));
         return;
       }
       callback();
@@ -324,7 +324,7 @@ export default {
         return;
       }
       if (this.addStructureForm.questionStructure.multipleChoiceTotal > 1000) {
-        callback(new Error("请输入合理有效的数值!"));
+        callback(new Error("请输入合理的数值!"));
         return;
       }
       callback();
@@ -340,7 +340,7 @@ export default {
         return;
       }
       if (this.addStructureForm.questionStructure.boolQuestionTotal > 1000) {
-        callback(new Error("请输入合理有效的数值!"));
+        callback(new Error("请输入合理的数值!"));
         return;
       }
       callback();
@@ -530,9 +530,9 @@ export default {
       this.addStructureDialog = true;
       this.addStructureForm.orgId = this.formSearch.orgId;
       this.addStructureForm.examId = this.formSearch.examId;
-      this.addStructureForm.questionStructure.singleChoiceTotal = 0;
-      this.addStructureForm.questionStructure.multipleChoiceTotal = 0;
-      this.addStructureForm.questionStructure.boolQuestionTotal = 0;
+      this.addStructureForm.questionStructure.singleChoiceTotal = "";
+      this.addStructureForm.questionStructure.multipleChoiceTotal = "";
+      this.addStructureForm.questionStructure.boolQuestionTotal = "";
     },
     closeAddStructureDialog() {
       /* 关闭考试结构弹窗 */

+ 1 - 1
src/modules/print/view/ProjectStatistic.vue

@@ -67,7 +67,7 @@
               icon="el-icon-refresh"
               v-show="!checkEmptyNumber(formSearch.examId)"
               @click="refreshStatistic"
-              >刷新
+              >统计刷新
             </el-button>
 
             <el-button