diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts index ad7ea8e..a1846b1 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts @@ -7,6 +7,7 @@ enum Api { list = '/wjxDjxx/djjglist', exportXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportXls', + exportDjXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportDjXls', } /** @@ -16,4 +17,5 @@ enum Api { export const list = (params) => defHttp.get({ url: Api.list, params }); -export const getExportUrl = Api.exportXls; \ No newline at end of file +export const getExportUrl = Api.exportXls; +export const getExportDjUrl = Api.exportDjXls; \ No newline at end of file diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue index 3152965..81a2dbe 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue @@ -43,7 +43,7 @@ import {ref, reactive, defineExpose, unref} from 'vue'; import { defHttp } from '/@/utils/http/axios'; import { useListPage } from '/@/hooks/system/useListPage'; import {dccolumns} from './WjxWjxxTmlbDjjgs.data'; - import { list,getExportUrl } from './WjxWjxxTmlbDjjgs.api'; + import { list,getExportDjUrl } from './WjxWjxxTmlbDjjgs.api'; import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue' const queryParam = ref({}); @@ -69,7 +69,7 @@ import {ref, reactive, defineExpose, unref} from 'vue'; }, exportConfig: { name: "学生问卷信息", - url: getExportUrl, + url: getExportDjUrl, params: () => { return Object.assign({},queryParam.value); } diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue index 3c140c4..dc48000 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue @@ -68,13 +68,13 @@ import {ref, reactive, defineExpose, unref} from 'vue'; return Object.assign(params, queryParam.value); }, }, - // exportConfig: { - // name: "学生测验信息", - // url: getExportUrl, - // params: () => { - // return Object.assign({},queryParam.value); - // } - // }, + exportConfig: { + name: "学生测验信息", + url: getExportUrl, + params: () => { + return Object.assign({},queryParam.value); + } + }, }); const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const labelCol = reactive({ diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index 07a835b..c58dfaa 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -33,7 +33,7 @@
- +
{{callText(item)}}
@@ -46,9 +46,12 @@
网络查重:{{item.wwxsl?item.wwxsl+'%':'-'}}
-
课程内查重:{{item.nwxsl?item.nwxsl+'%':'-'}}
+
作业查重:{{item.nwxsl?item.nwxsl+'%':'-'}}
Aigc查重:{{item.aigcxsl?item.aigcxsl+'%':'-'}}
+ +
校内查重:{{item.xnxsl?item.xnxsl+'%':'-'}}
+
详情 上传 diff --git a/src/views/zy/zyInfo/components/ZyInfoForm.vue b/src/views/zy/zyInfo/components/ZyInfoForm.vue index c357b8d..75147ba 100644 --- a/src/views/zy/zyInfo/components/ZyInfoForm.vue +++ b/src/views/zy/zyInfo/components/ZyInfoForm.vue @@ -158,6 +158,8 @@ nwtgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},], aigccc: [{ required: true, message: '请输入aigc查重!'},], aigctgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},], + xncc: [{ required: true, message: '请输入aigc查重!'},], + xntgl: [{ required: false}, { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'},], }; const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); const disabledDate = (current: Dayjs) => { diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index 517f3d3..057ed0b 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [ width: '100px' }, { - title: '内网检测', + title: '作业检测', align: "center", dataIndex: 'nwsftg', slots: { customRender: 'nwsftgaction' }, @@ -48,6 +48,14 @@ export const columns: BasicColumn[] = [ slots: { customRender: 'aigcsftgaction' }, width: '100px' }, + { + title: '校内检测', + align: "center", + dataIndex: 'xnsftg', + slots: { customRender: 'xnsftgaction' }, + width: '100px' + }, + { title: '存档类型', align: "center", diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue index 99cd13b..2de63d0 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue +++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue @@ -74,6 +74,17 @@ +