From 0941d4408fe2b026029e1fec6dcb764931e7413f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 6 May 2024 08:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E5=8D=B7=E6=98=9F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxListNew.vue | 1 + src/views/kc/config/StaticCon/StaticCon.vue | 2 + src/views/kc/kcTtksdpz/KcTtksdpz.data.ts | 2 +- .../kc/kcTtksdpz/components/KcTtksdpzForm.vue | 12 +- src/views/kc/wjxWjxx/WjxWjxx.api.ts | 72 ++++++ src/views/kc/wjxWjxx/WjxWjxx.data.ts | 79 ++++++ src/views/kc/wjxWjxx/WjxWjxxList.vue | 243 ++++++++++++++++++ .../kc/wjxWjxx/components/WjxWjxxForm.vue | 141 ++++++++++ .../kc/wjxWjxx/components/WjxWjxxModal.vue | 75 ++++++ .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 218 ++++++++++++++++ .../wjxWjxx/components/WjxWjxxTmlbModal.vue | 64 +++++ src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts | 81 ++++++ src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts | 95 +++++++ src/views/kc/wjxWjxxTmlb/WjxWjxxTmlbList.vue | 211 +++++++++++++++ .../components/WjxWjxxTmlbForm.vue | 190 ++++++++++++++ .../components/WjxWjxxTmlbModal.vue | 68 +++++ src/views/site/jingCaiGongKaiKe/gkkMore.vue | 2 +- src/views/site/jingCaiGongKaiKe/index.vue | 4 +- src/views/zuoye/webAll/JianceForm.vue | 31 +++ 19 files changed, 1581 insertions(+), 10 deletions(-) create mode 100644 src/views/kc/wjxWjxx/WjxWjxx.api.ts create mode 100644 src/views/kc/wjxWjxx/WjxWjxx.data.ts create mode 100644 src/views/kc/wjxWjxx/WjxWjxxList.vue create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxForm.vue create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxModal.vue create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue create mode 100644 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts create mode 100644 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts create mode 100644 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlbList.vue create mode 100644 src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue create mode 100644 src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbModal.vue diff --git a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue index 327d94f..70a47cb 100644 --- a/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue +++ b/src/views/kc/config/KcExportConfigTpkwcqkjzglxListNew.vue @@ -165,6 +165,7 @@ } function handleEdit(record,type) { record.type = type; + record.xqxn = queryParam.value.xqxn; StaticCon.value.disableSubmit = true; StaticCon.value.edit(record); } diff --git a/src/views/kc/config/StaticCon/StaticCon.vue b/src/views/kc/config/StaticCon/StaticCon.vue index c1c5855..27f6cfe 100644 --- a/src/views/kc/config/StaticCon/StaticCon.vue +++ b/src/views/kc/config/StaticCon/StaticCon.vue @@ -201,8 +201,10 @@ console.log(`🚀 ~ file: StaticCon.vue:177 ~ init ~ record:`, record) queryParam.value.code = record.code; queryParam.value.type = record.type; + queryParam.value.xqxn = record.xqxn; queryParam.value.xm = null; queryParam.value.dwmc = null; + console.log(`🚀 ~ file: StaticCon.vue:207 ~ init ~ queryParam:`, queryParam) reload(); } diff --git a/src/views/kc/kcTtksdpz/KcTtksdpz.data.ts b/src/views/kc/kcTtksdpz/KcTtksdpz.data.ts index 27d54bc..9a36f5f 100644 --- a/src/views/kc/kcTtksdpz/KcTtksdpz.data.ts +++ b/src/views/kc/kcTtksdpz/KcTtksdpz.data.ts @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [ }, }, { - title: '调课时间', + title: '上哪天的课', align: "center", dataIndex: 'tksj', customRender:({text}) =>{ diff --git a/src/views/kc/kcTtksdpz/components/KcTtksdpzForm.vue b/src/views/kc/kcTtksdpz/components/KcTtksdpzForm.vue index 5782883..9055fa0 100644 --- a/src/views/kc/kcTtksdpz/components/KcTtksdpzForm.vue +++ b/src/views/kc/kcTtksdpz/components/KcTtksdpzForm.vue @@ -8,19 +8,19 @@ - - + + - - + + -

停课：代表在放假时间内，不上课

-

调课：放假时间上调课时间内的课程

+

停课：代表在调课时间内，不上课

+

调课：调课时间上哪天的课

 diff --git a/src/views/kc/wjxWjxx/WjxWjxx.api.ts b/src/views/kc/wjxWjxx/WjxWjxx.api.ts new file mode 100644 index 0000000..2f95de7 --- /dev/null +++ b/src/views/kc/wjxWjxx/WjxWjxx.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/wjxWjxx/wjxWjxx/list', + save='/wjxWjxx/wjxWjxx/add', + edit='/wjxWjxx/wjxWjxx/edit', + deleteOne = '/wjxWjxx/wjxWjxx/delete', + deleteBatch = '/wjxWjxx/wjxWjxx/deleteBatch', + importExcel = '/wjxWjxx/wjxWjxx/importExcel', + exportXls = '/wjxWjxx/wjxWjxx/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/wjxWjxx/WjxWjxx.data.ts b/src/views/kc/wjxWjxx/WjxWjxx.data.ts new file mode 100644 index 0000000..4451eee --- /dev/null +++ b/src/views/kc/wjxWjxx/WjxWjxx.data.ts @@ -0,0 +1,79 @@ +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: 'createBy' + }, + { + title: '创建时间', + align: "center", + dataIndex: 'createTime', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text); + }, + }, + { + title: '问卷名称', + align: "center", + dataIndex: 'title' + }, + { + title: '问卷描述', + align: "center", + dataIndex: 'content' + }, + { + title: '是否发布问卷', + align: "center", + dataIndex: 'qpublish_dictText' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "问卷名称", + field: 'title', + component: 'Input', + colProps: {span: 6}, + }, +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '问卷名称', + field: 'title', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入问卷名称!'}, + ]; + }, + }, + { + label: '问卷描述', + field: 'content', + component: 'InputTextArea', + }, + { + label: '是否发布问卷', + field: 'qpublish', + component: 'JDictSelectTag', + componentProps:{ + dictCode: "yn" + }, + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/kc/wjxWjxx/WjxWjxxList.vue b/src/views/kc/wjxWjxx/WjxWjxxList.vue new file mode 100644 index 0000000..119d85a --- /dev/null +++ b/src/views/kc/wjxWjxx/WjxWjxxList.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue new file mode 100644 index 0000000..5ed3a5a --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxModal.vue new file mode 100644 index 0000000..5694b95 --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue new file mode 100644 index 0000000..e27ee77 --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue new file mode 100644 index 0000000..faf5326 --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts new file mode 100644 index 0000000..64592a6 --- /dev/null +++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api.ts @@ -0,0 +1,81 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/wjxWjxxTmlb/wjxWjxxTmlb/list', + save='/wjxWjxxTmlb/wjxWjxxTmlb/add', + edit='/wjxWjxxTmlb/wjxWjxxTmlb/edit', + deleteOne = '/wjxWjxxTmlb/wjxWjxxTmlb/delete', + deleteBatch = '/wjxWjxxTmlb/wjxWjxxTmlb/deleteBatch', + importExcel = '/wjxWjxxTmlb/wjxWjxxTmlb/importExcel', + exportXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportXls', + queryDataById = '/wjxWjxxTmlb/wjxWjxxTmlb/queryById', + wjxWjxxTmxxList = '/wjxWjxxTmlb/wjxWjxxTmlb/queryWjxWjxxTmxxByMainId', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 查询子表数据 + * @param params + */ +export const queryWjxWjxxTmxxListByMainId = (id) => defHttp.get({url: Api.wjxWjxxTmxxList, params:{ id }}); + +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +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 + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = Api.save; + return defHttp.post({url: url, params}); +} + +/** +* 根据id查询数据 +* @param params +*/ +export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }}); + diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts new file mode 100644 index 0000000..755aaa2 --- /dev/null +++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts @@ -0,0 +1,95 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +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' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '题目编号', + field: 'wjIndex', + component: 'InputNumber', + }, + { + label: '问题标题', + field: 'wjTitle', + component: 'Input', + }, + { + label: '是否必填', + field: 'isRequir', + component: 'Input', + }, + { + label: '问题分值', + field: 'wjScore', + component: 'InputNumber', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false + }, +]; +//子表单数据 +//子表表格配置 +export const wjxWjxxTmxxColumns: JVxeColumn[] = [ + { + title: '选项编号', + key: 'itemIndex', + type: JVxeTypes.inputNumber, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + validateRules: [ + { required: true, message: '${title}不能为空' }, + ], + }, + { + title: '选项标题', + key: 'itemTitle', + type: JVxeTypes.input, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + validateRules: [ + { required: true, message: '${title}不能为空' }, + ], + }, + { + title: '正确答案', + key: 'itemSelected', + type: JVxeTypes.input, + width:"200px", + placeholder: '请输入${title}', + defaultValue:'', + }, + ] diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlbList.vue b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlbList.vue new file mode 100644 index 0000000..fe13d74 --- /dev/null +++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlbList.vue @@ -0,0 +1,211 @@ + + + + \ No newline at end of file diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue new file mode 100644 index 0000000..48ae412 --- /dev/null +++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue @@ -0,0 +1,190 @@ + + + \ No newline at end of file diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbModal.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbModal.vue new file mode 100644 index 0000000..314a598 --- /dev/null +++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbModal.vue @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/src/views/site/jingCaiGongKaiKe/gkkMore.vue b/src/views/site/jingCaiGongKaiKe/gkkMore.vue index 51c848b..3023ac1 100644 --- a/src/views/site/jingCaiGongKaiKe/gkkMore.vue +++ b/src/views/site/jingCaiGongKaiKe/gkkMore.vue @@ -142,7 +142,7 @@ function jrkt(item){ let jssj = Date.parse(item.rq+" "+item.jssj+":00"); let dqsj = Date.parse(dateFormat(new Date(), format)); console.log(`🚀 ~ file: index.vue:114 ~ jrkt ~ dqsj:`, kssj,dqsj,jssj) - if(kssj<=dqsj && jssj>= dqsj){ + if((kssj<=dqsj && jssj>= dqsj) || (dqsj>= jssj)){ var par = {usercode:userStore?.getUserInfo?.username,username:userStore?.getUserInfo?.realname,shijian: dateFormat(new Date(), format),gkkid:item.id} saveOrUpdate(par, false) .then((res) => { }) } diff --git a/src/views/site/jingCaiGongKaiKe/index.vue b/src/views/site/jingCaiGongKaiKe/index.vue index 6923f98..685c6ca 100644 --- a/src/views/site/jingCaiGongKaiKe/index.vue +++ b/src/views/site/jingCaiGongKaiKe/index.vue @@ -116,10 +116,10 @@ function jrkt(item){ let jssj = Date.parse(item.rq+" "+item.jssj+":00"); let dqsj = Date.parse(dateFormat(new Date(), format)); console.log(`🚀 ~ file: index.vue:114 ~ jrkt ~ dqsj:`, kssj,dqsj,jssj) - // if(kssj<=dqsj && jssj>= dqsj){ + if((kssj<=dqsj && jssj>= dqsj) || (dqsj>= jssj)){ var par = {usercode:userStore?.getUserInfo?.username,username:userStore?.getUserInfo?.realname,shijian: dateFormat(new Date(), format),gkkid:item.id} saveOrUpdate(par, false) .then((res) => { }) - // } + } } const saveOrUpdate = (params, isUpdate) => { let url = isUpdate ? Api.edit : Api.save; diff --git a/src/views/zuoye/webAll/JianceForm.vue b/src/views/zuoye/webAll/JianceForm.vue index 4b7856f..a307004 100644 --- a/src/views/zuoye/webAll/JianceForm.vue +++ b/src/views/zuoye/webAll/JianceForm.vue @@ -119,6 +119,25 @@ + + + + + + + + + + 上传并检测 + + + +
+ + + + +