From 86ea17180e5b34faff92c5337b11359cbeb44987 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 5 Feb 2025 08:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 8 +-
.../Form/src/jeecg/components/JEditor3.vue | 39 ++
src/components/Tinymce/index3.ts | 4 +
src/components/Tinymce/src/Editor3.vue | 366 ++++++++++++++++++
src/components/Tinymce/src/tinymce.ts | 5 +
src/views/zy/zyInfo/ZyInfoV2List.vue | 8 +-
6 files changed, 423 insertions(+), 7 deletions(-)
create mode 100644 src/components/Form/src/jeecg/components/JEditor3.vue
create mode 100644 src/components/Tinymce/index3.ts
create mode 100644 src/components/Tinymce/src/Editor3.vue
diff --git a/.env.production b/.env.production
index 9f18d7b..276d4f9 100644
--- a/.env.production
+++ b/.env.production
@@ -20,16 +20,16 @@ VITE_GLOB_API_URL=/jeecg-boot
#后台接口全路径地址(必填)
# VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot
-VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot
-# VITE_GLOB_DOMAIN_URL=https://xxhbtest2.nenu.edu.cn/jeecg-boot
+# VITE_GLOB_DOMAIN_URL=https://smartedu.nenu.edu.cn/jeecg-boot
+VITE_GLOB_DOMAIN_URL=https://xxhbtest2.nenu.edu.cn/jeecg-boot
#VITE_GLOB_DOMAIN_URL=http://210.47.29.177
# VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot
# VITE_GLOB_DOMAIN_URL=http://210.47.29.100/jeecg-boot
#RTC服务器地址
# VITE_GLOB_RTC_SERVER = https://zxkccx.webvpn.nenu.edu.cn:8081
-VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081
-# VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
+# VITE_GLOB_RTC_SERVER = https://smartedu.nenu.edu.cn:8081
+VITE_GLOB_RTC_SERVER = https://xxhbtest2.nenu.edu.cn:8081
# 接口父路径前缀
VITE_GLOB_API_URL_PREFIX=
diff --git a/src/components/Form/src/jeecg/components/JEditor3.vue b/src/components/Form/src/jeecg/components/JEditor3.vue
new file mode 100644
index 0000000..b5c8364
--- /dev/null
+++ b/src/components/Form/src/jeecg/components/JEditor3.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
diff --git a/src/components/Tinymce/index3.ts b/src/components/Tinymce/index3.ts
new file mode 100644
index 0000000..98882e5
--- /dev/null
+++ b/src/components/Tinymce/index3.ts
@@ -0,0 +1,4 @@
+import { withInstall } from '/@/utils/index';
+import tinymce from './src/Editor3.vue';
+
+export const Tinymce = withInstall(tinymce);
diff --git a/src/components/Tinymce/src/Editor3.vue b/src/components/Tinymce/src/Editor3.vue
new file mode 100644
index 0000000..da32fd2
--- /dev/null
+++ b/src/components/Tinymce/src/Editor3.vue
@@ -0,0 +1,366 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts
index 0840912..336a465 100644
--- a/src/components/Tinymce/src/tinymce.ts
+++ b/src/components/Tinymce/src/tinymce.ts
@@ -23,6 +23,10 @@ export const plugins = [
'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus template textpattern visualblocks visualchars wordcount image',
];
+export const plugins2 = [
+ 'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus template textpattern visualblocks visualchars wordcount 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';
@@ -31,6 +35,7 @@ export const plugins = [
// fullscreen code preview | undo redo |
export const simplePlugins = ['lists image link media table textcolor wordcount contextmenu fullscreen'];
+export const simple2Plugins = [''];
export const simpleToolbar = [
'undo redo formatselect bold italic alignleft aligncenter alignright alignjustify bullist numlist outdent indent',
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 6c8730c..b747b73 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -134,7 +134,8 @@
-
+
+
温馨提示:点击可编辑作业要求
@@ -153,7 +154,8 @@
placeholder="请选择评分标准是否允许学生查看" :disabled="editDisabled" />
-
+
+
温馨提示:点击可编辑评分标准
@@ -582,7 +584,7 @@ import { Form } from 'ant-design-vue';
import { saveOrUpdate } from '/@/views/zy/zyInfo/ZyInfo.api';
import { getValueType } from '/@/utils';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor3.vue';
import dayjs, { Dayjs } from 'dayjs';
import { useListPage } from '/@/hooks/system/useListPage';
import { newcolumns } from '/@/views/zy/zyInfoStudent/ZyInfoStudent.data';