From 2f99a00a4737a3c0dbb4f699a720134fb145783a Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 21 Nov 2024 17:31:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF-=E8=80=83=E8=AF=95?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/api/mode/index.js | 21 +- .../template-study/container/header.vue | 13 +- .../container/adjust-dialog.vue | 303 +++++++++++ .../examination-analysis/container/dialog.vue | 211 ++++++++ .../container/edit-dialog.vue | 78 +++ .../examination-analysis/container/header.vue | 143 +++++ .../container/keyword-dialog.vue | 161 ++++++ .../container/{pdf-template.vue => pdf.vue} | 2 - .../container/question-answer.vue | 153 ------ .../container/read-result.vue | 174 ------ .../container/read-template.vue | 116 ---- .../examination-analysis/container/result.vue | 505 ++++++++++++++++++ .../src/views/examination-analysis/index.vue | 185 ++----- src/renderer/src/views/model/index.vue | 2 +- .../views/teachingDesign/container/right.vue | 1 - 15 files changed, 1460 insertions(+), 608 deletions(-) create mode 100644 src/renderer/src/views/examination-analysis/container/adjust-dialog.vue create mode 100644 src/renderer/src/views/examination-analysis/container/dialog.vue create mode 100644 src/renderer/src/views/examination-analysis/container/edit-dialog.vue create mode 100644 src/renderer/src/views/examination-analysis/container/header.vue create mode 100644 src/renderer/src/views/examination-analysis/container/keyword-dialog.vue rename src/renderer/src/views/examination-analysis/container/{pdf-template.vue => pdf.vue} (99%) delete mode 100644 src/renderer/src/views/examination-analysis/container/question-answer.vue delete mode 100644 src/renderer/src/views/examination-analysis/container/read-result.vue delete mode 100644 src/renderer/src/views/examination-analysis/container/read-template.vue create mode 100644 src/renderer/src/views/examination-analysis/container/result.vue diff --git a/src/renderer/src/api/mode/index.js b/src/renderer/src/api/mode/index.js index a53a36f..59d0380 100644 --- a/src/renderer/src/api/mode/index.js +++ b/src/renderer/src/api/mode/index.js @@ -15,7 +15,7 @@ export function conversation(data) { }) } -// 进行课标研读对话 +// 进行课标研读对话 质点提取 export function completion(data) { return axios({ url: rootPath + '/api/v1/parse/docs', @@ -100,3 +100,22 @@ export function tempResult(params) { }) } +// 新增 doc +export function addDoc(data) { + return request({ + url: '/education/doc', + method: 'post', + data + }) +} + +// 查询 doc +export function docList(params) { + return request({ + url: '/education/doc/list', + method: 'get', + params + }) +} + + diff --git a/src/renderer/src/components/template-study/container/header.vue b/src/renderer/src/components/template-study/container/header.vue index 219db88..0846bb1 100644 --- a/src/renderer/src/components/template-study/container/header.vue +++ b/src/renderer/src/components/template-study/container/header.vue @@ -2,7 +2,7 @@
- 高中语文课程标准 + {{ curNode.edustage}}{{ curNode.edusubject }}{{ type == 1 ? '课标研读': '教材分析'}}
@@ -26,7 +26,7 @@ 添加提示词 - 保存模板 + 一键研读
@@ -37,14 +37,14 @@ \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/dialog.vue b/src/renderer/src/views/examination-analysis/container/dialog.vue new file mode 100644 index 0000000..5e81e27 --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/dialog.vue @@ -0,0 +1,211 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/edit-dialog.vue b/src/renderer/src/views/examination-analysis/container/edit-dialog.vue new file mode 100644 index 0000000..fa7ff5d --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/edit-dialog.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/header.vue b/src/renderer/src/views/examination-analysis/container/header.vue new file mode 100644 index 0000000..880debf --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/header.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue b/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue new file mode 100644 index 0000000..4821d6e --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/keyword-dialog.vue @@ -0,0 +1,161 @@ + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/pdf-template.vue b/src/renderer/src/views/examination-analysis/container/pdf.vue similarity index 99% rename from src/renderer/src/views/examination-analysis/container/pdf-template.vue rename to src/renderer/src/views/examination-analysis/container/pdf.vue index ceba60f..c83dfd0 100644 --- a/src/renderer/src/views/examination-analysis/container/pdf-template.vue +++ b/src/renderer/src/views/examination-analysis/container/pdf.vue @@ -3,7 +3,6 @@ - - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/read-result.vue b/src/renderer/src/views/examination-analysis/container/read-result.vue deleted file mode 100644 index aa3bd2d..0000000 --- a/src/renderer/src/views/examination-analysis/container/read-result.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/read-template.vue b/src/renderer/src/views/examination-analysis/container/read-template.vue deleted file mode 100644 index 0b2c218..0000000 --- a/src/renderer/src/views/examination-analysis/container/read-template.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/renderer/src/views/examination-analysis/container/result.vue b/src/renderer/src/views/examination-analysis/container/result.vue new file mode 100644 index 0000000..e1cfa1b --- /dev/null +++ b/src/renderer/src/views/examination-analysis/container/result.vue @@ -0,0 +1,505 @@ + + + + + + diff --git a/src/renderer/src/views/examination-analysis/index.vue b/src/renderer/src/views/examination-analysis/index.vue index 9d0044d..7461e1c 100644 --- a/src/renderer/src/views/examination-analysis/index.vue +++ b/src/renderer/src/views/examination-analysis/index.vue @@ -1,177 +1,52 @@ \ No newline at end of file diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index da9b87b..e352f1c 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -7,7 +7,7 @@ 教材研读 教学框架设计 打开PPTist - + 考试分析 diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue index 9e2cd94..48c1ce3 100644 --- a/src/renderer/src/views/teachingDesign/container/right.vue +++ b/src/renderer/src/views/teachingDesign/container/right.vue @@ -61,7 +61,6 @@ import { completion } from '@/api/mode/index.js' const resultList = ref([]) emitter.on('changeMode', (item) => { - console.log(item, 3000) resultList.value = item.child conversation() }) From 398de60dcd3c5e7f4e71f669a1969f1eb01a906d Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Thu, 21 Nov 2024 17:32:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=96=87=E4=BB=B6=EF=BC=8C=E8=B6=85=E8=BF=87?= =?UTF-8?q?150M=E6=96=87=E4=BB=B6=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/file-list-item.vue | 4 ++-- src/renderer/src/views/prepare/container/kj-list-item.vue | 4 ++-- src/renderer/src/views/resource/container/resoure-list.vue | 6 +++++- src/renderer/src/views/resource/container/third-list.vue | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue index 8d9bc5f..c2e3e90 100644 --- a/src/renderer/src/views/prepare/container/file-list-item.vue +++ b/src/renderer/src/views/prepare/container/file-list-item.vue @@ -280,14 +280,14 @@ export default { cookie, fileType: item.fileType }) - ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => { + /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => { items.async = 'on' }) ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => { items.fileSize = data.fileSize items.md5 = md5 items.async = true - }) + })*/ } }) }) diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue index 7a9a56a..8936e22 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -357,14 +357,14 @@ export default { cookie, fileType: item.fileType }) - ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => { + /*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => { items.async = 'on' }) ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => { items.fileSize = data.fileSize items.md5 = md5 items.async = true - }) + })*/ } }) }) diff --git a/src/renderer/src/views/resource/container/resoure-list.vue b/src/renderer/src/views/resource/container/resoure-list.vue index 517d97f..9b2bf8f 100644 --- a/src/renderer/src/views/resource/container/resoure-list.vue +++ b/src/renderer/src/views/resource/container/resoure-list.vue @@ -161,7 +161,11 @@ const delRow = (item) => { } // 加入备课 -const addLesson = ({ id }) => { +const addLesson = ({ id, fileSize }) => { + if (fileSize>1024*1024*150) { + ElMessage.warning('文件超过150M,暂停超过150M资源的下载,请重新选择') + return + } let data = { id, fileRoot: '备课', diff --git a/src/renderer/src/views/resource/container/third-list.vue b/src/renderer/src/views/resource/container/third-list.vue index 204dc12..3fb5cca 100644 --- a/src/renderer/src/views/resource/container/third-list.vue +++ b/src/renderer/src/views/resource/container/third-list.vue @@ -125,6 +125,10 @@ const handleRow = (item) => { thirdPreview.value.init(item.itemId) } const openChapter = (item)=>{ + if (item.size>1024*1024*150) { + ElMessage.warning('文件超过150M,暂停超过150M资源的下载,请重新选择') + return + } currentItem.value = item // 打开弹窗 treelogRef.value.openDialog() From 6a6d9328526726ed16b992162b49d324c2e7b075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 22 Nov 2024 09:33:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/tinymce/tinymce.vue | 8 ++++---- .../views/classTask/newClassTaskAssign/Right/index.vue | 1 + .../src/views/classTask/newClassTaskAssign/index.vue | 6 ++++++ .../classTask/newClassTaskAssign/questionUpload/index.vue | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/components/tinymce/tinymce.vue b/src/renderer/src/components/tinymce/tinymce.vue index 1f5256e..2e4a7e9 100644 --- a/src/renderer/src/components/tinymce/tinymce.vue +++ b/src/renderer/src/components/tinymce/tinymce.vue @@ -187,10 +187,10 @@ const init = reactive({ min_height: props.minHeight, draggable_modal: true, extended_valid_elements: '*[.*]', - external_plugins: { - tiny_mce_wiris: getStaticUrl('/tinymce/tool/wiris/mathtype-tinymce6/plugin.min.js'), - //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, - }, + // external_plugins: { + // tiny_mce_wiris: getStaticUrl('/tinymce/tool/wiris/mathtype-tinymce6/plugin.min.js'), + // //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, + // }, // setup: function (editor) { // }, diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue index b582944..7ee7d86 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue @@ -36,6 +36,7 @@ const items = shallowRef([ { title: '课堂展示', description: '555555', icon: '#icon-huaban',type:'primary' }, { title: '常规作业', description: '555555', icon: '#icon-zhaoxiangji',type:'primary' }, { title: 'AI设计作业', description: '555555', icon: '#icon-jiqiren_o',type:'danger' }, + { title: '习题上传', description: '555555', icon: '#icon-jiqiren_o',type:'danger' }, ]); const handleClick = (item) => { diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue index 8cd77c0..6adcd64 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue @@ -155,6 +155,7 @@ import { useRouter, useRoute } from 'vue-router' import useUserStore from '@/store/modules/user' const userStore = useUserStore().user const route = useRoute(); +const router = useRouter() const { proxy } = getCurrentInstance() const props = defineProps({ }) @@ -202,6 +203,11 @@ onMounted(() => { //---------作业设计--- const handleItemClick = (itemName) => { console.log('itemName', itemName); + if(itemName == '习题上传'){ + router.push({ path: '/model/questionUpload', query: { courseObj: JSON.stringify(courseObj) } }); + return; + } + currentRow.value = {id:1}; // 作业设计 /** * 智能推荐?AI设计作业? diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue index 503f76c..d3a7cae 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue @@ -46,8 +46,8 @@

orc 使用说明

1、本地浏览

2、获取剪贴板图片

-

3、整题识别

-

+

3、整题识别:可识别整张图片,自动填充到对应内容。

+

4、右侧搜索按钮:点击后可识别图中内容到对应的富文本中。