Selaa lähdekoodia

bug fix 和ui优化

刘洋 1 vuosi sitten
vanhempi
commit
24f37e68ea

+ 1 - 1
src/assets/styles/home.scss

@@ -25,7 +25,7 @@
   top: 110px;
   right: 0;
   bottom: 0;
-  overflow: auto;
+  overflow-y: auto;
   z-index: 8;
 }
 .home-main {

+ 3 - 2
src/assets/styles/pages.scss

@@ -1147,14 +1147,14 @@
 }
 .folder-question {
   height: 100%;
-  overflow: hidden;
+  // overflow: hidden;
   display: flex;
   justify-content: space-between;
   align-items: stretch;
 
   .folder-list {
     width: 320px;
-    margin-right: 20px;
+    margin-right: 15px;
     flex-grow: 0;
     flex-shrink: 0;
     padding: 15px 12px;
@@ -1166,6 +1166,7 @@
       width:0;
       overflow:hidden;
       padding:0;
+      margin-right:0;
     }
     .el-tree-node > .el-tree-node__children{
       overflow:visible;

+ 12 - 7
src/modules/paper/components/AuditPaperDialog.vue

@@ -58,12 +58,9 @@ export default {
       },
     },
   },
-  data() {
-    return {
-      modalIsShow: false,
-      isSubmit: false,
-      modalForm: { ...initModelForm },
-      rules: {
+  computed: {
+    rules() {
+      return {
         auditResult: [
           {
             required: true,
@@ -81,9 +78,17 @@ export default {
               callback();
             },
             trigger: "change",
+            required: this.info.auditResult === "NOT_PASS",
           },
         ],
-      },
+      };
+    },
+  },
+  data() {
+    return {
+      modalIsShow: false,
+      isSubmit: false,
+      modalForm: { ...initModelForm },
     };
   },
   methods: {

+ 2 - 2
src/modules/paper/components/AuditPaperUnsubmit.vue

@@ -13,9 +13,9 @@
           placeholder="请输入试卷名称"
         ></el-input>
       </el-form-item> -->
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button type="primary" @click="toPage(1)">查询</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <div>

+ 1 - 1
src/modules/paper/components/AuditPaperWait.vue

@@ -14,7 +14,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="toPage(1)">查询</el-button>
+        <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
     </el-form>
 

+ 1 - 1
src/modules/paper/components/QuestionGroupStruct.vue

@@ -8,7 +8,7 @@
         >按难度抽题</el-checkbox
       >
       <el-checkbox v-model="useProperty" @change="setChange"
-        >按课程属性抽题</el-checkbox
+        >按课程知识点抽题</el-checkbox
       >
       <!-- <el-select
         v-if="useProperty"

+ 12 - 8
src/modules/paper/views/EditPaper.vue

@@ -298,7 +298,9 @@
                 @click="toMovePaperDetail(paperDetail, 'up')"
                 >上移</span
               >
-              <span v-if="detailIndex < paper.paperDetails.length - 1"
+              <span
+                v-if="detailIndex < paper.paperDetails.length - 1"
+                @click="toMovePaperDetail(paperDetail, 'down')"
                 >下移</span
               >
               <span @click="toDeletePaperDetail(paperDetail)">删除</span>
@@ -905,14 +907,16 @@ export default {
     this.initPaper();
   },
   methods: {
-    async initPaper(bool) {
+    async initPaper(bool, bool2) {
       const res = await paperDetailApi(this.paperId);
-      res.data.paperDetails.forEach((detail) => {
-        detail.showQuestions = true;
-        detail.paperDetailUnits.forEach((question) => {
-          question.showSubQuestions = true;
+      if (!bool2) {
+        res.data.paperDetails.forEach((detail) => {
+          detail.showQuestions = true;
+          detail.paperDetailUnits.forEach((question) => {
+            question.showSubQuestions = true;
+          });
         });
-      });
+      }
       this.paper = res.data;
       this.paper.title = this.paper.title || this.paper.name;
       this.showCheckDuplicate();
@@ -1176,7 +1180,7 @@ export default {
 
       if (!res) return;
       this.$message.success("操作成功!");
-      this.initPaper();
+      this.initPaper(false, true);
     },
     // 删除大题
     async toDeletePaperDetail(detail) {

+ 3 - 0
src/modules/question/components/QuestionPreviewLoopDialog.vue

@@ -221,6 +221,9 @@ export default {
     propQuestion(val) {
       this.question = val;
     },
+    modalIsShow(val) {
+      val && (this.modalForm.auditRemark = "");
+    },
   },
   methods: {
     toPrev() {

+ 11 - 15
src/modules/question/views/QuestionManage.vue

@@ -163,8 +163,8 @@
       </div>
       <div class="collapse-icon-box">
         <div class="icon-circle" @click="treeCollapse = !treeCollapse">
-          <i class="el-icon-caret-right" v-if="treeCollapse"></i>
-          <i class="el-icon-caret-left" v-else></i>
+          <i class="el-icon-arrow-right" v-if="treeCollapse"></i>
+          <i class="el-icon-arrow-left" v-else></i>
         </div>
       </div>
       <div class="question-list">
@@ -399,7 +399,7 @@ export default {
   },
   data() {
     return {
-      treeCollapse: false,
+      treeCollapse: true,
       filter: {
         courseId: "",
         questionType: "",
@@ -696,27 +696,23 @@ export default {
     position: relative;
     overflow: visible;
     .icon-circle {
-      width: 18px;
-      height: 18px;
+      width: 16px;
+      height: 16px;
       border-radius: 50%;
       display: flex;
       justify-content: center;
       align-items: center;
       border: 2px solid #6d5ff6;
       position: absolute;
-      left: calc(50% - 9px);
-      top: 50%;
+      left: 50%;
+      top: 30px;
       transform: translateX(-50%) translateY(-50%);
       cursor: pointer;
-      &:hover {
-        background-color: #6d5ff6;
-        i {
-          color: #fff;
-        }
-      }
+      background-color: #6d5ff6;
+
       i {
-        font-size: 14px;
-        color: #6d5ff6;
+        font-size: 10px;
+        color: #fff;
       }
     }
   }

+ 2 - 2
src/modules/questions/views/QuestionInfo.vue

@@ -90,7 +90,7 @@
           <div class="td">预估难度</div>
           <div class="td">{{ quesModel.difficulty || "-" }}</div>
         </div>
-        <div class="tr">
+        <!-- <div class="tr">
           <div class="td">计算难度</div>
           <div class="td">{{ quesModel.calculateDifficultyDegree || "-" }}</div>
         </div>
@@ -113,7 +113,7 @@
         <div class="tr">
           <div class="td">平均分值</div>
           <div class="td">{{ quesModel.calculateAvgScore || "-" }}</div>
-        </div>
+        </div> -->
         <div class="tr" v-if="infoType === 'existed'">
           <div class="td">重复率</div>
           <div class="td">{{ quesModel.duplicateRate || "-" }}</div>