diff --git a/public/resource/img/kc/moren.png b/public/resource/img/kc/moren.png index 16115a0..692581f 100644 Binary files a/public/resource/img/kc/moren.png and b/public/resource/img/kc/moren.png differ diff --git a/public/resource/img/kc/moren2.png b/public/resource/img/kc/moren2.png new file mode 100644 index 0000000..16115a0 Binary files /dev/null and b/public/resource/img/kc/moren2.png differ diff --git a/public/resource/img/toleft.png b/public/resource/img/toleft.png new file mode 100644 index 0000000..482e841 Binary files /dev/null and b/public/resource/img/toleft.png differ diff --git a/public/resource/img/toright.png b/public/resource/img/toright.png new file mode 100644 index 0000000..d3f64c8 Binary files /dev/null and b/public/resource/img/toright.png differ diff --git a/src/views/site/jingCaiGongKaiKe/index.vue b/src/views/site/jingCaiGongKaiKe/index.vue index e07a805..770472b 100644 --- a/src/views/site/jingCaiGongKaiKe/index.vue +++ b/src/views/site/jingCaiGongKaiKe/index.vue @@ -18,7 +18,7 @@ {{item.dqzt}} {{item.dqzt}} {{item.dqzt}} -
+
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue index b6223c9..4bf7b86 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue @@ -10,19 +10,30 @@
- + - - 课程名称：{{ kcxxInfo.kcmc }} + + 课程名称：{{ kcxxInfo.kcmc + '（' + toWeek(kcxxInfo.week) + '第' + kcxxInfo.hh + '节）'}} + + + + {{ kcxxInfo.skdd }} - + 课程名称：{{ kcxxInfo.kcmc }} + @@ -77,7 +88,18 @@ const kcxxInfo = ref(''); const spanlg = ref(5); const spanlt = ref(19); const collapsed = ref(false); - + const weebMap = { + '1': '星期一', + '2': '星期二', + '3': '星期三', + '4': '星期四', + '5': '星期五', + '6': '星期六', + '7': '星期日', +}; +function toWeek(week) { + return weebMap[week]; +} function toggleCollapsed() { collapsed.value = !collapsed.value; @@ -94,7 +116,7 @@ function toggleCollapsed() { onMounted(() => { // console.log('rwbh:',rwbh); defHttp.get({ url: '/ktgl/kcKechengbiao/getKcxxByRwbhXqxn', params: { rwbh: rwbh, xqxn: xqxn } }).then((res) => { - // console.log(`🚀 ~ 1111 defHttp.get ~ res:`, res) + console.log(`🚀 ~ 1111 defHttp.get ~ res:`, res) kcxxInfo.value = res; }); }); @@ -151,4 +173,20 @@ onMounted(() => { text-overflow: ellipsis; /* 使用省略号表示溢出的文本 */ } + +.course-info-container { + display: flex; + justify-content: space-between; + align-items: center; /* 如果需要垂直居中对齐 */ +} + +.course-name { + flex-grow: 1; /* 让第一个span可以自动扩展 */ +} + +.course-location { + float: right; + margin-right: 20px; /* 右边距 */ +} + diff --git a/src/views/site/studentWdkc/studentMain.vue b/src/views/site/studentWdkc/studentMain.vue index a1850ff..6ce72a7 100644 --- a/src/views/site/studentWdkc/studentMain.vue +++ b/src/views/site/studentWdkc/studentMain.vue @@ -2,28 +2,48 @@
- + - -
- - - - - 课程名称：{{kcxxInfo.kcmc}}
+ +
+ + + + + + 课程名称：{{ kcxxInfo.kcmc + '（' + toWeek(kcxxInfo.week) + '第' + kcxxInfo.hh + '节）' }} + + + + {{ kcxxInfo.skdd }} + +
+ + +
+ + + + + + 课程名称：{{ kcxxInfo.kcmc }} + +
- + - + - + - +
\ No newline at end of file diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue index c13fe0d..deec8c3 100644 --- a/src/views/zy/zyInfo/ZyInfoV2List.vue +++ b/src/views/zy/zyInfo/ZyInfoV2List.vue @@ -1766,7 +1766,7 @@ function handleZySuccess(zyid) { var url = '/zyInfo/zyInfo/editStudent'; defHttp.get({ url: url, params: { id: zyid } }).then((res) => {}); - defHttp.get({ url: '/zyInfo/zyInfo/sendZyWechat', params: { id: zyid } }).then((res) => {}); + // defHttp.get({ url: '/zyInfo/zyInfo/sendZyWechat', params: { id: zyid } }).then((res) => {}); } /** diff --git a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue index 1341585..5b87b31 100644 --- a/src/views/zy/zyInfo/ZyInfoV2Listhis.vue +++ b/src/views/zy/zyInfo/ZyInfoV2Listhis.vue @@ -11,7 +11,6 @@
老师您好，
请根据课程教学大纲的要求，
设置学生修完本课程需要完成的作业次数及每次作业在总成绩中所占的比例。
-
设置作业次数
diff --git a/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue index b6ca99c..fc2ea9d 100644 --- a/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue +++ b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue @@ -47,7 +47,7 @@
查重设置
- + @@ -81,7 +81,7 @@ - +
批阅信息
@@ -96,6 +96,9 @@ 下载 + +
+
@@ -155,8 +158,12 @@ import { useRouter } from 'vue-router'; import dayjs, { Dayjs } from 'dayjs'; import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; +import WebOfficeSDK from '/@/views/zy/zyInfoStudent/components/wpsApi/web-office-sdk-solution-v2.0.7.es' import { downloadFile } from '/@/utils/common/renderUtils'; +import { useUserStore } from '/@/store/modules/user'; + +const userStore = useUserStore(); //当前路由信息 const { currentRoute } = useRouter(); const { query } = unref(currentRoute); @@ -166,6 +173,7 @@ const props = defineProps({ formData: { type: Object, default: () => {} }, formBpm: { type: Boolean, default: true }, }); +const showType = ref('0'); const formRef = ref(); const useForm = Form.useForm; const emit = defineEmits(['register', 'ok']); @@ -283,11 +291,61 @@ function add() { * 编辑 */ function edit(record) { + console.log("🚀 ~ edit ~ record:", record) nextTick(() => { resetFields(); //赋值 Object.assign(formData, record); handleKcnr(formData.kcnr); + + + const parts = record.stuFilePath.split('.'); + const filetype = parts[parts.length - 1]; + console.log(`🚀 ~ nextTick ~ filetype:`, filetype) + let wpsType = "w"; + if(filetype=='doc' || filetype=='docx'){ + showType.value = '1'; + wpsType = "w"; + }else if(filetype=='pdf'){ + showType.value = '1'; + wpsType = "f"; + }else if(filetype=='ppt' || filetype=='pptx' ){ + showType.value = '1'; + wpsType = "p"; + }else if(filetype=='xls' || filetype=='xlsx' ){ + showType.value = '1'; + wpsType = "s"; + } + + if(showType.value == '1'){ + const element = document.getElementById('wpsiframeid'); + console.log('userStore.getUserInfo',userStore.getUserInfo) + formData.id = '1863389832580046849'; + // 清空内容 + element.innerHTML = ''; + const jssdk = WebOfficeSDK.init({ + officeType: wpsType, + appId: 'SX20241118WSUGQN', + // fileId: formData.stuId, + fileId: formData.id, + mount:document.querySelector('.wps-iframe'), + commonOptions: { + isShowDocMap: false, //是否开启目录功能，默认开启 + isShowTopArea: false, // 隐藏顶部区域（头部和工具栏） + isShowHeader: false, // 隐藏头部区域 + isBrowserViewFullscreen: true, // 是否在浏览器区域全屏 + isIframeViewFullscreen: true, // 是否在 iframe 区域内全屏 + acceptVisualViewportResizeEvent: true // 控制 WebOffice 是否接受外部的 VisualViewport + }, + wordOptions: { + isShowDocMap: false, // 是否开启目录功能，默认开启 + isBestScale: true, // 打开文档时，默认以最佳比例显示 + isShowBottomStatusBar: false, // 是否展示底部状态栏 + }, + token: userStore.getUserInfo.username + }) + } + }); } @@ -385,30 +443,11 @@ defineExpose({ diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue index f731b08..f185c44 100644 --- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentPiyueForm.vue @@ -1,53 +1,61 @@