Sfoglia il codice sorgente

新旧接口都兼容

JXDS18FUJT 1 anno fa
parent
commit
082c7dec22
1 ha cambiato i file con 61 aggiunte e 26 eliminazioni
  1. 61 26
      src/hooks/examTest.ts

+ 61 - 26
src/hooks/examTest.ts

@@ -649,35 +649,70 @@ export function useExamTest() {
 
     let getPgae = () => {
         console.log(router)
-        let params = {
-            model: router.currentRoute.value.query.model as string,
-            subject: Number(router.currentRoute.value.query.subject)
-        }
-
-        Api.openApiquestion2InfoSelectTestQuestionInfo(params).then((res) => {
-            res.data.rows.forEach((item) => {
-                item.optsArr = item.opts.split('-');
-                item.answerArr = item.answer.split('-');
-                item.questionType < 3 ? item.userAnswer = '' : item.userAnswer = [];
-            });
-            if (!res.data.rows || res.data.rows.length === 0) {
-                interfaceErrVisible.value = true
-                return
+        if(router.currentRoute.value.query.gs){
+            let params = {
+                gs:router.currentRoute.value.query.gs as string,
+                // model: router.currentRoute.value.query.model as string,
+                subject: Number(router.currentRoute.value.query.subject)
             }
-            //科目一多余100道题目的切割
-            if (Number(router.currentRoute.value.query.subject) == 1 && res.data.rows.length > 100) {
-                res.data.rows.splice(100)
-
+            Api.openApiquestionInfoSelectTestQuestionInfo(params).then((res) => {
+                res.data.rows.forEach((item) => {
+                    item.optsArr = item.opts.split('-');
+                    item.answerArr = item.answer.split('-');
+                    item.questionType < 3 ? item.userAnswer = '' : item.userAnswer = [];
+                });
+                if (!res.data.rows || res.data.rows.length === 0) {
+                    interfaceErrVisible.value = true
+                    return
+                }
+                //科目一多余100道题目的切割
+                if (Number(router.currentRoute.value.query.subject) == 1 && res.data.rows.length > 100) {
+                    res.data.rows.splice(100)
+    
+                }
+                //科目四多余50题切割
+                if (Number(router.currentRoute.value.query.subject) == 4 && res.data.rows.length > 50) {
+                    res.data.rows.splice(50)
+    
+                }
+                list.value = res.data.rows;
+            }).catch(err => {
+                interfaceErrVisible.value = true
+            });
+        }
+        else{
+            let params = {
+                // gs:router.currentRoute.value.query.gs as string,
+                model: router.currentRoute.value.query.model as string,
+                subject: Number(router.currentRoute.value.query.subject)
             }
-            //科目四多余50题切割
-            if (Number(router.currentRoute.value.query.subject) == 4 && res.data.rows.length > 50) {
-                res.data.rows.splice(50)
+            Api.openApiquestion2InfoSelectTestQuestionInfo(params).then((res) => {
+                res.data.rows.forEach((item) => {
+                    item.optsArr = item.opts.split('-');
+                    item.answerArr = item.answer.split('-');
+                    item.questionType < 3 ? item.userAnswer = '' : item.userAnswer = [];
+                });
+                if (!res.data.rows || res.data.rows.length === 0) {
+                    interfaceErrVisible.value = true
+                    return
+                }
+                //科目一多余100道题目的切割
+                if (Number(router.currentRoute.value.query.subject) == 1 && res.data.rows.length > 100) {
+                    res.data.rows.splice(100)
+    
+                }
+                //科目四多余50题切割
+                if (Number(router.currentRoute.value.query.subject) == 4 && res.data.rows.length > 50) {
+                    res.data.rows.splice(50)
+    
+                }
+                list.value = res.data.rows;
+            }).catch(err => {
+                interfaceErrVisible.value = true
+            });
 
-            }
-            list.value = res.data.rows;
-        }).catch(err => {
-            interfaceErrVisible.value = true
-        });
+        }
+      
     }
     return {
         interfaceErrVisible,