Skip to content

P
pica.cloud.web-education-admin
提交 844581ac 编写于 作者: shuang.zhou's avatar shuang.zhou
浏览文件
操作

Merge branch 'release' of... 

Merge branch 'release' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into testing/3.29.0
上级 5349b118 89f80506
隐藏空白字符变更
内嵌 并排
正在显示 包含 89 行增加 和 29 行删除
src/views/education/create-component.vue
浏览文件 @ 844581ac
...@@ -280,9 +280,13 @@ ...@@ -280,9 +280,13 @@
>{{ _item.name }}</el-button >{{ _item.name }}</el-button
> >
</div> </div>
<div <!-- <div
v-for="(item1, index1) in item.templetModelList" v-for="(item1, index1) in item.templetModelList"
:key="index1" :key="index1"
> -->
<div
v-for="(item1, index1) in showData(item.templetModelList)"
:key="item1.id"
> >
<el-form <el-form
ref="templateForm" ref="templateForm"
...@@ -317,7 +321,7 @@ ...@@ -317,7 +321,7 @@
</div> </div>
<div <div
v-for="(item2, index2) in item1.partModelList" v-for="(item2, index2) in item1.partModelList"
:key="index2" :key="item2.id"
> >
<!-- 考试 --> <!-- 考试 -->
<div v-if="item2.type == 1"> <div v-if="item2.type == 1">
...@@ -327,7 +331,7 @@ ...@@ -327,7 +331,7 @@
<div <div
v-for="(item3, v-for="(item3,
index3) in item2.partContentModelList" index3) in item2.partContentModelList"
:key="index3" :key="item3.id"
> >
<el-row> <el-row>
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
...@@ -645,6 +649,17 @@ ...@@ -645,6 +649,17 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<div class="pagination-warp">
<el-pagination
:current-page="pageNo"
:page-size="pageSize"
:page-sizes="[3]"
layout="total, sizes, prev, pager, next, jumper"
:total="item.templetModelList.length"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
></el-pagination>
</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -736,6 +751,7 @@ ...@@ -736,6 +751,7 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<span slot="footer" class="dialog-footer dialog-foot"> <span slot="footer" class="dialog-footer dialog-foot">
<el-button <el-button
type="default" type="default"
...@@ -878,6 +894,8 @@ export default { ...@@ -878,6 +894,8 @@ export default {
certificateCondition: "100", // 证书完成率 certificateCondition: "100", // 证书完成率
status: "", status: "",
}, },
pageNo: 1,
pageSize: 3,
componentList: { componentList: {
moduleModelList: [ moduleModelList: [
{ {
...@@ -954,6 +972,11 @@ export default { ...@@ -954,6 +972,11 @@ export default {
computed: { computed: {
...mapGetters(["_token", "idType"]), ...mapGetters(["_token", "idType"]),
}, },
watch: {
firstTab() {
this.pageNo = 1;
}
},
created() { created() {
console.log("#######==========#####"); console.log("#######==========#####");
vm = this; vm = this;
...@@ -980,6 +1003,20 @@ export default { ...@@ -980,6 +1003,20 @@ export default {
console.log("idType==>", vm.idType); console.log("idType==>", vm.idType);
}, },
methods: { methods: {
handleSizeChange(val) {
this.pageSize = val;
this.showData(this.tamp);
},
handleCurrentChange(val) {
this.pageNo = val;
this.showData(this.tamp);
},
showData(data) {
this.tamp = data;
let start = this.pageNo == 1 ? 0 : ((this.pageNo-1) * this.pageSize);
console.log(start,this.pageNo * this.pageSize);
return data && data.length ? data.slice(start, this.pageNo * this.pageSize) : [];
},
// 模块可以拖动排序 // 模块可以拖动排序
tabDrop() { tabDrop() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -1268,20 +1305,26 @@ export default { ...@@ -1268,20 +1305,26 @@ export default {
examName = vm.testIdSelect[i].onlineExamName; examName = vm.testIdSelect[i].onlineExamName;
} }
} }
if ( vm.componentList.moduleModelList[vm.examIndex].templetModelList[
!vm.componentList.moduleModelList[vm.examIndex].templetModelList[
vm.examIndex1
].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3]
.content1
) {
vm.componentList.moduleModelList[vm.examIndex].templetModelList[
vm.examIndex1 vm.examIndex1
].partModelList[vm.examIndex2].partContentModelList[ ].partModelList[vm.examIndex2].partContentModelList[
vm.examIndex3 vm.examIndex3
].content1 = examName; ].content1 = examName;
} // if (
// !vm.componentList.moduleModelList[vm.examIndex].templetModelList[
// vm.examIndex1
// ].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3]
// .content1
// ) {
// vm.componentList.moduleModelList[vm.examIndex].templetModelList[
// vm.examIndex1
// ].partModelList[vm.examIndex2].partContentModelList[
// vm.examIndex3
// ].content1 = examName;
// }
}, },
examIDfocus(index, index1, index2, index3) { examIDfocus(index, index1flag, index2, index3) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
vm.examIndex = index; vm.examIndex = index;
vm.examIndex1 = index1; vm.examIndex1 = index1;
vm.examIndex2 = index2; vm.examIndex2 = index2;
...@@ -1309,20 +1352,26 @@ export default { ...@@ -1309,20 +1352,26 @@ export default {
courseName = vm.courseIdSelect[i].name; courseName = vm.courseIdSelect[i].name;
} }
} }
if ( vm.componentList.moduleModelList[vm.courseIndex].templetModelList[
!vm.componentList.moduleModelList[vm.courseIndex].templetModelList[
vm.courseIndex1
].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3]
.content1
) {
vm.componentList.moduleModelList[vm.courseIndex].templetModelList[
vm.courseIndex1 vm.courseIndex1
].partModelList[vm.courseIndex2].partContentModelList[ ].partModelList[vm.courseIndex2].partContentModelList[
vm.courseIndex3 vm.courseIndex3
].content1 = courseName; ].content1 = courseName;
} // if (
// !vm.componentList.moduleModelList[vm.courseIndex].templetModelList[
// vm.courseIndex1
// ].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3]
// .content1
// ) {
// vm.componentList.moduleModelList[vm.courseIndex].templetModelList[
// vm.courseIndex1
// ].partModelList[vm.courseIndex2].partContentModelList[
// vm.courseIndex3
// ].content1 = courseName;
// }
}, },
courseIDfocus(index, index1, index2, index3) { courseIDfocus(index, index1flag, index2, index3) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
vm.courseIndex = index; vm.courseIndex = index;
vm.courseIndex1 = index1; vm.courseIndex1 = index1;
vm.courseIndex2 = index2; vm.courseIndex2 = index2;
...@@ -1594,7 +1643,8 @@ export default { ...@@ -1594,7 +1643,8 @@ export default {
}, },
// 删除模板前 // 删除模板前
beforeDeleteTemplate(index, index1) { beforeDeleteTemplate(index, index1flag) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
vm.$confirm( vm.$confirm(
"确定要删除此模板吗？<br/>（<span style='color:red;font-size:12px;'>如需更新学情报告，可通过上下架项目实现</span>）", "确定要删除此模板吗？<br/>（<span style='color:red;font-size:12px;'>如需更新学情报告，可通过上下架项目实现</span>）",
"提示", "提示",
...@@ -1643,7 +1693,8 @@ export default { ...@@ -1643,7 +1693,8 @@ export default {
}, },
// 课程排序-向上 // 课程排序-向上
sortCourseUp(index, index1, index2, index3) { sortCourseUp(index, index1flag, index2, index3) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
// 不是第一个元素，才可能上移 // 不是第一个元素，才可能上移
if (index3 > 0) { if (index3 > 0) {
let item = vm.componentList.moduleModelList[index].templetModelList[ let item = vm.componentList.moduleModelList[index].templetModelList[
...@@ -1661,7 +1712,8 @@ export default { ...@@ -1661,7 +1712,8 @@ export default {
}, },
// 课程排序-向下 // 课程排序-向下
sortCourseDown(index, index1, index2, index3) { sortCourseDown(index, index1flag, index2, index3) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
let pLength = let pLength =
vm.componentList.moduleModelList[index].templetModelList[index1] vm.componentList.moduleModelList[index].templetModelList[index1]
.partModelList[index2].partContentModelList.length - 1; .partModelList[index2].partContentModelList.length - 1;
...@@ -1683,8 +1735,9 @@ export default { ...@@ -1683,8 +1735,9 @@ export default {
}, },
// 添加多个课程 // 添加多个课程
addMatterCourse(index, index1, index2) { addMatterCourse(index, index1flag, index2) {
console.log(index, index1, index2); console.log(index, index1flag, index2);
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
for (let i = 0; i < vm.componentList.moduleModelList.length; i++) { for (let i = 0; i < vm.componentList.moduleModelList.length; i++) {
if (index == i) { if (index == i) {
for ( for (
...@@ -1726,7 +1779,8 @@ export default { ...@@ -1726,7 +1779,8 @@ export default {
}, },
// 删除多个课程(多个考试)元件的确认框 // 删除多个课程(多个考试)元件的确认框
beforeDeleteMatterCourse(index, index1, index2, index3) { beforeDeleteMatterCourse(index, index1flag, index2, index3) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
// 删除模块前进行确认 // 删除模块前进行确认
vm.$confirm( vm.$confirm(
"确定要删除此课程吗？<br>（<span style='color:red;font-size:12px;'>如需更新学情报告，可通过上下架项目实现</span>）", "确定要删除此课程吗？<br>（<span style='color:red;font-size:12px;'>如需更新学情报告，可通过上下架项目实现</span>）",
...@@ -1798,7 +1852,8 @@ export default { ...@@ -1798,7 +1852,8 @@ export default {
} }
}, },
// 模板下移 // 模板下移
sortUp(index, index1) { sortUp(index, index1flag) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
for (let i = 0; i < vm.componentList.moduleModelList.length; i++) { for (let i = 0; i < vm.componentList.moduleModelList.length; i++) {
if (index == i) { if (index == i) {
if ( if (
...@@ -1824,7 +1879,8 @@ export default { ...@@ -1824,7 +1879,8 @@ export default {
} }
}, },
// 模板下移 // 模板下移
sortDown(index, index1) { sortDown(index, index1flag) {
let index1 = index1flag + (this.pageNo-1) * this.pageSize;
for (let i = 0; i < vm.componentList.moduleModelList.length; i++) { for (let i = 0; i < vm.componentList.moduleModelList.length; i++) {
if (index == i) { if (index == i) {
if (index1 != 0) { if (index1 != 0) {
...@@ -2311,6 +2367,10 @@ export default { ...@@ -2311,6 +2367,10 @@ export default {
} }
} }
} }
.pagination-warp {
padding: 10px;
text-align: right;
}
} }
.cc-class-box { .cc-class-box {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或