Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
3e87ebddbf
commit
f9678d335f
8 changed files with 36 additions and 21 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.097f4993d36f7bf0f1e84033151f0b63.css
  3. 0 0
      dist/static/css/app.097f4993d36f7bf0f1e84033151f0b63.css.map
  4. 0 0
      dist/static/js/app.7519c4bed5f73d50ecd0.js
  5. 0 0
      dist/static/js/app.b6020703e854fcd2d196.js
  6. 0 0
      dist/static/js/app.b6020703e854fcd2d196.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 35 20
      src/components/student/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -18,7 +18,7 @@
 
       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.b82889a692da3a36de1985724be053d4.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.7519c4bed5f73d50ecd0.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.097f4993d36f7bf0f1e84033151f0b63.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.b6020703e854fcd2d196.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


+ 35 - 20
src/components/student/studyStudent.vue
View File 

@@ -1780,21 +1780,21 @@ export default {
 
                       _work.atool == _tool.tool
 
                     ) {
 
                       if (_tool.tool == 1) {
 
-                        _work.workContent = `${_work.username}使用电子白板提交了：`;
 
+                        _work.workContent = `${_work.username}使用电子白板提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 3) {
 
-                        _work.workContent = `${_work.username}使用思维导图提交了：`;
 
+                        _work.workContent = `${_work.username}使用思维导图提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 6) {
 
-                        _work.workContent = `${_work.username}使用协同文档提交了：`;
 
+                        _work.workContent = `${_work.username}使用协同文档提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 15) {
 
-                        _work.workContent = `${_work.username}使用问答工具提交了：`;
 
+                        _work.workContent = `${_work.username}使用问答工具提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 53) {
 
-                        _work.workContent = `${_work.username}使用文件上传提交了：`;
 
+                        _work.workContent = `${_work.username}使用文件上传提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 54) {
 
-                        _work.workContent = `${_work.username}使用拍照提交了：`;
 
+                        _work.workContent = `${_work.username}使用拍照提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 55) {
 
-                        _work.workContent = `${_work.username}使用文件提交了：`;
 
+                        _work.workContent = `${_work.username}使用文件提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 56) {
 
-                        _work.workContent = `${_work.username}使用投票提交了：`;
 
+                        _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                         checkPeople++;
 
                         var checkL = JSON.parse(_work.content);
 
                         for (var kz = 0; kz < checkL.length; kz++) {
 
@@ -1846,12 +1846,12 @@ export default {
 
                     _tool.toolPhoto.length &&
 
                       (_tool.toolPhoto[0].workContent = `${_tool.people.join(
 
                         ","
 
-                      )}使用表格提交了：`);
 
+                      )}使用表格提交了“${_tool.toolPhoto[0].name ? _tool.toolPhoto[0].name : this.setTime(_tool.toolPhoto[0].create_at)}”：`);
 
                   } else if (_tool.tool == 52) {
 
                     _tool.toolPhoto.length &&
 
                       (_tool.toolPhoto[0].workContent = `${_tool.people.join(
 
                         ","
 
-                      )}使用文档提交了：`);
 
+                      )}使用文档提交了“${_tool.toolPhoto[0].name ? _tool.toolPhoto[0].name : this.setTime(_tool.toolPhoto[0].create_at)}”：`);
 
                   }
 
 
                   for (var kz = 0; kz < this.checkJson[z].length; kz++) {
 
@@ -1913,22 +1913,22 @@ export default {
 
                       _work.atool == _tool.tool
 
                     ) {
 
                       if (_tool.tool == 1) {
 
-                        _work.workContent = `${_work.username}使用电子白板提交了：`;
 
+                        _work.workContent = `${_work.username}使用电子白板提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 3) {
 
-                        _work.workContent = `${_work.username}使用思维导图提交了：`;
 
+                        _work.workContent = `${_work.username}使用思维导图提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 6) {
 
-                        _work.workContent = `${_work.username}使用协同文档提交了：`;
 
+                        _work.workContent = `${_work.username}使用协同文档提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 15) {
 
-                        _work.workContent = `${_work.username}使用问答工具提交了：`;
 
+                        _work.workContent = `${_work.username}使用问答工具提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 53) {
 
-                        _work.workContent = `${_work.username}使用文件上传提交了：`;
 
+                        _work.workContent = `${_work.username}使用文件上传提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 54) {
 
-                        _work.workContent = `${_work.username}使用拍照提交了：`;
 
+                        _work.workContent = `${_work.username}使用拍照提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 55) {
 
-                        _work.workContent = `${_work.username}使用文件提交了：`;
 
+                        _work.workContent = `${_work.username}使用文件提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                       } else if (_tool.tool == 56) {
 
                         console.log(_tool);
 
-                        _work.workContent = `${_work.username}使用投票提交了：`;
 
+                        _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
 
                         checkPeople++;
 
                         var checkL = JSON.parse(_work.content);
 
                         for (var kz = 0; kz < checkL.length; kz++) {
 
@@ -1981,12 +1981,12 @@ export default {
 
                     _tool.toolPhoto.length &&
 
                       (_tool.toolPhoto[0].workContent = `${_tool.people.join(
 
                         ","
 
-                      )}使用表格提交了：`);
 
+                      )}使用表格提交了“${_tool.toolPhoto[0].name ? _tool.toolPhoto[0].name : this.setTime(_tool.toolPhoto[0].create_at)}”：`);
 
                   } else if (_tool.tool == 52) {
 
                     _tool.toolPhoto.length &&
 
                       (_tool.toolPhoto[0].workContent = `${_tool.people.join(
 
                         ","
 
-                      )}使用文档提交了：`);
 
+                      )}使用文档提交了“${_tool.toolPhoto[0].name ? _tool.toolPhoto[0].name : this.setTime(_tool.toolPhoto[0].create_at)}”：`);
 
                   }
 
                   for (var kz = 0; kz < this.checkJson[z].length; kz++) {
 
                     this.checkJson[z][kz].checkPerent = [];
 
@@ -2858,6 +2858,21 @@ export default {
 
         return s2;
 
       };
 
     },
 
+    setTime() {
 
+      return function (timeA) {
 
+        var time = new Date(timeA);
 
+        time.setTime(time.getTime());
 
+        var s2 =
 
+          time.getFullYear() +
 
+          "." +
 
+          (time.getMonth() + 1 < 10
 
+            ? "0" + (time.getMonth() + 1)
 
+            : time.getMonth() + 1) +
 
+          "." +
 
+          (time.getDate() < 10 ? "0" + time.getDate() : time.getDate());
 
+        return s2;
 
+      };
 
+    },
 
     getMan() {
 
       return function (people) {
 
         let _people = "";

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