From 11e456a39d379adba9943d359b71842b2a31037b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 23 May 2024 18:09:34 +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/views/kc/wjxCswj/WjxCswjList.vue | 24 ++++++++--- src/views/kc/wjxCswj/WjxCswjStuList.vue | 4 +- src/views/kc/wjxDcwj/WjxDcwjList.vue | 6 +-- src/views/kc/wjxDcwj/WjxDcwjStuList.vue | 10 ++--- .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 5 +++ src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts | 43 ++++++++----------- .../components/WjxWjxxTmlbForm.vue | 16 +++---- src/views/zy/zyInfo/StudentZyInfoList.vue | 6 +-- src/views/zy/zyInfo/ZyInfoList.vue | 6 +-- 9 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue index 2bc9aae..b219a29 100644 --- a/src/views/kc/wjxCswj/WjxCswjList.vue +++ b/src/views/kc/wjxCswj/WjxCswjList.vue @@ -24,8 +24,9 @@ 查询 - 重置 - 新增 + + 新增 + 题库 @@ -94,6 +95,7 @@ + @@ -102,13 +104,14 @@ import { defHttp } from '/@/utils/http/axios'; import { Input, Popover, Pagination, Empty } from 'ant-design-vue'; import { list ,deleteOne } from '/@/views/kc/wjxWjxx/WjxWjxx.api'; + import {useRouter} from "vue-router"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import WjxWjxxModal from '/@/views/kc/wjxWjxx/components/WjxWjxxModal.vue' import WjxWjxxTmlbModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue' import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue' import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue' import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue'; - import {useRouter} from "vue-router"; + import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue'; //当前路由信息 const { currentRoute } = useRouter(); @@ -129,6 +132,7 @@ const WjxWjxxTmlbDjjgsModalPage = ref() const WjxWjxxTmlbDjjgsDcModalPage = ref(); const XxhbbksListModalPage = ref(); + const TikuListModalPage = ref(); const labelCol = reactive({ xs: { span: 24 }, @@ -139,6 +143,14 @@ sm: { span: 16 }, }); + + //题库类型（6作业，1问卷） + function handleTiku(wjLeixing){ + var record = {wjLeixing} + TikuListModalPage.value.disableSubmit = true; + TikuListModalPage.value.init(record); + } + /** * 新增事件 */ @@ -279,11 +291,11 @@ function classFun(type){ if(type == '0'){ - return "background: #a7a6a6"; + return "background: #fe1a1a"; }else if(type == '1'){ - return "background: #18a689"; + return "background: #c6c209"; }else if(type == '2'){ - return "background: #6583f8"; + return "background: #18a689"; } } diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue index dffb804..2e4c2d9 100644 --- a/src/views/kc/wjxCswj/WjxCswjStuList.vue +++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue @@ -184,9 +184,9 @@ function classFun(type){ if(type == '-1'){ - return "background: #a7a6a6"; + return "background: #fe1a1a"; }else if(type == '0'){ - return "background: #1c84c6"; + return "background: #c6c209"; }else if(type == '1'){ return "background: #18a689"; } diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue index e843f30..06f1e8e 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue @@ -282,11 +282,11 @@ function classFun(type){ if(type == '0'){ - return "background: #a7a6a6"; + return "background: #fe1a1a"; }else if(type == '1'){ - return "background: #18a689"; + return "background: #c6c209"; }else if(type == '2'){ - return "background: #6583f8"; + return "background: #18a689"; } } diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue index ca619eb..777f30b 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue @@ -13,8 +13,8 @@ 全部 - 待提交 - 已提交 + 待答卷 + 待批卷 已完成 @@ -51,7 +51,7 @@ 答卷 - 正在批卷 + 正在批卷 查看答卷 @@ -184,9 +184,9 @@ function classFun(type){ if(type == '-1'){ - return "background: #a7a6a6"; + return "background: #fe1a1a"; }else if(type == '0'){ - return "background: #1c84c6"; + return "background: #c6c209"; }else if(type == '1'){ return "background: #18a689"; } diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 26f73f7..12a1a46 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -127,6 +127,7 @@ const isShow = ref(false); const confirmLoading = ref(false); const tiganData = ref([]); const tmxxPar = ref({}); +const wjLeixing = ref(''); const { createMessage } = useMessage(); const emit = defineEmits(['register', 'success']); @@ -140,6 +141,7 @@ function addTigan(type){ mainId:mainId, wjTitle:null, wjScore:null, + wjLeixing, // itemSelected:'1', wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}], } @@ -152,6 +154,7 @@ function addTigan(type){ mainId:mainId, wjTitle:null, wjScore:null, + wjLeixing, // itemSelected:['1'], wjxWjxxTmxxList:[{itemTitle:null,itemIndex:'1'},{itemTitle:null,itemIndex:'2'}], } @@ -164,6 +167,7 @@ function addTigan(type){ mainId:mainId, wjTitle:null, wjScore:null, + wjLeixing, wjAnswer:null, } list.push(params); @@ -195,6 +199,7 @@ function getType(value,type){ } //初始化 function edit(record,type){ + wjLeixing.value=type; tiganData.value = []; title.value = record.title; mainId.value = record.id; diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts index 755aaa2..392a441 100644 --- a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts +++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts @@ -5,26 +5,21 @@ import { render } from '/@/utils/common/renderUtils'; import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types' //列表数据 export const columns: BasicColumn[] = [ - { - title: '题目编号', - align:"center", - dataIndex: 'wjIndex' - }, { title: '问题标题', align:"center", dataIndex: 'wjTitle' }, - { - title: '是否必填', - align:"center", - dataIndex: 'isRequir' - }, { title: '问题分值', align:"center", dataIndex: 'wjScore' }, + { + title: '是否公有', + align:"center", + dataIndex: 'wjSytype_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -62,21 +57,21 @@ export const formSchema: FormSchema[] = [ //子表单数据 //子表表格配置 export const wjxWjxxTmxxColumns: JVxeColumn[] = [ + // { + // title: '选项编号', + // key: 'itemIndex', + // type: JVxeTypes.inputNumber, + // width:"200px", + // placeholder: '请输入${title}', + // defaultValue:'', + // validateRules: [ + // { required: true, message: '${title}不能为空' }, + // ], + // }, { - title: '选项编号', - key: 'itemIndex', - type: JVxeTypes.inputNumber, - width:"200px", - placeholder: '请输入${title}', - defaultValue:'', - validateRules: [ - { required: true, message: '${title}不能为空' }, - ], - }, - { - title: '选项标题', + title: '选项', key: 'itemTitle', - type: JVxeTypes.input, + type: JVxeTypes.text, width:"200px", placeholder: '请输入${title}', defaultValue:'', @@ -87,7 +82,7 @@ export const wjxWjxxTmxxColumns: JVxeColumn[] = [ { title: '正确答案', key: 'itemSelected', - type: JVxeTypes.input, + type: JVxeTypes.text, width:"200px", placeholder: '请输入${title}', defaultValue:'', diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue index 48ae412..8c130a4 100644 --- a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue @@ -2,22 +2,22 @@ - + + - + + @@ -39,7 +39,7 @@ :disabled="disabled" :rowNumber="true" :rowSelection="true" - :toolbar="true"/> + :toolbar="false"/> @@ -80,9 +80,7 @@ const activeKey = ref('wjxWjxxTmxx'); const formData = reactive>({ id: '', - wjIndex: '', wjTitle: '', - isRequir: '', wjScore: '', }); diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index 44c311e..15a66cf 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -120,11 +120,11 @@ function classFun(record){ if(record.score){ - return "background: #1f77f8"; - }else if(record.stuFilePath){ return "background: #18a689"; + }else if(record.stuFilePath){ + return "background: #c6c209"; }else{ - return "background: #ff0000"; + return "background: #fe1a1a"; } } function callText(record){ diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue index 04c225d..2920937 100644 --- a/src/views/zy/zyInfo/ZyInfoList.vue +++ b/src/views/zy/zyInfo/ZyInfoList.vue @@ -125,11 +125,11 @@ import dayjs from 'dayjs'; function classFun(type){ if(type == '0'){ - return "background: #a7a6a6"; + return "background: #fe1a1a"; }else if(type == '1'){ - return "background: #18a689"; + return "background: #c6c209"; }else if(type == '2'){ - return "background: #6583f8"; + return "background: #18a689"; } } /**