Merge branch 'dev_1.1.0' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.1.0

src/modules/portal/views/home/Home.vue

@@ -255,7 +255,7 @@ export default {
           .then(() => {
             setTimeout(() => {
               this.onlineSignal();
-            }, 3000);
+            }, 5000);
           });
       } catch (error) {
         console.log("tag", error);

src/modules/questions/routes/routes.js

@@ -122,7 +122,8 @@ export default [
         component: ImportPaperInfo,
       },
       {
-        path: "gen_paper_detail/:courseNo", //组卷页面
+        path: "gen_paper_detail", //组卷页面
+        name: "gen_paper_detail", //组卷页面
         component: GenPaperDetail,
       },
       {

src/modules/questions/views/EditOtherQuestion.vue

@@ -316,7 +316,11 @@ export default {
     }
     if (this.courseNo) {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + this.courseNo)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(this.courseNo)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });

src/modules/questions/views/EditPaper.vue

@@ -176,7 +176,11 @@
                 </span>
               </h3>
             </div>
-            <div :id="paperDetail.id" class="edit-cont-action">
+            <div
+              :id="paperDetail.id"
+              class="edit-cont-action"
+              style="visibility: hidden"
+            >
               <el-button
                 v-show="parentView == 'gen_paper'"
                 size="small"
@@ -291,7 +295,11 @@
                   ></span>
                   <span> （{{ paperDetailUnit.score }}分） </span>
                 </div>
-                <div :id="paperDetailUnit.id" class="edit-cont-action">
+                <div
+                  :id="paperDetailUnit.id"
+                  class="edit-cont-action"
+                  style="visibility: hidden"
+                >
                   <span class="tips-info">
                     {{ paperDetailUnit.question.bodyLengthText }}
                   </span>
@@ -437,6 +445,7 @@
                   <div
                     :id="getSubQuesEditId(paperDetailUnit, subQuestion)"
                     class="edit-cont-action"
+                    style="visibility: hidden"
                   >
                     <el-button
                       size="small"
@@ -1772,7 +1781,11 @@ export default {
     //查询所有课程属性名
     initCourseProperty(courseCode) {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + courseCode)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(courseCode)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });

src/modules/questions/views/EditPaperPendingTrial.vue

@@ -208,9 +208,15 @@
                 </span>
               </h3>
             </div>
-            <div :id="paperDetail.id" class="edit-cont-action">
+            <div
+              :id="paperDetail.id"
+              class="edit-cont-action"
+              style="visibility: hidden"
+            >
               <el-button
-                v-show="parentView == 'gen_paper' && isShowEditBtn()"
+                v-show="
+                  parentView == 'exam_paper_pending_trial' && isShowEditBtn()
+                "
                 size="small"
                 type="primary"
                 plain
@@ -327,7 +333,11 @@
                   ></span>
                   <span> （{{ paperDetailUnit.score }}分） </span>
                 </div>
-                <div :id="paperDetailUnit.id" class="edit-cont-action">
+                <div
+                  :id="paperDetailUnit.id"
+                  class="edit-cont-action"
+                  style="visibility: hidden"
+                >
                   <span class="tips-info">
                     {{ paperDetailUnit.question.bodyLengthText }}
                   </span>
@@ -479,6 +489,7 @@
                     v-show="isShowEditBtn()"
                     :id="getSubQuesEditId(paperDetailUnit, subQuestion)"
                     class="edit-cont-action"
+                    style="visibility: hidden"
                   >
                     <el-button
                       size="small"
@@ -1883,7 +1894,11 @@ export default {
     //查询所有课程属性名
     initCourseProperty(courseCode) {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + courseCode)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(courseCode)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });

src/modules/questions/views/EditSelectQuestion.vue

@@ -341,7 +341,11 @@ export default {
     }
     if (this.courseNo) {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + this.courseNo)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(this.courseNo)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });
@@ -563,7 +567,11 @@ export default {
     initCourseProperty() {
       var code = this.quesModel.course.code;
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + code)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(code)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });

src/modules/questions/views/GenPaper.vue

@@ -626,7 +626,8 @@ export default {
         sessionStorage.setItem("gen_paper", JSON.stringify(this.formSearch));
         sessionStorage.setItem("gen_paper_currentPage", this.currentPage);
         this.$router.push({
-          path: "/questions/gen_paper_detail/" + courseNo,
+          name: "gen_paper_detail",
+          params: { courseNo: courseNo },
         });
       }
     },

src/modules/questions/views/GenPaperDetail.vue

@@ -22,7 +22,7 @@
             @click="confirmGenPaper"
             >确定</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="back"
+          <el-button type="danger" plain icon="icon icon-back" @click="toback"
             >返回</el-button
           >
         </div>
@@ -779,7 +779,7 @@ export default {
       "rootOrgId=" +
       this.user.rootOrgId +
       "&code=" +
-      this.genPaper.courseNo;
+      encodeURIComponent(this.genPaper.courseNo);
     this.$httpWithMsg
       .get(url)
       .then((response) => {
@@ -821,7 +821,6 @@ export default {
       this.searchPaper();
     },
     selectChange(val) {
-      console.log("val123:");
       val.forEach((element) => {
         element.publicSimple = 0;
         element.publicMedium = 0;
@@ -877,7 +876,6 @@ export default {
             this.loading = false;
           });
       } else {
-        console.log("空值");
         this.selectPapers = [];
         this.totalSelect = 0;
         this.loading = false;
@@ -888,9 +886,9 @@ export default {
       this.searchPaperDetailStructs();
     },
     searchPaperStructs() {
-      console.log("bbb");
       var courseNo = this.genPaper.courseNo;
-      var url = QUESTION_API + "/paperStruct?courseNo=" + courseNo;
+      var url =
+        QUESTION_API + "/paperStruct?courseNo=" + encodeURIComponent(courseNo);
       this.loading = true;
       this.$http.get(url).then((response) => {
         this.paperStructs = response.data;
@@ -909,7 +907,6 @@ export default {
       });
     },
     searchPaperDetailStructs() {
-      console.log("this.genPaper.paperStructId:", this.genPaper.paperStructId);
       for (let paperStruct of this.paperStructs) {
         if (paperStruct.id == this.genPaper.paperStructId) {
           this.paperDetailStructs = paperStruct.paperDetailStructs;
@@ -1074,6 +1071,9 @@ export default {
       this.curSelect = val;
       this.searchPaper();
     },
+    toback() {
+      this.$router.push({ path: "/questions/gen_paper/1" });
+    },
     back(status) {
       if ("PASS" == status) {
         this.$notify({
@@ -1124,7 +1124,6 @@ export default {
     setSimpleParams() {
       var simpleParams = new Object();
       for (let paper of this.tempPapers) {
-        console.log("paper", paper);
         if (this.genPaper.simpleGenPaperPolicy == "BY_SCORE") {
           if (!this.isNumber(paper.publicSimple)) {
             this.$notify({
@@ -1223,14 +1222,17 @@ export default {
         simpleParams[paper.id] = numberParams;
       }
       this.genPaper.simpleParams = simpleParams;
-      console.log("this.genPaper.simpleParams:", this.genPaper.simpleParams);
       return true;
     },
     //查询课程下开启的课程属性
     getCoursePropertyList() {
       var courseNo = this.genPaper.courseNo;
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + courseNo)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(courseNo)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
           this.searchPaperStructs();

src/modules/questions/views/InsertBluePaperStructure.vue

@@ -328,7 +328,9 @@ export default {
         this.blueStruct = blueStruct;
         this.$http
           .get(
-            QUESTION_API + "/courseProperty/enable/" + this.blueStruct.courseNo
+            QUESTION_API +
+              "/courseProperty/enable?courseCode=" +
+              encodeURIComponent(this.blueStruct.courseNo)
           )
           .then((response) => {
             this.coursePropertyList = response.data;
@@ -362,7 +364,9 @@ export default {
     getCoursePropertyList() {
       this.$http
         .get(
-          QUESTION_API + "/courseProperty/enable/" + this.blueStruct.courseNo
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(this.blueStruct.courseNo)
         )
         .then((response) => {
           this.coursePropertyList = response.data;

src/modules/questions/views/InsertPaperTitle.vue

@@ -46,14 +46,6 @@
             >
             </el-option>
           </el-select>
-          <span style="padding-left: 5px">
-            <el-button
-              type="primary"
-              icon="icon icon-plus-white"
-              @click="insertPaper"
-              >新增试卷</el-button
-            >
-          </span>
         </el-form-item>
         <el-form-item v-if="paperDetailDisable" label="试卷大题">
           <el-select
@@ -374,9 +366,9 @@ export default {
           "/" +
           this.paperTitleForm.value +
           "/" +
-          this.paperTitleForm.courseNo +
+          encodeURIComponent(this.paperTitleForm.courseNo) +
           "/" +
-          this.paperTitleForm.courseName,
+          encodeURIComponent(this.paperTitleForm.courseName),
       });
     },
   },

src/modules/questions/views/PaperBlue.vue

@@ -131,7 +131,11 @@ export default {
 
     init() {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + this.courseCode)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(this.courseCode)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });

src/modules/questions/views/Question.vue

@@ -476,8 +476,8 @@ export default {
             this.$http
               .get(
                 QUESTION_API +
-                  "/courseProperty/enable/" +
-                  this.formSearch.courseNo
+                  "/courseProperty/enable?courseCode=" +
+                  encodeURIComponent(this.formSearch.courseNo)
               )
               .then((response) => {
                 this.coursePropertyList = response.data;
@@ -549,7 +549,9 @@ export default {
       if (this.formSearch.courseNo) {
         this.$http
           .get(
-            QUESTION_API + "/courseProperty/enable/" + this.formSearch.courseNo
+            QUESTION_API +
+              "/courseProperty/enable?courseCode=" +
+              encodeURIComponent(this.formSearch.courseNo)
           )
           .then((response) => {
             this.coursePropertyList = response.data;

src/modules/questions/views/ViewPaper.vue

@@ -669,7 +669,11 @@ export default {
     //查询所有课程属性名
     initCourseProperty(courseCode) {
       this.$http
-        .get(QUESTION_API + "/courseProperty/enable/" + courseCode)
+        .get(
+          QUESTION_API +
+            "/courseProperty/enable?courseCode=" +
+            encodeURIComponent(+courseCode)
+        )
         .then((response) => {
           this.coursePropertyList = response.data;
         });