lsc 2 years ago
parent
commit
c3745b1f9c

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.54b7c048f6f38eb378ec46f4436330a2.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.22ce41e1fce64bc5d1cf.js></script><script type=text/javascript src=./static/js/app.b94778c5b8b46e20dea9.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.61e05f4bd0263c135afff1b5192cc436.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.22ce41e1fce64bc5d1cf.js></script><script type=text/javascript src=./static/js/app.0ae9eebde047cc09717e.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.61e05f4bd0263c135afff1b5192cc436.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.61e05f4bd0263c135afff1b5192cc436.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0ae9eebde047cc09717e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.0ae9eebde047cc09717e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b94778c5b8b46e20dea9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b94778c5b8b46e20dea9.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 13 - 9
src/components/study.vue

@@ -551,7 +551,7 @@
                                         </div>
                                       </div>
                                       <img v-if="tool.askJson[index1].img" :src="tool.askJson[index1].img"
-                                          style="width: 100%; margin-top: 10px" />
+                                        style="width: 100%; margin-top: 10px" />
                                     </div>
                                     <div class="a_add_body">
                                       <div class="a_add_input">
@@ -1862,15 +1862,15 @@
               </div>
               <div class="rightAnswerCss"  v-if="isSelect && tType == 3">
                 <div v-for="(a, aIndex) in selectJson.answer" :key="aIndex" class="rightAnswer">
-                  <div v-if="selectAnswer.answer[aIndex] == selectJson.answer[a]" style="color: #767de1">
+                  <div v-if="selectAnswer.answer[aIndex] === a" style="color: #767de1">
                     回答正确
                   </div>
                   <div v-else>回答错误</div>
-                  <div style="margin-left: 10px" v-if="selectAnswer.answer[aIndex] != selectJson.answer[a]">
+                  <div style="margin-left: 10px" v-if="selectAnswer.answer[aIndex] !== a">
                     正确答案:
                   </div>
                   <div :class="
-                    selectAnswer.answer[aIndex] == selectJson.answer[a]
+                    selectAnswer.answer[aIndex] === a
                       ? 'blueCss'
                       : 'redCss'
                   ">
@@ -2517,7 +2517,7 @@ export default {
                       var checkL = JSON.parse(data.content)[0].anwer.split(",");
                       for (var z = 0; z < checkL.length; z++) {
                         if (!this.checkJson[q][w][i][z]) {
-                          this.checkJson[q][w][i].push({ checkCount: [],checkPerson: [], });
+                          this.checkJson[q][w][i].push({ checkCount: [], checkPerson: [], });
                         }
                         if (!this.checkJson[q][w][i][z].checkCount.length) {
                           this.checkJson[q][w][i][z].checkCount = [];
@@ -2531,7 +2531,7 @@ export default {
                           parseInt(checkL[z])
                         ]
                           ? this.checkJson[q][w][i][z].checkPerson[
-                          parseInt(checkL[z])
+                            parseInt(checkL[z])
                           ].push(data.name)
                           : (this.checkJson[q][w][i][z].checkPerson[
                             parseInt(checkL[z])
@@ -2778,6 +2778,7 @@ export default {
         "POTX",
         "PPSM",
       ];
+      var excelA = ['XLSX', 'XLXB', 'XLS', 'XLSM']
       if (
         b.indexOf(
           file.name
@@ -2792,7 +2793,9 @@ export default {
           });
           return;
         }
-      } else {
+      } else if (excelA.indexOf(file.name
+        .split(".")
+      [file.name.split(".").length - 1].toLocaleUpperCase()) != "-1") {
         if (file.size / 1024 / 1024 > 5) {
           _this.$message({
             message: "上传文件大于5兆,请重新选择文件!",
@@ -4048,7 +4051,7 @@ export default {
           stage: this.courseType,
           task: this.taskCount,
           tool: this.toolindex,
-          content: this.selectAnswer,
+          content: this.selectAnswer.answer,
           type: 7,
         },
       ];
@@ -4059,8 +4062,9 @@ export default {
             message: "提交成功",
             type: "success",
           });
-          this.selectAnswer = [];
+          // this.selectAnswer = [];
           this.dialogVisibleSelect = false;
+          this.selectSWorks();
         })
         .catch((err) => {
           this.$message.error("提交失败");

+ 86 - 10
src/components/studyStudent.vue

@@ -1399,7 +1399,7 @@
                           margin: 10px 10px 10px 0;
                         " v-for="(w, wIndex) in workStudent[toolIndex]" :key="wIndex">
                         <div class="workImg">
-                          <img src="../assets/icon/works/noImg.png" @click="openPj(w.works, toolIndex)" alt />
+                          <img src="../assets/icon/works/noImg.png" @click="openXz(w, toolIndex)" alt />
                         </div>
                         <div class="worksName">
                           <div>{{ w.sName }}</div>
@@ -2059,15 +2059,15 @@
               </div>
               <div class="rightAnswerCss" v-if="isSelect && tType == 1">
                 <div v-for="(a, aIndex) in selectJson.answer" :key="aIndex" class="rightAnswer">
-                  <div v-if="selectAnswer.answer[aIndex] == selectJson.answer[a]" style="color: #767de1">
+                  <div v-if="selectAnswer.answer[aIndex] === a" style="color: #767de1">
                     回答正确
                   </div>
                   <div v-else>回答错误</div>
-                  <div style="margin-left: 10px" v-if="selectAnswer.answer[aIndex] != selectJson.answer[a]">
+                  <div style="margin-left: 10px" v-if="selectAnswer.answer[aIndex] !== a">
                     正确答案:
                   </div>
                   <div :class="
-                    selectAnswer.answer[aIndex] == selectJson.answer[a]
+                    selectAnswer.answer[aIndex] === a
                       ? 'blueCss'
                       : 'redCss'
                   ">
@@ -2350,7 +2350,7 @@ export default {
           stage: this.courseType,
           task: this.taskCount,
           tool: this.toolindex,
-          content: this.selectAnswer,
+          content: this.selectAnswer.answer,
           type: 7,
         },
       ];
@@ -2361,8 +2361,10 @@ export default {
             message: "提交成功",
             type: "success",
           });
-          this.selectAnswer = [];
           this.dialogVisibleSelect = false;
+          // this.selectAnswer = {};
+          this.selectSWorks();
+          this.selectStudent();
         })
         .catch((err) => {
           this.$message.error("提交失败");
@@ -2506,13 +2508,48 @@ export default {
             ].toolChoose;
           var b = res.data[0];
           var c = ["PDF", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-
+          var y = [
+            "AVI",
+            "NAVI",
+            "MPEG",
+            "ASF",
+            "MOV",
+            "WMV",
+            "3GP",
+            "RM",
+            "RMVB",
+            "FLV",
+            "F4V",
+            "H.264",
+            "H.265",
+            "REAL VIDEO",
+            "MKV",
+            "WebM",
+            "HDDVD",
+            "MP4",
+            "MPG",
+            "M4V",
+            "MGV",
+            "OGV",
+            "QTM",
+            "STR",
+            "AMC",
+            "DVX",
+            "EVO",
+            "DAT",
+            "OGG",
+            "OGM",
+          ];
           for (var i = 0; i < a.length; i++) {
             this.workStudent[i] = [];
             for (var j = 0; j < b.length; j++) {
               if (i == b[j].tool) {
                 if (
-                  (b[j].type == 1 || b[j].type == 4) &&
+                  (b[j].type == 1 ||
+                    b[j].type == 4 ||
+                    b[j].type == 5 ||
+                    b[j].type == 6 ||
+                    b[j].type == 7) &&
                   a[i].tool[0] != 15 &&
                   a[i].tool[0] != 4
                 ) {
@@ -2529,6 +2566,41 @@ export default {
                       type: 1,
                       time: b[j].time,
                     });
+                  } else if (
+                    y.indexOf(
+                      b[j].content
+                        .split(".")
+                      [
+                        b[j].content.split(".").length - 1
+                      ].toLocaleUpperCase()
+                    ) != -1
+                  ) {
+                    this.workStudent[i].push({
+                      userid: b[j].userid,
+                      wid: b[j].id,
+                      works: b[j].content,
+                      sName: b[j].name,
+                      type: 3,
+                      time: b[j].time,
+                    });
+                  } else if (b[j].type == 6) {
+                    this.workStudent[i].push({
+                      userid: b[j].userid,
+                      wid: b[j].id,
+                      works: b[j].content,
+                      sName: b[j].name,
+                      type: 4,
+                      time: b[j].time,
+                    });
+                  } else if (b[j].type == 7) {
+                    this.workStudent[i].push({
+                      userid: b[j].userid,
+                      wid: b[j].id,
+                      works: b[j].content,
+                      sName: b[j].name,
+                      type: 5,
+                      time: b[j].time,
+                    });
                   } else {
                     this.workStudent[i].push({
                       works: b[j].content,
@@ -2584,6 +2656,7 @@ export default {
               type: "success",
             });
             this.selectSWorks();
+            this.selectStudent();
           })
           .catch((err) => {
             this.$message.error("点赞失败");
@@ -2603,6 +2676,7 @@ export default {
               type: "success",
             });
             this.selectSWorks();
+            this.selectStudent();
           })
           .catch((err) => {
             console.error(err);
@@ -2669,6 +2743,7 @@ export default {
           });
           this.commentText = "";
           this.selectSWorks();
+          this.selectStudent();
         })
         .catch((err) => {
           this.$message.error("评论失败");
@@ -2997,6 +3072,7 @@ export default {
         "POTX",
         "PPSM",
       ];
+      var excelA = ['XLSX', 'XLXB', 'XLS', 'XLSM']
       if (
         b.indexOf(
           file.name
@@ -3009,9 +3085,9 @@ export default {
           return;
         }
       } else if (
-        file.name
+        excelA.indexOf(file.name
           .split(".")
-        [file.name.split(".").length - 1].toLocaleUpperCase() != "PDF"
+        [file.name.split(".").length - 1].toLocaleUpperCase()) != "-1"
       ) {
         if (file.size / 1024 / 1024 > 5) {
           this.$message.error("添加成上传文件大于5兆,请重新选择文件!");

Some files were not shown because too many files changed in this diff