diff --git a/src/router/routes/modules/site/site.ts b/src/router/routes/modules/site/site.ts index 7ca5df3..ef547e5 100644 --- a/src/router/routes/modules/site/site.ts +++ b/src/router/routes/modules/site/site.ts @@ -59,6 +59,15 @@ const site: AppRouteModule = { title: '评价结果', }, }, + { + path: 'ktsbMore', + name: 'ktsbMore', + component: () => import('/@/views/site/ktsb/more.vue'), + meta: { + // affix: true, + title: '评价结果', + }, + }, { path: 'yuyuekechengMore', name: 'yuyuekechengMore', diff --git a/src/views/kc/kcErrorreport/KcZbErrorreport.data.ts b/src/views/kc/kcErrorreport/KcZbErrorreport.data.ts new file mode 100644 index 0000000..4aca46b --- /dev/null +++ b/src/views/kc/kcErrorreport/KcZbErrorreport.data.ts @@ -0,0 +1,233 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '报错时间', + align: "center", + dataIndex: 'reportstime' + }, + { + title: '报错人姓名', + align: "center", + dataIndex: 'username' + }, + { + title: '报错课程', + align: "center", + dataIndex: 'kcmc' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '上课日期', + align: "center", + dataIndex: 'skrq' + }, + { + title: '上课节次', + align: "center", + dataIndex: 'hh' + }, + { + title: '错误类型', + align: "center", + dataIndex: 'meetingpsw' + }, + { + title: '错误信息', + align: "center", + dataIndex: 'errortext' + }, +]; + + +export const kcxxcolumns: BasicColumn[] = [ + { + title: '报错时间', + align: "center", + dataIndex: 'reportstime' + }, + { + title: '报错人工号', + align: "center", + dataIndex: 'userid' + }, + { + title: '报错人姓名', + align: "center", + dataIndex: 'username' + }, + { + title: '报错人单位', + align: "center", + dataIndex: 'college' + }, + { + title: '报错课程', + align: "center", + dataIndex: 'kcmc' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '上课日期', + align: "center", + dataIndex: 'skrq' + }, + { + title: '上课节次', + align: "center", + dataIndex: 'hh' + }, + { + title: '错误信息描述', + align: "center", + dataIndex: 'errortext' + }, + { + title: '修改方式', + align: "center", + dataIndex: 'edittype_dictText' + }, +]; + + + +export const jscjcolumns: BasicColumn[] = [ + { + title: '报错时间', + align: "center", + dataIndex: 'reportstime' + }, + { + title: '报错人工号', + align: "center", + dataIndex: 'userid' + }, + { + title: '报错人姓名', + align: "center", + dataIndex: 'username' + }, + { + title: '报错人单位', + align: "center", + dataIndex: 'college' + }, + { + title: '报错课程', + align: "center", + dataIndex: 'kcmc' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '上课日期', + align: "center", + dataIndex: 'skrq' + }, + { + title: '上课节次', + align: "center", + dataIndex: 'hh' + }, + { + title: '要求是否出镜', + align: "center", + dataIndex: 'ktbsfcj_dictText' + }, + { + title: '当前是否出镜', + align: "center", + dataIndex: 'sfcj_dictText' + }, + { + title: '修改方式', + align: "center", + dataIndex: 'edittype_dictText' + }, +]; + + +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '错误类型', + field: 'optionsradios', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "optionsradios" + }, + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入错误类型!'}, + ]; + }, + }, + { + label: '会议号', + field: 'meetingnum', + component: 'Input', + }, + { + label: '会议密码', + field: 'meetingpsw', + component: 'Input', + }, + { + label: '会议邀请链接', + field: 'meetinglink', + component: 'Input', + }, + { + label: '修改类型:0-本堂课修改,1-', + field: 'edittype', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "edittype" + }, + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入修改类型:0-本堂课修改,1-!'}, + ]; + }, + }, + { + label: '是否修改:0-未修改,1-已修改', + field: 'ismodified', + component: 'InputNumber', + }, + { + label: '课程的上课日期', + field: 'skrq', + component: 'Input', + }, + { + label: '是否出镜,0-出镜,1-不出镜', + field: 'sfcj', + component: 'InputNumber', + }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/kc/kcErrorreport/ZbptErrorList.vue b/src/views/kc/kcErrorreport/ZbptErrorList.vue index 451dcdf..5598e8d 100644 --- a/src/views/kc/kcErrorreport/ZbptErrorList.vue +++ b/src/views/kc/kcErrorreport/ZbptErrorList.vue @@ -18,7 +18,7 @@ import { ref, reactive,defineExpose, createVNode,h } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; - import { columns } from './KcErrorreport.data'; + import { columns } from './KcZbErrorreport.data'; import { list } from './KcErrorreport.api'; import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined,CheckOutlined } from '@ant-design/icons-vue'; diff --git a/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbForm.vue b/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbForm.vue new file mode 100644 index 0000000..20523c1 --- /dev/null +++ b/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbForm.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbModal.vue b/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbModal.vue new file mode 100644 index 0000000..faad7a6 --- /dev/null +++ b/src/views/kc/kcErrorreport/components/KcErrorreportIndexZbModal.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue b/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue index 61e1989..67389aa 100644 --- a/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue +++ b/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue @@ -5,12 +5,13 @@
当前学期
- + + - + diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue index fd4fd57..0c08a5c 100644 --- a/src/views/site/common/video/videojs/viewPage.vue +++ b/src/views/site/common/video/videojs/viewPage.vue @@ -6,7 +6,7 @@ -
+
@@ -27,7 +27,8 @@
查看听课笔记 - 保存听课笔记 + 保存听课笔记 + 报错
@@ -72,6 +73,7 @@
+
@@ -93,9 +95,11 @@ import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue'; import { nextTick } from 'vue'; import { useRoute } from 'vue-router' import { getUserId } from '/@/views/site/utils/index'; +import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErrorreportIndexZbModal.vue' const mainVideo = ref(); const bVideoRefs = ref([]); +const kcErrorreportIndexModal = ref(); const tingKeZuJiAddModal = ref({}); const curentPlayerVideo = ref({}); @@ -149,6 +153,10 @@ onMounted(() => { } }); +function handleBaocuo(item) { + kcErrorreportIndexModal.value.disableSubmit = false; + kcErrorreportIndexModal.value.add(item); +} /** * 子页加载完成后回调 * @param player diff --git a/src/views/site/ktsb/KtbjInfoList.vue b/src/views/site/ktsb/KtbjInfoList.vue index c289be9..317fd86 100644 --- a/src/views/site/ktsb/KtbjInfoList.vue +++ b/src/views/site/ktsb/KtbjInfoList.vue @@ -45,6 +45,7 @@ import { getUserId } from '/@/views/site/utils/index'; const queryParam = ref({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -57,7 +58,6 @@ import { getUserId } from '/@/views/site/utils/index'; immediate: false, beforeFetch: (params) => { params.column = '',params.order = '';//新生成的默认不带排序 - return Object.assign(params, queryParam.value); }, }, @@ -65,10 +65,10 @@ import { getUserId } from '/@/views/site/utils/index'; name: "听课笔记", url: getExportUrl, }, - importConfig: { - url: getImportUrl, - success: handleSuccess - }, + importConfig: { + url: getImportUrl, + success: handleSuccess + }, }); const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext; const labelCol = reactive({ diff --git a/src/views/site/ktsb/components/ktsbDetailModal.vue b/src/views/site/ktsb/components/ktsbDetailModal.vue new file mode 100644 index 0000000..18c0f4a --- /dev/null +++ b/src/views/site/ktsb/components/ktsbDetailModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/site/ktsb/components/ktsbDetialForm.vue b/src/views/site/ktsb/components/ktsbDetialForm.vue new file mode 100644 index 0000000..0270b71 --- /dev/null +++ b/src/views/site/ktsb/components/ktsbDetialForm.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/site/ktsb/components/ktsbForm.vue b/src/views/site/ktsb/components/ktsbForm.vue new file mode 100644 index 0000000..7bca2b4 --- /dev/null +++ b/src/views/site/ktsb/components/ktsbForm.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/src/views/site/ktsb/components/ktsbModal.vue b/src/views/site/ktsb/components/ktsbModal.vue new file mode 100644 index 0000000..97c9578 --- /dev/null +++ b/src/views/site/ktsb/components/ktsbModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/site/ktsb/index.vue b/src/views/site/ktsb/index.vue index 0bf1d7f..2876d47 100644 --- a/src/views/site/ktsb/index.vue +++ b/src/views/site/ktsb/index.vue @@ -2,9 +2,14 @@ - + @@ -13,11 +18,13 @@ import { defHttp } from '/@/utils/http/axios'; import { ref, onMounted } from 'vue'; import { getSysConfig } from '/@/views/site/utils/index'; import ktsbPage from '/@/views/site/ktsb/ktsbList.vue' +import ktsbModalPage from '/@/views/site/ktsb/components/ktsbModal.vue' const zzskTitle = ref('正在上课'); const queryParam = ref({}); + const ktsbAddModalPage = ref(); const jclist = (queryParam) => defHttp.get({ url: '/kcJieci/kcJieci/getIndexJcList', params:queryParam }); //进入就加载 onMounted(() => { @@ -41,6 +48,9 @@ onMounted(() => { }) }); +function addTkbj(){ + ktsbAddModalPage.value.add() +} diff --git a/src/views/site/ktsb/ktsbMoreList.vue b/src/views/site/ktsb/ktsbMoreList.vue new file mode 100644 index 0000000..6472be8 --- /dev/null +++ b/src/views/site/ktsb/ktsbMoreList.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/views/site/ktsb/more.vue b/src/views/site/ktsb/more.vue new file mode 100644 index 0000000..5b673ea --- /dev/null +++ b/src/views/site/ktsb/more.vue @@ -0,0 +1,120 @@ + + + \ No newline at end of file diff --git a/src/views/site/kxstkkt/itemPage.vue b/src/views/site/kxstkkt/itemPage.vue index 989a921..3d86c8f 100644 --- a/src/views/site/kxstkkt/itemPage.vue +++ b/src/views/site/kxstkkt/itemPage.vue @@ -56,13 +56,17 @@
+ + diff --git a/src/views/site/kxstkkt/zzsk.vue b/src/views/site/kxstkkt/zzsk.vue index 5509cb0..050ac72 100644 --- a/src/views/site/kxstkkt/zzsk.vue +++ b/src/views/site/kxstkkt/zzsk.vue @@ -39,8 +39,6 @@ -->
- - @@ -48,7 +46,6 @@ import { ref,watch,reactive,defineExpose,onMounted, createVNode,h } from 'vue'; import { defHttp } from '/@/utils/http/axios'; import { useMessage } from '/@/hooks/web/useMessage'; -import KcErrorreportIndexModal from '/@/views/kc/kcErrorreport/components/KcErrorreportIndexModal.vue' import { addTingKeLog, getUserId } from '/@/views/site/utils/index'; import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue'; import itemPage from './itemPage.vue'; @@ -60,7 +57,6 @@ import { CloseOutlined } from '@ant-design/icons-vue'; //用户相关 import { useUserStore } from '/@/store/modules/user'; const userStore = useUserStore(); -const kcErrorreportIndexModal = ref(); const tingKeZuJiAddModal = ref(); const route = useRouter(); @@ -97,14 +93,15 @@ function loadData(num?) { pageNo.value = 1 listData.value = []; } - queryParam.value.pageSize = '4' - queryParam.value.pageNo = pageNo - queryParam.value.sfyzhjs = '1' - queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',') - queryParam.value.skrq = queryParam.value.ywTime - queryParam.value.userid = getUserId() - queryParam.value.skxs = 1 - queryParam.value.type = 1 + // queryParam.value.pageSize = '4' + // queryParam.value.pageNo = pageNo + // queryParam.value.sfyzhjs = '1' + // queryParam.value.hh = queryParam.value.jieci+","+queryParam.value.jieci.split("、").join(',') + // queryParam.value.skrq = queryParam.value.ywTime + // queryParam.value.userid = getUserId() + // queryParam.value.skxs = 1 + // queryParam.value.type = 1 + queryParam.value.ywskxs = '' console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam) if(queryParam.value.hh!=","){ @@ -147,13 +144,6 @@ listTkjlApi({ userid: userid, ketangbiaoid:item.ketangbiaoid}).then(res => { }); } -/** - * 报错事件 - */ -function handleBaocuo(item) { - kcErrorreportIndexModal.value.disableSubmit = false; - kcErrorreportIndexModal.value.add(item); -} /** diff --git a/src/views/site/tingKeZuJi/list.vue b/src/views/site/tingKeZuJi/list.vue index 8ac8c78..8838370 100644 --- a/src/views/site/tingKeZuJi/list.vue +++ b/src/views/site/tingKeZuJi/list.vue @@ -1,6 +1,6 @@