1.5.12

pages/test/index.js

@@ -142,22 +142,22 @@ Page({
             Image: "../images/examine_subject_a009.png"
           }, ]
         },
-        // {
-        //   Name: "六年级",
-        //   Name2: "语文六年级",
-        //   Select: "",
-        //   List: [
-        //     {
-        //       ID: 11,
-        //       Type: "Shizi",
-        //       Name: "语文识字",
-        //       Name2: "上学期",
-        //       Finish: 0,
-        //       Total: 16,
-        //       Image: "../images/examine_subject_a011.png"
-        //     },
-        //   ]
-        // },
+        {
+          Name: "六年级",
+          Name2: "语文六年级",
+          Select: "",
+          List: [
+            {
+              ID: 11,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a011.png"
+            },
+          ]
+        },
         // {
         //   Name: "英语常用词",
         //   Name2: "英语常用词",
@@ -268,13 +268,20 @@ Page({
     var id = e.currentTarget.dataset.id;
     var userid = app.globalData.userInfo.UserID;
     //todo
-    main.getData('GetTestReportInfo?UserID=' + userid+'&ID='+id, function (data) {
-      if (data) {
+    // main.getData('GetTestReportInfo?UserID=' + userid+'&ID='+id, function (data) {
+    //   if (data) {
+    //     wx.setStorageSync("TestTask", data);
+    //     wx.navigateTo({
+    //       url: "./report?type=edit",
+    //     });
+    //   }
+    // });
+
+    main.GetTestReportInfo(id,function(data){
         wx.setStorageSync("TestTask", data);
         wx.navigateTo({
-          url: "./report?type=edit&id="+id,
+          url: "./report?type=edit",
         });
-      }
     });
   },
   onUnload: function () {

pages/test/list.js

@@ -138,14 +138,21 @@ Page({
 
       if (id) {
         var reporttype = e.currentTarget.dataset.type;
-        main.getData('GetTestReportInfo?UserID=' + userid + '&ID=' + id, function(data) {
-          if (data) {
-            wx.setStorageSync("TestTask2", data);
+        // main.getData('GetTestReportInfo?UserID=' + userid + '&ID=' + id, function(data) {
+        //   if (data) {
+        //     wx.setStorageSync("TestTask2", data);
+        //     that.onClose();
+        //     wx.navigateTo({
+        //       url: "./item?type=" + reporttype,
+        //     });
+        //   }
+        // });
+        main.GetTestReportInfo(id,function(data){
+          wx.setStorageSync("TestTask2", data);
             that.onClose();
             wx.navigateTo({
               url: "./item?type=" + reporttype,
             });
-          }
         });
       } else {
         that.onClose();

pages/test/report.js

@@ -27,16 +27,23 @@ Page({
     var listRight = [];
     var listSkip = [];
     var listWrong = [];
+    TestTask.TestRightStr=[];
+    TestTask.TestWrongStr=[];
+    TestTask.TestSkipStr=[];
+
     if (list) {
       for (var i = 0; i < list.length; i++) {
         if (list[i].Result == 1) {
           listRight.push(list[i]);
+          TestTask.TestRightStr.push(list[i].Word);
         }
         else if (list[i].Result == -1) {
           listWrong.push(list[i]);
+          TestTask.TestWrongStr.push(list[i].Word);
         }
         else if (list[i].Result == 0) {
           listSkip.push(list[i]);
+          TestTask.TestSkipStr.push(list[i].Word);
         }
       }
 
@@ -78,9 +85,9 @@ Page({
         List: result,
         NumberTotal: list.length,
       });
-
+      
       if (that.data.ReportType=="new")
-        that.saveInfo();
+        that.saveInfo(TestTask);
 
       wx.setNavigationBarTitle({
         title: "报告"
@@ -130,7 +137,7 @@ Page({
   },
   buildCard: function () {
     var that = this;
-    var arr = [];
+    var arr = [],TestExistStr=[];
     for (var i = 0; i < that.data.List.length; i++) {
       for (var j = 0; j < that.data.List[i].List.length; j++) {
         if (that.data.List[i].List[j].Css === "Select") {
@@ -145,6 +152,11 @@ Page({
           obj.LimitTime = common.formatTime(new Date());
           obj.FontSize = item.FontSize;
           arr.push(obj);
+          TestExistStr.push(item.Word);
+        }
+        else if (that.data.List[i].List[j].Css === "Select2") {
+          var item = that.data.List[i].List[j];
+          TestExistStr.push(item.Word);
         }
       }
     }
@@ -163,6 +175,9 @@ Page({
         });
         if (buildCardNumber >= arr.length) {
           clearInterval(intervalBuild);
+          var TestTask={};
+          TestTask.TestExistStr=TestExistStr;
+          that.saveInfo(TestTask);
           that.setData({
             IsBuild: 2,
           });
@@ -192,16 +207,22 @@ Page({
       delta: delta,
     });
   },
-  saveInfo: function () {
+  saveInfo: function (TestTask) {
     var that = this;
     clearInterval(intervalBuild);
     var userid = app.globalData.userInfo.UserID;
     var param1 = wx.getStorageSync("TestTask");
-    param1.TestRight = this.data.NumberRight;
-    param1.TestWrong = this.data.NumberWrong;
-    param1.TestSkip = this.data.NumberSkip;
     param1.TestTotal = param1.List.length;
-    param1.List = JSON.stringify(param1.List);
+    if (TestTask.TestRightStr)
+      param1.TestRightStr=TestTask.TestRightStr.join("");
+    if (TestTask.TestWrongStr)
+      param1.TestWrongStr=TestTask.TestWrongStr.join("");
+    if (TestTask.TestSkipStr)
+      param1.TestSkipStr=TestTask.TestSkipStr.join("");
+    if (TestTask.TestExistStr)
+      param1.TestExistStr=TestTask.TestExistStr.join("");
+    //param1.List = JSON.stringify(param1.List);
+    delete param1.List;
     main.postData('InsertTestReport?UserID=' + userid, param1, function (data) {
       if (data)
         TestReportID = data;