From ebed58ea9edbb2a18292152fba51a60456518cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Thu, 21 Nov 2024 15:58:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=80=89=E6=8B=A9=E5=AD=A6=E7=A7=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/profile/components/selectClass.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/views/profile/components/selectClass.vue b/src/renderer/src/views/profile/components/selectClass.vue index f956927..24e3d48 100644 --- a/src/renderer/src/views/profile/components/selectClass.vue +++ b/src/renderer/src/views/profile/components/selectClass.vue @@ -62,10 +62,18 @@ const handleUserEduStage = (item) => { // 默认语文 userStore.edusubject = '语文' } + else if(item === '高中' && userStore.edusubject === "道德与法治"){ + // 默认语文 + userStore.edusubject = '政治' + } + else if(item != '高中' && userStore.edusubject === "政治"){ + // 默认语文 + userStore.edusubject = '道德与法治' + } } // 选择学科 const handleUserEduSubject = (item) => { - userStore.edusubject = item + userStore.edusubject = item; } onMounted(() => { getSubject() From ad006bb218a929ae4c33aad459262b9a56f434df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Thu, 21 Nov 2024 16:27:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E6=94=BEmathtype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/index.html | 2 +- src/renderer/src/components/tinymce/tinymce.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer/index.html b/src/renderer/index.html index 1de810c..974cb39 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -8,7 +8,7 @@ http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" /> --> - + diff --git a/src/renderer/src/components/tinymce/tinymce.vue b/src/renderer/src/components/tinymce/tinymce.vue index 4c74536..d0837e3 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: `/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: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`, + //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, + }, // setup: function (editor) { // },