diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts index c11a917..0840912 100644 --- a/src/components/Tinymce/src/tinymce.ts +++ b/src/components/Tinymce/src/tinymce.ts @@ -27,7 +27,7 @@ export const plugins = [ // 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl'; export const toolbar = - 'bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify '; + 'kityformula-editor bold italic underline strikethrough | alignleft aligncenter alignright alignjustify '; // fullscreen code preview | undo redo | export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen']; diff --git a/src/components/Tinymce/src/tinymce2.ts b/src/components/Tinymce/src/tinymce2.ts index 0a519ba..69cf75a 100644 --- a/src/components/Tinymce/src/tinymce2.ts +++ b/src/components/Tinymce/src/tinymce2.ts @@ -20,21 +20,21 @@ // export const menubar = 'file edit insert view format table'; export const plugins = [ - 'image code kityformula-editor', + 'image', ]; // export const toolbar = // 'fullscreen code preview | undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent lineheight|subscript superscript blockquote| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | insertfile image media pageembed link anchor codesample insertdatetime hr| a11ycheck ltr rtl'; export const toolbar = -'bold italic underline strikethrough | insertfile image media pageembed link | alignleft aligncenter alignright alignjustify | outdent indent lineheight| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | anchor codesample insertdatetime hr| a11ycheck ltr rtl | code kityformula-editor'; +'bold italic underline strikethrough | insertfile image media pageembed link | alignleft aligncenter alignright alignjustify | outdent indent lineheight| numlist bullist checklist | forecolor backcolor casechange permanentpen formatpainter removeformat | pagebreak | charmap emoticons | anchor codesample insertdatetime hr| a11ycheck ltr rtl'; - // fullscreen code preview | undo redo | + // fullscreen code preview | undo redo | -export const simplePlugins = ['lists insertfile image link table fullscreen']; +export const simplePlugins = ['lists insertfile image link table fullscreen mathjax kityformula-editor bullist numlist']; export const simpleToolbar = [ - 'lists link unlink image media table fullscreen | code kityformula-editor', + 'lists link unlink image media table fullscreen mathjax kityformula-editor bullist numlist', ]; export const menubar = ''; diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue index 9ca8f56..f0d9ba8 100644 --- a/src/views/kc/wjxCswj/WjxCywjV2List.vue +++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue @@ -842,6 +842,10 @@
+ + 分享 + + 微信提醒 @@ -993,6 +997,7 @@ +
@@ -1023,6 +1028,7 @@ import YycyListModal from '/@/views/kc/wjxWjxx/YycyListModal.vue'; import { create } from 'sortablejs'; import { downloadByUrl } from '/@/utils/file/download'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; +import ZyCyFenxiangListModal from '/@/views/zy/zyCyFenxiang/ZyCyFenxiangListModal.vue'; const glob = useGlobSetting(); const globSetting = useGlobSetting(); @@ -1049,6 +1055,7 @@ const registerZcjcModal = ref(); const YinyongTikuListModalpage = ref(); const YinyongTikuDcListModalpage = ref(); const TikuListModalPage = ref(); +const ZyCyFenxiangListModalpage = ref(); const showType = ref(0); const zycs = ref(0); @@ -1123,6 +1130,13 @@ const wrapperCol4 = reactive({ sm: { span: 12 }, }); +//分享给他人 +function handleFenxiang(record){ + console.log(record); + record.type="1"; + ZyCyFenxiangListModalpage.value.init(record) + ZyCyFenxiangListModalpage.value.disableSubmit = true; +} //引用作业 function handleYyzy() { @@ -1724,9 +1738,9 @@ function handleFabu(record: Recordable) { }, }); //推送微信信息 - setTimeout(() => { - defHttp.get({ url: '/wjxWjxx/wjxWjxx/sendWjWechat', params: { id: record.id, wjlx: wjLeixing.value } }).then((res) => {}); - }, 5000); + // setTimeout(() => { + // defHttp.get({ url: '/wjxWjxx/wjxWjxx/sendWjWechat', params: { id: record.id, wjlx: wjLeixing.value } }).then((res) => {}); + // }, 5000); } //动态添加测验次数 diff --git a/src/views/kc/wjxWjxx/WjxWjxx.api.ts b/src/views/kc/wjxWjxx/WjxWjxx.api.ts index 39932aa..6d660ab 100644 --- a/src/views/kc/wjxWjxx/WjxWjxx.api.ts +++ b/src/views/kc/wjxWjxx/WjxWjxx.api.ts @@ -5,6 +5,7 @@ const { createConfirm } = useMessage(); enum Api { list = '/wjxWjxx/wjxWjxx/list', + listOther = '/wjxWjxx/wjxWjxx/listOther', save='/wjxWjxx/wjxWjxx/add', edit='/wjxWjxx/wjxWjxx/edit', deleteOne = '/wjxWjxx/wjxWjxx/delete', @@ -32,6 +33,7 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const listOther = (params) => defHttp.get({ url: Api.listOther, params }); /** * 删除单个 diff --git a/src/views/kc/wjxWjxx/YycyListMain.vue b/src/views/kc/wjxWjxx/YycyListMain.vue new file mode 100644 index 0000000..0b0cbb4 --- /dev/null +++ b/src/views/kc/wjxWjxx/YycyListMain.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/YycyListModal.vue b/src/views/kc/wjxWjxx/YycyListModal.vue index f95e0fb..6ee1f0a 100644 --- a/src/views/kc/wjxWjxx/YycyListModal.vue +++ b/src/views/kc/wjxWjxx/YycyListModal.vue @@ -6,7 +6,7 @@ + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue index d501baf..219021d 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue @@ -127,6 +127,9 @@ function handleHqjg(record){ defHttp.post({url:'/wjxDjxx/updateDjjg',params:record}).then(res=>{ console.log('-->',res) }) + // defHttp.post({url:'/wjxDjxx/getDjjg',params:record}).then(res=>{ + // console.log('-->',res) + // }) } /** diff --git a/src/views/zy/zyCyFenxiang/ZyCyFenxiang.api.ts b/src/views/zy/zyCyFenxiang/ZyCyFenxiang.api.ts new file mode 100644 index 0000000..d82dc2c --- /dev/null +++ b/src/views/zy/zyCyFenxiang/ZyCyFenxiang.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/zyCyFenxiang/zyCyFenxiang/list', + save='/zyCyFenxiang/zyCyFenxiang/add', + edit='/zyCyFenxiang/zyCyFenxiang/edit', + deleteOne = '/zyCyFenxiang/zyCyFenxiang/delete', + deleteBatch = '/zyCyFenxiang/zyCyFenxiang/deleteBatch', + importExcel = '/zyCyFenxiang/zyCyFenxiang/importExcel', + exportXls = '/zyCyFenxiang/zyCyFenxiang/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/zy/zyCyFenxiang/ZyCyFenxiang.data.ts b/src/views/zy/zyCyFenxiang/ZyCyFenxiang.data.ts new file mode 100644 index 0000000..01b0ece --- /dev/null +++ b/src/views/zy/zyCyFenxiang/ZyCyFenxiang.data.ts @@ -0,0 +1,78 @@ +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: 'teacherNo' + }, + { + title: '教师姓名', + align: "center", + dataIndex: 'teacherName' + }, +]; +//列表数据 +export const columns2: BasicColumn[] = [ + { + title: '教工号', + align: "center", + dataIndex: 'gh' + }, + { + title: '教师姓名', + align: "center", + dataIndex: 'xm' + }, + { + title: '单位名称', + align: "center", + dataIndex: 'dwmc' + }, + { + title: '操作', + align: "center", + key: 'action', + dataIndex: 'action' + }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "教工号", + field: 'teacherNo', + component: 'Input', + colProps: {span: 6}, + }, + { + label: "教师姓名", + field: 'teacherName', + component: 'Input', + colProps: {span: 6}, + }, +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '教工号', + field: 'teacherNo', + component: 'Input', + }, + { + label: '教师姓名', + field: 'teacherName', + component: 'Input', + }, + // TODO 主键隐藏字段,目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/zy/sysZy/statics/SysStaticList copy.vue b/src/views/zy/zyCyFenxiang/ZyCyFenxiangList copy.vue similarity index 55% rename from src/views/zy/sysZy/statics/SysStaticList copy.vue rename to src/views/zy/zyCyFenxiang/ZyCyFenxiangList copy.vue index cf0e986..010a5a8 100644 --- a/src/views/zy/sysZy/statics/SysStaticList copy.vue +++ b/src/views/zy/zyCyFenxiang/ZyCyFenxiangList copy.vue @@ -4,31 +4,24 @@
- - - + + + - - - + + + - - - - - - - - - - - + 查询 - 导出 + @@ -36,11 +29,29 @@
- + + @@ -619,6 +621,7 @@ import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStude import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue'; import ZyInfoEditModal from './components/ZyInfoEditModal.vue'; import YyzyListModal from '/@/views/zy/zyInfo/YyzyListModal.vue'; +import ZyCyFenxiangListModal from '/@/views/zy/zyCyFenxiang/ZyCyFenxiangListModal.vue'; const globSetting = useGlobSetting(); const baseApiUrl = globSetting.domainUrl; @@ -666,6 +669,7 @@ const XxhbbksListModalPage = ref(); const registerEditModal = ref(); const registerDetialModal = ref(); const YyzyListModalPage = ref(); +const ZyCyFenxiangListModalpage = ref(); const pdfUrl = ref('/downPath/ylhpsf.pdf'); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -714,6 +718,16 @@ function handleYyzy() { YyzyListModalPage.value.disableSubmit = true; YyzyListModalPage.value.init(params); } + + +//分享给他人 +function handleFenxiang(record){ + console.log(record); + record.type="0"; + ZyCyFenxiangListModalpage.value.init(record) + ZyCyFenxiangListModalpage.value.disableSubmit = true; +} + //引用作业回调 function handleCallYinyong(record) { console.log('👯‍♂️', record); diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue index a4b0466..a86aa81 100644 --- a/src/views/zy/zyInfo/ZyInfoV2List.vue +++ b/src/views/zy/zyInfo/ZyInfoV2List.vue @@ -524,6 +524,8 @@ --> 编辑作业 + 分享 + 撤回作业 批阅作业 @@ -577,6 +579,7 @@ +
@@ -626,6 +629,7 @@ import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStude import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue'; import ZyInfoEditModal from './components/ZyInfoEditModal.vue'; import YyzyListModal from '/@/views/zy/zyInfo/YyzyListModal.vue'; +import ZyCyFenxiangListModal from '/@/views/zy/zyCyFenxiang/ZyCyFenxiangListModal.vue'; import { encryptByBase64 } from '/@/utils/cipher'; const globSetting = useGlobSetting(); @@ -680,6 +684,7 @@ const registerEditModal = ref(); const registerDetialModal = ref(); const registerPiyueModal = ref(); const YyzyListModalPage = ref(); +const ZyCyFenxiangListModalpage = ref(); const pdfUrl = ref('/downPath/ylhpsf.pdf'); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -739,6 +744,17 @@ function handleCallYinyong(record) { zyInfo.value = record; console.log('😠', zyInfo); } +//分享给他人 +function handleFenxiang(record){ + // console.log(record); + record.type="0"; + ZyCyFenxiangListModalpage.value.init(record) + ZyCyFenxiangListModalpage.value.disableSubmit = true; + // defHttp.get({url:'/zyInfoStudent/zyInfoStudent/cxccByZyId'}).then(res=>{ + // console.log("🚀 ~ defHttp.get ~ res:", res) + + // }) +} //选择是否允许学生查看 function handleXshpkg(record) {