|
@@ -1780,21 +1780,21 @@ export default {
|
|
|
_work.atool == _tool.tool
|
|
_work.atool == _tool.tool
|
|
|
) {
|
|
) {
|
|
|
if (_tool.tool == 1) {
|
|
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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} else if (_tool.tool == 56) {
|
|
|
- _work.workContent = `${_work.username}使用投票提交了：`;
|
|
|
|
|
|
|
+ _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
|
|
|
checkPeople++;
|
|
checkPeople++;
|
|
|
var checkL = JSON.parse(_work.content);
|
|
var checkL = JSON.parse(_work.content);
|
|
|
for (var kz = 0; kz < checkL.length; kz++) {
|
|
for (var kz = 0; kz < checkL.length; kz++) {
|
|
@@ -1846,12 +1846,12 @@ export default {
|
|
|
_tool.toolPhoto.length &&
|
|
_tool.toolPhoto.length &&
|
|
|
(_tool.toolPhoto[0].workContent = `${_tool.people.join(
|
|
(_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) {
|
|
} else if (_tool.tool == 52) {
|
|
|
_tool.toolPhoto.length &&
|
|
_tool.toolPhoto.length &&
|
|
|
(_tool.toolPhoto[0].workContent = `${_tool.people.join(
|
|
(_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++) {
|
|
for (var kz = 0; kz < this.checkJson[z].length; kz++) {
|
|
@@ -1913,22 +1913,22 @@ export default {
|
|
|
_work.atool == _tool.tool
|
|
_work.atool == _tool.tool
|
|
|
) {
|
|
) {
|
|
|
if (_tool.tool == 1) {
|
|
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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} 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) {
|
|
} else if (_tool.tool == 56) {
|
|
|
console.log(_tool);
|
|
console.log(_tool);
|
|
|
- _work.workContent = `${_work.username}使用投票提交了：`;
|
|
|
|
|
|
|
+ _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”：`;
|
|
|
checkPeople++;
|
|
checkPeople++;
|
|
|
var checkL = JSON.parse(_work.content);
|
|
var checkL = JSON.parse(_work.content);
|
|
|
for (var kz = 0; kz < checkL.length; kz++) {
|
|
for (var kz = 0; kz < checkL.length; kz++) {
|
|
@@ -1981,12 +1981,12 @@ export default {
|
|
|
_tool.toolPhoto.length &&
|
|
_tool.toolPhoto.length &&
|
|
|
(_tool.toolPhoto[0].workContent = `${_tool.people.join(
|
|
(_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) {
|
|
} else if (_tool.tool == 52) {
|
|
|
_tool.toolPhoto.length &&
|
|
_tool.toolPhoto.length &&
|
|
|
(_tool.toolPhoto[0].workContent = `${_tool.people.join(
|
|
(_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++) {
|
|
for (var kz = 0; kz < this.checkJson[z].length; kz++) {
|
|
|
this.checkJson[z][kz].checkPerent = [];
|
|
this.checkJson[z][kz].checkPerent = [];
|
|
@@ -2858,6 +2858,21 @@ export default {
|
|
|
return s2;
|
|
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() {
|
|
getMan() {
|
|
|
return function (people) {
|
|
return function (people) {
|
|
|
let _people = "";
|
|
let _people = "";
|
