From 5424ef82f9e020408262626018d1c7651a783cc0 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Sat, 10 Dec 2022 17:27:16 +0800
Subject: [PATCH] 接口调整

---
 src/api/axios.js                       |  3 ++-
 src/api/urls/answerSheet.js            |  2 +-
 src/store/index.js                     |  2 +-
 src/views/examinationPaper/add.vue     | 17 +++++++----------
 src/views/examinationPaper/edit.vue    | 10 +++++++---
 src/views/examinationPaper/index.vue   | 98 ++++++++++++++++++--------------------------------------------------------------------------------
 src/views/examinationPaper/recycle.vue | 91 +++++++++++++++++++++++++++++++------------------------------------------------------------
 vue.config.js                          |  2 +-
 8 files changed, 68 insertions(+), 157 deletions(-)

diff --git a/src/api/axios.js b/src/api/axios.js
index 03f3de2..ff65b10 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -59,7 +59,8 @@ service.interceptors.response.use(
         // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       }
     }
-    return Promise.resolve(response)
+    console.log(response)
+    return Promise.resolve(res)
   },
   error => {
     Message({
diff --git a/src/api/urls/answerSheet.js b/src/api/urls/answerSheet.js
index 6fd30a2..c529f41 100644
--- a/src/api/urls/answerSheet.js
+++ b/src/api/urls/answerSheet.js
@@ -2,7 +2,7 @@ export default {
   // 答题卡列表
   paperList: "/api_html/teaching/paperList",
   // 答题卡详情
-  paperList: "/api_html/teaching/paperDetail",
+  paperDetail: "/api_html/teaching/paperDetail",
   // 查找年级
   gradeList: "/api_html/teaching/gradeList",
   // 测验类型
diff --git a/src/store/index.js b/src/store/index.js
index 3a115b3..8927fb2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -65,7 +65,7 @@ const store = new Vuex.Store({
       loginForm.username = params.username;
       loginForm.password = encryptLoginPassword(params.password);
       request.login({ ...loginForm }).then(res => {
-        let response = res.data
+        let response = res
         if (response.status == 0) {
           const userInfo = { ...response.data }
           commit("setToken", "isLogin");
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index d420b68..f5551e6 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -433,7 +433,6 @@
 
 <script>
 import { formatDate, deepClone } from "utils";
-import { number } from "echarts";
 const questionForm = {
   questionTitle: "",
   questionType: 2,
@@ -509,7 +508,9 @@ export default {
       },
     };
   },
-  created() {
+  async created() {
+    await this._GradeList()
+    await this._CreatedTypeList()
     this.type = this.$route.query.type ? this.$route.query.type : 1;
     if (this.type == 2) {
       this._QueryDetail();
@@ -833,14 +834,10 @@ export default {
         this.$message.error(message);
       }
     },
-    async _QuerySubjectList(grade, dont) {
+    async _QuerySubjectList(grade) {
       //查询科目列表
-      let param = {};
-      if (grade) {
-        param.gradeName = grade;
-      }
       const { data, status, message } = await this.$request.fetchSubjectList(
-        param
+        {gradeName :grade}
       );
       if (status === 0) {
         this.subjectList = data.list.map((item) => {
@@ -865,7 +862,7 @@ export default {
         this.form.title = data.title;
         this.form.tagId = data.tagId;
         this.form.subjectName = data.subjectName;
-        this.form.gradeName = data.gradeName;
+        this.form.gradeName = data.grade;
         this.form.examsDuration = data.examsDuration;
         this.form.sharingType = data.sharingType;
         this.form.questionList = data.questionList?.map((item) => {
@@ -876,7 +873,7 @@ export default {
                 score: items.score,
                 partScore: items.partScore,
                 selectNum: items.answerOptions.split(',').length,
-                answerOptions: [...items.answerOptions],
+                answerOptions: items.answerOptions||"A,B,C,D",
                 correctAnswer: items.correctAnswer,
               };
             }) || [];
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 40a078b..a98c609 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -69,7 +69,7 @@
               <p v-if="subQuestions.questionType == 3" class="answer-box">
                 <span
                   class="answer-s"
-                  v-for="option in subQuestions.answerOptions"
+                  v-for="option in subQuestions.answerOptions.split(',')"
                   :class="
                     subQuestions.correctAnswer.includes(option) ? 'active' : ''
                   "
@@ -81,7 +81,7 @@
               <p v-if="subQuestions.questionType == 2" class="answer-box">
                 <span
                   class="answer-s"
-                  v-for="option in subQuestions.answerOptions"
+                  v-for="option in subQuestions.answerOptions.split(',')"
                   :class="subQuestions.correctAnswer == option ? 'active' : ''"
                   :key="option"
                   @click="subQuestions.correctAnswer = option"
@@ -101,6 +101,7 @@
 </template>
 
 <script>
+import { deepClone } from "utils";
 export default {
   data() {
     return {
@@ -201,7 +202,10 @@ export default {
       }
     },
     async save(){
-      let questionList = []
+      let questionList = this.form.questionList.map(item=>{
+        item.score = null
+        return item
+      })
        //更新答题卡
       const { data, status, message } = await this.$request.modifyPaper({
         paperId:this.form.id,
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 1715c7c..ddf47dc 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -55,10 +55,10 @@
         >
           <el-option
             v-for="item in typeList"
-            :key="item"
+            :key="item.label"
             :label="item.label"
             :value="item.value"
-            >{{ item }}
+            >{{ item.label }}
           </el-option>
         </el-select>
         <el-input
@@ -100,8 +100,8 @@
               v-for="(clazzChild, indexs) in item.classList"
               :key="clazzChild.classId"
               >{{
-                `${clazzChild.className}班${
-                  indexs != item.aboutClazz.length - 1 ? "、" : ""
+                `${clazzChild.className}${
+                  indexs !=  item.classList.length-1? "、" : ""
                 }`
               }}
               <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
@@ -178,72 +178,7 @@ export default {
       subjectList: [],
       typeList: [],
       archivedTotal: 0, //已归档答题卡数量
-      tableData: [
-        {
-          title: "数学样例试卷202211-324654",
-          id: "1062837",
-          tag: "周测",
-          answerNum: 45,
-          time: 90,
-          aboutClazz: [203, 204],
-          teacher: "张老师",
-          date: "2022-11-04 18:09:49",
-          share: 1,
-          score: 100,
-          gradeName: "二年级",
-          subjectId: 1,
-          examsDuration: 4800,
-          questionList: [
-            {
-              questionTitle: "f",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 1,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A,B,C,D",
-                  correctAnswer: "B",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          title: "数学样例试卷202211-4180949",
-          id: "1062838",
-          tag: "周测",
-          answerNum: 45,
-          time: 90,
-          aboutClazz: [203, 204],
-          teacher: "张老师",
-          date: "2022-11-04 18:09:49",
-          share: 1,
-          score: 100,
-          gradeName: "二年级",
-          subjectId: 1,
-          examsDuration: 3000,
-          questionList: [
-            {
-              questionTitle: "f",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 2,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D"],
-                  correctAnswer: "A,C",
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      tableData: [],
       shareForm: {
         id: "",
         share: 1,
@@ -334,16 +269,18 @@ export default {
     },
     // 查找答题卡类型
     async _QueryTypeList() {
-      const { data, status, message } = await this.$request.fetchTypeNames();
+      const { data, status, message } = await this.$request.fetchTypeNames({
+        classId: this.query.classId,
+      });
       if (status === 0) {
         this.typeList =
-          data.subjectNames.map((item) => {
+          data.list.map((item) => {
             return {
               value: item.tagId,
               label: item.tag,
             };
           }) || [];
-        this.subjectNames.unshift({
+        this.typeList.unshift({
           value: "",
           label: "--",
         });
@@ -354,15 +291,16 @@ export default {
     // 查找班级
     async _QueryClassList() {
       const { data, status, message } = await this.$request.fetchClassList();
+      console.log(status)
       if (status === 0) {
         if (!!data.list) {
           this.classList = data.list.map((item) => {
             return {
-              value: item.clazzId,
-              label: item.clazzName,
+              value: item.classId,
+              label: item.className,
             };
           });
-          this.query.clazzId = this.classList[0]?.value;
+          this.query.classId = this.classList[0]?.value;
         }
       } else {
         this.$message.error(message);
@@ -371,7 +309,7 @@ export default {
     // 查找科目
     async _QuerySubjectList() {
       const { data, status, message } = await this.$request.fetchSubjectList({
-        clazzId: this.query.clazzId,
+        classId: this.query.classId,
       });
       if (status === 0) {
         this.subjectList = data.subjectNames.map((item) => {
@@ -380,7 +318,7 @@ export default {
             label: item,
           };
         });
-        this.query.clazzId = this.subjectList[0]?.value;
+        this.query.subjectName = this.subjectList[0]?.value;
       } else {
         this.$message.error(message);
       }
@@ -396,13 +334,13 @@ export default {
         this.query.tagId = "";
         this.query.subjectName = "";
       }
-      query.clazzId = this.query.clazzId;
+      query.classId = this.query.classId;
       for (let key in query) {
         if (!query[key]) {
           query[key] = null;
         }
       }
-      if (!query.clazzId) {
+      if (!query.classId) {
         this.total = 0;
         this.tableData = [];
         this.loading = false;
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index 07f0953..6e3a129 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -57,10 +57,10 @@
         >
           <el-option
             v-for="item in typeList"
-            :key="item"
+            :key="item.label"
             :label="item.label"
             :value="item.value"
-            >{{ item }}
+            >{{ item.label }}
           </el-option>
         </el-select>
 
@@ -78,7 +78,7 @@
         </el-input>
       </div>
     </div>
-    <ul class="content">
+    <ul class="content" v-loading="loading">
       <li class="item" v-for="item in tableData" :key="item.id">
         <div class="pic-box">
           <p class="i-box"><i class="fa fa-map-o"></i></p>
@@ -124,6 +124,7 @@
         </div>
       </li>
     </ul>
+    <el-empty :image-size="100" v-if="tableData&&!tableData.legnth&&loading==false" description="没有更多数据"></el-empty>
   </div>
 </template>
 
@@ -131,6 +132,7 @@
 export default {
   data() {
     return {
+      loading:false,
       props: { multiple: true, checkStrictly: true },
       options: [
         {
@@ -163,55 +165,15 @@ export default {
         },
       ],
       query: {
-        classId: 2003,
-        subjectName: "语文",
-        tagId: 1,
+        classId: "",
+        subjectName: "",
+        tagId: "",
         title: "",
       },
-      classList: [
-        {
-          label: "2003班",
-          value: 2003,
-        },
-      ],
-      subjectList: [
-        {
-          label: "语文",
-          value: "语文",
-        },
-      ],
-      typeList: [
-        {
-          label: "周测",
-          value: 1,
-        },
-      ],
-      tableData: [
-        {
-          title: "数学样例试卷202211-324654",
-          id: "1062837",
-          gradeName: "二年级",
-          typeName: "周测",
-          answerNum: 45,
-          time: 90,
-          aboutClazz: [203, 204],
-          teacher: "张老师",
-          date: "2022-11-04 18:09:49",
-          share: 1,
-        },
-        {
-          title: "数学样例试卷202211-4180949",
-          id: "1062838",
-          gradeName: "二年级",
-          typeName: "周测",
-          answerNum: 45,
-          time: 90,
-          aboutClazz: [203, 204],
-          teacher: "张老师",
-          date: "2022-11-04 18:09:49",
-          share: 1,
-        },
-      ],
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      tableData: null,
       total: 0,
     };
   },
@@ -226,7 +188,7 @@ export default {
       //恢复答题卡
       const { data, status, message } = await this.$request.modifyPaper({
         paperId: obj.id,
-        status: 2,
+        status: 1,
       });
       if (status == 0) {
         let type = this.query.title ? 1 : 0;
@@ -254,6 +216,7 @@ export default {
     },
     async _QueryData(type) {
       //获取答题卡列表
+      this.loading=true
       let query = {};
       if (!type) {
         this.query.title = "";
@@ -263,14 +226,15 @@ export default {
         this.query.type = "";
         this.query.subjectId = "";
       }
+       query.classId = this.query.classId;
       for (let key in query) {
         if (!query[key]) {
           query[key] = null;
         }
       }
-      this.loading = true;
-      const { data, status, message } = await this.$request.fetchAnswerList({
+      const { data, status, message } = await this.$request.fetchPaperList({
         ...query,
+        status:2
       });
       this.loading = false;
       if (status === 0) {
@@ -283,15 +247,16 @@ export default {
     // 查找班级
     async _QueryClassList() {
       const { data, status, message } = await this.$request.fetchClassList();
+      console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.classList = data.list.map((item) => {
             return {
-              value: item.clazzId,
-              label: item.clazzName,
+              value: item.classId,
+              label: item.className,
             };
           });
-          this.query.clazzId = this.classList[0]?.value;
+          this.query.classId = this.classList[0]?.value;
         }
       } else {
         this.$message.error(message);
@@ -300,7 +265,7 @@ export default {
     // 查找科目
     async _QuerySubjectList() {
       const { data, status, message } = await this.$request.fetchSubjectList({
-        clazzId: this.query.clazzId,
+        classId: this.query.classId,
       });
       if (status === 0) {
         this.subjectList = data.subjectNames.map((item) => {
@@ -309,22 +274,28 @@ export default {
             label: item,
           };
         });
-        this.query.clazzId = this.subjectList[0]?.value;
+        this.query.subjectName = this.subjectList[0]?.value;
       } else {
         this.$message.error(message);
       }
     },
     // 查找答题卡类型
     async _QueryTypeList() {
-      const { data, status, message } = await this.$request.fetchTypeNames();
+      const { data, status, message } = await this.$request.fetchTypeNames({
+        classId: this.query.classId,
+      });
       if (status === 0) {
         this.typeList =
-          data.subjectNames.map((item) => {
+          data.list.map((item) => {
             return {
               value: item.tagId,
               label: item.tag,
             };
           }) || [];
+        this.typeList.unshift({
+          value: "",
+          label: "--",
+        });
       } else {
         this.$message.error(message);
       }
diff --git a/vue.config.js b/vue.config.js
index 84ef096..52d4610 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,7 +22,7 @@ module.exports = {
     },
     proxy: {
       "/": {
-        target:"http://192.168.3.29:8080",
+        target:"http://47.104.214.8",
         changeOrigin: true,
         ws:true,
       },
--
libgit2 0.21.4