From 66a878ee1da346207165a8a45d110c979e4052db Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 24 May 2024 15:31:26 +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
---
src/router/routes/modules/site/site.ts | 1 +
src/router/routes/modules/zy/zy.ts | 8 ++
src/views/kc/wjxCswj/WjxCswjStuList.vue | 8 +-
src/views/kc/wjxDcwj/WjxDcwjStuList.vue | 8 +-
.../kc/wjxWjxx/components/WjxWjxxForm.vue | 1 +
.../checkKecheng/dqxqkcDetail.vue | 51 +++++++++----
.../checkKecheng/dqxqkcMenu.vue | 5 +-
.../zy/zyGonggao/components/ZyGonggaoForm.vue | 4 +-
.../zyGonggao/components/ZyGonggaoModal.vue | 4 +-
src/views/zy/zyInfo/StudentZyInfoList.vue | 6 +-
.../zy/zyInfoStudent/ZyInfoStudent.api.ts | 9 +++
.../zy/zyInfoStudent/ZyInfoStudent.data.ts | 75 ++++++++++++++++++-
.../zy/zyInfoStudent/ZyInfoStudentList.vue | 47 ++++++------
13 files changed, 175 insertions(+), 52 deletions(-)
diff --git a/src/router/routes/modules/site/site.ts b/src/router/routes/modules/site/site.ts
index 233c501..fed8860 100644
--- a/src/router/routes/modules/site/site.ts
+++ b/src/router/routes/modules/site/site.ts
@@ -207,6 +207,7 @@ const site: AppRouteModule = {
title: '讨论区',
},
},
+
],
};
diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts
index 7aaae00..d6158dc 100644
--- a/src/router/routes/modules/zy/zy.ts
+++ b/src/router/routes/modules/zy/zy.ts
@@ -111,6 +111,14 @@ const zuoye: AppRouteModule = {
title: '教学资源库',
},
},
+ {
+ path: 'dqkcCdxx',
+ name: 'dqkcCdxx',
+ component: () => import('/@/views/zy/zyInfoStudent/ZyCdxxList.vue'),
+ meta: {
+ title: '存档信息',
+ },
+ },
]
}
diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index 460a710..ab14975 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -13,8 +13,8 @@
全部
- 待答卷
- 待批卷
+ 待提交
+ 待评分
已完成
@@ -192,9 +192,9 @@
function getStatus(flag){
if(flag == '-1'){
- return "待答卷";
+ return "待提交";
}else if(flag == '0'){
- return "待批卷";
+ return "待评分";
}else if(flag == '1'){
return "已完成";
}
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
index 05fc249..9e8894e 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
@@ -13,8 +13,8 @@
全部
- 待答卷
- 待批卷
+ 待提交
+ 待评分
已完成
@@ -192,9 +192,9 @@
function getStatus(flag){
if(flag == '-1'){
- return "待答卷";
+ return "待提交";
}else if(flag == '0'){
- return "待批卷";
+ return "待评分";
}else if(flag == '1'){
return "已完成";
}
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
index 80ba01d..5c820d8 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
@@ -160,6 +160,7 @@ import {ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted,
}
}
}
+ model.public = "0"
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index 6055a0f..f4b1533 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -13,10 +13,10 @@
@@ -25,10 +25,10 @@
@@ -115,9 +115,28 @@ const baseApiUrl = globSetting.domainUrl;
id:'',
filePath:null,
jxrlFilePath:null,
- kcjs:''
+ kcjs:'',
+ pdfPath:null,
+ jxrlPdfPath:null,
});
+ //教学大纲提交附件
+ function jxdgChange(record){
+ console.log(`🚀 ~ jxdgChange ~ record:`, record)
+ var model = {id:jxdgInfo.value.id,filePath:record}
+ defHttp.post({ url: '/zyJxdg/zyJxdg/jxdgScfj', params: model }).then((res) => {
+ getKcjsJxdg();
+ });
+ }
+
+ function jxrlChange(record){
+ console.log(`🚀 ~ jxdgChange ~ record:`, record)
+ var model = {id:jxdgInfo.value.id,jxrlFilePath:record}
+ defHttp.post({ url: '/zyJxdg/zyJxdg/jxrlScfj', params: model }).then((res) => {
+ getKcjsJxdg();
+ });
+ }
+
//引用功能
function handleYinyong(){
var record = {xqxn,rwbh}
@@ -145,17 +164,23 @@ const baseApiUrl = globSetting.domainUrl;
}
function openPdf(record){
- var url2 = getFileAccessHttpUrl(record.pdfPath)
- // console.log(`🚀 ~ openPdf ~ url2:`, url2)
- let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
- window.open(url,"_blank")
+ if(record.pdfPath){
+ var url2 = getFileAccessHttpUrl(record.pdfPath)
+ let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
+ window.open(url,"_blank")
+ }else{
+ createMessage.warning("暂无文件或文件上传中")
+ }
}
function openJxrlPdf(record){
- var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
- // console.log(`🚀 ~ openPdf ~ url2:`, url2)
- let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
- window.open(url,"_blank")
+ if(record.jxrlPdfPath){
+ var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
+ let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
+ window.open(url,"_blank")
+ }else{
+ createMessage.warning("暂无文件或文件上传中")
+ }
}
//常见问题回调刷新
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 2f445cd..6dcb9f9 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -23,6 +23,7 @@
教学工具
问卷调查
到课率识别
+ 作业存档
教学资源库
@@ -96,8 +97,10 @@
href = "/zy/dqkcJxzyk";
}else if(zytype=='tlq'){
href = "/zy/dqkcTlq";
+ }else if(zytype=='zycd'){
+ href = "/zy/dqkcCdxx";
}
-
+
router.push({path:href,query: {rwbh,xqxn,type}});
}
diff --git a/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue b/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
index 46adbe6..ec795b8 100644
--- a/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
+++ b/src/views/zy/zyGonggao/components/ZyGonggaoForm.vue
@@ -44,8 +44,8 @@
content: '',
});
const { createMessage } = useMessage();
- const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
- const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
+ const labelCol = ref({ xs: { span: 24 }, sm: { span: 2 } });
+ const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 21 } });
const confirmLoading = ref(false);
//表单验证
const validatorRules = {
diff --git a/src/views/zy/zyGonggao/components/ZyGonggaoModal.vue b/src/views/zy/zyGonggao/components/ZyGonggaoModal.vue
index 581cf0d..6351996 100644
--- a/src/views/zy/zyGonggao/components/ZyGonggaoModal.vue
+++ b/src/views/zy/zyGonggao/components/ZyGonggaoModal.vue
@@ -1,5 +1,5 @@
-
+
@@ -9,7 +9,7 @@
import ZyGonggaoForm from './ZyGonggaoForm.vue'
const title = ref('');
- const width = ref(800);
+ const width = ref('95%');
const visible = ref(false);
const disableSubmit = ref(false);
const registerForm = ref();
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 53911b7..5fd4a76 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -129,11 +129,11 @@
}
function callText(record){
if(record.score){
- return "已评分";
+ return "已完成";
}else if(record.stuFilePath){
- return "已提交";
+ return "待评分";
}else{
- return "未提交";
+ return "待提交";
}
}
/**
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
index 572f009..6606df8 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
@@ -5,9 +5,11 @@ const { createConfirm } = useMessage();
enum Api {
list = '/zyInfoStudent/zyInfoStudent/list',
+ cdxxlist = '/zyInfoStudent/zyInfoStudent/cdxxlist',
save='/zyInfoStudent/zyInfoStudent/add',
edit='/zyInfoStudent/zyInfoStudent/edit',
zyscStu='/zyInfoStudent/zyInfoStudent/zyscStu',
+ editCdlx='/zyInfoStudent/zyInfoStudent/editCdlx',
deleteOne = '/zyInfoStudent/zyInfoStudent/delete',
deleteBatch = '/zyInfoStudent/zyInfoStudent/deleteBatch',
importExcel = '/zyInfoStudent/zyInfoStudent/importExcel',
@@ -30,6 +32,7 @@ export const getImportUrl = Api.importExcel;
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
+export const cdxxlist = (params) => defHttp.get({ url: Api.cdxxlist, params });
/**
* 删除单个
@@ -78,3 +81,9 @@ export const zyscStu = (params, isUpdate) => {
}
+export const editCdlx = (params, isUpdate) => {
+ let url = Api.editCdlx;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index e8159cf..3fff072 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -12,12 +12,14 @@ export const columns: BasicColumn[] = [
{
title: '学生学号',
align: "center",
- dataIndex: 'createBy'
+ dataIndex: 'createBy',
+ width: '100px'
},
{
title: '提交时间',
align: "center",
- dataIndex: 'createTime'
+ dataIndex: 'createTime',
+ width: '100px'
},
{
title: '评分',
@@ -47,6 +49,7 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'wwsftg',
slots: { customRender: 'wwsftgaction' },
+ width: '100px'
},
// {
// title: '内网相似率',
@@ -58,6 +61,7 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'nwsftg',
slots: { customRender: 'nwsftgaction' },
+ width: '100px'
},
// {
// title: 'aigc相似率',
@@ -69,9 +73,76 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'aigcsftg',
slots: { customRender: 'aigcsftgaction' },
+ width: '100px'
+ },
+ {
+ title: '存档类型',
+ align: "center",
+ dataIndex: 'cdlx_dictText',
+ width: '100px'
},
];
+
+
+//列表数据
+export const cdxxcolumns: BasicColumn[] = [
+ {
+ title: '作业名称',
+ align: "center",
+ dataIndex: 'zyname'
+ },
+ {
+ title: '学生姓名',
+ align: "center",
+ dataIndex: 'studentName'
+ },
+ {
+ title: '学生学号',
+ align: "center",
+ dataIndex: 'createBy',
+ width: '100px'
+ },
+ {
+ title: '提交时间',
+ align: "center",
+ dataIndex: 'createTime',
+ width: '100px'
+ },
+ {
+ title: '评分',
+ align: "center",
+ dataIndex: 'score',
+ width: '80px'
+ },
+ {
+ title: '外网检测',
+ align: "center",
+ dataIndex: 'wwsftg',
+ slots: { customRender: 'wwsftgaction' },
+ width: '100px'
+ },
+ {
+ title: '内网检测',
+ align: "center",
+ dataIndex: 'nwsftg',
+ slots: { customRender: 'nwsftgaction' },
+ width: '100px'
+ },
+ {
+ title: 'aigc检测',
+ align: "center",
+ dataIndex: 'aigcsftg',
+ slots: { customRender: 'aigcsftgaction' },
+ width: '100px'
+ },
+ {
+ title: '存档类型',
+ align: "center",
+ dataIndex: 'cdlx_dictText',
+ width: '100px'
+ },
+];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 81372dd..6a8fcda 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -22,13 +22,6 @@
-->
-
-
-
-
@@ -87,7 +80,7 @@
-
+
@@ -100,6 +93,7 @@
import { downloadFile } from '/@/utils/common/renderUtils';
import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue'
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+ import SzybStudentModal from '/@/views/zy/zyInfoStudent/components/SzybStudentModal.vue';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue'
import { useGlobSetting } from '/@/hooks/setting';
@@ -117,16 +111,16 @@
const toggleSearchStatus = ref(false);
const registerModal = ref();
const registerScoreModal = ref();
+ const SzybStudentModalpage = ref();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
- title: '学生提交作业',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
- width: 320,
+ width: '300px',
// fixed: 'right',
},
beforeFetch: (params) => {
@@ -208,6 +202,12 @@
registerModal.value.edit(record);
}
+ //存档类型
+ function handleSzyb(record: Recordable){
+ SzybStudentModalpage.value.disabled = false;
+ SzybStudentModalpage.value.edit(record);
+ }
+
/**
* 删除事件
*/
@@ -240,18 +240,23 @@
if(record.filePath){
if(record.scoreFabu=='1'){
var list = [
- {
- label: '详情',
- onClick: handleDetail.bind(null, record),
- },
- {
- label: '下载',
- onClick: handleDown.bind(null, record),
+ {
+ label: '详情',
+ onClick: handleDetail.bind(null, record),
},
- {
- label: '预览',
- onClick: yulanFile.bind(null, record),
- }];
+ {
+ label: '设置样本',
+ onClick: handleSzyb.bind(null, record),
+ },
+ {
+ label: '下载',
+ onClick: handleDown.bind(null, record),
+ },
+ {
+ label: '预览',
+ onClick: yulanFile.bind(null, record),
+ }
+ ];
return list;
}else{
var list = [