diff --git a/.env.production b/.env.production index 276d4f9..9f18d7b 100644 --- a/.env.production +++ b/.env.production @@ -20,16 +20,16 @@ VITE_GLOB_API_URL=/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://xxhbtest2.nenu.edu.cn/jeecg-boot +VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot +# VITE_GLOB_DOMAIN_URL=https://xxhbtest2.nenu.edu.cn/jeecg-boot #VITE_GLOB_DOMAIN_URL=http://210.47.29.177 # VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot # VITE_GLOB_DOMAIN_URL=http://210.47.29.100/jeecg-boot #RTC服务器地址 # VITE_GLOB_RTC_SERVER = https://zxkccx.webvpn.nenu.edu.cn:8081 -# VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081 -VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081 +VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081 +# VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/views/kc/detection/KcDetectionMain.api.ts b/src/views/kc/detection/KcDetectionMain.api.ts index 65717e6..93e940a 100644 --- a/src/views/kc/detection/KcDetectionMain.api.ts +++ b/src/views/kc/detection/KcDetectionMain.api.ts @@ -11,6 +11,7 @@ enum Api { deleteBatch = '/detection/kcDetectionMain/deleteBatch', importExcel = '/detection/kcDetectionMain/importExcel', exportXls = '/detection/kcDetectionMain/exportXls', + syslist = '/detection/kcDetectionMain/syslist', } /** * 导出api @@ -25,8 +26,8 @@ export const getImportUrl = Api.importExcel; * 列表接口 * @param params */ -export const list = (params) => - defHttp.get({ url: Api.list, params }); +export const list = (params) => defHttp.get({ url: Api.list, params }); +export const syslist = (params) => defHttp.get({ url: Api.syslist, params }); /** * 删除单个 diff --git a/src/views/kc/detection/KcDetectionMainList.vue b/src/views/kc/detection/KcDetectionMainList.vue index 097cfd9..b449b02 100644 --- a/src/views/kc/detection/KcDetectionMainList.vue +++ b/src/views/kc/detection/KcDetectionMainList.vue @@ -67,7 +67,7 @@ import { useModal } from '/@/components/Modal'; import { useListPage } from '/@/hooks/system/useListPage' import KcDetectionMainModal from './components/KcDetectionMainModal.vue' import { columns, searchFormSchema } from './KcDetectionMain.data'; -import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcDetectionMain.api'; +import { syslist, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcDetectionMain.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { JInput, JDictSelectTag } from '/@/components/Form'; const checkedKeys = ref>([]); @@ -77,7 +77,7 @@ const [registerModal, { openModal }] = useModal(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - api: list, + api: syslist, columns, canResize: false, useSearchForm: false, diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcHistory.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcHistory.vue index 544f8d1..8237bff 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcHistory.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcHistory.vue @@ -37,10 +37,10 @@ :numberStyle="{ backgroundColor: '#f00', width: '10px', height: '10px' }" :title="'您有' + item.dbtxType + '条提醒信息'" > --> - {{ item.kcmc }} + {{ item.kcmc }} -
{{ item.skdd }}
+
{{item.xqxn}} - {{ item.skdd }}
@@ -111,7 +111,7 @@ function openKechengDetail(item) { //未改版前跳转组件地址 // window.open('/history/hismain?rwbh='+item.rwbh+'&xqxn='+getSysConfig().flag1+"&type=0","_blank"); //改版后组件跳转地址 - window.open('/zyhis/tuGonggaohis?rwbh=' + item.rwbh + '&xqxn=' + getSysConfig().flag1 + '&type=1' + '&teano=' + item.jgh, '_blank'); + window.open('/zyhis/tuGonggaohis?rwbh=' + item.rwbh + '&xqxn=' + item.xqxn + '&type=1' + '&teano=' + item.jgh, '_blank'); } //获取选课人数 diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue index e23e394..efefc8d 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue @@ -9,66 +9,56 @@ mode="inline" :inline-collapsed="collapsed" > - + 通知公告 - + + - 课程简介 - - + + 课程简介 + 教学单元 + 课程资源 + + - 课程作业 - - - - 期末考试 - - - - 课堂测验 - - - - 课程资源 - - - - 上传考核材料 - - - - 教学单元 - - + + 课程作业 + 期末考试 + 课堂测验 + 上传考核材料 + + + 讨论区 + + + + 课程助教 + + + +
-
+ diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index cb24365..9eaa594 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -334,6 +334,7 @@ async function handleShangchuan(record) { if(record.xzxstjzy == 'Y'){ stuZyIds = await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/getZyStuId', data: { zyinfoId: record.id, xh: record.stuId } }) const own = stuZyIds.filter(stu => stu.id == record.stuId) + console.log('own--->',own); if(own[0].sfzz == 'N'){ createMessage.error('您不是组长，无法提交作业！') return diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue index 4404f1e..bac8ea9 100644 --- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue @@ -294,6 +294,10 @@ function submitZy(model, ids, isUpdate) { if (res.success) { //异步提交维普 stuWpKsjc(model, isUpdate).then((res) => { }) + createMessage.success("操作成功"); + emit('ok'); + confirmLoading.value = false; + emit('closeLoading'); } else { msg = res.message createMessage.warning(res.message);