瀏覽代碼

Merge branch 'beta' into HK

SanHQin 2 月之前
父節點
當前提交
a2bf860e22
共有 66 個文件被更改,包括 178 次插入32 次删除
  1. 4 0
      dist/index.html
  2. 0 0
      dist/static/css/app.1a1cf54e58e0216370df30223cfc276a.css
  3. 1 0
      dist/static/css/app.1a1cf54e58e0216370df30223cfc276a.css.map
  4. 0 0
      dist/static/css/app.2c0c3f00353d9dbaff9fd5dce08cc8a7.css.map
  5. 二進制
      dist/static/fonts/KaTeX_AMS-Regular.10824af.woff
  6. 二進制
      dist/static/fonts/KaTeX_AMS-Regular.5657322.ttf
  7. 二進制
      dist/static/fonts/KaTeX_AMS-Regular.66c6782.woff2
  8. 二進制
      dist/static/fonts/KaTeX_Caligraphic-Bold.497bf40.ttf
  9. 二進制
      dist/static/fonts/KaTeX_Caligraphic-Regular.e6fb499.ttf
  10. 二進制
      dist/static/fonts/KaTeX_Fraktur-Bold.40934fc.woff
  11. 二進制
      dist/static/fonts/KaTeX_Fraktur-Bold.796f379.woff2
  12. 二進制
      dist/static/fonts/KaTeX_Fraktur-Bold.b9d7c44.ttf
  13. 二進制
      dist/static/fonts/KaTeX_Fraktur-Regular.97a699d.ttf
  14. 二進制
      dist/static/fonts/KaTeX_Fraktur-Regular.e435cda.woff
  15. 二進制
      dist/static/fonts/KaTeX_Fraktur-Regular.f9e6a99.woff2
  16. 二進制
      dist/static/fonts/KaTeX_Main-Bold.4cdba64.woff
  17. 二進制
      dist/static/fonts/KaTeX_Main-Bold.8e431f7.ttf
  18. 二進制
      dist/static/fonts/KaTeX_Main-Bold.a9382e2.woff2
  19. 二進制
      dist/static/fonts/KaTeX_Main-BoldItalic.52fb39b.ttf
  20. 二進制
      dist/static/fonts/KaTeX_Main-BoldItalic.5f875f9.woff
  21. 二進制
      dist/static/fonts/KaTeX_Main-BoldItalic.d873734.woff2
  22. 二進制
      dist/static/fonts/KaTeX_Main-Italic.39349e0.ttf
  23. 二進制
      dist/static/fonts/KaTeX_Main-Italic.6529706.woff2
  24. 二進制
      dist/static/fonts/KaTeX_Main-Italic.8ffd28f.woff
  25. 二進制
      dist/static/fonts/KaTeX_Main-Regular.818582d.ttf
  26. 二進制
      dist/static/fonts/KaTeX_Main-Regular.f1cdb69.woff
  27. 二進制
      dist/static/fonts/KaTeX_Main-Regular.f8a7f19.woff2
  28. 二進制
      dist/static/fonts/KaTeX_Math-BoldItalic.1320454.woff2
  29. 二進制
      dist/static/fonts/KaTeX_Math-BoldItalic.48155e4.woff
  30. 二進制
      dist/static/fonts/KaTeX_Math-BoldItalic.6589c4f.ttf
  31. 二進制
      dist/static/fonts/KaTeX_Math-Italic.d8b7a80.woff2
  32. 二進制
      dist/static/fonts/KaTeX_Math-Italic.ed7aea1.woff
  33. 二進制
      dist/static/fonts/KaTeX_Math-Italic.fe5ed58.ttf
  34. 二進制
      dist/static/fonts/KaTeX_SansSerif-Bold.0e897d2.woff
  35. 二進制
      dist/static/fonts/KaTeX_SansSerif-Bold.ad546b4.woff2
  36. 二進制
      dist/static/fonts/KaTeX_SansSerif-Bold.f2ac731.ttf
  37. 二進制
      dist/static/fonts/KaTeX_SansSerif-Italic.e934cbc.woff2
  38. 二進制
      dist/static/fonts/KaTeX_SansSerif-Italic.ef725de.woff
  39. 二進制
      dist/static/fonts/KaTeX_SansSerif-Italic.f60b4a3.ttf
  40. 二進制
      dist/static/fonts/KaTeX_SansSerif-Regular.1ac3ed6.woff2
  41. 二進制
      dist/static/fonts/KaTeX_SansSerif-Regular.3243452.ttf
  42. 二進制
      dist/static/fonts/KaTeX_SansSerif-Regular.5f8637e.woff
  43. 二進制
      dist/static/fonts/KaTeX_Script-Regular.a189c37.ttf
  44. 二進制
      dist/static/fonts/KaTeX_Script-Regular.a82fa2a.woff
  45. 二進制
      dist/static/fonts/KaTeX_Size1-Regular.0d8d920.ttf
  46. 二進制
      dist/static/fonts/KaTeX_Size2-Regular.1fdda0e.ttf
  47. 二進制
      dist/static/fonts/KaTeX_Size4-Regular.27a23ee.ttf
  48. 二進制
      dist/static/fonts/KaTeX_Typewriter-Regular.0e04605.woff
  49. 二進制
      dist/static/fonts/KaTeX_Typewriter-Regular.6bf4287.ttf
  50. 二進制
      dist/static/fonts/KaTeX_Typewriter-Regular.b8b8393.woff2
  51. 1 0
      dist/static/js/app.615fbbc6a499e52f9dc9.js
  52. 1 0
      dist/static/js/app.615fbbc6a499e52f9dc9.js.map
  53. 1 0
      dist/static/js/app.da976caf1deffcca5ab9.js
  54. 0 0
      dist/static/js/app.da976caf1deffcca5ab9.js.map
  55. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  56. 0 0
      dist/static/js/vendor.b2299056e030e9dd4cb8.js
  57. 0 0
      dist/static/js/vendor.b2299056e030e9dd4cb8.js.map
  58. 57 0
      package-lock.json
  59. 1 0
      package.json
  60. 21 7
      src/components/components/askStatic2.vue
  61. 16 2
      src/components/components/choseWorksDetailDialog.vue
  62. 2 2
      src/components/easy/studyStudent.vue
  63. 18 5
      src/components/easy2/studyStudent.vue
  64. 17 4
      src/components/easy3/studyStudent.vue
  65. 20 7
      src/components/studyStudent.vue
  66. 18 5
      src/components/studySutdentClass/studyStudent.vue

+ 4 - 0
dist/index.html

@@ -27,7 +27,11 @@
     html,
     body{
       font-family: '黑体';
+<<<<<<< HEAD
     }</style><link href=./static/css/app.2c0c3f00353d9dbaff9fd5dce08cc8a7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.43cd677d9291e0373eea.js></script><script type=text/javascript src=./static/js/app.da976caf1deffcca5ab9.js></script></body></html><script>function stopSafari() {
+=======
+    }</style><link href=./static/css/app.1a1cf54e58e0216370df30223cfc276a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.615fbbc6a499e52f9dc9.js></script></body></html><script>function stopSafari() {
+>>>>>>> beta
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.1a1cf54e58e0216370df30223cfc276a.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.1a1cf54e58e0216370df30223cfc276a.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.2c0c3f00353d9dbaff9fd5dce08cc8a7.css.map


二進制
dist/static/fonts/KaTeX_AMS-Regular.10824af.woff


二進制
dist/static/fonts/KaTeX_AMS-Regular.5657322.ttf


二進制
dist/static/fonts/KaTeX_AMS-Regular.66c6782.woff2


二進制
dist/static/fonts/KaTeX_Caligraphic-Bold.497bf40.ttf


二進制
dist/static/fonts/KaTeX_Caligraphic-Regular.e6fb499.ttf


二進制
dist/static/fonts/KaTeX_Fraktur-Bold.40934fc.woff


二進制
dist/static/fonts/KaTeX_Fraktur-Bold.796f379.woff2


二進制
dist/static/fonts/KaTeX_Fraktur-Bold.b9d7c44.ttf


二進制
dist/static/fonts/KaTeX_Fraktur-Regular.97a699d.ttf


二進制
dist/static/fonts/KaTeX_Fraktur-Regular.e435cda.woff


二進制
dist/static/fonts/KaTeX_Fraktur-Regular.f9e6a99.woff2


二進制
dist/static/fonts/KaTeX_Main-Bold.4cdba64.woff


二進制
dist/static/fonts/KaTeX_Main-Bold.8e431f7.ttf


二進制
dist/static/fonts/KaTeX_Main-Bold.a9382e2.woff2


二進制
dist/static/fonts/KaTeX_Main-BoldItalic.52fb39b.ttf


二進制
dist/static/fonts/KaTeX_Main-BoldItalic.5f875f9.woff


二進制
dist/static/fonts/KaTeX_Main-BoldItalic.d873734.woff2


二進制
dist/static/fonts/KaTeX_Main-Italic.39349e0.ttf


二進制
dist/static/fonts/KaTeX_Main-Italic.6529706.woff2


二進制
dist/static/fonts/KaTeX_Main-Italic.8ffd28f.woff


二進制
dist/static/fonts/KaTeX_Main-Regular.818582d.ttf


二進制
dist/static/fonts/KaTeX_Main-Regular.f1cdb69.woff


二進制
dist/static/fonts/KaTeX_Main-Regular.f8a7f19.woff2


二進制
dist/static/fonts/KaTeX_Math-BoldItalic.1320454.woff2


二進制
dist/static/fonts/KaTeX_Math-BoldItalic.48155e4.woff


二進制
dist/static/fonts/KaTeX_Math-BoldItalic.6589c4f.ttf


二進制
dist/static/fonts/KaTeX_Math-Italic.d8b7a80.woff2


二進制
dist/static/fonts/KaTeX_Math-Italic.ed7aea1.woff


二進制
dist/static/fonts/KaTeX_Math-Italic.fe5ed58.ttf


二進制
dist/static/fonts/KaTeX_SansSerif-Bold.0e897d2.woff


二進制
dist/static/fonts/KaTeX_SansSerif-Bold.ad546b4.woff2


二進制
dist/static/fonts/KaTeX_SansSerif-Bold.f2ac731.ttf


二進制
dist/static/fonts/KaTeX_SansSerif-Italic.e934cbc.woff2


二進制
dist/static/fonts/KaTeX_SansSerif-Italic.ef725de.woff


二進制
dist/static/fonts/KaTeX_SansSerif-Italic.f60b4a3.ttf


二進制
dist/static/fonts/KaTeX_SansSerif-Regular.1ac3ed6.woff2


二進制
dist/static/fonts/KaTeX_SansSerif-Regular.3243452.ttf


二進制
dist/static/fonts/KaTeX_SansSerif-Regular.5f8637e.woff


二進制
dist/static/fonts/KaTeX_Script-Regular.a189c37.ttf


二進制
dist/static/fonts/KaTeX_Script-Regular.a82fa2a.woff


二進制
dist/static/fonts/KaTeX_Size1-Regular.0d8d920.ttf


二進制
dist/static/fonts/KaTeX_Size2-Regular.1fdda0e.ttf


二進制
dist/static/fonts/KaTeX_Size4-Regular.27a23ee.ttf


二進制
dist/static/fonts/KaTeX_Typewriter-Regular.0e04605.woff


二進制
dist/static/fonts/KaTeX_Typewriter-Regular.6bf4287.ttf


二進制
dist/static/fonts/KaTeX_Typewriter-Regular.b8b8393.woff2


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.615fbbc6a499e52f9dc9.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.615fbbc6a499e52f9dc9.js.map


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.da976caf1deffcca5ab9.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.da976caf1deffcca5ab9.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.b2299056e030e9dd4cb8.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.b2299056e030e9dd4cb8.js.map


+ 57 - 0
package-lock.json

@@ -25,6 +25,7 @@
         "js-audio-recorder": "^1.0.7",
         "jsmind": "^0.4.8",
         "jszip": "^3.10.1",
+        "katex": "^0.16.22",
         "lamejs": "^1.2.1",
         "language-hk-loader": "^1.0.1",
         "markdown-it": "^13.0.1",
@@ -13891,6 +13892,31 @@
         "setimmediate": "^1.0.5"
       }
     },
+    "node_modules/katex": {
+      "version": "0.16.22",
+      "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
+      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^8.3.0"
+      },
+      "bin": {
+        "katex": "cli.js"
+      }
+    },
+    "node_modules/katex/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -35713,6 +35739,21 @@
         "setimmediate": "^1.0.5"
       }
     },
+    "katex": {
+      "version": "0.16.22",
+      "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
+      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+      "requires": {
+        "commander": "^8.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
+        }
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -37966,6 +38007,7 @@
         "js-audio-recorder": "^1.0.7",
         "jsmind": "^0.4.8",
         "jszip": "^3.10.1",
+        "katex": "^0.16.22",
         "lamejs": "^1.2.1",
         "language-hk-loader": "^1.0.1",
         "markdown-it": "^13.0.1",
@@ -49318,6 +49360,21 @@
             "setimmediate": "^1.0.5"
           }
         },
+        "katex": {
+          "version": "0.16.22",
+          "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
+          "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+          "requires": {
+            "commander": "^8.3.0"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "8.3.0",
+              "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
+              "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
+            }
+          }
+        },
         "killable": {
           "version": "1.0.1",
           "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",

+ 1 - 0
package.json

@@ -29,6 +29,7 @@
     "js-audio-recorder": "^1.0.7",
     "jsmind": "^0.4.8",
     "jszip": "^3.10.1",
+    "katex": "^0.16.22",
     "lamejs": "^1.2.1",
     "language-hk-loader": "^1.0.1",
     "markdown-it": "^13.0.1",

+ 21 - 7
src/components/components/askStatic2.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sjBox" v-if="askJSONC && askJSONC.testJson">
-    <div class="a_add_title">
+    <div class="a_add_title" >
       <div style="font-size: 25px">{{ askJSONC.testTitle }}</div>
     </div>
     <div class="a_addBox">
@@ -33,7 +33,7 @@
                   cursor: pointer;
                 "
               >
-                {{ index + 1 + "、" + item.teststitle }}
+                {{ index + 1 + "、"  }} <span ref="latexElement" v-html="renderedFormula(item.teststitle)"></span>
               </div>
             </el-tooltip>
             <!-- </el-tooltip> -->
@@ -185,6 +185,8 @@
 </template>
 
 <script>
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 export default {
   props: ["askJSON", "checkJson"],
   data() {
@@ -197,10 +199,17 @@ export default {
       checkJson2: [],
     };
   },
-  watch: {
-    askJSON(val) {
-      this.askJSONC = this.askJSON ? JSON.parse(this.askJSON)[0] : {};
-    },
+  computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    }
   },
   methods: {
     handleClose(done) {
@@ -229,6 +238,9 @@ export default {
         this.checkJson2 = this.checkJson;
       },
     },
+    askJSON(val) {
+      this.askJSONC = this.askJSON ? JSON.parse(this.askJSON)[0] : {};
+    },
   },
   mounted() {
     // this.askJSONC = this.askJSON ? JSON.parse(this.askJSON)[0] : {};
@@ -267,7 +279,9 @@ export default {
   font-size: 18px;
   width: 100%;
 }
-
+.a_add_head >>> .katex{
+  font-size: 16px;
+}
 .a_add_head .a_add_head_input {
   width: 300px;
 }

+ 16 - 2
src/components/components/choseWorksDetailDialog.vue

@@ -85,7 +85,7 @@
                         >
                           (多选题)
                         </div>
-                        <div>题目:{{ item1.teststitle }}</div>
+                        <div>题目:<span v-html="renderedFormula(item1.teststitle)"></span></div>
                       </div>
                       <img
                         v-if="item1.img"
@@ -1366,7 +1366,8 @@ import smarter from './intelligentAnalysis/smarter.vue';
 import { tools as toolsList } from "@/common/tools2.js";
 import { myMixin } from "@/mixins/mixin.js"
 // import html2canvas from "html2canvas";
-
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 export default {
   mixins: [ myMixin ],
 	components:{
@@ -1519,6 +1520,16 @@ export default {
   },
 
   computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    },
     tableData() {
       let _result = [];
       if (this.show && this.toolIndex !== null && [45].includes(this.toolType)) {
@@ -4341,4 +4352,7 @@ ol {
   color: rgb(80, 80, 80);
   margin-bottom: 20px;
 }
+.a_add_head >>> .katex{
+  font-size: 14px;
+}
 </style>

+ 2 - 2
src/components/easy/studyStudent.vue

@@ -243,7 +243,7 @@
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
 											allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('cloud.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('app.cocorobo.cn')!=-1"
+                      v-if="pptImgUrl1.indexOf('cocorobo.cn')!=-1"
                       :src="pptImgUrl1"
                     ></iframe>
                     <iframe
@@ -1499,7 +1499,7 @@
             style="width: 100%; height: 100%; border: none"
 						:key="diffKey"
 						allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-            v-else-if="fulltype == 2 && (fullUrl.indexOf('knowledge.cocorobo.cn')!=-1 || fullUrl.indexOf('cloud.cocorobo.cn')!=-1) || fullUrl.indexOf('app.cocorobo.cn')!=-1"
+            v-else-if="fulltype == 2 && (fullUrl.indexOf('cocorobo')!=-1)"
             :src="fullUrl"
           ></iframe>
           <iframe

+ 18 - 5
src/components/easy2/studyStudent.vue

@@ -6206,7 +6206,7 @@
                               cursor: pointer;
                             "
                           >
-                            {{ index + 1 + "、" + item.teststitle }}
+                            {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
                         </el-tooltip>
                       </div>
@@ -13927,7 +13927,7 @@
         <iframe
             style="width: 100%; height: 100%; border: none"
 						allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('knowledge.cocorobo.cn')!=-1 || fullUrl.indexOf('cloud.cocorobo.cn')!=-1) || fullUrl.indexOf('app.cocorobo.cn')!=-1"
+            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('cocorobo')!=-1)"
             :src="fullUrl"
           ></iframe>
           <iframe
@@ -13949,7 +13949,7 @@
           sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           :src="fullUrl"
         ></iframe>
- 
+
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>
@@ -16262,7 +16262,8 @@ import statisticalAnalysis from "../components/statisticalAnalysis.vue";
 import choseWorksDetailDialog from "../components/choseWorksDetailDialog.vue";
 import appStoreC from "../components/appStoreC.vue";
 import cocoFlowDia from "../components/cocoFlowDia.vue";
-
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 
 import choseWordCloud from '../components/choseWordCloud.vue'
 import { myMixin } from "@/mixins/mixin.js"
@@ -26115,6 +26116,16 @@ export default {
     this.updateSplitScreenData(1);
   },
   computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    },
     isAndroid() {
       return /Android/i.test(navigator.userAgent);
     },
@@ -28966,7 +28977,9 @@ export default {
   display: flex;
   align-items: center;
 }
-
+.tool_right_box >>> .katex {
+  font-size: 16px;
+}
 .tool_right_box + .tool_right_box {
   margin-top: 10px;
 }

+ 17 - 4
src/components/easy3/studyStudent.vue

@@ -622,7 +622,7 @@
                       style="width: 100%; height: 100%; border: none"
                       :key="diffKey"
 											allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('cloud.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('app.cocorobo.cn')!=-1"
+                      v-if="pptImgUrl1.indexOf('cocorobo')!=-1"
                       :src="pptImgUrl1"
                     ></iframe>
                     <iframe
@@ -4465,7 +4465,7 @@
                               cursor: pointer;
                             "
                           >
-                            {{ index + 1 + "、" + item.teststitle }}
+                            {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
                         </el-tooltip>
                       </div>
@@ -12616,7 +12616,8 @@ import appStoreC from "../components/appStoreC.vue";
 import cocoFlowDia from "../components/cocoFlowDia.vue";
 import { myMixin } from "@/mixins/mixin.js"
 import { tools as toolsList } from "@/common/tools2.js";
-
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 let converter = OpenCC.Converter({
   from: "hk",
   to: "cn"
@@ -21538,6 +21539,16 @@ export default {
 		this.updateSplitScreenData(1);
   },
   computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    },
     isAndroid() {
       return /Android/i.test(navigator.userAgent);
     },
@@ -24308,7 +24319,9 @@ export default {
   display: flex;
   align-items: center;
 }
-
+.tool_right_box >>> .katex {
+  font-size: 16px;
+}
 .tool_right_box + .tool_right_box {
   margin-top: 10px;
 }

+ 20 - 7
src/components/studyStudent.vue

@@ -587,7 +587,7 @@
                       style="width: 100%; height: 100%; border: none"
                       allow="camera *; microphone *;display-capture;midi;encrypted-media;"
                       :key="diffKey"
-                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('cloud.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('app.cocorobo.cn')!=-1"
+                      v-if="pptImgUrl1.indexOf('cocorobo')!=-1"
                       :src="pptImgUrl1"
                     ></iframe>
                     <iframe
@@ -812,7 +812,7 @@
                               </div>
                           </div>
                         </div>
-                        
+
                         <div
                           class="fileC_box"
                           v-if="fileC[taskCount].length > 0"
@@ -4425,7 +4425,7 @@
                               cursor: pointer;
                             "
                           >
-                            {{ index + 1 + "、" + item.teststitle }}
+                            {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
                         </el-tooltip>
                       </div>
@@ -10499,7 +10499,7 @@
           <iframe
             style="width: 100%; height: 100%; border: none"
             allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('knowledge.cocorobo.cn')!=-1 || fullUrl.indexOf('cloud.cocorobo.cn')!=-1) || fullUrl.indexOf('app.cocorobo.cn')!=-1"
+            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('cocorobo')!=-1)"
             :src="fullUrl"
           ></iframe>
           <iframe
@@ -12554,7 +12554,8 @@ import appStoreC from "./components/appStoreC.vue";
 import cocoFlowDia from "./components/cocoFlowDia.vue";
 import { myMixin } from "@/mixins/mixin.js"
 import { tools as toolsList } from "@/common/tools2.js";
-
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 let converter = OpenCC.Converter({
   from: "hk",
   to: "cn"
@@ -13361,7 +13362,7 @@ export default {
 					this.insertMemorandum(`选择<span class="variable">阶段${i+1}${this.navList[i].dyName?':'+this.navList[i].dyName:''}</span>→<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?':'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}:${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 				}
       }
-      
+
       // var b = this.$refs["bz" + k][0];
       // a.scrollTop = b.offsetTop;
     },
@@ -21492,6 +21493,16 @@ export default {
 		this.updateSplitScreenData(1);
   },
   computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    },
     isAndroid() {
       return /Android/i.test(navigator.userAgent);
     },
@@ -24255,7 +24266,9 @@ export default {
   display: flex;
   align-items: center;
 }
-
+.tool_right_box >>> .katex {
+  font-size: 16px;
+}
 .tool_right_box + .tool_right_box {
   margin-top: 10px;
 }

+ 18 - 5
src/components/studySutdentClass/studyStudent.vue

@@ -621,7 +621,7 @@
                       style="width: 100%; height: 100%; border: none"
                       allow="camera *; microphone *;display-capture;midi;encrypted-media;"
                       :key="diffKey"
-                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('cloud.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('app.cocorobo.cn')!=-1"
+                      v-if="pptImgUrl1.indexOf('cocorobo')!=-1"
                       :src="pptImgUrl1"
 
                     ></iframe>
@@ -6202,7 +6202,7 @@
                               cursor: pointer;
                             "
                           >
-                            {{ index + 1 + "、" + item.teststitle }}
+                            {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
                         </el-tooltip>
                       </div>
@@ -13737,7 +13737,7 @@
         <iframe
             style="width: 100%; height: 100%; border: none"
             allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('knowledge.cocorobo.cn')!=-1 || fullUrl.indexOf('cloud.cocorobo.cn')!=-1) || fullUrl.indexOf('app.cocorobo.cn')!=-1"
+            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('cocorobo.cn')!=-1)"
             :src="fullUrl"
           ></iframe>
           <iframe
@@ -15863,7 +15863,8 @@ import appStoreC from "../components/appStoreC.vue";
 import cocoFlowDia from "../components/cocoFlowDia.vue";
 import { myMixin } from "@/mixins/mixin.js"
 import { tools as toolsList } from "@/common/tools2.js";
-
+import katex from 'katex'
+import 'katex/dist/katex.min.css'
 var OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
   from: "hk",
@@ -25515,6 +25516,16 @@ export default {
 		this.updateSplitScreenData(1);
   },
   computed: {
+    renderedFormula() {
+      return function(val){
+        try {
+          return katex.renderToString(val,{ throwOnError: false });
+        } catch (e) {
+          console.error('KaTeX渲染错误:', e);
+          return val;
+        }
+      }
+    },
     isAndroid() {
       return /Android/i.test(navigator.userAgent);
     },
@@ -28305,7 +28316,9 @@ export default {
   display: flex;
   align-items: center;
 }
-
+.tool_right_box >>> .katex {
+  font-size: 16px;
+}
 .tool_right_box + .tool_right_box {
   margin-top: 10px;
 }

Some files were not shown because too many files changed in this diff