Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/oe/views/awaitingAudit.vue

@@ -319,9 +319,9 @@
             >
             </el-input>
           </el-form-item>
-          <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doAudit">确 定</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
           </div>
         </el-form>
       </el-dialog>
@@ -597,6 +597,9 @@ export default {
 .operateRow {
   margin-top: 2px;
 }
+.margin-top-10 {
+  margin-top: 10px;
+}
 .select-type {
   font-size: 8px;
   cursor: pointer;

src/modules/oe/views/captureDetail.vue

@@ -183,9 +183,9 @@
             >
             </el-input>
           </el-form-item>
-          <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doAuditNoPass">确 定</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
           </div>
         </el-form>
       </el-dialog>

src/modules/oe/views/examDetail.vue

@@ -14,26 +14,19 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="开始时间">
+          <el-col :span="12">
+            <el-form-item label="开考时间">
               <el-date-picker
-                size="small"
-                v-model="form.startTime"
-                type="datetime"
-                placeholder="选择日期时间"
+                class="input"
+                v-model="startExamDatetimeRange"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                range-separator="至"
+                end-placeholder="结束日期"
                 value-format="yyyy/MM/dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束时间">
-              <el-date-picker
+                :clearable="false"
                 size="small"
-                v-model="form.endTime"
-                type="datetime"
-                placeholder="选择日期时间"
-                value-format="yyyy/MM/dd HH:mm:ss"
+                @change="changeStartExamDatetimeRange"
               >
               </el-date-picker>
             </el-form-item>
@@ -376,6 +369,7 @@ export default {
       total: 0,
       tableLoading: false,
       showAllCondition: false,
+      startExamDatetimeRange: [],
       form: {
         examRecordDataId: null,
         hasStranger: null,
@@ -449,6 +443,7 @@ export default {
         endTime: null,
         infoCollector: null
       };
+      this.startExamDatetimeRange = [];
     },
     showMoreCondition() {
       this.showAllCondition = true;
@@ -463,6 +458,15 @@ export default {
       this.resetForm();
       this.showAllCondition = false;
     },
+    changeStartExamDatetimeRange(e) {
+      if (e && e.length > 0) {
+        this.form.startTime = e[0];
+        this.form.endTime = e[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+      }
+    },
     search(type) {
       if (!this.form.examId) {
         this.$notify({

src/modules/oe/views/reexamine.vue

@@ -92,9 +92,9 @@
             >
             </el-input>
           </el-form-item>
-          <div class="dialog-footer">
-            <el-button @click="dialogFormVisible = false">取 消</el-button>
+          <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doSetReexamine">确 定</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
           </div>
         </el-form>
       </el-dialog>

src/modules/questions/views/CourseProperty.vue

@@ -157,7 +157,7 @@
       <div class="page pull-right">
         <el-pagination
           @current-change="handleCurrentChange"
-          :current-page="currentPage"
+          :current-page.sync="currentPage"
           :page-size="pageSize"
           :page-sizes="[10, 20, 50, 100]"
           @size-change="handleSizeChange"
@@ -265,6 +265,8 @@ export default {
       this.searchCourProperty();
     },
     searchCourProperty() {
+      console.log("page:", this.currentPage);
+      var pageNo = Number(this.currentPage);
       this.loading = true;
       var url =
         QUESTION_API +
@@ -275,6 +277,7 @@ export default {
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = pageNo;
         this.loading = false;
       });
     },
@@ -502,7 +505,7 @@ export default {
             : parseInt(sessionStorage.getItem("course_property_currentPage"));
       }
       this.getOneCourse(this.formSearch.courseId);
-      this.searchCourProperty();
+      this.handleCurrentChange(this.currentPage);
     },
     //查询单个课程
     getOneCourse(courseId) {

src/modules/questions/views/EditPaper.vue

@@ -622,7 +622,12 @@
             <el-col :xs="10" :sm="10" :md="10" :lg="10">
               <el-form-item label="考试说明">
                 <div style="width:550px;">
-                  <ckeditor v-model="examRemark"></ckeditor>
+                  <ckeditor
+                    :display="display"
+                    :width="wValue"
+                    :height="hValue"
+                    v-model="examRemark"
+                  ></ckeditor>
                 </div>
               </el-form-item>
             </el-col>
@@ -690,6 +695,9 @@ export default {
   },
   data() {
     return {
+      hValue: "100px",
+      wValue: "500px",
+      display: "block",
       uploadAction: "",
       fileList: [],
       paperId: "",

src/modules/questions/views/ExportStructure.vue

@@ -87,6 +87,9 @@
           </el-col>
         </el-row>
       </el-form>
+      <div
+        style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+      ></div>
       <!-- 页面列表 -->
       <el-table border :data="tableData">
         <el-table-column label="考试类型">

src/modules/questions/views/GenPaper.vue

@@ -491,7 +491,7 @@ export default {
           },
           response => {
             this.$notify({
-              message: response.data.msg,
+              message: response.response.data.msg,
               type: "error"
             });
             this.loading = false;

src/modules/questions/views/InsertBluePaperStructure.vue

@@ -107,7 +107,12 @@
           </el-row>
           <el-form-item label="考试说明">
             <div style="width:550px;">
-              <ckeditor v-model="blueStruct.examRemark"></ckeditor>
+              <ckeditor
+                :display="display"
+                :width="wValue"
+                :height="hValue"
+                v-model="blueStruct.examRemark"
+              ></ckeditor>
             </div>
           </el-form-item>
         </el-form>
@@ -174,6 +179,7 @@
         </el-dialog>
 
         <!-- 页面列表 -->
+        <div style="margin-top:10px"></div>
         <el-table :data="paperDetailStructs" border style="width: 100%;">
           <el-table-column label="大题名称">
             <template slot-scope="scope">
@@ -237,6 +243,9 @@ export default {
   },
   data() {
     return {
+      hValue: "100px",
+      wValue: "800px",
+      display: "block",
       blueStruct: {
         name: "",
         totalScore: 0, //结构总分

src/modules/questions/views/InsertPaperStructure.vue

@@ -82,7 +82,12 @@
           <el-row>
             <el-form-item label="考试说明">
               <div style="width:550px;">
-                <ckeditor v-model="paperStruct.examRemark"></ckeditor>
+                <ckeditor
+                  :display="display"
+                  :width="wValue"
+                  :height="hValue"
+                  v-model="paperStruct.examRemark"
+                ></ckeditor>
               </div>
             </el-form-item>
           </el-row>
@@ -154,6 +159,7 @@
         </el-dialog>
 
         <!-- 页面列表 -->
+        <div style="margin-top:10px"></div>
         <el-table :data="paperDetailStructs" border>
           <el-table-column label="大题名称">
             <template slot-scope="scope">
@@ -210,8 +216,12 @@ export default {
     ckeditor,
     LinkTitlesCustom
   },
+
   data() {
     return {
+      hValue: "100px",
+      wValue: "800px",
+      display: "block",
       loading: false,
       courseList: [],
       paperDetailStructForm: {

src/modules/questions/views/Question.vue

@@ -169,7 +169,9 @@
           </el-col>
         </el-row>
       </el-form>
-
+      <div
+        style="width: 100%; border-bottom: 1px solid #ddd; margin: 10px 0;"
+      ></div>
       <!-- 页面列表 -->
       <el-table :data="tableData" border>
         <el-table-column label="课程" width="180">
@@ -701,8 +703,20 @@ export default {
           sessionStorage.getItem("question_currentPage")
         );
       }
-      if (this.formSearch.courseName) {
+      if (this.formSearch && this.formSearch.courseName) {
         this.getCourses(this.formSearch.courseName);
+      } else {
+        this.formSearch = {
+          questionType: "",
+          courseNo: "",
+          courseLevel: "",
+          courseName: "",
+          publicity: "",
+          coursePropertyName: "",
+          firstPropertyId: "",
+          secondPropertyId: ""
+        };
+        this.currentPage = 1;
       }
       this.searchQues();
     }