+
+
@@ -203,7 +205,7 @@
okText: '确认',
cancelText: '取消',
onOk: () => {
- var params = {id:record.id,ggStatus:"0",flag:"0",fbTime:new Date()}
+ var params = {id:record.id,ggStatus:"2",flag:"0",fbTime:new Date()}
defHttp.post({url: '/zyGonggao/zyGonggao/edit', params: params}).then(() => {
handleSuccess();
});
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 21e2469..0d79afb 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -33,14 +33,15 @@
-
+
{{callText(item)}}
{{item.title}}
- 时间：{{dayjs(item.startTime).format('YYYY.MM.DD')}} - {{dayjs(item.endTime).format('YYYY.MM.DD')}}
+ 开始时间：{{dayjs(item.startTime).format('YYYY.MM.DD HH:mm')}}
+ 结束时间：{{dayjs(item.endTime).format('YYYY.MM.DD HH:mm')}}
评分：{{item.score?item.score:'未评'}}分
@@ -71,7 +72,7 @@
-
+
@@ -91,7 +92,7 @@
import { useGlobSetting } from '/@/hooks/setting';
import dayjs from 'dayjs';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
- import ZyInfoModal from './components/ZyInfoModal.vue';
+ import ZyInfoDetailModal from './components/ZyInfoDetailModal.vue';
import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue';
import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue';
import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
@@ -212,18 +213,21 @@ const baseApiUrl = globSetting.domainUrl;
return;
}
- createConfirm({
- iconType: 'warning',
- title: '确认上传',
- content: '作业上传后，不可修改，请仔细检查后提交',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- ZyInfoStudentModalPage.value.disableSubmit = false;
- var param = {id:record.stuId,zyfj:record.filePath}
- ZyInfoStudentModalPage.value.edit(param);
- }
- });
+ ZyInfoStudentModalPage.value.disableSubmit = false;
+ var param = {id:record.stuId,zyfj:record.filePath}
+ ZyInfoStudentModalPage.value.edit(param);
+ // createConfirm({
+ // iconType: 'warning',
+ // title: '确认上传',
+ // content: '作业上传后，不可修改，请仔细检查后提交',
+ // okText: '确认',
+ // cancelText: '取消',
+ // onOk: () => {
+ // ZyInfoStudentModalPage.value.disableSubmit = false;
+ // var param = {id:record.stuId,zyfj:record.filePath}
+ // ZyInfoStudentModalPage.value.edit(param);
+ // }
+ // });
}
//预览
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index 0421e3d..7cdbb27 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -38,13 +38,14 @@
-
+
{{item.zyStatus_dictText}}
{{item.title}}
- 时间：{{dayjs(item.startTime).format('YYYY.MM.DD HH:mm')}} - {{dayjs(item.endTime).format('YYYY.MM.DD HH:mm')}}
+ 开始时间：{{dayjs(item.startTime).format('YYYY.MM.DD HH:mm')}}
+ 结束时间：{{dayjs(item.endTime).format('YYYY.MM.DD HH:mm')}}
未提交：{{item.wtjnum}}人;
已提交：{{item.ytjnum}}人
未评阅：{{item.wpynum}}人;
已评阅：{{item.ypynum}}人
@@ -71,6 +72,7 @@
+
@@ -89,6 +91,7 @@
import { useRouter } from 'vue-router';
import { JInput } from '/@/components/Form';
import dayjs from 'dayjs';
+ import ZyInfoDetailModal from './components/ZyInfoDetailModal.vue';
import ZyInfoModal from './components/ZyInfoModal.vue';
import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue';
import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue';
@@ -161,8 +164,8 @@ import dayjs from 'dayjs';
* 详情
*/
function handleDetail(record: Recordable) {
- registerModal.value.disableSubmit = true;
- registerModal.value.edit(record);
+ registerDetialModal.value.disableSubmit = true;
+ registerDetialModal.value.edit(record);
}
//查看作业信息
@@ -181,7 +184,7 @@ import dayjs from 'dayjs';
//获取选课人数
function openXkrs(record){
console.log(`🚀 ~ openXkrs ~ record:`, record)
- ZyInfoStudentModalPage.value.disableSubmit = true;
+ XxhbbksListModalPage.value.disableSubmit = true;
XxhbbksListModalPage.value.init(record);
}
diff --git a/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue
new file mode 100644
index 0000000..0b80587
--- /dev/null
+++ b/src/views/zy/zyInfo/components/ZyInfoDetailForm.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+ 作业名称：{{formData.title}}
+
+
+ 作业分值：{{formData.score?formData.score:'未填写'}}
+
+
+ 描述：
+
+ {{formData.content}}
+
+ 暂无内容
+
+
+
+ 附件：
+
+ 下载
+
+ 暂无内容
+
+
+
+ 上传时间：{{formData.startTime}} ~ {{formData.endTime}}
+
+
+ 是否网络查重：{{formData.wwcc=='0'?'否':'是'}} 网络通过率：{{formData.wwtgl?formData.wwtgl+"%":'未配置'}}
+
+
+ 是否课程内查重：{{formData.nwcc=='0'?'否':'是'}} 网络通过率：{{formData.nwtgl?formData.nwtgl+"%":'未配置'}}
+
+
+ Aigc是否查重：{{formData.aigccc=='0'?'否':'是'}} 网络通过率：{{formData.aigctgl?formData.aigctgl+"%":'未配置'}}
+
+
+ 是否校内查重：{{formData.xncc=='0'?'否':'是'}} 网络通过率：{{formData.xntgl?formData.xntgl+"%":'未配置'}}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zy/zyInfo/components/ZyInfoDetailModal.vue b/src/views/zy/zyInfo/components/ZyInfoDetailModal.vue
new file mode 100644
index 0000000..b505e49
--- /dev/null
+++ b/src/views/zy/zyInfo/components/ZyInfoDetailModal.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zy/zyInfo/components/ZyInfoEditForm.vue b/src/views/zy/zyInfo/components/ZyInfoEditForm.vue
new file mode 100644
index 0000000..7eed947
--- /dev/null
+++ b/src/views/zy/zyInfo/components/ZyInfoEditForm.vue
@@ -0,0 +1,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 说明：是否在外部网络资源内进行查重
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+ 说明：是否在本课程所有提交的作业资源内进行查重
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+ 说明：是否对AI撰写相似度进行查重
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+ 说明：是否在全校范围内提交的作业资源内进行查重
+
+
+
+
+
+ %
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zy/zyInfo/components/ZyInfoEditModal.vue b/src/views/zy/zyInfo/components/ZyInfoEditModal.vue
new file mode 100644
index 0000000..1373af4
--- /dev/null
+++ b/src/views/zy/zyInfo/components/ZyInfoEditModal.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zy/zyInfo/components/ZyInfoForm.vue b/src/views/zy/zyInfo/components/ZyInfoForm.vue
index e9e6389..b1c87e0 100644
--- a/src/views/zy/zyInfo/components/ZyInfoForm.vue
+++ b/src/views/zy/zyInfo/components/ZyInfoForm.vue
@@ -7,11 +7,12 @@
-
+
@@ -40,7 +41,7 @@
-
+
%
@@ -56,7 +57,7 @@
-
+
%
@@ -71,7 +72,7 @@
-
+
%
@@ -86,7 +87,7 @@
-
+
%
@@ -125,6 +126,7 @@
const formData = reactive>({
id: '',
title: '',
+ score: '',
zyType: '0',
content: '',
filePath: '',
@@ -149,6 +151,7 @@
//表单验证
const validatorRules = {
title: [{ required: true, message: '请输入作业名称!'},],
+ score: [{ required: true, message: '请输入作业分值!'},],
// zyType: [{ required: true, message: '请输入类型!'},],
startTime: [{ required: true, message: '请输入开始时间!'},],
endTime: [{ required: true, message: '请输入结束时间!'},],
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index 5b19578..f5a6825 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -7,52 +7,61 @@ export const columns: BasicColumn[] = [
{
title: '学生姓名',
align: "center",
- dataIndex: 'studentName'
+ dataIndex: 'studentName',
+ sorter: true,
},
{
title: '学生学号',
align: "center",
dataIndex: 'createBy',
+ sorter: true,
},
{
title: '提交时间',
align: "center",
dataIndex: 'publishTime',
+ sorter: true,
},
{
title: '评分',
align: "center",
dataIndex: 'score',
+ sorter: true,
},
{
title: '网络查重',
align: "center",
dataIndex: 'wwsftg',
slots: { customRender: 'wwsftgaction' },
+ sorter: true,
},
{
title: '作业查重',
align: "center",
dataIndex: 'nwsftg',
slots: { customRender: 'nwsftgaction' },
+ sorter: true,
},
{
title: 'Aigc查重',
align: "center",
dataIndex: 'aigcsftg',
slots: { customRender: 'aigcsftgaction' },
+ sorter: true,
},
{
title: '校内查重',
align: "center",
dataIndex: 'xnsftg',
slots: { customRender: 'xnsftgaction' },
+ sorter: true,
},
{
title: '存档类型',
align: "center",
dataIndex: 'cdlx_dictText',
+ sorter: true,
},
];
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 9ef1f20..869d23f 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -29,7 +29,7 @@
-
+
+ 一键发布评分
+ 温馨提醒：发布评分后可以在操作列进行存档类型（设置样本）操作！
+ 非高峰期预计30分钟内返回检测结果，高峰期预计时间会更长，请您耐心等待！
+ 点击查重率可预览查重报告！ 勾选数据后可针对勾选数据进行一键发布评分
+
+
@@ -179,8 +184,13 @@
width: '300px',
// fixed: 'right',
},
+ showTableSetting: true,
+ defSort: {
+ field: 'name',
+ order: 'ascend',
+ },
beforeFetch: (params) => {
- params.column = 'publishTime',params.order = 'desc';//新生成的默认不带排序
+ // params.column = 'publishTime',params.order = 'desc';//新生成的默认不带排序
return Object.assign(params, queryParam.value);
},
},
@@ -283,6 +293,12 @@
async function batchHandleFabu() {
+
+ if(selectedRowKeys.value.length==0){
+ createMessage.warn('请勾选要发布的数据！');
+ return;
+ }
+
await batchFabu({ ids: selectedRowKeys.value }, handleSuccess);
}
@@ -326,7 +342,7 @@
onClick: handleBohui.bind(null, record),
},
{
- label: '评分',
+ label: record.score ? '修改评分':'评分',
onClick: handleScore.bind(null, record),
},
{
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
index 11c2471..60439b9 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
@@ -2,9 +2,13 @@
-
+
+ 作业名称：{{zyInfo.title}}
+ 作业要求：{{zyInfo.content?zyInfo.content:'无'}}
+ 上传时间：{{zyInfo.startTime}} ~ {{zyInfo.endTime}}
+
+
@@ -57,6 +61,7 @@
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref(false);
+ let zyInfo = ref({});
//表单验证
const validatorRules = {
filePath: [{ required: true, message: '请上传作业附件!'},],
@@ -83,12 +88,32 @@
edit({});
}
+ function downLoad(file) {
+ if (file) {
+ let url = getFileAccessHttpUrl(file);
+ if (url) {
+ window.open(url);
+ }
+ } else {
+ createMessage.warning('暂无文件或文件上传中');
+ }
+}
/**
* 编辑
*/
function edit(record) {
+ console.log(`🚀 ~ edit ~ record:`, record)
nextTick(() => {
resetFields();
+
+
+ defHttp.get({url:'/zyInfo/zyInfo/queryZyinfoByStuId',params:{id:record.id}}).then((res) => {
+ console.log(`🚀 ~ defHttp.get ~ res:`, res)
+ zyInfo.value = res;
+ console.log(`🚀 ~ defHttp.get ~ zyInfo:`, zyInfo)
+ });
+
+
//赋值
Object.assign(formData, record);
isYl.value = record.isYl;
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
index 778e9e7..2727ef9 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue
@@ -2,9 +2,12 @@
+
+ 预设作业分值：{{zyInfo.score?zyInfo.score+"分 评分不能高于预设分值":'未设置 评分不能高于100分'}}
+
-
+
@@ -37,6 +40,7 @@
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref(false);
+ const zyInfo = ref({});
//表单验证
const validatorRules = {
score: [{ required: true, message: '请输入评分!'},],
@@ -55,6 +59,21 @@
return props.formDisabled;
});
+ function handleJyfz(record){
+ console.log(`🚀 ~ handleJyfz ~ record:`, record)
+ if(zyInfo.score){
+ if(parseInt(record) > parseInt(zyInfo.score)){
+ createMessage.warning('评分不能超过预设作业分值!');
+ formData.score = zyInfo.score;
+ }
+ }else{
+ if(parseInt(record) > 100){
+ createMessage.warning('评分不能超过100分!');
+ formData.score = zyInfo.score;
+ }
+ }
+
+ }
/**
* 新增
@@ -69,6 +88,14 @@
function edit(record) {
nextTick(() => {
resetFields();
+
+ defHttp.get({url:'/zyInfo/zyInfo/queryById',params:{id:record.mainId}}).then(res=>{
+ console.log(`🚀 ~ defHttp.get ~ res:`, res)
+ zyInfo.value = res;
+ })
+
+
+
//赋值
Object.assign(formData, record);
});
diff --git a/src/views/zyk/ZykInfo.data.ts b/src/views/zyk/ZykInfo.data.ts
index 07ded93..a84a12a 100644
--- a/src/views/zyk/ZykInfo.data.ts
+++ b/src/views/zyk/ZykInfo.data.ts
@@ -29,12 +29,11 @@ export const columns: BasicColumn[] = [
title: '文件名称',
align:"center",
dataIndex: 'fileName',
+ width: 300,
customRender: ({ record,text }) => {
- console.log(`🚀 1~ text:`, text)
if(text){
text = text.substring(text.lastIndexOf("/")+1,text.length)
}
- console.log(`🚀 2~ text:`, text)
return text;
}
},
diff --git a/src/views/zyk/ZykInfoYinyongList.vue b/src/views/zyk/ZykInfoYinyongList.vue
new file mode 100644
index 0000000..06f23fb
--- /dev/null
+++ b/src/views/zyk/ZykInfoYinyongList.vue
@@ -0,0 +1,367 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+