|
@@ -1780,21 +1780,21 @@ export default {
|
|
|
_work.atool == _tool.tool
|
|
|
) {
|
|
|
if (_tool.tool == 1) {
|
|
|
- _work.workContent = `${_work.username}使用电子白板提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用电子白板提交了:`;
|
|
|
} else if (_tool.tool == 3) {
|
|
|
- _work.workContent = `${_work.username}使用思维导图提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用思维导图提交了:`;
|
|
|
} else if (_tool.tool == 6) {
|
|
|
- _work.workContent = `${_work.username}使用协同文档提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用协同文档提交了:`;
|
|
|
} else if (_tool.tool == 15) {
|
|
|
- _work.workContent = `${_work.username}使用问答工具提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用问答工具提交了:`;
|
|
|
} else if (_tool.tool == 53) {
|
|
|
- _work.workContent = `${_work.username}使用文件上传提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用文件上传提交了:`;
|
|
|
} else if (_tool.tool == 54) {
|
|
|
- _work.workContent = `${_work.username}使用拍照提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用拍照提交了:`;
|
|
|
} else if (_tool.tool == 55) {
|
|
|
- _work.workContent = `${_work.username}使用文件提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用文件提交了:`;
|
|
|
} else if (_tool.tool == 56) {
|
|
|
- _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用投票提交了:`;
|
|
|
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++) {
|
|
@@ -1912,23 +1912,24 @@ export default {
|
|
|
_work.tool == z &&
|
|
|
_work.atool == _tool.tool
|
|
|
) {
|
|
|
+ // “${_work.name ? _work.name : this.setTime(_work.create_at)}”
|
|
|
if (_tool.tool == 1) {
|
|
|
- _work.workContent = `${_work.username}使用电子白板提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用电子白板提交了:`;
|
|
|
} else if (_tool.tool == 3) {
|
|
|
- _work.workContent = `${_work.username}使用思维导图提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用思维导图提交了:`;
|
|
|
} else if (_tool.tool == 6) {
|
|
|
- _work.workContent = `${_work.username}使用协同文档提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用协同文档提交了:`;
|
|
|
} else if (_tool.tool == 15) {
|
|
|
- _work.workContent = `${_work.username}使用问答工具提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用问答工具提交了:`;
|
|
|
} else if (_tool.tool == 53) {
|
|
|
- _work.workContent = `${_work.username}使用文件上传提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用文件上传提交了:`;
|
|
|
} else if (_tool.tool == 54) {
|
|
|
- _work.workContent = `${_work.username}使用拍照提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用拍照提交了:`;
|
|
|
} else if (_tool.tool == 55) {
|
|
|
- _work.workContent = `${_work.username}使用文件提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用文件提交了:`;
|
|
|
} else if (_tool.tool == 56) {
|
|
|
console.log(_tool);
|
|
|
- _work.workContent = `${_work.username}使用投票提交了“${_work.name ? _work.name : this.setTime(_work.create_at)}”:`;
|
|
|
+ _work.workContent = `${_work.username}使用投票提交了:`;
|
|
|
checkPeople++;
|
|
|
var checkL = JSON.parse(_work.content);
|
|
|
for (var kz = 0; kz < checkL.length; kz++) {
|
|
@@ -1977,16 +1978,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // “${_tool.toolPhoto[0].name ? _tool.toolPhoto[0].name : this.setTime(_tool.toolPhoto[0].create_at)}”
|
|
|
if (_tool.tool == 48) {
|
|
|
_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 = [];
|