xg

src/api/report.js

@@ -32,22 +32,42 @@ export function getReportUserTime(pid,uid) {
     .then(res => res.data);
 }
 
-export function getSpecialReport(pid,uid) {
-    return axios.get('/specialReport/generate',{
-        params: {
-            pid: pid,
-            uid: uid
-        }
-    })
-    .then(res => res.data);
+export function getSpecialReport(pid,uid,resultId) {
+    if(resultId){
+        return axios.get('/specialReport/generate1',{
+            params: {
+                resultId: resultId,
+            }
+        })
+        .then(res => res.data);
+    }
+    else{
+        return axios.get('/specialReport/generate',{
+            params: {
+                pid: pid,
+                uid: uid
+            }
+        })
+        .then(res => res.data);
+    }
 }
 
-export function generateMind(pid,uid) {
-    return axios.get('/specialReport/generateMind',{
-        params: {
-            pid: pid,
-            uid: uid
-        }
-    })
-    .then(res => res.data);
+export function generateMind(pid,uid,resultId) {
+    if(resultId){
+        return axios.get('/specialReport/generateMind1',{
+            params: {
+                resultId: resultId,
+            }
+        })
+        .then(res => res.data);
+    }
+    else{
+        return axios.get('/specialReport/generateMind',{
+            params: {
+                pid: pid,
+                uid: uid
+            }
+        })
+        .then(res => res.data);
+    }
 }

src/components/controlMainPage/DocList.vue

@@ -250,10 +250,13 @@ export default {
         sectionRests:this.paperData.sectionRests
       }
       updatePaper(data).then((result) => {
-        alert(result.message);
+        alert(result.result?'修改成功':'修改失败');
         this.visibleChange = false;
         this.searchDoc();
       })
+      .catch(()=>{
+        alert('修改失败');
+      })
     },
     deletePaper(){
       deletePaper(this.deleteId).then((result) => {

src/components/controlMainPage/PaperListSimple.vue

@@ -51,7 +51,7 @@ export default {
     //       this.$router.push({path: '/ctrlApp/checkTable/' + item.pid + '/' + item.uid});
     //   },
       checkReport(item){
-          this.$router.push({path: '/ctrlApp/simpleReport/' + item.pid + '/' + item.uid});
+          this.$router.push({path: '/ctrlApp/simpleReport/' + item.pid + '/' + item.uid,query: {resultId: item.id}});
       }
   }
 }

src/components/controlMainPage/docList/QuestionList.vue

@@ -181,14 +181,14 @@ export default {
     oScript.type = 'text/javascript';
     oScript.src = 'mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
     document.body.appendChild(oScript);
-    this.getQuestion(this.$route.params.pid);
+    this.getQuestion(this.$route.params.pid,0);
   },
   methods: {
-    getQuestion(pid){
+    getQuestion(pid,index){
       getPaperById(pid).then((result) => {
         Object.assign(this.paper,result);
         this.setIndexRange();
-        this.changePage(0);
+        this.changePage(index);
       })
     },
     setIndexRange() {
@@ -212,10 +212,11 @@ export default {
     },
     updateQuestion(){
       updateQuestion(this.paper.questions[this.currentQuestion]).then((result) => {
-        alert(result.message);
-        let before = this.currentQuestion;
-        this.getQuestion(this.$route.params.pid);
-        this.changePage(before);
+        alert(result.result?'修改成功':'修改失败');
+        this.getQuestion(this.$route.params.pid,this.currentQuestion);
+      })
+      .catch(()=>{
+        alert('修改失败');
       })
     },
   },

src/components/report/CheckTable.vue

@@ -39,7 +39,7 @@
                 <td :rowspan="item.countNum" v-if="item.countNum">{{item.section}}</td>
                 <td>{{item.number}}</td>
                 <td>{{item.answer}}</td>
-                <td>{{item.wrongAnswer?item.wrongAnswer:item.answer}}</td>
+                <td :style="{'color':item.wrongAnswer?'red':'black'}">{{item.wrongAnswer?item.wrongAnswer:item.answer}}</td>
                 <!-- <td></td> -->
                 <td :style="{'color':item.wrongAnswer?'red':'black'}">{{item.wrongAnswer?'错误':'正确'}}</td>
             </tr>
@@ -69,14 +69,16 @@ export default {
     computed: {
     },
     created() {
+        console.log(this.$route.query.resultId);
         getPaperById(this.$route.params.pid).then((result) => {
             this.paper = result;
             this.setIndexStart(result.sectionNums).forEach((item) => {
                 this.paper.questions[item.index].countNum = item.num
             })
             getCommitPaperListSimple(this.$route.params.uid,this.$route.params.pid).then((result2) => {
-                this.user.name = result2.t[0].uname;
-                let wrongList = JSON.parse(result2.t[0].wrongAnswerContrast);
+                let index = result2.t.findIndex((value) => value.id == this.$route.query.resultId);
+                this.user.name = result2.t[index].uname;
+                let wrongList = JSON.parse(result2.t[index].wrongAnswerContrast);
                 wrongList.forEach((item) => {
                     this.paper.questions[item.number - 1].wrongAnswer = item.options == ''?'无':item.options;
                     this.paper.questions[item.number - 1].useTime = item.useTime;

src/components/report/Knowledge.vue

@@ -333,7 +333,8 @@ export default {
     computed: {
     },
     created() {
-        getSpecialReport(this.$route.params.pid,this.$route.params.uid).then((result) => {
+        console.log(this.$route.query.resultId);
+        getSpecialReport(this.$route.params.pid,this.$route.params.uid,this.$route.query.resultId).then((result) => {
             this.splitNodeLevel(result.knowledges,1);
             this.subjectMap[this.treeToObj[1][0].grade + this.treeToObj[1][0].subjectId].forEach((range) => {
                 let tree = JSON.parse(JSON.stringify(this.treeToObj));
@@ -341,7 +342,7 @@ export default {
             })
             console.log(this.resultList);
             if(this.treeToObj[1][0].grade + this.treeToObj[1][0].subjectId == '9Y2'){
-                generateMind(this.$route.params.pid,this.$route.params.uid).then((result2) => {
+                generateMind(this.$route.params.pid,this.$route.params.uid,this.$route.query.resultId).then((result2) => {
                     this.problemList = result2;
                 })
             }

src/router/index.js

@@ -168,17 +168,7 @@ export default new Router({
             path: 'simpleReport/:pid/:uid',
             name: 'SimpleReport',
             component: SimpleReport,
-        },
-        // {
-        //     path: 'checkTable/:pid/:uid',
-        //     name: 'CheckTable',
-        //     component: CheckTable,
-        // },{
-        //     path: 'knowledge/:pid/:uid',
-        //     name: 'Knowledge',
-        //     component: Knowledge,
-        // }
-        ]
+        }]
     },{
         path: '/ctrlLogin',
         name: 'ControlLogin',

static/index.html

@@ -31,4 +31,4 @@
           if(window.confirm("您的浏览器版本过低，推荐使用IE10及以上浏览器或者chrome浏览器，点击确定下载chrome安装浏览器。若是360等浏览器，开启兼容模式")){
               window.open("/download/44.0.2403.89_chrome_installer.exe", "_blank");
           }
-      }</script><link href=/css/group-app.000700aa.css rel=prefetch><link href=/css/group-controlApp.80afe86e.css rel=prefetch><link href=/css/group-controlApp~group-doTest.89491563.css rel=prefetch><link href=/css/group-doTest.c440bfd3.css rel=prefetch><link href=/css/group-mainPage.4239d005.css rel=prefetch><link href=/js/group-app.24429b9c.js rel=prefetch><link href=/js/group-controlApp.33d8ae0e.js rel=prefetch><link href=/js/group-controlApp~group-doTest.65437509.js rel=prefetch><link href=/js/group-doTest.18d01b3c.js rel=prefetch><link href=/js/group-mainPage.0c0574a3.js rel=prefetch><link href=/css/app.e9f156cc.css rel=preload as=style><link href=/css/chunk-vendors.723a90c8.css rel=preload as=style><link href=/js/app.ec0bb46f.js rel=preload as=script><link href=/js/chunk-vendors.2493bbd2.js rel=preload as=script><link href=/css/chunk-vendors.723a90c8.css rel=stylesheet><link href=/css/app.e9f156cc.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-project doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.2493bbd2.js></script><script src=/js/app.ec0bb46f.js></script></body></html>
+      }</script><link href=/css/group-app.000700aa.css rel=prefetch><link href=/css/group-controlApp.c846d1f3.css rel=prefetch><link href=/css/group-controlApp~group-doTest.40e89122.css rel=prefetch><link href=/css/group-doTest.c440bfd3.css rel=prefetch><link href=/css/group-mainPage.4239d005.css rel=prefetch><link href=/js/group-app.24429b9c.js rel=prefetch><link href=/js/group-controlApp.1602c604.js rel=prefetch><link href=/js/group-controlApp~group-doTest.68232a9c.js rel=prefetch><link href=/js/group-doTest.18d01b3c.js rel=prefetch><link href=/js/group-mainPage.0c0574a3.js rel=prefetch><link href=/css/app.e9f156cc.css rel=preload as=style><link href=/css/chunk-vendors.723a90c8.css rel=preload as=style><link href=/js/app.f30623f1.js rel=preload as=script><link href=/js/chunk-vendors.2493bbd2.js rel=preload as=script><link href=/css/chunk-vendors.723a90c8.css rel=stylesheet><link href=/css/app.e9f156cc.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-project doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.2493bbd2.js></script><script src=/js/app.f30623f1.js></script></body></html>