diff --git a/.env.production b/.env.production index 896dbb4..8293447 100644 --- a/.env.production +++ b/.env.production @@ -19,8 +19,9 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false VITE_GLOB_API_URL=/jeecg-boot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot -# VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot +# VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot +# VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot +VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot # VITE_GLOB_DOMAIN_URL=http://210.47.29.100/jeecg-boot #RTC服务器地址 @@ -39,5 +40,5 @@ VITE_USE_PWA = false VITE_LEGACY = false # 是否开启单点登录 -VITE_GLOB_APP_OPEN_SSO = true +VITE_GLOB_APP_OPEN_SSO = false diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue index 89ee294..906d320 100644 --- a/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue +++ b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue @@ -15,25 +15,30 @@
- 教学大纲内容 + {{jxdgInfo.fbName}}{{jxdgInfo.xqxn}}季学期执行教学大纲 - + - + {{ item.title }} - - + + - - + + -
+
@@ -41,7 +46,7 @@ - + @@ -58,8 +63,8 @@ - - + + @@ -67,42 +72,97 @@ -
+
- - + + - - - + + - - + - - + + + + + + + + + + + {{ item3.title }} ： + + {{ item3.title }} + + + + + + + + + + + + + + + {{ item3.title }}： + + {{ item3.content }} + + + +   + + + + + + + + + + + + + + + + + + - @@ -114,7 +174,14 @@ import { ref, reactive, computed, unref, onMounted } from 'vue'; import { useRouter } from 'vue-router'; import { defHttp } from '/@/utils/http/axios'; -import { queryZyJxdgMainListByMainId, queryDataById, saveOrUpdate2, queryZyJxdgMainListByMainId2 } from '/@/views/kc/zyJxdgBanben/ZyJxdgBanben.api'; +import { useMessage } from '/@/hooks/web/useMessage'; +import { + queryZyJxdgMainListByMainId, + queryDataById, + saveOrUpdate2, + queryZyJxdgMainListByMainId2, + queryZyJxdgMainListByMainId3, +} from '/@/views/kc/zyJxdgBanben/ZyJxdgBanben.api'; import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue'; //当前路由信息 @@ -125,6 +192,13 @@ const showType = ref(0); const jxdgInfo = ref({}); const jxdgbbDataSource = ref([]); const disabled = ref(false); +const { createMessage, createConfirm } = useMessage(); + +let kcmbDataSource = ref<{ title: any }[]>([]); +const checkKcmb = ref(''); +const checkKhfs = ref([]); +const khmbDataSource = ref([]); +const kcmbShow = ref(false); const zyJxdgMainTable = reactive>({ loading: false, @@ -161,7 +235,11 @@ function handleGlxm(item) { //判断当前项是否等于关联项 var item3 = item2.zyJxdgPzxxList; if (item3 != null && item3.length > 0) { - item2.list.push({ [item3[0].id]: title }); + if (item2.type == '11') { + item2.list.push({ [item3[0].id]: '', [item3[1].id]: title }); + } else { + item2.list.push({ [item3[0].id]: title }); + } } } } @@ -169,11 +247,38 @@ function handleGlxm(item) { } } } -function handleFabu(sffb){ +function handleFabu(sffb) { + if(sffb=='1'){ + var par = jxdgInfo.value; + var title = '《'+par.kcmc+'》教学大纲（'+par.banbenName+'）是否作为'+par.xqxn+'季学期的执行教学大纲'; + createConfirm({ + iconType: 'warning', + title: '确认发布', + content: title+'，面向学生发布？', + okText: '确认', + cancelText: '取消', + onOk: () => { + defHttp.post({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/edit', params: { sffb, id: jxdgInfo.value.id,fbName:title } }).then((res) => { + init(); + }); + }, + }); + }else{ + createConfirm({ + iconType: 'warning', + title: '确认撤回', + content: '确认撤回已发布的执行大纲吗？', + okText: '确认', + cancelText: '取消', + onOk: () => { + defHttp.post({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/edit', params: { sffb, id: jxdgInfo.value.id,fbName:title } }).then((res) => { + init(); + }); + }, + }); - defHttp.post({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/edit', params: { sffb,id:jxdgInfo.value.id} }).then((res) => { - init() - }); + } + } //两列关联项目计算方法 function handleTwoGlxm(item) { @@ -332,7 +437,16 @@ async function handleCheckBanben(record) { //子表数据 var id = record.id; - const zyJxdgMainDataList = await queryZyJxdgMainListByMainId(id); + + var params = { + mainId: id, + rwbh: rwbh, + teacherNo: teano, + }; + //子表数据 + const zyJxdgMainDataList = await queryZyJxdgMainListByMainId3(params); + + // const zyJxdgMainDataList = await queryZyJxdgMainListByMainId(id); zyJxdgMainTable.dataSource = [...zyJxdgMainDataList]; } async function submitForm() { @@ -354,16 +468,17 @@ async function submitForm() { } //切换显示模块 function handleShowType(type) { + console.log('🤛', type); if (type == 1) { jxdgInfo.value = {}; zyJxdgMainTable.dataSource = []; - defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sffb: '1', pageNo: -1 } }).then((res) => { + defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sfsy: '1', pageNo: -1 } }).then((res) => { jxdgbbDataSource.value = res.records; }); - }else if(type == 2){ + } else if (type == 2) { type = 1; - - defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sffb: '1', pageNo: -1 } }).then((res) => { + + defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sfsy: '1', pageNo: -1 } }).then((res) => { jxdgbbDataSource.value = res.records; }); @@ -371,6 +486,23 @@ 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; + } + } }); } showType.value = type; @@ -391,8 +523,6 @@ async function init() { showType.value = 0; } }); - if (jxdgInfo.value.id) { - } } const jxdgbbColumns = [ @@ -413,15 +543,182 @@ const jxdgbbColumns = [ }, ]; +//--------------------------------------20240824------------------------------------------------------ +//新增课程目标自增表格 +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++) { + if (i == 0) { + oneId = item3[i].id; + } else if (i == 1) { + twoId = item3[i].id; + } + } + + item.list2Map.push([ + { + title: '课程目标' + (item.list2Map.length + 1), + key: oneId, + sort: item.list2Map.length, + }, + { + title: '', + key: twoId, + sort: item.list2Map.length, + }, + ]); + var list1 = ref<{ title: any }[]>([]); + for (var i = 0; i < item.list2Map.length; i++) { + var ppa = item.list2Map[i][0].title; + list1.value.push({ title: ppa }); + } + kcmbDataSource.value = list1.value; +} +//删除课程目标自增表格 +function handleKcmbZzbgDel(item, index) { + item.list2Map.splice(index, 1); + for (var i = 0; i < item.list2Map.length; i++) { + var item2 = item.list2Map[i]; + item2.forEach((item3, index2) => { + if (index2 == 0) { + item3.title = '课程目标' + (i + 1); + } + item3.sort = i; + }); + } +} +//关联项目计算方法 +function handle2Glxm(item) { + var listtt = ref<{ title: any }[]>([]); + for (var i = 0; i < item.list2Map.length; i++) { + var ppa = item.list2Map[i][0].title; + listtt.value.push({ title: ppa }); + } + 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; //第几个关联项目 + var alllist = zyJxdgMainTable.dataSource; //获取全部的数据 + for (var j = 0; j < alllist.length; j++) { + for (var i = 0; i < list1.length; i++) { + var item1 = list1[i][0]; + var title = item1.title; //具体信息 + var item2 = alllist[j]; //具体数据 + item2.list = item2.list || []; + if (item2.guanlian == sort) { + //关联项目等于当前数据 + if (i == 0) { + //判断第一回将原来的清空重新赋值 + item2.list = []; + } + //判断当前项是否等于关联项 + 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 }); + } else { + item2.list.push({ [item3[0].id]: title }); + } + } + } + } + } + } + } + // handleGlxm(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++) { + var par = list2[i]; + var type = '1'; + if (i == 1) { + type = '2'; + } + list3.push({ + title: par.title, + type, + content: '', + key: par.id, + }); + } + console.log('🦹', list3); + record.list.push({ list: list3 }); + console.log('👩‍🔧', record); +} + +//删除课程目标自增表格 +function handle13DelZzbg(item, index) { + item.list.splice(index, 1); +} + +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([]); + var list2 = record.zyJxdgPzxxList; + for (var i = 0; i < list2.length; i++) { + var par = list2[i]; + columns.push(par.id); + } + for (var i = 0; i < a2.length; i++) { + var khfsmc = a2[i]; //考核方式名称 + record.list.push({ [columns[0]]: a1, [columns[1]]: khfsmc }); + } + handleTwoGlxm(record); + kcmbShow.value = false; +} + +//--------------------------------------20240824------------------------------------------------------ + onMounted(() => { init(); }); \ No newline at end of file diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue index 7e8fa75..a6c6ad7 100644 --- a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue +++ b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue @@ -3,7 +3,6 @@
教学大纲设置 -
温馨提示：设置完成后，您也可以在课程教学过程中，随时根据实际情况进行调整。
@@ -16,17 +15,21 @@
- + 填写教学大纲内容 - 返回 + + 返回 + -
请选择填写的教学大纲版本
+
请选择填写的教学大纲版本
 - +