|
|
@@ -138,12 +138,12 @@
|
|
|
<input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="pType_box all_choose" v-if="oid == '1c3b9def-8fbe-11ed-b13d-005056b86db5'">
|
|
|
+ <div class="pType_box all_choose" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
|
|
|
<span>类型</span>
|
|
|
<!-- 学科+ 主题+ 未来+ -->
|
|
|
- <el-checkbox-group v-model="pTypeCheck" style="display: flex; align-items: center">
|
|
|
+ <el-checkbox-group @change="CourseType2Change" v-model="pTypeCheckName" style="display: flex; align-items: center">
|
|
|
<div class="all_choose" style="width: 100px" v-for="(item, index) in CourseType2" :key="index">
|
|
|
- <el-checkbox :label="item.id">{{ item.name }}+</el-checkbox>
|
|
|
+ <el-checkbox :label="item.name">{{ item.name }}</el-checkbox>
|
|
|
</div>
|
|
|
</el-checkbox-group>
|
|
|
</div>
|
|
|
@@ -152,13 +152,13 @@
|
|
|
<div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
|
|
|
<span v-if="
|
|
|
CourseTypeJson[item.id].length > 0 &&
|
|
|
- (pTypeCheck.length > 0
|
|
|
+ (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
|
|
|
? pTypeCheck.indexOf(item.id) != -1
|
|
|
: true)
|
|
|
">{{ item.name }}</span>
|
|
|
<el-checkbox-group v-model="courseTypeId" v-if="
|
|
|
CourseTypeJson[item.id].length > 0 &&
|
|
|
- (pTypeCheck.length > 0
|
|
|
+ (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
|
|
|
? pTypeCheck.indexOf(item.id) != -1
|
|
|
: true)
|
|
|
">
|
|
|
@@ -1357,7 +1357,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="tool">
|
|
|
- <div class="whiteBIcon" @click="openTools(itemTaskIndex, 50, toolIndex)">
|
|
|
+ <div class="whiteBIcon" @click="addTools(50, itemTaskIndex, toolIndex)">
|
|
|
<img src="../../assets/icon/thirdToolList/plwork.png" alt />
|
|
|
<div style="margin: 5px 0">批量上传</div>
|
|
|
</div>
|
|
|
@@ -1627,6 +1627,18 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="tool">
|
|
|
+ <div class="whiteBIcon" @click="addTools(61, itemTaskIndex, toolIndex)">
|
|
|
+ <img src="../../assets/icon/fourthToolList/allHistory.png" alt />
|
|
|
+ <div style="margin: 5px 0">全历史</div>
|
|
|
+ </div>
|
|
|
+ <div class="check" @click="addTools(61, itemTaskIndex, toolIndex)">
|
|
|
+ <img src="../../assets/icon/checkNo.png" alt v-if="itemTool.tool.indexOf(61) == -1" />
|
|
|
+ <div class="checkDiv" v-else>
|
|
|
+ <img src="../../assets/icon/checkedIs.png" alt /><span>已选择</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="toolSort" v-if="itemTool.toolType == 4">
|
|
|
<div class="tool">
|
|
|
@@ -3141,6 +3153,7 @@ export default {
|
|
|
courseTypeSon: [],
|
|
|
clearArray: [],
|
|
|
pTypeCheck: [],
|
|
|
+ pTypeCheckName:[],
|
|
|
loading: false,
|
|
|
toolType: 0,
|
|
|
inputShow: true,
|
|
|
@@ -3326,11 +3339,12 @@ export default {
|
|
|
setMan() {
|
|
|
// let teacherJuri = this.teacherJuri2;
|
|
|
this.ManAarray = [];
|
|
|
- if (this.checkboxList3.indexOf(this.courseUserid || this.userid) == -1) {
|
|
|
- this.checkboxList3.push(this.courseUserid || this.userid);
|
|
|
+ let _user = JSON.parse(JSON.stringify(this.checkboxList3))
|
|
|
+ if (_user.indexOf(this.courseUserid || this.userid) == -1) {
|
|
|
+ _user.push(this.courseUserid || this.userid);
|
|
|
}
|
|
|
let params = {
|
|
|
- uid: this.checkboxList3.join(","),
|
|
|
+ uid: _user.join(","),
|
|
|
};
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "getAllUserById", params)
|
|
|
@@ -4584,6 +4598,15 @@ export default {
|
|
|
console.error(err);
|
|
|
});
|
|
|
},
|
|
|
+ CourseType2Change(val){
|
|
|
+ this.pTypeCheck = []
|
|
|
+ for(var i = 0;i<this.CourseType2.length;i++){
|
|
|
+ let typeA = this.CourseType2[i]
|
|
|
+ if(val.indexOf(typeA.name) != -1){
|
|
|
+ this.pTypeCheck.push(...typeA.id)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
getChapterData(e, i, j, ic, type) {
|
|
|
e.stopPropagation();
|
|
|
this.updataC = true;
|
|
|
@@ -4963,6 +4986,36 @@ export default {
|
|
|
.get(this.$store.state.api + "getCourseTemplateT", "")
|
|
|
.then((res) => {
|
|
|
this.templateArray = res.data[0];
|
|
|
+ this.getTemplateOid();
|
|
|
+ this.$forceUpdate();
|
|
|
+ })
|
|
|
+ .catch((err) => { });
|
|
|
+ },
|
|
|
+ getTemplateOid() {
|
|
|
+ let params = {
|
|
|
+ oid:this.oid
|
|
|
+ }
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "getCourseTemplateTByOid", params)
|
|
|
+ .then((res) => {
|
|
|
+ if(res.data[0].length){
|
|
|
+ this.templateArray = [...res.data[0],...this.templateArray];
|
|
|
+ }
|
|
|
+ this.getTemplateOrg();
|
|
|
+ this.$forceUpdate();
|
|
|
+ })
|
|
|
+ .catch((err) => { });
|
|
|
+ },
|
|
|
+ getTemplateOrg() {
|
|
|
+ let params = {
|
|
|
+ oid:this.org
|
|
|
+ }
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "getCourseTemplateTByOid", params)
|
|
|
+ .then((res) => {
|
|
|
+ if(res.data[0].length){
|
|
|
+ this.templateArray = [...res.data[0],...this.templateArray];
|
|
|
+ }
|
|
|
this.$forceUpdate();
|
|
|
})
|
|
|
.catch((err) => { });
|
|
|
@@ -5358,24 +5411,25 @@ export default {
|
|
|
this.wordJson = wordJson;
|
|
|
}
|
|
|
this.dialogVisibleWord = true;
|
|
|
- } else if (i == 50) {
|
|
|
- if (
|
|
|
- this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
|
|
|
- .toolChoose[toolIndex].uploadJson
|
|
|
- ) {
|
|
|
- this.uploadJson = JSON.parse(
|
|
|
- JSON.stringify(
|
|
|
- this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
- itemTaskIndex
|
|
|
- ].toolChoose[toolIndex].uploadJson
|
|
|
- )
|
|
|
- );
|
|
|
- } else {
|
|
|
- var uploadJson = [];
|
|
|
- this.uploadJson = uploadJson;
|
|
|
- }
|
|
|
- this.dialogVisibleMoreUpload = true;
|
|
|
- } else if (i == 10) {
|
|
|
+ // else if (i == 50) {
|
|
|
+ // if (
|
|
|
+ // this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
|
|
|
+ // .toolChoose[toolIndex].uploadJson
|
|
|
+ // ) {
|
|
|
+ // this.uploadJson = JSON.parse(
|
|
|
+ // JSON.stringify(
|
|
|
+ // this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
|
|
|
+ // itemTaskIndex
|
|
|
+ // ].toolChoose[toolIndex].uploadJson
|
|
|
+ // )
|
|
|
+ // );
|
|
|
+ // } else {
|
|
|
+ // var uploadJson = [];
|
|
|
+ // this.uploadJson = uploadJson;
|
|
|
+ // }
|
|
|
+ // this.dialogVisibleMoreUpload = true;
|
|
|
+ // }
|
|
|
+ } else if (i == 10) {
|
|
|
if (
|
|
|
this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
|
|
|
.toolChoose[toolIndex].preTime
|
|
|
@@ -5611,15 +5665,15 @@ export default {
|
|
|
// return;
|
|
|
// }
|
|
|
// }
|
|
|
- if (i == 50) {
|
|
|
- if (
|
|
|
- !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
|
|
|
- .toolChoose[toolIndex].uploadJson
|
|
|
- ) {
|
|
|
- this.openTools(itemTaskIndex, 50, toolIndex);
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (i == 50) {
|
|
|
+ // if (
|
|
|
+ // !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
|
|
|
+ // .toolChoose[toolIndex].uploadJson
|
|
|
+ // ) {
|
|
|
+ // this.openTools(itemTaskIndex, 50, toolIndex);
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
if (i == 49) {
|
|
|
if (
|
|
|
@@ -6379,17 +6433,17 @@ export default {
|
|
|
.then((res) => {
|
|
|
this.CourseType = res.data;
|
|
|
this.CourseType2 = [
|
|
|
- { name: "学科" },
|
|
|
- { name: "主题" },
|
|
|
- { name: "未来" },
|
|
|
- ];
|
|
|
+ { name: "智见课程",id:[] },
|
|
|
+ { name: "智行课程",id:[] },
|
|
|
+ { name: "智创课程",id:[] },
|
|
|
+ ];
|
|
|
+
|
|
|
for (var cti = 0; cti < res.data[0].length; cti++) {
|
|
|
- if (res.data[0][cti].name == "年级") {
|
|
|
- this.CourseType2[1].id = res.data[0][cti].id;
|
|
|
+ if (res.data[0][cti].name == "年级" || res.data[0][cti].name == "学科") {
|
|
|
+ this.CourseType2[1].id.push(res.data[0][cti].id);
|
|
|
+ this.CourseType2[0].id.push(res.data[0][cti].id);
|
|
|
} else if (res.data[0][cti].name == "主题") {
|
|
|
- this.CourseType2[2].id = res.data[0][cti].id;
|
|
|
- } else if (res.data[0][cti].name == "学科") {
|
|
|
- this.CourseType2[0].id = res.data[0][cti].id;
|
|
|
+ this.CourseType2[2].id.push(res.data[0][cti].id);
|
|
|
}
|
|
|
}
|
|
|
let _courseTypeId = [];
|
zengyicheng
