From 749ca47584ffcb4a7ac57ff9f782f07e4364a882 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 26 Mar 2024 18:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E5=8F=8A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kc/jiaoshi/index copy.vue | 1503 +++++++++++++++++ src/views/kc/kcJieciPipei/KcJieciPipei.api.ts | 72 + .../kc/kcJieciPipei/KcJieciPipei.data.ts | 54 + .../kc/kcJieciPipei/KcJieciPipeiList.vue | 237 +++ .../components/KcJieciPipeiForm.vue | 133 ++ .../components/KcJieciPipeiModal.vue | 75 + .../kcKechengExclude/KcKechengExclude.api.ts | 72 + .../kcKechengExclude/KcKechengExclude.data.ts | 184 ++ .../kcKechengExclude/KcKechengExcludeList.vue | 268 +++ .../components/KcKechengExcludeForm.vue | 193 +++ .../components/KcKechengExcludeModal.vue | 75 + .../components/KcSysConfigKkpz.vue | 6 + src/views/kc/kcTingkeBmd/KcTingkeBmd.data.ts | 42 +- .../kcTingkeBmd/checkuser/CheckUserTool.vue | 8 +- .../checkuser/CheckUserToolModal.vue | 2 +- .../components/KcTingkeBmdForm.vue | 36 +- .../components/KcTingkeBmdModal.vue | 5 +- src/views/kc/kcZzThpjb/KcZzThpjb.data.ts | 199 ++- .../kc/kcZzThpjb/components/KcZzThpjbForm.vue | 53 +- .../kc/kcZzXstkb/components/KcZzXstkbForm.vue | 46 +- .../kc/kcZzYbtkb/components/KcZzYbtkbForm.vue | 49 +- .../kc/ketang/KcKetangbiaoCheckBmdList.vue | 272 +++ .../ketang/KcKetangbiaoCheckBmdListModal.vue | 76 + src/views/kc/ketang/KcKetangbiaoCheckList.vue | 3 +- src/views/site/common/header.vue | 6 +- src/views/site/index.vue | 17 +- src/views/site/jrkclb/kclbRkb.vue | 9 +- src/views/site/jrkclb/kclbXyjk.vue | 10 +- src/views/site/jrkclb/kclbZzsk.vue | 9 +- src/views/site/kxstkkt/itemPage.vue | 12 +- src/views/site/kxstkkt/rkb.vue | 4 +- src/views/site/kxstkkt/xyjk.vue | 4 +- src/views/site/kxstkkt/zzsk.vue | 4 +- src/views/site/studentJrkb/kclbRkb.vue | 2 +- src/views/site/studentJrkb/kclbXyjk.vue | 2 +- src/views/site/studentJrkb/kclbZzsk.vue | 2 +- 36 files changed, 3566 insertions(+), 178 deletions(-) create mode 100644 src/views/kc/jiaoshi/index copy.vue create mode 100644 src/views/kc/kcJieciPipei/KcJieciPipei.api.ts create mode 100644 src/views/kc/kcJieciPipei/KcJieciPipei.data.ts create mode 100644 src/views/kc/kcJieciPipei/KcJieciPipeiList.vue create mode 100644 src/views/kc/kcJieciPipei/components/KcJieciPipeiForm.vue create mode 100644 src/views/kc/kcJieciPipei/components/KcJieciPipeiModal.vue create mode 100644 src/views/kc/kcKechengExclude/KcKechengExclude.api.ts create mode 100644 src/views/kc/kcKechengExclude/KcKechengExclude.data.ts create mode 100644 src/views/kc/kcKechengExclude/KcKechengExcludeList.vue create mode 100644 src/views/kc/kcKechengExclude/components/KcKechengExcludeForm.vue create mode 100644 src/views/kc/kcKechengExclude/components/KcKechengExcludeModal.vue create mode 100644 src/views/kc/ketang/KcKetangbiaoCheckBmdList.vue create mode 100644 src/views/kc/ketang/KcKetangbiaoCheckBmdListModal.vue diff --git a/src/views/kc/jiaoshi/index copy.vue b/src/views/kc/jiaoshi/index copy.vue new file mode 100644 index 0000000..5e09b64 --- /dev/null +++ b/src/views/kc/jiaoshi/index copy.vue @@ -0,0 +1,1503 @@ + + + \ No newline at end of file diff --git a/src/views/kc/kcJieciPipei/KcJieciPipei.api.ts b/src/views/kc/kcJieciPipei/KcJieciPipei.api.ts new file mode 100644 index 0000000..e616a99 --- /dev/null +++ b/src/views/kc/kcJieciPipei/KcJieciPipei.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/kcJieciPipei/kcJieciPipei/list', + save='/kcJieciPipei/kcJieciPipei/add', + edit='/kcJieciPipei/kcJieciPipei/edit', + deleteOne = '/kcJieciPipei/kcJieciPipei/delete', + deleteBatch = '/kcJieciPipei/kcJieciPipei/deleteBatch', + importExcel = '/kcJieciPipei/kcJieciPipei/importExcel', + exportXls = '/kcJieciPipei/kcJieciPipei/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/kc/kcJieciPipei/KcJieciPipei.data.ts b/src/views/kc/kcJieciPipei/KcJieciPipei.data.ts new file mode 100644 index 0000000..46d66c2 --- /dev/null +++ b/src/views/kc/kcJieciPipei/KcJieciPipei.data.ts @@ -0,0 +1,54 @@ +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: 'expCol' + }, + { + title: '正确数据', + align: "center", + dataIndex: 'norCol' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "异常数据", + field: 'expCol', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "正确数据", + field: 'norCol', + component: 'Input', + colProps: {span: 6}, + }, +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '异常数据', + field: 'expCol', + component: 'Input', + }, + { + label: '正确数据', + field: 'norCol', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/kc/kcJieciPipei/KcJieciPipeiList.vue b/src/views/kc/kcJieciPipei/KcJieciPipeiList.vue new file mode 100644 index 0000000..c1bad80 --- /dev/null +++ b/src/views/kc/kcJieciPipei/KcJieciPipeiList.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/src/views/kc/kcJieciPipei/components/KcJieciPipeiForm.vue b/src/views/kc/kcJieciPipei/components/KcJieciPipeiForm.vue new file mode 100644 index 0000000..cf71333 --- /dev/null +++ b/src/views/kc/kcJieciPipei/components/KcJieciPipeiForm.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/kc/kcJieciPipei/components/KcJieciPipeiModal.vue b/src/views/kc/kcJieciPipei/components/KcJieciPipeiModal.vue new file mode 100644 index 0000000..43d7b43 --- /dev/null +++ b/src/views/kc/kcJieciPipei/components/KcJieciPipeiModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/kc/kcKechengExclude/KcKechengExclude.api.ts b/src/views/kc/kcKechengExclude/KcKechengExclude.api.ts new file mode 100644 index 0000000..b433b97 --- /dev/null +++ b/src/views/kc/kcKechengExclude/KcKechengExclude.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/kcKechengExclude/kcKechengExclude/list', + save='/kcKechengExclude/kcKechengExclude/add', + edit='/kcKechengExclude/kcKechengExclude/edit', + deleteOne = '/kcKechengExclude/kcKechengExclude/delete', + deleteBatch = '/kcKechengExclude/kcKechengExclude/deleteBatch', + importExcel = '/kcKechengExclude/kcKechengExclude/importExcel', + exportXls = '/kcKechengExclude/kcKechengExclude/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/kc/kcKechengExclude/KcKechengExclude.data.ts b/src/views/kc/kcKechengExclude/KcKechengExclude.data.ts new file mode 100644 index 0000000..72018bb --- /dev/null +++ b/src/views/kc/kcKechengExclude/KcKechengExclude.data.ts @@ -0,0 +1,184 @@ +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: 'kcmc' + }, + { + title: '教工号', + align: "center", + dataIndex: 'jgh' + }, + { + title: '授课教师', + align: "center", + dataIndex: 'skjs' + }, + { + title: '开课单位', + align: "center", + dataIndex: 'kkdw' + }, + { + title: '课程性质', + align: "center", + dataIndex: 'kcxz' + }, + { + title: '上课地点', + align: "center", + dataIndex: 'skdd' + }, + { + title: '授课时间', + align: "center", + dataIndex: 'sksj' + }, + { + title: '授课周次', + align: "center", + dataIndex: 'jkzc' + }, + { + title: '学年学期【orcl】', + align: "center", + dataIndex: 'xnxq' + }, + { + title: '课程大类', + align: "center", + dataIndex: 'kcdl' + }, + { + title: '是否前台展示', + align: "center", + dataIndex: 'sfqtzs' + }, + { + title: '学年学期【系统自用】', + align: "center", + dataIndex: 'xqxn' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "课程名称", + field: 'kcmc', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "教工号", + field: 'jgh', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "授课教师", + field: 'skjs', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "开课单位", + field: 'kkdw', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "授课时间", + field: 'sksj', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "是否前台展示", + field: 'sfqtzs', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "学年学期【系统自用】", + field: 'xqxn', + component: 'Input', + colProps: {span: 6}, + }, +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '课程名称', + field: 'kcmc', + component: 'Input', + }, + { + label: '教工号', + field: 'jgh', + component: 'Input', + }, + { + label: '授课教师', + field: 'skjs', + component: 'Input', + }, + { + label: '开课单位', + field: 'kkdw', + component: 'Input', + }, + { + label: '课程性质', + field: 'kcxz', + component: 'Input', + }, + { + label: '上课地点', + field: 'skdd', + component: 'Input', + }, + { + label: '授课时间', + field: 'sksj', + component: 'Input', + }, + { + label: '授课周次', + field: 'jkzc', + component: 'Input', + }, + { + label: '学年学期【orcl】', + field: 'xnxq', + component: 'Input', + }, + { + label: '课程大类', + field: 'kcdl', + component: 'Input', + }, + { + label: '是否前台展示', + field: 'sfqtzs', + component: 'Input', + }, + { + label: '学年学期【系统自用】', + field: 'xqxn', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/kc/kcKechengExclude/KcKechengExcludeList.vue b/src/views/kc/kcKechengExclude/KcKechengExcludeList.vue new file mode 100644 index 0000000..782d996 --- /dev/null +++ b/src/views/kc/kcKechengExclude/KcKechengExcludeList.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/views/kc/kcKechengExclude/components/KcKechengExcludeForm.vue b/src/views/kc/kcKechengExclude/components/KcKechengExcludeForm.vue new file mode 100644 index 0000000..fe515a7 --- /dev/null +++ b/src/views/kc/kcKechengExclude/components/KcKechengExcludeForm.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/kc/kcKechengExclude/components/KcKechengExcludeModal.vue b/src/views/kc/kcKechengExclude/components/KcKechengExcludeModal.vue new file mode 100644 index 0000000..a09ca50 --- /dev/null +++ b/src/views/kc/kcKechengExclude/components/KcKechengExcludeModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue b/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue index 427cbb9..6f9ddc1 100644 --- a/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue +++ b/src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue @@ -47,6 +47,11 @@ + + + + + 保存 @@ -93,6 +98,7 @@ const queryParam = ref({}); flag7: '', xsktTitle:'', jrktTitle:'', + bmdTitle:'', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); diff --git a/src/views/kc/kcTingkeBmd/KcTingkeBmd.data.ts b/src/views/kc/kcTingkeBmd/KcTingkeBmd.data.ts index fb6102b..6844c9a 100644 --- a/src/views/kc/kcTingkeBmd/KcTingkeBmd.data.ts +++ b/src/views/kc/kcTingkeBmd/KcTingkeBmd.data.ts @@ -20,6 +20,39 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'ssxy' }, + { + title: '开始时间', + align:"center", + dataIndex: 'kssj' + }, + { + title: '结束时间', + align:"center", + dataIndex: 'jssj' + }, + { + title: '状态', + align:"center", + dataIndex: 'status', + customRender: ({ record }) => { + var kssj = record.kssj; + var jssj = record.jssj; + var text = ""; + if(kssj && jssj){ + var dateTime = new Date(); + var kssjDate = new Date(kssj); + var jssjDate = new Date(jssj); + if(dateTime.getTime() > kssjDate.getTime() && dateTime.getTime() < jssjDate.getTime()){ + text = "进行中"; + }else if(dateTime.getTime() < kssjDate.getTime()){ + text = "未开始"; + }else if(dateTime.getTime() > jssjDate.getTime()){ + text = "已完成"; + } + } + return text; + }, + }, { title: '学年学期', align:"center", @@ -106,10 +139,17 @@ export const kcTingkeBmdKcxxColumns: JVxeColumn[] = [ placeholder: '请输入${title}', defaultValue:'', }, + { + title: '开课单位', + key: 'kkdw', + type: JVxeTypes.text, + placeholder: '请输入${title}', + defaultValue:'', + }, { title: '学年学期', key: 'xnxq', - type: JVxeTypes.text, + type: JVxeTypes.hidden, placeholder: '请输入${title}', defaultValue:'', }, diff --git a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue index 5f517df..41fa269 100644 --- a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue +++ b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.vue @@ -5,13 +5,13 @@ - - + + - + @@ -57,7 +57,7 @@ //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '选择听课教师', + title: '选择教师信息', api: list, columns, canResize:false, diff --git a/src/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue b/src/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue index 21fc2c5..328d38a 100644 --- a/src/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue +++ b/src/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue @@ -19,7 +19,7 @@ * 新增 */ function add(titlePar) { - title.value = titlePar+'新增'; + title.value = titlePar; visible.value = true; nextTick(() => { registerForm222.value.add(); diff --git a/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue b/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue index c5af825..e92910b 100644 --- a/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue +++ b/src/views/kc/kcTingkeBmd/components/KcTingkeBmdForm.vue @@ -2,28 +2,38 @@ - + + 选择教师 + + - + - + - + - - 选择教师 + + @@ -67,7 +77,7 @@ import { JVxeTable } from '/@/components/jeecg/JVxeTable'; import {kcTingkeBmdKcxxColumns} from '../KcTingkeBmd.data'; import { Form } from 'ant-design-vue'; - import KcKetangbiaoCheckListModal from '/@/views/kc/ketang/KcKetangbiaoCheckListModal.vue'; + import KcKetangbiaoCheckListModal from '/@/views/kc/ketang/KcKetangbiaoCheckBmdListModal.vue'; import CheckUserToolModal from '/@/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue'; import _ from 'lodash-es'; const useForm = Form.useForm; @@ -105,6 +115,8 @@ jsxm: '', ssxy: '', xnxq: '', + kssj: '', + jssj: '', }); //表单验证 @@ -114,8 +126,8 @@ const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: true}); const dbData = {}; const formItemLayout = { - labelCol: {xs: {span: 24}, sm: {span: 5}}, - wrapperCol: {xs: {span: 24}, sm: {span: 16}}, + labelCol: {xs: {span: 24}, sm: {span: 8}}, + wrapperCol: {xs: {span: 24}, sm: {span: 13}}, }; function checkTeacher(){ @@ -142,7 +154,11 @@ } function ketangSuccess(par){ - var list = par; + var list = par.list; + var kssj = par.kssj; + var jssj = par.jssj; + formData.kssj = kssj; + formData.jssj = jssj; console.log(`🚀 ~ ketangSuccess ~ par`, par); var oldList2 = kcTingkeBmdKcxxTable.dataSource; for(var i=0;i - - - - - + + 匹配教师数据 - - - - - - - - - + + + + + + + + + + + + + + + + + + 匹配课堂数据 @@ -153,6 +157,7 @@ + @@ -165,8 +170,10 @@ import { saveOrUpdate } from '../KcZzThpjb.api'; import { Form } from 'ant-design-vue'; import KcKetangbiaoListModal from '/@/views/kc/ketang/KcKetangbiaoListModal.vue' + import CheckUserToolModal from '/@/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue'; const KcKetangbiaoListModalPage = ref(); + const CheckUserToolModalRef = ref(); const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: ()=>{} }, @@ -206,8 +213,8 @@ ans19: '', }); const { createMessage } = useMessage(); - const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); - const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } }); + const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); + const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 13 } }); const labelCol2 = ref({ xs: { span: 24 }, sm: { span: 12 } }); const wrapperCol2 = ref({ xs: { span: 24 }, sm: { span: 12 } }); const labelCol3 = ref({ xs: { span: 24 }, sm: { span: 6 } }); @@ -239,6 +246,16 @@ return props.formDisabled; }); + //选择教师 + function checkTeacher(){ + CheckUserToolModalRef.value.add("选择教师") + } + //教师回显 + function userSuccess(par){ + console.log(`🚀 ~ userSuccess ~ par:`, par) + formData.pkjsxm = par.xm; + formData.pkjsbh = par.gh; + } /** * 校验课堂数据 */ diff --git a/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue b/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue index 9df8dc2..b089f69 100644 --- a/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue +++ b/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue @@ -2,20 +2,27 @@ - - - - + + 匹配教师数据 - - - - - - - - - + + + + + + + + + + + + + + + + + + 匹配课堂数据 @@ -113,6 +120,7 @@ + @@ -126,8 +134,10 @@ import { Form } from 'ant-design-vue'; import KcKetangbiaoListModal from '/@/views/kc/ketang/KcKetangbiaoListModal.vue' import JCheckbox from "/@/components/Form/src/jeecg/components/JCheckbox.vue"; + import CheckUserToolModal from '/@/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue'; const KcKetangbiaoListModalPage = ref(); + const CheckUserToolModalRef = ref(); const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -194,6 +204,16 @@ return props.formDisabled; }); + //选择教师 + function checkTeacher(){ + CheckUserToolModalRef.value.add("选择教师") + } + //教师回显 + function userSuccess(par){ + console.log(`🚀 ~ userSuccess ~ par:`, par) + formData.tkjsxm = par.xm; + formData.tkjsgh = par.gh; + } /** * 校验课堂数据 */ diff --git a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue index da8da23..45bb405 100644 --- a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue +++ b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue @@ -2,20 +2,27 @@ - - - - + + 匹配教师数据 - - - - - - - - - + + + + + + + + + + + + + + + + + + 匹配课堂数据 @@ -44,7 +51,7 @@ - + @@ -104,6 +111,7 @@ + @@ -114,10 +122,12 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import KcKetangbiaoListModal from '/@/views/kc/ketang/KcKetangbiaoListModal.vue' + import CheckUserToolModal from '/@/views/kc/kcTingkeBmd/checkuser/CheckUserToolModal.vue'; import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../KcZzYbtkb.api'; import { Form } from 'ant-design-vue'; const KcKetangbiaoListModalPage = ref(); + const CheckUserToolModalRef = ref(); const props = defineProps({ formDisabled: { type: Boolean, default: false }, @@ -181,7 +191,16 @@ } return props.formDisabled; }); - + //选择教师 + function checkTeacher(){ + CheckUserToolModalRef.value.add("选择教师") + } + //教师回显 + function userSuccess(par){ + console.log(`🚀 ~ userSuccess ~ par:`, par) + formData.tkjsxm = par.xm; + formData.tkjsbh = par.gh; + } /** * 校验课堂数据 */ diff --git a/src/views/kc/ketang/KcKetangbiaoCheckBmdList.vue b/src/views/kc/ketang/KcKetangbiaoCheckBmdList.vue new file mode 100644 index 0000000..0abba30 --- /dev/null +++ b/src/views/kc/ketang/KcKetangbiaoCheckBmdList.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/kc/ketang/KcKetangbiaoCheckBmdListModal.vue b/src/views/kc/ketang/KcKetangbiaoCheckBmdListModal.vue new file mode 100644 index 0000000..44b360a --- /dev/null +++ b/src/views/kc/ketang/KcKetangbiaoCheckBmdListModal.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/kc/ketang/KcKetangbiaoCheckList.vue b/src/views/kc/ketang/KcKetangbiaoCheckList.vue index 6d17f76..a496a49 100644 --- a/src/views/kc/ketang/KcKetangbiaoCheckList.vue +++ b/src/views/kc/ketang/KcKetangbiaoCheckList.vue @@ -31,7 +31,8 @@ - + + diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue index 618bd90..1190c4e 100644 --- a/src/views/site/common/header.vue +++ b/src/views/site/common/header.vue @@ -21,10 +21,10 @@ - + 听课足迹 - + 评课足迹 @@ -33,7 +33,7 @@ 评价结果 - + 预约课程 diff --git a/src/views/site/index.vue b/src/views/site/index.vue index e1d071e..66bfc03 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -6,6 +6,8 @@ + +
{{getSysConfig().bmdTitle}}
@@ -13,13 +15,13 @@ - + - + @@ -262,4 +264,15 @@ a { color: #337ab7; } +.bmdTitle{ + background-color: #fff; + height: 100px; + line-height: 23px; + padding: 10px; + display: flex; + align-items: center; + flex-direction: row; + flex-wrap: wrap; +font-weight: 600;font-size: 16px; +} \ No newline at end of file diff --git a/src/views/site/jrkclb/kclbRkb.vue b/src/views/site/jrkclb/kclbRkb.vue index 3939705..ea3ee62 100644 --- a/src/views/site/jrkclb/kclbRkb.vue +++ b/src/views/site/jrkclb/kclbRkb.vue @@ -9,7 +9,8 @@ - + + @@ -43,7 +44,7 @@