From 98a93fcccee3b0aaa26164e249ef361e35589499 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 4 Jun 2024 08:47:27 +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 --- .env.production | 6 +- src/views/kc/wjxCswj/WjxCswjList.vue | 2 +- src/views/kc/wjxCswj/WjxCswjStuList.vue | 7 +- src/views/kc/wjxCswj/WjxCswjTableList.vue | 2 +- src/views/kc/wjxDcwj/WjxDcwjList.vue | 10 +- src/views/kc/wjxDcwj/WjxDcwjStuList.vue | 7 +- .../wjxWjxx/components/WjxWjxxTmlbDjForm.vue | 1 + .../components/WjxWjxxTmlbDjjgForm.vue | 2 + .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 117 +++++++++++++----- src/views/site/common/header.vue | 5 +- .../renKeJiaoCheng/checkKecheng/dqxqkc.vue | 2 +- .../checkKecheng/dqxqkcDetail.vue | 32 +++-- .../checkKecheng/dqxqkcMenu.vue | 6 +- src/views/site/studentWdkc/studentMenu.vue | 6 +- src/views/site/studentWdkc/studentWdkc.vue | 2 +- src/views/site/studentWdkc/studentZyxx.vue | 10 +- src/views/site/tongJi/index.vue | 2 +- src/views/site/tongZhiGongGao/index.vue | 6 +- src/views/zuoye/webAll/JianceForm.vue | 8 +- src/views/zy/jiaoXueDanYuanNeiRong/index.vue | 35 ++++-- .../zy/jiaoXueDanYuanNeiRong/stuIndex.vue | 4 +- src/views/zy/zyGonggao/StudentGonggaoList.vue | 6 +- src/views/zy/zyGonggao/ZyGonggaoList.vue | 22 +++- src/views/zy/zyInfo/StudentZyInfoList.vue | 48 ++++++- src/views/zy/zyInfo/ZyInfoLiebiaoList.vue | 7 +- src/views/zy/zyInfo/ZyInfoList.vue | 5 +- src/views/zy/zyInfoStudent/ZyCdxxList.vue | 11 ++ .../zy/zyInfoStudent/ZyInfoStudent.api.ts | 16 +++ .../zy/zyInfoStudent/ZyInfoStudent.data.ts | 27 ++-- .../zy/zyInfoStudent/ZyInfoStudentList.vue | 63 ++++++++-- .../zy/zyInfoStudent/ZyStudentJczList.vue | 6 +- .../components/ZyInfoStudentScoreForm.vue | 2 +- src/views/zy/zyTlq/StuZyTlqList.vue | 4 +- src/views/zy/zyTlq/ZyTlqList.vue | 4 +- 34 files changed, 356 insertions(+), 137 deletions(-) diff --git a/.env.production b/.env.production index 363729d..d40284e 100644 --- a/.env.production +++ b/.env.production @@ -19,8 +19,8 @@ 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=http://210.47.29.100/jeecg-boot +VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.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 @@ -38,5 +38,5 @@ VITE_USE_PWA = false VITE_LEGACY = false # 是否开启单点登录 -VITE_GLOB_APP_OPEN_SSO = false +VITE_GLOB_APP_OPEN_SSO = true diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue index 117b82b..112a241 100644 --- a/src/views/kc/wjxCswj/WjxCswjList.vue +++ b/src/views/kc/wjxCswj/WjxCswjList.vue @@ -34,7 +34,7 @@ - +
{{item.qpublish_dictText}}
diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue index 6429b76..70258db 100644 --- a/src/views/kc/wjxCswj/WjxCswjStuList.vue +++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue @@ -33,7 +33,7 @@
- +
{{getStatus(item.flag)}}
@@ -85,7 +85,7 @@ //当前路由信息 const { currentRoute } = useRouter(); const { query } = unref(currentRoute); - const { rwbh,xqxn,typa } = query;//获取传递参数 + const { rwbh,xqxn,type,teano } = query;//获取传递参数 const { createMessage } = useMessage(); const APagination = Pagination; const queryParam = ref({}); @@ -117,7 +117,7 @@ createMessage.error('还未到答卷时间！'); return; } - let endTimestamp = Date.parse(record.endTime); + let endTimestamp = Date.parse(record.endTime+" 23:59:59"); if(timestamp>endTimestamp){ createMessage.error('答卷时间已过！'); return; @@ -139,6 +139,7 @@ queryParam.value.pageSize = pageSize.value; queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; + queryParam.value.teano = teano; queryParam.value.atype = "6"; defHttp.get({ url: '/wjxWjxx/wjxWjxx/stuList', params: queryParam.value }).then(res => { // console.log(`🚀 ~ defHttp.get ~ res:`, res) diff --git a/src/views/kc/wjxCswj/WjxCswjTableList.vue b/src/views/kc/wjxCswj/WjxCswjTableList.vue index bad132e..ef430f3 100644 --- a/src/views/kc/wjxCswj/WjxCswjTableList.vue +++ b/src/views/kc/wjxCswj/WjxCswjTableList.vue @@ -90,7 +90,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ useSearchForm: false, actionColumn: { width: 280, - fixed: 'right', + // fixed: 'right', }, beforeFetch: (params) => { params.column = '',params.order = '';//新生成的默认不带排序 diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue index bbf939b..7a4b768 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue @@ -33,7 +33,7 @@ - +
{{item.qpublish_dictText}}
@@ -59,13 +59,13 @@ - 编辑问卷 + 设置问卷 发布问卷 删除问卷 - 问卷设置 - 问卷预览 + 编辑问卷 + 预览问卷 问卷详情 - 问卷预览 + 预览问卷 问卷结果 diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue index 5289480..42f6197 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue @@ -33,7 +33,7 @@
- +
{{getStatus(item.flag)}}
@@ -85,7 +85,7 @@ //当前路由信息 const { currentRoute } = useRouter(); const { query } = unref(currentRoute); - const { rwbh,xqxn,typa } = query;//获取传递参数 + const { rwbh,xqxn,type,teano } = query;//获取传递参数 const { createMessage } = useMessage(); const APagination = Pagination; const queryParam = ref({}); @@ -117,7 +117,7 @@ createMessage.error('还未到答卷时间！'); return; } - let endTimestamp = Date.parse(record.endTime); + let endTimestamp = Date.parse(record.endTime+" 23:59:59"); if(timestamp>endTimestamp){ createMessage.error('答卷时间已过！'); return; @@ -139,6 +139,7 @@ queryParam.value.pageSize = pageSize.value; queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; + queryParam.value.teano = teano; queryParam.value.atype = "1"; defHttp.get({ url: '/wjxWjxx/wjxWjxx/stuList', params: queryParam.value }).then(res => { // console.log(`🚀 ~ defHttp.get ~ res:`, res) diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue index b27e1e6..a1cc929 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue @@ -155,6 +155,7 @@ async function submitForm(){ // values[i].openTime = openTime.value; } const isUpdate = false + console.log(`🚀 ~ submitForm ~ values:`, values) await djtj(values, isUpdate); //关闭弹窗 emit('ok'); diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue index 1454f96..abad4b9 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue @@ -43,9 +43,11 @@
题目分值： {{item.wjScore}} 分
所得分值： {{item.itemScore}} 分
+ + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index a349fc3..511c6ca 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -22,7 +22,9 @@