Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…

…form into ezTeach-2.0.0.0.release

Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…
…form into ezTeach-2.0.0.0.release
刘鸿
2 parents 96dbf0ac a1adf9e8
Showing 3 changed files with 41 additions and 26 deletions
src/api/apis/apis.js
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
src/views/basic/askTestQuestion/wrongQuestion.vue
@@ -8,11 +8,11 @@ const defaltService = (url, data) =&gt; {
     data,
   });
 };
-const defaltGetService = (url, data) => {
+const defaltGetService = (url, params) => {
   return service({
     url: url,
-    method: "Get",
-    data,
+    method: "GET",
+    params,
   });
 };
 const downService = (url, data) => {
@@ -203,6 +203,8 @@
                     :min="1"
                     :max="30"
                     style="width: 100px"
+                    :step="1"
+                    :precision="0"
                   ></el-input-number>
                 </div>
               </div>
@@ -232,7 +234,6 @@
   </el-dialog>
 </template>
 <script>
-import { number } from "echarts";
 import draggable from "vuedraggable";
 import { paperPrint } from "@/utils";
 export default {
@@ -707,7 +708,6 @@ export default {
           localStorage.setItem("question", JSON.stringify(this.groups));
           localStorage.setItem("testlist", JSON.stringify(this.testData));
           this.$emit("setQuestions");
-          this.handleClose();
         })
         .catch(() => {
           console.log("取消");
@@ -831,6 +831,7 @@ export default {
           height: 40px;
           justify-content: space-between;
           cursor: pointer;
+          padding: 0 10px;
         }
       }
@@ -923,4 +924,4 @@ export default {
   background: rgb(115, 142, 246);
   border-bottom: 1px solid rgb(115, 142, 246);
 }
-</style>
 \ No newline at end of file
+</style>
@@ -254,11 +254,12 @@
     />
   </div>
 </template>
-  
-  <script>
-import { setDateRules } from "@/utils";
+
+<script>
+import { setDateRules, getKnowledge } from "@/utils";
 import wrongQuestionDialog from "./components/wrongQuestionDialog.vue";
 import analysisDialog from "./components/analysisDialog.vue";
+
 export default {
   components: {
     wrongQuestionDialog,
@@ -373,12 +374,16 @@ export default {
       let param = {
         ...this.listPage,
         ...this.formData,
+        startScoreRate: this.formData.startScoreRate.toString(),
+        endScoreRate: this.formData.endScoreRate.toString(),
         startDate: this.formData.dateRange[0],
         endDate: this.formData.dateRange[1],
       };
       let data = await this.$request.getWrongQuestionList(param);
       this.queryLoading = false;
-      this.topicList = data.data.records;
+      this.topicList = data.data.records.map((item) => {
+        return { ...item, knowledge: getKnowledge(item.knowledge) };
+      });
       this.listPage.total = data.data.total;
       // this.topicList = await this.loadAndModifyHTML(data.data.records);
     },
@@ -420,6 +425,9 @@ export default {
       if (value > this.formData.endScoreRate) {
         this.formData.startScoreRate = this.formData.endScoreRate;
       }
+      if (!value) {
+        this.formData.startScoreRate = 0;
+      }
     },
     // 输入不超过100
     endValidateInput(value) {
@@ -432,6 +440,9 @@ export default {
       if (value < this.formData.startScoreRate) {
         this.formData.endScoreRate = this.formData.startScoreRate;
       }
+      if (!value) {
+        this.formData.endScoreRate = 0;
+      }
     },
     // 搜索按钮
@@ -471,11 +482,10 @@ export default {
     },
     // 全部删除
     handleDelTest() {
-      let list = this.removeMatchingValues(
-        this.topicList.map((item) => item.id),
-        this.questions.map((item) => item.id)
-      );
+      let list = this.removeMatchingValues(this.topicList, this.questions);
       this.questions = list;
+      console.log("移除本业", this.questions);
+
       localStorage.setItem("testlist", JSON.stringify(this.questions));
     },
     // 重置 去除locastorage 以及 questions
@@ -496,11 +506,11 @@ export default {
     },
     // 去除第二数组中存在第一数组中的值
     removeMatchingValues(arr1, arr2) {
-      // 将第一个数组的值存入 Set，提高查找效率
-      const valuesSet = new Set(arr1);
+      const arr1Ids = arr1.map((item) => item.id);
+      const res = arr2.filter((item) => !arr1Ids.includes(item.id));
+      console.log(res, "res");
-      // 过滤第二个数组，保留不在 Set 中的值
-      return arr2.filter((value) => !valuesSet.has(value));
+      return res;
     },
     // 判断第一个数组在第二个种是否全部存在
@@ -514,9 +524,7 @@ export default {
     // 购物车触发弹框
     handleShop() {
-      if (this.questions.length > 0) {
-        this.visible = true;
-      }
+      this.visible = true;
     },
     // 获取科目列表
@@ -527,6 +535,8 @@ export default {
       console.log(data, "--------");
       this.subjectList = data.data.subjectNames;
+      console.log(this.subjectList, "我被打印了");
+
       this.formData.subjectName = this.subjectList[0];
       this.getClassList();
     },
@@ -549,13 +559,17 @@ export default {
     },
     // 获取班级信息
     async getClassList() {
-      let data = await this.$request.getClassList({
+      console.log(this.formData, "this.formDate");
+
+      let data = await this.$request.getGradeList({
         grade: this.formData.grade,
         subjectName: this.formData.subjectName,
       });
       this.classList = [
         { className: "全部", classId: null },
-        ...data.data.list,
+        ...data.data.map((item) => {
+          return { className: item.className, classId: item.id };
+        }),
       ];
       this.formData.classId = null;
       this.getList();
@@ -620,8 +634,8 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 .page-content {
   box-sizing: border-box;
   padding: 0 20px;
@@ -781,4 +795,4 @@ export default {
 .size {
   font-size: 14px !important;
 }
-</style>
 \ No newline at end of file
+</style>