From f456795b3c7de20420cb25dff26ee39fc5f095f6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 30 Aug 2024 10:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/zyJxdgBanben/ZyJxdgStudentList.vue | 199 +++++++++++++++--- .../kc/zyJxdgBanben/ZyJxdgTeacherList.vue | 176 ++++++++-------- .../components/ZyJxdgBanbenForm.vue | 22 +- src/views/site/studentWdkc/studentMenu.vue | 4 +- src/views/site/tongJi/index.vue | 2 +- 5 files changed, 281 insertions(+), 122 deletions(-) diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue index 6823f58..0de0792 100644 --- a/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue +++ b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue @@ -18,16 +18,16 @@ {{jxdgInfo.fbName}}{{jxdgInfo.xqxn}}季学期执行教学大纲 - + - + {{ item.title }} + + + {{ item.tsy }} + + @@ -41,12 +41,12 @@
- - + + - + @@ -54,7 +54,7 @@ - + @@ -87,15 +87,15 @@ - + - + - + @@ -107,8 +107,8 @@ - {{ item3.title }} ： - + {{ item3.title }}: + {{ item3.title }} @@ -123,10 +123,20 @@ - - {{ item3.title }}： - - {{ item3.content }} + + + + {{ item3.title }}: + + {{ item3.content }} + + + + +
{{ item3.title }}:
+
+ {{ item3.content }} +
@@ -140,20 +150,15 @@ - - + + @@ -162,7 +167,6 @@ - @@ -280,6 +284,129 @@ function handleFabu(sffb) { } } + +//获取自增列表列表头 +function getTableZzColumns333(list, datalist) { + const data = datalist; + let columns = reactive([]); + let namePar = ''; + for (var i = 0; i < list.length; i++) { + var par = list[i]; + var inePar = { + title: par.title, + dataIndex: par.id, + key: par.id, + width: 100, + customCell: (record, index, bhdata) => { + if (bhdata.title == '课程教学目标') { + let nextRecord = data[index + 1]; + let rowSpan = 0; + while (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { + namePar = nextRecord[bhdata.key]; + rowSpan += 1; + nextRecord = data[index + rowSpan]; + } + let sizeNum = 0; + for (var i = 0; i < data.length; i++) { + let beforeRecord = data[i]; + if (beforeRecord[bhdata.key] === record[bhdata.key]) { + sizeNum += 1; + } + } + if (sizeNum != rowSpan) { + rowSpan = 0; + } + if (sizeNum == 1) { + rowSpan = 1; + } + return { + rowSpan, + }; + } + }, + }; + columns.push(inePar); + } + return columns; +} +function getCglist(record,type,zyJxdgPzxxList){ + var nerList: { title: string; content: string; }[] = []; + for (var i = 0; i < zyJxdgPzxxList.length; i++) { + var par = zyJxdgPzxxList[i]; + var newType = par.type; + if(newType == type){ + var initPar = {title:par.title,content:record[par.id]} + nerList.push(initPar); + } + } + return nerList; +} +//获取自增列表列表头 +function getTableZzColumns222(list, datalist) { + const data = datalist; + let columns = reactive([]); + let namePar = ''; + var parid3 = ''; + for(var j=2;j { + if (bhdata.title == '课程目标') { + let nextRecord = data[index + 1]; + let rowSpan = 0; + while (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { + namePar = nextRecord[bhdata.key]; + rowSpan += 1; + nextRecord = data[index + rowSpan]; + } + let sizeNum = 0; + for (var i = 0; i < data.length; i++) { + let beforeRecord = data[i]; + if (beforeRecord[bhdata.key] === record[bhdata.key]) { + sizeNum += 1; + } + } + if (sizeNum != rowSpan) { + rowSpan = 0; + } + if (sizeNum == 1) { + rowSpan = 1; + } + return { + rowSpan, + }; + } + }, + }; + columns.push(inePar2); + } + + } + return columns; +} + + //两列关联项目计算方法 function handleTwoGlxm(item) { var sfsglxm = item.sfsglxm; @@ -388,6 +515,7 @@ function getTableColumns(list) { title: par.title, dataIndex: par.id, key: par.id, + width: 100, }; columns.push(inePar); } @@ -423,6 +551,7 @@ function getTableZzColumns2(list) { title: par.title, dataIndex: par.id, key: par.id, + width: 100, }; columns.push(inePar); } diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue index 62edf40..3e2f6a3 100644 --- a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue +++ b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue @@ -408,7 +408,7 @@ - + @@ -467,21 +467,15 @@ - - + @@ -717,6 +711,7 @@ function getTableColumns(list) { title: par.title, dataIndex: par.id, key: par.id, + width: 100, }; columns.push(inePar); } @@ -731,6 +726,7 @@ function getTableZzColumns(list) { title: par.title, dataIndex: par.id, key: par.id, + width: 100, }; columns.push(inePar); } @@ -752,6 +748,7 @@ function getTableZzColumns2(list) { title: par.title, dataIndex: par.id, key: par.id, + width: 150, customCell: (_, index) => { if (index === 2) { return { rowSpan: 2 }; @@ -769,12 +766,86 @@ function getTableZzColumns2(list) { } return columns; } - +function getCglist(record,type,zyJxdgPzxxList){ + var nerList: { title: string; content: string; }[] = []; + for (var i = 0; i < zyJxdgPzxxList.length; i++) { + var par = zyJxdgPzxxList[i]; + var newType = par.type; + if(newType == type){ + var initPar = {title:par.title,content:record[par.id]} + nerList.push(initPar); + } + } + return nerList; +} //获取自增列表列表头 function getTableZzColumns222(list, datalist) { - console.log('🙎‍♀️datalist-->', datalist); const data = datalist; - // console.log('😊', data); + let columns = reactive([]); + let namePar = ''; + var parid3 = ''; + for(var j=2;j { + if (bhdata.title == '课程目标') { + let nextRecord = data[index + 1]; + let rowSpan = 0; + while (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { + namePar = nextRecord[bhdata.key]; + rowSpan += 1; + nextRecord = data[index + rowSpan]; + } + let sizeNum = 0; + for (var i = 0; i < data.length; i++) { + let beforeRecord = data[i]; + if (beforeRecord[bhdata.key] === record[bhdata.key]) { + sizeNum += 1; + } + } + if (sizeNum != rowSpan) { + rowSpan = 0; + } + if (sizeNum == 1) { + rowSpan = 1; + } + return { + rowSpan, + }; + } + }, + }; + columns.push(inePar2); + } + + } + return columns; +} + +//获取自增列表列表头 +function getTableZzColumns333(list, datalist) { + const data = datalist; let columns = reactive([]); let namePar = ''; for (var i = 0; i < list.length; i++) { @@ -783,28 +854,9 @@ function getTableZzColumns222(list, datalist) { title: par.title, dataIndex: par.id, key: par.id, + width: 100, customCell: (record, index, bhdata) => { - // if (bhdata.title == '课程目标' && (index == 0 || index == 1)) { - // let nextRecord = data[index + 1]; - // if (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { - // let rowSpan = 1; - // while (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { - // nextRecord = data[index + rowSpan]; - // rowSpan += 1; - // } - // rowSpan -= 1; - // console.log(rowSpan); - // return { - // rowSpan, - // }; - // } else { - // return { - // rowSpan: 0, - // }; - // } - // } - - if (bhdata.title == '课程目标') { + if (bhdata.title == '课程教学目标') { let nextRecord = data[index + 1]; let rowSpan = 0; while (nextRecord && nextRecord[bhdata.key] === record[bhdata.key]) { @@ -819,11 +871,10 @@ function getTableZzColumns222(list, datalist) { sizeNum += 1; } } - console.log('👨‍🦳', sizeNum); - if (sizeNum != rowSpan ) { + if (sizeNum != rowSpan) { rowSpan = 0; } - if(sizeNum == 1){ + if (sizeNum == 1) { rowSpan = 1; } return { @@ -834,21 +885,6 @@ function getTableZzColumns222(list, datalist) { }; columns.push(inePar); } - - // columns[0].customCell = (text, index,record ) => { - // if (index === 0) { - // return { - // rowSpan: 2, - // }; - // } - // if (index === 1) { - // return { - // rowSpan: 0, - // }; - // } - // }; - - // console.log('columns-->', columns); return columns; } @@ -857,8 +893,6 @@ async function handleCheckBanben(record) { jxdgInfo.value.banbenId = record.id; jxdgInfo.value.rwbh = rwbh; jxdgInfo.value.teacherNo = teano; - console.log('👨‍👧', jxdgInfo.value); - //子表数据 var id = record.id; @@ -871,14 +905,11 @@ async function handleCheckBanben(record) { let zyJxdgMainDataList = await queryZyJxdgMainListByMainId3(params); await defHttp.get({ url: '/ktgl/kcKechengbiao/getKcxxByRwbhXqxn', params: { rwbh, xqxn } }).then((res) => { - console.log('🙅‍♀️', res); kechengInfo.value = res; }); var list = zyJxdgMainDataList; - console.log('👯‍♀️', list); for (var i = 0; i < list.length; i++) { var par = list[i]; - console.log('👕', par); if (par.type == '4') { var list1 = par.zyJxdgPzxxList; for (var j = 0; j < list1.length; j++) { @@ -917,7 +948,6 @@ async function submitForm() { } //切换显示模块 function handleShowType(type) { - console.log('🤛', type); if (type == 1) { jxdgInfo.value = {}; zyJxdgMainTable.dataSource = []; @@ -937,18 +967,14 @@ function handleShowType(type) { zyJxdgMainTable.dataSource = []; defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList', params: { rwbh, teacherNo } }).then((res) => { zyJxdgMainTable.dataSource = [...res]; - console.log('👩‍💼', zyJxdgMainTable.dataSource); for (var i = 0; i < zyJxdgMainTable.dataSource.length; i++) { var par = zyJxdgMainTable.dataSource[i]; - console.log('👅', par); if (par.type == '12') { var list = par.list2Map; - console.log('🧔', list); var list1 = ref<{ title: any }[]>([]); for (var j = 0; j < list.length; j++) { var ppa = list[j][0].title; - console.log('👧', ppa); list1.value.push({ title: ppa }); } kcmbDataSource.value = list1.value; @@ -961,7 +987,6 @@ function handleShowType(type) { //初始化查询 async function init() { - console.log('rwbh--->', rwbh); defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbh', params: { rwbh, xqxn, teacherNo: teano } }).then((res) => { if (res) { jxdgInfo.value = res; @@ -1000,7 +1025,6 @@ function handleKcmbZzbg(item) { item.list2Map = item.list2Map || []; var item3 = item.zyJxdgPzxxList; - console.log('😁', item3); var oneId = ''; var twoId = ''; for (var i = 0; i < item3.length; i++) { @@ -1052,13 +1076,10 @@ function handle2Glxm(item) { } kcmbDataSource.value = listtt.value; - console.log('👳‍♀️', item); var sfsglxm = item.sfsglxm; - console.log('👱‍♀️', sfsglxm); if (sfsglxm == '1') { //判断是否是关联项目 var list1 = item.list2Map; //课程目标集合 - console.log('👑', list1); if (list1 != null) { //关联项目是否有值 var sort = item.sort; //第几个关联项目 @@ -1077,7 +1098,6 @@ function handle2Glxm(item) { } //判断当前项是否等于关联项 var item3 = item2.zyJxdgPzxxList; - console.log('👶', item3); if (item3 != null && item3.length > 0) { if (item2.type == '11') { item2.list.push({ [item3[0].id]: '', [item3[1].id]: title }); @@ -1094,7 +1114,6 @@ function handle2Glxm(item) { } function handle13Zzbg(record) { - console.log('👎', record); var list2 = record.zyJxdgPzxxList; //课程目标集合 var list3: { title: any; type: string; content: string; key: string }[] = []; for (var i = 0; i < list2.length; i++) { @@ -1110,9 +1129,7 @@ function handle13Zzbg(record) { key: par.id, }); } - console.log('🦹', list3); record.list.push({ list: list3 }); - console.log('👩‍🔧', record); } //删除课程目标自增表格 @@ -1121,27 +1138,20 @@ function handle13DelZzbg(item, index) { } function handle14Zzbg(item) { - console.log('🤧item', item); kcmbShow.value = true; khmbDataSource.value = []; var guanlian = item.guanlian.split(','); var khmbSort = guanlian[1]; - console.log('👱‍♀️khmbSort', khmbSort); var alllist = zyJxdgMainTable.dataSource[khmbSort - 1]; //获取全部的数据 var item2 = alllist.list; var item3 = alllist.zyJxdgPzxxList[0]; - console.log('item2', item2); - console.log('item3', item3); for (var i = 0; i < item2.length; i++) { var item1 = item2[i]; - console.log('👩‍👩‍👦item1', item1[item3.id]); khmbDataSource.value.push({ title: item1[item3.id] }); } - console.log('😒khmbDataSource', khmbDataSource.value); } function handleKhmbqueren(record) { - console.log('👩‍👦record', record); var a1 = checkKcmb.value; //选择的课程目标 var a2 = checkKhfs.value; //选择的考核方式集合 let columns = reactive([]); diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue index c808875..8c8c757 100644 --- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue +++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue @@ -73,7 +73,7 @@ 教学内容、重难点和课时安排 13 课程目标的评价方式 14 --> - + 新增字段 @@ -90,6 +90,26 @@ + + + + 新增字段 + + + + + + + + + + + + + + + + diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue index 1866756..84b8f5c 100644 --- a/src/views/site/studentWdkc/studentMenu.vue +++ b/src/views/site/studentWdkc/studentMenu.vue @@ -21,12 +21,12 @@ 课程简介 - +