Merge remote-tracking branch 'origin/main'

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:"
     /> -->
-    <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;" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self'; script-src 'self' 'unsafe-eval' http://www.wiris.net 'unsafe-inline'; 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>
 

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: {
+  // external_plugins: {
-    tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
+  //   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`,
+  //   //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
-  },
+  // },
   
   // setup: function (editor) {
   // },

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) => {

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设计作业？

src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue

@@ -457,8 +457,6 @@ const handleDelete = async(item, index) => {
   //   ElMessage('试题已经存在')
   // }
 };
-
-
 // 防抖
 const debounceQueryData = debounce(() => {
   console.log("防抖 加载数据中...")
@@ -477,17 +475,7 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 })
 
 </script>
-<style>
+<style src="@/assets/styles/JYStyle.css"></style>
-.my-custom-dialog{
-  width: 60% !important;
-  height: 77vh !important;
-  overflow: hidden !important;
-}
-.my-custom-dialog .el-dialog__body {
-  height: 90% !important;
-  overflow: auto !important;
-}
-</style>
 <style scoped lang="scss">
 .page-myquest {
   height: 100%;
@@ -522,4 +510,14 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 // }
 
 </style>
-<style src="@/assets/styles/JYStyle.css"></style>
+<style>
+.my-custom-dialog{
+  width: 60% !important;
+  height: 77vh !important;
+  overflow: hidden !important;
+}
+.my-custom-dialog .el-dialog__body {
+  height: 90% !important;
+  overflow: auto !important;
+}
+</style>

src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue

@@ -46,8 +46,8 @@
               <p>orc 使用说明</p>
               <p>1、本地浏览 </p>
               <p>2、获取剪贴板图片 </p>
-              <p>3、整题识别 </p>
+              <p>3、整题识别：可识别整张图片，自动填充到对应内容。 </p>
-              <p> </p>
+              <p>4、右侧搜索按钮：点击后可识别图中内容到对应的富文本中。 </p>
             </div>
           </div>
         </el-tab-pane>

src/renderer/src/views/model/index.vue

@@ -7,8 +7,8 @@
       <div class="page-right">
         <div class="button-container">
           <el-button style="margin-left: 12px;" type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
-          <el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
+          <!-- <el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button> -->
-          <el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
+          <el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理</el-button>
           <el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
           <el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
           <el-button type="success" @click="openPPTist">打开PPTist</el-button>