diff --git a/src/views/kc/wjxWjxx/WjxWjxx.data.ts b/src/views/kc/wjxWjxx/WjxWjxx.data.ts index 77e8ba7..02c4f5a 100644 --- a/src/views/kc/wjxWjxx/WjxWjxx.data.ts +++ b/src/views/kc/wjxWjxx/WjxWjxx.data.ts @@ -4,18 +4,28 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + // { + // title: '创建人', + // align: "center", + // dataIndex: 'createBy' + // }, + // { + // title: '创建时间', + // align: "center", + // dataIndex: 'createTime', + // customRender:({text}) =>{ + // return !text?"":(text.length>10?text.substr(0,10):text); + // }, + // }, { - title: '创建人', + title: '学年学期', align: "center", - dataIndex: 'createBy' + dataIndex: 'xnxq' }, { - title: '创建时间', + title: '课程名称', align: "center", - dataIndex: 'createTime', - customRender:({text}) =>{ - return !text?"":(text.length>10?text.substr(0,10):text); - }, + dataIndex: 'kcmc' }, { title: '问卷名称', @@ -29,11 +39,21 @@ export const columns: BasicColumn[] = [ customRender: ({ text }) => { let dictMap = { '1': '调查', - '6': '考试', + '6': '随堂练', } return dictMap[text??'']; } }, + { + title: '开始时间', + align: "center", + dataIndex: 'startTime' + }, + { + title: '结束时间', + align: "center", + dataIndex: 'endTime' + }, { title: '问卷描述', align: "center", diff --git a/src/views/kc/wjxWjxx/WjxWjxxList.vue b/src/views/kc/wjxWjxx/WjxWjxxList.vue index 7af79da..3a27561 100644 --- a/src/views/kc/wjxWjxx/WjxWjxxList.vue +++ b/src/views/kc/wjxWjxx/WjxWjxxList.vue @@ -1,14 +1,22 @@ diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue index 8cb2eff..677859f 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue @@ -8,15 +8,13 @@ - - - 调查 - 考试 - + + + + + + + @@ -24,37 +22,55 @@ - + + + + + + + + + + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue new file mode 100644 index 0000000..1f60f4f --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 4333f79..bf961c8 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -140,7 +140,7 @@ function handleRemTmxx(record,index,list){ } } function getType(value,type){ - console.log(`🚀 ~ getType ~ value,type:`, value,type) + // console.log(`🚀 ~ getType ~ value,type:`, value,type) if(type=='3'){ return parseInt(value); }else if(type=='4'){ @@ -153,7 +153,7 @@ function edit(record){ title.value = record.title; mainId.value = record.id; defHttp.get({url:'/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId',params:{id:record.id}}).then(res =>{ - console.log(`🚀 ~ defHttp.get ~ res:`, res) + // console.log(`🚀 ~ defHttp.get ~ res:`, res) var list = res; for(var i=0;i