From 20c16e30a6106c635ef617613a4692c7726e335e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 29 May 2024 10:59:42 +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
---
.../components/WjxWjxxTmlbDjjgs.data.ts | 48 +-
.../components/WjxWjxxTmlbDjjgsDcList.vue | 12 +-
.../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 23 +-
src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts | 29 +-
.../kc/wjxWjxxTmlb/YinyongTikuDcList.vue | 213 +++++++++
.../kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue | 65 +++
src/views/site/common/header.vue | 2 +-
src/views/zy/zyInfo/components/ZyInfoForm.vue | 24 +
.../zy/zyInfoStudent/ZyInfoStudent.api.ts | 2 +
.../zy/zyInfoStudent/ZyInfoStudent.data.ts | 80 ++++
.../zy/zyInfoStudent/ZyInfoStudentList.vue | 2 +-
.../zy/zyInfoStudent/ZyStudentJczList.vue | 417 ++++++++++++++++++
12 files changed, 885 insertions(+), 32 deletions(-)
create mode 100644 src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
create mode 100644 src/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue
create mode 100644 src/views/zy/zyInfoStudent/ZyStudentJczList.vue
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
index b793c8b..2fa062b 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts
@@ -127,30 +127,30 @@ export const dccolumns: BasicColumn[] = [
dataIndex: 'xqxn',
width: 80
},
- {
- title: '课程名称',
- align: "center",
- dataIndex: 'kcmc',
- width: 200
- },
- {
- title: '开始时间',
- align: "center",
- dataIndex: 'startTime',
- width: 150
- },
- {
- title: '结束时间',
- align: "center",
- dataIndex: 'endTime',
- width: 150
- },
- {
- title: '问卷描述',
- align: "center",
- dataIndex: 'content',
- width: 200
- },
+ // {
+ // title: '课程名称',
+ // align: "center",
+ // dataIndex: 'kcmc',
+ // width: 200
+ // },
+ // {
+ // title: '开始时间',
+ // align: "center",
+ // dataIndex: 'startTime',
+ // width: 150
+ // },
+ // {
+ // title: '结束时间',
+ // align: "center",
+ // dataIndex: 'endTime',
+ // width: 150
+ // },
+ // {
+ // title: '问卷描述',
+ // align: "center",
+ // dataIndex: 'content',
+ // width: 200
+ // },
];
//查询数据
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
index 88c4ad3..3152965 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
@@ -17,6 +17,7 @@
查询
+ 导出
@@ -42,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 } from './WjxWjxxTmlbDjjgs.api';
+ import { list,getExportUrl } from './WjxWjxxTmlbDjjgs.api';
import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
const queryParam = ref({});
@@ -65,7 +66,14 @@ import {ref, reactive, defineExpose, unref} from 'vue';
params.column = '',params.order = '';//新生成的默认不带排序
return Object.assign(params, 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/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
index cdc20f0..a349fc3 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue
@@ -117,6 +117,7 @@
+
@@ -127,6 +128,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
import { defHttp } from '/@/utils/http/axios';
import { queryWjxWjxxTmxxListByMainId, queryDataById, saveOrUpdate } from '/@/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api';
import YinyongTikuListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuListModal.vue'
+import YinyongTikuDcListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue'
import { useUserStore } from '/@/store/modules/user';
//用户相关
@@ -136,6 +138,7 @@ import YinyongTikuListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuListModal.v
const title = ref('');
const mainId = ref('');
const YinyongTikuListModalpage = ref();
+const YinyongTikuDcListModalpage = ref();
const isShow = ref(false);
const confirmLoading = ref(false);
const tiganData = ref([]);
@@ -197,8 +200,14 @@ function handleYylx(sylx){
wjSytype = "1";
}
var record = {wjLeixing,createBy,wjSytype};
- YinyongTikuListModalpage.value.disableSubmit = false;
- YinyongTikuListModalpage.value.init(record);
+ if(wjLeixing=='6'){
+ YinyongTikuListModalpage.value.disableSubmit = false;
+ YinyongTikuListModalpage.value.init(record);
+ }else{
+ YinyongTikuDcListModalpage.value.disableSubmit = false;
+ YinyongTikuDcListModalpage.value.init(record);
+ }
+
}
//引用题库回调
@@ -286,7 +295,15 @@ for(var i=0;i{
+ var rt = "";
+ if(text == '3'){
+ rt = "单选";
+ }else if(text == '4'){
+ rt = "多选";
+ }else if(text == '5'){
+ rt = "填空";
+ }
+ return rt;
+ },
+ },
+ {
+ title: '题干名称',
+ align:"center",
+ dataIndex: 'wjTitle'
+ },
+ {
+ title: '是否公有',
+ align:"center",
+ dataIndex: 'wjSytype_dictText'
+ },
+];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
diff --git a/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
new file mode 100644
index 0000000..da05146
--- /dev/null
+++ b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getAreaTextByCode(text) }}
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue
new file mode 100644
index 0000000..c4dc65e
--- /dev/null
+++ b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue
index c0b5829..e6403a3 100644
--- a/src/views/site/common/header.vue
+++ b/src/views/site/common/header.vue
@@ -81,7 +81,7 @@
点击开始跨域报错
{{ projectName }}
{{getSysConfig().flag1}}({{getSysConfig().bxqkssj}}至{{getSysConfig().bxqjssj}})
- 本学期听课要求:{{tkyqcs}}次;已完成:{{tkyqywc}}次
+ 本学期听课要求:{{tkyqcs}}次;已完成:{{tkyqywc}}次
直播测试页rtsp
直播测试页flv
diff --git a/src/views/zy/zyInfo/components/ZyInfoForm.vue b/src/views/zy/zyInfo/components/ZyInfoForm.vue
index 61e927c..c357b8d 100644
--- a/src/views/zy/zyInfo/components/ZyInfoForm.vue
+++ b/src/views/zy/zyInfo/components/ZyInfoForm.vue
@@ -78,6 +78,21 @@
+
+
+
+
+ 说明:是否在全校范围内提交的作业资源内进行查重
+
+
+
+
+
+ %
+
+
+
+
@@ -122,6 +137,8 @@
aigccc: '0',
aigctgl: undefined,
rwbh: '',
+ xncc: '0',
+ xntgl: undefined,
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 6 } });
@@ -223,6 +240,13 @@
return;
}
}
+ if(model.xncc=='1'){
+ if(!model.xntgl){
+ createMessage.warning('校内通过率不能为空');
+ confirmLoading.value = false;
+ return;
+ }
+ }
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
index 6606df8..9c18b57 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.api.ts
@@ -14,6 +14,7 @@ enum Api {
deleteBatch = '/zyInfoStudent/zyInfoStudent/deleteBatch',
importExcel = '/zyInfoStudent/zyInfoStudent/importExcel',
exportXls = '/zyInfoStudent/zyInfoStudent/exportXls',
+ getQuaList = '/zyCcjg/zyCcjg/getQuaList',
}
/**
@@ -33,6 +34,7 @@ export const getImportUrl = Api.importExcel;
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const cdxxlist = (params) => defHttp.get({ url: Api.cdxxlist, params });
+export const getQuaList = (params) => defHttp.get({ url: Api.getQuaList, params });
/**
* 删除单个
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
index 04d936d..517f3d3 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts
@@ -57,6 +57,86 @@ export const columns: BasicColumn[] = [
];
+export const htcxcolumns: BasicColumn[] = [
+ {
+ title: '作业名称',
+ align: "center",
+ dataIndex: 'title',
+ },
+ {
+ title: '学生姓名',
+ align: "center",
+ dataIndex: 'stuName',
+ width: '100px'
+ },
+ {
+ title: '学生学号',
+ align: "center",
+ dataIndex: 'stuNo',
+ width: '100px'
+ },
+ {
+ title: '授课教师',
+ align: "center",
+ dataIndex: 'teaName',
+ width: '100px'
+ },
+ {
+ title: '提交时间',
+ align: "center",
+ dataIndex: 'createTime',
+ width: '100px'
+ },
+ {
+ title: '检测类型',
+ align: "center",
+ dataIndex: 'ccType',
+ width: '100px',
+ customRender:({text}) =>{
+ if(text=='1'){
+ text = '作业检测'
+ }else if(text=='3'){
+ text = '全校检测'
+ }else if(text=='2'){
+ text = 'aigc检测'
+ }else{
+ text = '外网检测'
+ }
+ return text;
+ },
+ },
+ {
+ title: '检测状态',
+ align: "center",
+ dataIndex: 'filestateid',
+ width: '100px',
+ customRender:({text}) =>{
+ if(text=='1'){
+ text = '检测中'
+ }else if(text=='3'){
+ text = '检测失败'
+ }else if(text=='2'){
+ text = '检测完成'
+ }else{
+ text = '未检测'
+ }
+ return text;
+ },
+ },
+ {
+ title: '文档ID',
+ align: "center",
+ dataIndex: 'paperid',
+ width: '100px',
+ },
+ {
+ title: '检测结果',
+ align: "center",
+ dataIndex: 'message',
+ },
+];
+
+
//列表数据
export const cdxxcolumns: BasicColumn[] = [
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index fd28e86..99cd13b 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -29,7 +29,7 @@
- 检测时间提醒: 非高峰期预计30分钟内返回检测结果,高峰期预计时间会更长,请您耐心等待!
+ 检测时间提醒: 非高峰期预计30分钟内返回检测结果,高峰期预计时间会更长,请您耐心等待!
diff --git a/src/views/zy/zyInfoStudent/ZyStudentJczList.vue b/src/views/zy/zyInfoStudent/ZyStudentJczList.vue
new file mode 100644
index 0000000..56d554b
--- /dev/null
+++ b/src/views/zy/zyInfoStudent/ZyStudentJczList.vue
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ {{record.wwxsl}}%
+ {{record.wwxsl}}%
+
+ 检测中
+ 未提交
+
+
+
+
+ -
+
+ {{record.nwxsl}}%
+ {{record.nwxsl}}%
+
+ 检测中
+ 未提交
+
+
+
+
+ -
+
+ {{record.aigcxsl}}%
+ {{record.aigcxsl}}%
+
+ 检测中
+ 未提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+