|
|
@@ -426,7 +426,7 @@
|
|
|
新建项目
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="wordTeacher" @click="checkTemplate1()">
|
|
|
+ <!-- <div class="wordTeacher" @click="checkTemplate1()">
|
|
|
<div class="wordPic">
|
|
|
<img src="../../../assets/icon/wordMub.png" alt />
|
|
|
</div>
|
|
|
@@ -440,7 +440,7 @@
|
|
|
">
|
|
|
我的项目
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -554,9 +554,10 @@
|
|
|
" /> -->
|
|
|
<el-select v-model="unitJson[unitIndex].chapterInfo[0].taskJson[
|
|
|
itemTaskIndex
|
|
|
- ].people" placeholder="请选择负责人" clearable filterable @change="peopleChange(unitJson[unitIndex].chapterInfo[0].taskJson[
|
|
|
- itemTaskIndex
|
|
|
- ].people,itemTaskIndex)">
|
|
|
+ ].people" placeholder="请选择负责人" clearable filterable
|
|
|
+ @change="peopleChange(unitJson[unitIndex].chapterInfo[0].taskJson[
|
|
|
+ itemTaskIndex
|
|
|
+ ].people, itemTaskIndex)">
|
|
|
<el-option v-for="item in ManAarray" :key="item.userid"
|
|
|
:label="item.name + (item.type == 1 ? '(老师)' : '(学生)')"
|
|
|
:value="item.userid">
|
|
|
@@ -564,15 +565,15 @@
|
|
|
</el-select>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="addPeople" @click="addTcMember(itemTaskIndex)"
|
|
|
+ <!-- <div class="addPeople" @click="addTcMember(itemTaskIndex)"
|
|
|
style="background: rgb(107, 146, 201);margin: 0 0 10px 15px;margin-bottom: 10px;width: 100px;">
|
|
|
{{
|
|
|
(unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember
|
|
|
- &&
|
|
|
- unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember.length)
|
|
|
- ? '已添加' : '添加协同者'
|
|
|
+ &&
|
|
|
+ unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember.length)
|
|
|
+ ? '已添加' : '添加协同者'
|
|
|
}}
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
<div class="remove" v-if="item.taskJson.length > 1"
|
|
|
@click="deleteTask(itemTaskIndex)"
|
|
|
@@ -583,7 +584,8 @@
|
|
|
justify-content: flex-start;
|
|
|
align-items: center;
|
|
|
display: flex;
|
|
|
- " v-if="unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember && unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember.length">
|
|
|
+ margin: 10px 0 15px;
|
|
|
+ ">
|
|
|
<div style="
|
|
|
height: 20px;
|
|
|
padding-left: 16px;
|
|
|
@@ -592,10 +594,18 @@
|
|
|
">
|
|
|
协同人员
|
|
|
</div>
|
|
|
- <div style="margin-left:10px">
|
|
|
- <span class="tcMember"
|
|
|
- v-for="(tc, tcIndex) in unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember"
|
|
|
- :key="tcIndex">{{ getMan(tc) }}</span>
|
|
|
+ <el-tooltip
|
|
|
+ :content="getMen(unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember)"
|
|
|
+ placement="top" effect="dark"
|
|
|
+ v-if="unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember && unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember.length">
|
|
|
+ <div class="tcMember_box" @click="addTcMember(itemTaskIndex)">
|
|
|
+ <span :class="{ tcMember: getMan(tc) }"
|
|
|
+ v-for="(tc, tcIndex) in unitJson[unitIndex].chapterInfo[0].taskJson[itemTaskIndex].tcMember"
|
|
|
+ :key="tcIndex">{{ getMan(tc) }}</span>
|
|
|
+ </div>
|
|
|
+ </el-tooltip>
|
|
|
+ <div class="tcMember_box" @click="addTcMember(itemTaskIndex)" v-else>
|
|
|
+ <span>点击添加协同成员</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div style="
|
|
|
@@ -928,7 +938,8 @@
|
|
|
</div>
|
|
|
<div class="tool" v-if="itemTool.tool == 53"
|
|
|
style="position:relative">
|
|
|
- <div class="whiteBIcon" :id="itemTaskIndex+'-'+toolIndex" @click="addImg($event)">
|
|
|
+ <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex"
|
|
|
+ @click="addImg($event)">
|
|
|
<img src="../../../assets/icon/fourthToolList/file.png"
|
|
|
alt />
|
|
|
<div style="margin: 5px 0">文件上传</div>
|
|
|
@@ -945,7 +956,8 @@
|
|
|
</div>
|
|
|
<div class="tool" v-if="itemTool.tool == 54"
|
|
|
style="position:relative">
|
|
|
- <div class="whiteBIcon" :id="itemTaskIndex+'-'+toolIndex" @click="addImg($event)">
|
|
|
+ <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex"
|
|
|
+ @click="addImg($event)">
|
|
|
<img src="../../../assets/icon/fourthToolList/photo.png"
|
|
|
alt />
|
|
|
<div style="margin: 5px 0">拍照</div>
|
|
|
@@ -962,7 +974,8 @@
|
|
|
</div>
|
|
|
<div class="tool" v-if="itemTool.tool == 55"
|
|
|
style="position:relative">
|
|
|
- <div class="whiteBIcon" :id="itemTaskIndex+'-'+toolIndex" @click="addImg($event)">
|
|
|
+ <div class="whiteBIcon" :id="itemTaskIndex + '-' + toolIndex"
|
|
|
+ @click="addImg($event)">
|
|
|
<img src="../../../assets/icon/fourthToolList/zip.png"
|
|
|
alt />
|
|
|
<div style="margin: 5px 0">压缩文件</div>
|
|
|
@@ -2537,9 +2550,28 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return _people
|
|
|
+ return this.ManAarray.length ? _people : ''
|
|
|
}
|
|
|
},
|
|
|
+ getMen() {
|
|
|
+ return function (people) {
|
|
|
+ let _people = people
|
|
|
+ let kp = []
|
|
|
+ if (this.ManAarray.length) {
|
|
|
+ for (var k = 0; k < _people.length; k++) {
|
|
|
+ let person = _people[k]
|
|
|
+ for (var i = 0; i < this.ManAarray.length; i++) {
|
|
|
+ if (this.ManAarray[i].userid == person) {
|
|
|
+ // _people = this.ManAarray[i].name;
|
|
|
+ kp.push(this.ManAarray[i].name)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return this.ManAarray.length ? (kp.length ? kp.join('、') : '') : ''
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
unitIndex(newValue, oldValue) {
|
|
|
@@ -2742,7 +2774,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
}
|
|
|
if (this.cidttt == 0) {
|
|
|
@@ -2940,14 +2976,22 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
}
|
|
|
this.setMan();
|
|
|
} else if (this.steps == 3) {
|
|
|
if (this.cid == "" || this.cid == undefined) {
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
} else {
|
|
|
this.addWork();
|
|
|
@@ -2959,7 +3003,11 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
} else {
|
|
|
if (this.type != 2) {
|
|
|
@@ -2996,7 +3044,11 @@ export default {
|
|
|
}
|
|
|
this.steps++;
|
|
|
} else {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
}
|
|
|
this.setMan();
|
|
|
@@ -3012,7 +3064,11 @@ export default {
|
|
|
} else if (this.steps == 3) {
|
|
|
if (this.cid == "" || this.cid == undefined) {
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
} else {
|
|
|
this.addWork();
|
|
|
@@ -3024,7 +3080,11 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.courseName == "" || typeT != 3) {
|
|
|
- this.$message.error("请将信息填写完整");
|
|
|
+ if (typeT != 3) {
|
|
|
+ this.$message.error("赛道主题为必选项目，请将信息补充完整后进行下一步");
|
|
|
+ } else {
|
|
|
+ this.$message.error("请将信息填写完整");
|
|
|
+ }
|
|
|
return;
|
|
|
} else {
|
|
|
if (this.type != 2) {
|
|
|
@@ -4067,18 +4127,18 @@ export default {
|
|
|
});
|
|
|
this.$forceUpdate();
|
|
|
this.dialogVisibleTool = false;
|
|
|
- if(tool == 1 || tool == 3 || tool == 6){
|
|
|
+ if (tool == 1 || tool == 3 || tool == 6) {
|
|
|
setTimeout(() => {
|
|
|
this.openToolFun(tool, this.taskCount, this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
- this.taskCount
|
|
|
- ].toolArray.length-1)
|
|
|
- },500)
|
|
|
- }else if(tool == 53 || tool == 54 || tool == 55){
|
|
|
+ this.taskCount
|
|
|
+ ].toolArray.length - 1)
|
|
|
+ }, 500)
|
|
|
+ } else if (tool == 53 || tool == 54 || tool == 55) {
|
|
|
setTimeout(() => {
|
|
|
this.addImg(document.getElementById(this.taskCount.toString() + '-' + (this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
- this.taskCount
|
|
|
- ].toolArray.length-1)));
|
|
|
- },500)
|
|
|
+ this.taskCount
|
|
|
+ ].toolArray.length - 1)));
|
|
|
+ }, 500)
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -4148,9 +4208,9 @@ export default {
|
|
|
this.toolIndex = i
|
|
|
const array = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[taskCount].toolArray[i].toolPhoto
|
|
|
let txt = ""
|
|
|
- for(var l = 0;l<array.length;l++){
|
|
|
+ for (var l = 0; l < array.length; l++) {
|
|
|
let _uid = array[l].userid
|
|
|
- if(_uid == this.userid){
|
|
|
+ if (_uid == this.userid) {
|
|
|
txt = JSON.parse(JSON.stringify(array[l].content))
|
|
|
break;
|
|
|
}
|
|
|
@@ -4168,9 +4228,9 @@ export default {
|
|
|
this.toolIndex = i
|
|
|
const array = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[taskCount].toolArray[i].toolPhoto
|
|
|
let txt = ""
|
|
|
- for(var l = 0;l<array.length;l++){
|
|
|
+ for (var l = 0; l < array.length; l++) {
|
|
|
let _uid = array[l].userid
|
|
|
- if(_uid == this.userid){
|
|
|
+ if (_uid == this.userid) {
|
|
|
txt = JSON.parse(JSON.stringify(array[l].content))
|
|
|
break;
|
|
|
}
|
|
|
@@ -4276,8 +4336,8 @@ export default {
|
|
|
getTeacher() {
|
|
|
let params = {
|
|
|
org:
|
|
|
- (this.org && this.org != "undefined" && this.org != "null")
|
|
|
- ? this.org : '',
|
|
|
+ (this.org && this.org != "undefined" && this.org != "null")
|
|
|
+ ? this.org : '',
|
|
|
oid: this.oid,
|
|
|
cu: "",
|
|
|
cn: this.searchTN,
|
|
|
@@ -4509,7 +4569,9 @@ export default {
|
|
|
this.cid = res.data.courseId;
|
|
|
this.courseUserid = this.userid;
|
|
|
this.islogin = true;
|
|
|
- this.selectCourseDetail();
|
|
|
+ setTimeout(() => {
|
|
|
+ this.selectCourseDetail();
|
|
|
+ }, 1000);
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("网络不佳");
|
|
|
@@ -4750,8 +4812,8 @@ export default {
|
|
|
let tcMember = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].tcMember ? this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].tcMember : []
|
|
|
const people = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].people
|
|
|
let ManAarray = JSON.parse(JSON.stringify(this.ManAarray))
|
|
|
- for(var i = 0;i<ManAarray.length;i++){
|
|
|
- if(ManAarray[i].userid === people){
|
|
|
+ for (var i = 0; i < ManAarray.length; i++) {
|
|
|
+ if (ManAarray[i].userid === people) {
|
|
|
ManAarray.splice(i, 1)
|
|
|
}
|
|
|
}
|
|
|
@@ -4760,7 +4822,7 @@ export default {
|
|
|
// this.getTeacher();
|
|
|
this.dialogVisibleTcMember = true;
|
|
|
},
|
|
|
- peopleChange(people,index){
|
|
|
+ peopleChange(people, index) {
|
|
|
let tcMember = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].tcMember ? this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].tcMember : []
|
|
|
if (tcMember.indexOf(people) != -1) {
|
|
|
tcMember.splice(tcMember.indexOf(people), 1)
|
|
|
@@ -5685,10 +5747,10 @@ export default {
|
|
|
this.dialogVisibleTool = false;
|
|
|
this.dialogVisibleText = false;
|
|
|
setTimeout(() => {
|
|
|
- // this.openToolFun(52, this.taskCount, this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
- // this.taskCount
|
|
|
- // ].toolArray.length-1)
|
|
|
- this.toolIndex = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].toolArray.length-1
|
|
|
+ // this.openToolFun(52, this.taskCount, this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
+ // this.taskCount
|
|
|
+ // ].toolArray.length-1)
|
|
|
+ this.toolIndex = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].toolArray.length - 1
|
|
|
this.addTextJson()
|
|
|
}, 500);
|
|
|
// if (
|
|
|
@@ -5718,12 +5780,12 @@ export default {
|
|
|
this.dialogVisibleTool = false;
|
|
|
this.dialogVisibleTable1 = false;
|
|
|
setTimeout(() => {
|
|
|
- // this.openToolFun(48, this.taskCount, this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
- // this.taskCount
|
|
|
- // ].toolArray.length-1)
|
|
|
- this.toolIndex = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].toolArray.length-1
|
|
|
+ // this.openToolFun(48, this.taskCount, this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
+ // this.taskCount
|
|
|
+ // ].toolArray.length-1)
|
|
|
+ this.toolIndex = this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount].toolArray.length - 1
|
|
|
this.addTableJson()
|
|
|
- },500)
|
|
|
+ }, 500)
|
|
|
// if (
|
|
|
// this.unitJson[this.unitIndex].chapterInfo[0].taskJson[this.taskCount]
|
|
|
// .toolChoose[this.toolIndex].tool != 15
|
|
|
@@ -9451,4 +9513,34 @@ ol {
|
|
|
.tcMember+.tcMember::before {
|
|
|
content: '、';
|
|
|
}
|
|
|
+
|
|
|
+.tcMember_box {
|
|
|
+ margin-left: 10px;
|
|
|
+ border: 1px solid #C0C4CC;
|
|
|
+ padding: 10px 14px;
|
|
|
+ border-radius: 4px;
|
|
|
+ background: #fff;
|
|
|
+ cursor: pointer;
|
|
|
+ color: #606266;
|
|
|
+ font-size: 14px;
|
|
|
+ width: 225px;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+}
|
|
|
+
|
|
|
+.upCss>>>.el-upload-list--picture .el-upload-list__item {
|
|
|
+ height: auto;
|
|
|
+}
|
|
|
+
|
|
|
+.upCss>>>.el-upload-list--picture .el-upload-list__item-thumbnail {
|
|
|
+ width: 200px;
|
|
|
+ height: 100px;
|
|
|
+ object-fit: contain;
|
|
|
+ background: unset;
|
|
|
+}
|
|
|
+
|
|
|
+.upCss>>>.el-upload-list--picture .el-upload-list__item.is-success .el-upload-list__item-name {
|
|
|
+ display: none;
|
|
|
+}
|
|
|
</style>
|
zengyicheng