From 437ccd8ffd47b714abe53471ad18c539fa33e169 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 7 Nov 2023 20:48:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiaoshi/KcZhihuijiaoshiMonitorLogList.vue | 10 +++++++-- src/views/kc/ktgl/KcKechengbiao.data.ts | 8 +++---- .../kc/ktgl/components/KcKechengbiaoForm.vue | 2 +- src/views/kc/szkc/KcKechengbiao.data.ts | 8 +++---- .../kc/szkc/components/KcKechengbiaoForm.vue | 2 +- .../kc/szkc/components/XzKechengbiao.data.ts | 6 +++--- src/views/site/kxstkkt/itemPage.vue | 8 +++---- src/views/site/kxstkkt/rkb.vue | 8 ++++++- src/views/site/kxstkkt/xyjk.vue | 8 ++++++- src/views/site/kxstkkt/zzsk.vue | 10 ++++++++- src/views/site/tongZhiGongGao/index.vue | 21 ++++++++++++++++--- 11 files changed, 66 insertions(+), 25 deletions(-) diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue index 59f1fad..f4fc0a9 100644 --- a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue +++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue @@ -17,13 +17,18 @@ - + + 全部 + 逸夫教学楼 + 净月综合教学楼 + 惟真楼 + - + @@ -95,6 +100,7 @@ import { columns } from './KcZhihuijiaoshiMonitorLog.data'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZhihuijiaoshiMonitorLog.api'; import { downloadFile } from '/@/utils/common/renderUtils'; + import { JInput } from '/@/components/Form'; import KcZhihuijiaoshiMonitorLogModal from './components/KcZhihuijiaoshiMonitorLogModal.vue' import KcZhihuijiaoshiMonitorStaticLogModal from './staticlist/KcZhihuijiaoshiMonitorStaticLogModal.vue' diff --git a/src/views/kc/ktgl/KcKechengbiao.data.ts b/src/views/kc/ktgl/KcKechengbiao.data.ts index 6d35ca3..6e4cc5b 100644 --- a/src/views/kc/ktgl/KcKechengbiao.data.ts +++ b/src/views/kc/ktgl/KcKechengbiao.data.ts @@ -24,7 +24,7 @@ export const columns = ([ key: 'skjs' }, { - title: '学科人数', + title: '选课人数', align: "left", width: '80px', key: 'xkrs' @@ -121,7 +121,7 @@ export const columns = ([ // dataIndex: 'skjs' // }, // { -// title: '学科人数', +// title: '选课人数', // align: "center", // width: '80px', // dataIndex: 'xkrs' @@ -304,12 +304,12 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '学科人数', + label: '选课人数', field: 'xkrs', component: 'Input', dynamicRules: ({model,schema}) => { return [ - { required: true, message: '请输入学科人数!'}, + { required: true, message: '请输入选课人数!'}, ]; }, }, diff --git a/src/views/kc/ktgl/components/KcKechengbiaoForm.vue b/src/views/kc/ktgl/components/KcKechengbiaoForm.vue index 33faafd..d06d20f 100644 --- a/src/views/kc/ktgl/components/KcKechengbiaoForm.vue +++ b/src/views/kc/ktgl/components/KcKechengbiaoForm.vue @@ -165,7 +165,7 @@ kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }], kcmc: [{ required: true, message: '请输入课程名称!'},], skjs: [{ required: true, message: '请输入授课教师!'},], - xkrs: [{ required: true, message: '请输入学科人数!'},], + xkrs: [{ required: true, message: '请输入选课人数!'},], kkdw: [{ required: true, message: '请输入开课单位!'},], kcxz: [{ required: true, message: '请输入课程性质!'},], jkzc: [{ required: true, message: '请输入上课周次!'},], diff --git a/src/views/kc/szkc/KcKechengbiao.data.ts b/src/views/kc/szkc/KcKechengbiao.data.ts index d152a09..853f8ab 100644 --- a/src/views/kc/szkc/KcKechengbiao.data.ts +++ b/src/views/kc/szkc/KcKechengbiao.data.ts @@ -23,7 +23,7 @@ export const columns = ([ key: 'skjs' }, { - title: '学科人数', + title: '选课人数', align: "left", width: '80px', key: 'xkrs' @@ -106,7 +106,7 @@ export const columns = ([ // dataIndex: 'skjs' // }, // { -// title: '学科人数', +// title: '选课人数', // align: "center", // width: '80px', // dataIndex: 'xkrs' @@ -289,12 +289,12 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '学科人数', + label: '选课人数', field: 'xkrs', component: 'Input', dynamicRules: ({model,schema}) => { return [ - { required: true, message: '请输入学科人数!'}, + { required: true, message: '请输入选课人数!'}, ]; }, }, diff --git a/src/views/kc/szkc/components/KcKechengbiaoForm.vue b/src/views/kc/szkc/components/KcKechengbiaoForm.vue index 33faafd..d06d20f 100644 --- a/src/views/kc/szkc/components/KcKechengbiaoForm.vue +++ b/src/views/kc/szkc/components/KcKechengbiaoForm.vue @@ -165,7 +165,7 @@ kcbh: [{ required: true, message: '请输入课程号!'}, { validator: kcbhDuplicatevalidate }], kcmc: [{ required: true, message: '请输入课程名称!'},], skjs: [{ required: true, message: '请输入授课教师!'},], - xkrs: [{ required: true, message: '请输入学科人数!'},], + xkrs: [{ required: true, message: '请输入选课人数!'},], kkdw: [{ required: true, message: '请输入开课单位!'},], kcxz: [{ required: true, message: '请输入课程性质!'},], jkzc: [{ required: true, message: '请输入上课周次!'},], diff --git a/src/views/kc/szkc/components/XzKechengbiao.data.ts b/src/views/kc/szkc/components/XzKechengbiao.data.ts index e099dc5..f1583e1 100644 --- a/src/views/kc/szkc/components/XzKechengbiao.data.ts +++ b/src/views/kc/szkc/components/XzKechengbiao.data.ts @@ -67,7 +67,7 @@ export const columns = ([ // dataIndex: 'skjs' // }, // { -// title: '学科人数', +// title: '选课人数', // align: "center", // width: '80px', // dataIndex: 'xkrs' @@ -250,12 +250,12 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '学科人数', + label: '选课人数', field: 'xkrs', component: 'Input', dynamicRules: ({model,schema}) => { return [ - { required: true, message: '请输入学科人数!'}, + { required: true, message: '请输入选课人数!'}, ]; }, }, diff --git a/src/views/site/kxstkkt/itemPage.vue b/src/views/site/kxstkkt/itemPage.vue index f532df8..16e4a90 100644 --- a/src/views/site/kxstkkt/itemPage.vue +++ b/src/views/site/kxstkkt/itemPage.vue @@ -45,11 +45,11 @@ --> - + + + 评价 diff --git a/src/views/site/kxstkkt/rkb.vue b/src/views/site/kxstkkt/rkb.vue index 266a2e6..74a0300 100644 --- a/src/views/site/kxstkkt/rkb.vue +++ b/src/views/site/kxstkkt/rkb.vue @@ -22,7 +22,12 @@ - + + 全部 + 逸夫教学楼 + 净月综合教学楼 + 惟真楼 + @@ -120,6 +125,7 @@ function loadData(num?) { queryParam.value.userid = getUserId() queryParam.value.skxs = 1 queryParam.value.type = 1 + queryParam.value.sftkb = 1 console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam) diff --git a/src/views/site/kxstkkt/xyjk.vue b/src/views/site/kxstkkt/xyjk.vue index 0eaddd7..d921c8b 100644 --- a/src/views/site/kxstkkt/xyjk.vue +++ b/src/views/site/kxstkkt/xyjk.vue @@ -7,7 +7,12 @@ - + + 全部 + 逸夫教学楼 + 净月综合教学楼 + 惟真楼 + @@ -106,6 +111,7 @@ function loadData(num?) { queryParam.value.userid = getUserId() queryParam.value.skxs = 1 queryParam.value.type = 0 + queryParam.value.sftkb = 1 console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam) if(queryParam.value.hh!=","){ diff --git a/src/views/site/kxstkkt/zzsk.vue b/src/views/site/kxstkkt/zzsk.vue index adb2622..e7ff085 100644 --- a/src/views/site/kxstkkt/zzsk.vue +++ b/src/views/site/kxstkkt/zzsk.vue @@ -7,7 +7,14 @@ - + + + + 全部 + 逸夫教学楼 + 净月综合教学楼 + 惟真楼 + @@ -101,6 +108,7 @@ function loadData(num?) { queryParam.value.userid = getUserId() queryParam.value.skxs = 1 queryParam.value.type = 1 + queryParam.value.sftkb = 1 queryParam.value.ywskxs = '' console.log(`🚀 ~ file: index.vue:112 ~ rkbLoadData ~ newRow:`, queryParam) diff --git a/src/views/site/tongZhiGongGao/index.vue b/src/views/site/tongZhiGongGao/index.vue index 84577cb..85ee15e 100644 --- a/src/views/site/tongZhiGongGao/index.vue +++ b/src/views/site/tongZhiGongGao/index.vue @@ -1,7 +1,6 @@ @@ -27,6 +34,7 @@ import { formatToDate } from '/@/utils/dateUtil'; // const { createConfirm } = useMessage(); enum Api { list = '/kcNotice/kcNotice/list', + tkList = '/grab/imports/xxhbtkxx/getDayTklist', } /** @@ -34,19 +42,26 @@ enum Api { * @param params */ const listApi = (params) => defHttp.get({ url: Api.list, params }); +const listTkApi = (params) => defHttp.get({ url: Api.tkList, params }); const list = ref([]); +const tklist = ref([]); onMounted(() => { //ontop,修改时间，新增时间 listApi({ pageSize: 6, nstatus: 1 }).then(res => { list.value = (res?.records) ?? []; }); + //ontop,修改时间，新增时间 + listTkApi({}).then(res => { + console.log(`🚀 ~ file: index.vue:56 ~ listTkApi ~ res:`, res) + tklist.value = res; + }); }); diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListOld.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListOld.vue new file mode 100644 index 0000000..02b841d --- /dev/null +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListOld.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/src/views/kc/config/StaticCon/StaticCon.api.ts b/src/views/kc/config/StaticCon/StaticCon.api.ts new file mode 100644 index 0000000..03f91dd --- /dev/null +++ b/src/views/kc/config/StaticCon/StaticCon.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/config/kcExportConfigTpkwcqkjzglx/queryTkyqPageList', + save='/config/kcExportConfigTpkwcqkjzglx/add', + edit='/config/kcExportConfigTpkwcqkjzglx/edit', + deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete', + deleteBatch = '/config/kcExportConfigTpkwcqkjzglx/deleteBatch', + importExcel = '/config/kcExportConfigTpkwcqkjzglx/importExcel', + exportXls = '/config/kcExportConfigTpkwcqkjzglx/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/config/StaticCon/StaticCon.data.ts b/src/views/kc/config/StaticCon/StaticCon.data.ts new file mode 100644 index 0000000..1636a81 --- /dev/null +++ b/src/views/kc/config/StaticCon/StaticCon.data.ts @@ -0,0 +1,81 @@ +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: 'xymc' + }, + { + title: '姓名', + align: "center", + dataIndex: 'xm' + }, + { + title: '听课身份', + align: "center", + dataIndex: 'tksf' + }, + { + title: '本学期应听课次数', + align: "center", + dataIndex: 'ytkcs' + }, + { + title: '本学期实际听课次数', + align: "center", + dataIndex: 'sjtkcs' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "教师", + field: 'gh', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "xxhbuser,xm,gh" + }, + colProps: {span: 6}, + }, + { + label: "听课类型", + field: 'tklx', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "tpkwcqkjzglx" + }, + colProps: {span: 6}, + }, +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '教师', + field: 'gh', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "xxhbuser,xm,gh" + }, + }, + { + label: '听课类型', + field: 'tklx', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "tpkwcqkjzglx" + }, + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/kc/config/StaticCon/StaticCon.vue b/src/views/kc/config/StaticCon/StaticCon.vue new file mode 100644 index 0000000..ac52140 --- /dev/null +++ b/src/views/kc/config/StaticCon/StaticCon.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/src/views/kc/config/StaticCon/StaticConModal.vue b/src/views/kc/config/StaticCon/StaticConModal.vue new file mode 100644 index 0000000..aca52be --- /dev/null +++ b/src/views/kc/config/StaticCon/StaticConModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue b/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue index 67389aa..ca83d13 100644 --- a/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue +++ b/src/views/kc/kcSysConfig/components/KcSysConfigMain.vue @@ -10,8 +10,8 @@ - - + + diff --git a/src/views/site/kxstkkt/rkb.vue b/src/views/site/kxstkkt/rkb.vue index 74a0300..fea22e3 100644 --- a/src/views/site/kxstkkt/rkb.vue +++ b/src/views/site/kxstkkt/rkb.vue @@ -25,7 +25,7 @@ 全部 逸夫教学楼 - 净月综合教学楼 + 净月综合教学楼 惟真楼 diff --git a/src/views/site/kxstkkt/xyjk.vue b/src/views/site/kxstkkt/xyjk.vue index d921c8b..5a6b6b3 100644 --- a/src/views/site/kxstkkt/xyjk.vue +++ b/src/views/site/kxstkkt/xyjk.vue @@ -10,7 +10,7 @@ 全部 逸夫教学楼 - 净月综合教学楼 + 净月综合教学楼 惟真楼 diff --git a/src/views/site/kxstkkt/zzsk.vue b/src/views/site/kxstkkt/zzsk.vue index e7ff085..7843d21 100644 --- a/src/views/site/kxstkkt/zzsk.vue +++ b/src/views/site/kxstkkt/zzsk.vue @@ -12,7 +12,7 @@ 全部 逸夫教学楼 - 净月综合教学楼 + 净月综合教学楼 惟真楼