zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: zhuhao:c858186d9f43e978a6c8cfc299141ed25b64e2ba
Branches Tags
zhuhao:main
zhuhao:zouyf_dev
zhuhao:lyc-dev
zhuhao:zdg_dev
zhuhao:zxl
zhuhao:baigl
zhuhao:yws_dev
zhuhao:zouyf_tmp
zhuhao:cys_dev
zhuhao:yangws_ws
zhuhao:2.5.9
zhuhao:2.5.7
zhuhao:2.5.5
...
compare: zhuhao:b24c3f1899741feae204629eaf90d2ab70807b40
Branches Tags
zhuhao:main
zhuhao:zouyf_dev
zhuhao:lyc-dev
zhuhao:zdg_dev
zhuhao:zxl
zhuhao:baigl
zhuhao:yws_dev
zhuhao:zouyf_tmp
zhuhao:cys_dev
zhuhao:yangws_ws
zhuhao:2.5.9
zhuhao:2.5.7
zhuhao:2.5.5

7 Commits
c858186d9f ... b24c3f1899

Author SHA1 Message Date
baigl b24c3f1899 Merge pull request 'baigl' (#54) from baigl into main 
Reviewed-on: #54
 2024-11-21 16:33:40 +08:00
白了个白 9efca5c7d8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:33:06 +08:00
yangws c97470ccb0 Merge pull request 'fix：样式调整；' (#53) from yws_dev into main 
Reviewed-on: #53
 2024-11-21 16:33:03 +08:00
白了个白 7d41653036 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:30:54 +08:00
“zouyf” ad006bb218 开放mathtype 2024-11-21 16:27:35 +08:00
“zouyf” ebed58ea9e 优化个人中心选择学科 2024-11-21 15:58:57 +08:00
“zouyf” fd5343c942 Merge branch 'main' into zouyf_dev 2024-11-21 15:06:17 +08:00
3 changed files with 14 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
src/renderer/index.html
View File

@ -8,7 +8,7 @@
http-equiv="Content-Security-Policy" http-equiv="Content-Security-Policy"
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
/> --> /> -->
<meta http-equiv="Content-Security-Policy" content="connect-src * blob:; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src * blob:;img-src * 'self' data: blob:" /> <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self'; script-src 'self' 'unsafe-eval' http://www.wiris.net; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
</head> </head>

8
src/renderer/src/components/tinymce/tinymce.vue
View File

@ -187,10 +187,10 @@ const init = reactive({
min_height: props.minHeight, min_height: props.minHeight,
draggable_modal: true, draggable_modal: true,
extended_valid_elements: '*[.*]', extended_valid_elements: '*[.*]',
// external_plugins: { external_plugins: {
// tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`, tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
// //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`, //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
// }, },
// setup: function (editor) { // setup: function (editor) {
// }, // },

10
src/renderer/src/views/profile/components/selectClass.vue
View File

@ -62,10 +62,18 @@ const handleUserEduStage = (item) => {
// 默认语文 // 默认语文
userStore.edusubject = '语文' userStore.edusubject = '语文'
} }
else if(item === '高中' && userStore.edusubject === "道德与法治"){
// 默认语文
userStore.edusubject = '政治'
}
else if(item != '高中' && userStore.edusubject === "政治"){
// 默认语文
userStore.edusubject = '道德与法治'
}
} }
// 选择学科 // 选择学科
const handleUserEduSubject = (item) => { const handleUserEduSubject = (item) => {
userStore.edusubject = item userStore.edusubject = item;
} }
onMounted(() => { onMounted(() => {
getSubject() getSubject()