Inicio Explorar Ayuda
Iniciar sesión
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Merge branch 'beta' into HK

lsc hace 6 meses
padre
ce9032b4eb 04827c5f65
commit
afe22e42c5
Se han modificado 23 ficheros con 359 adiciones y 30 borrados
Dividir vista Mostrar estadísticas de diff
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css
  3. 0 0
      dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css.map
  4. 1 0
      dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css
  5. 1 0
      dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map
  6. 0 0
      dist/static/img/aiTalk.2196c9f.svg
  7. 0 0
      dist/static/img/aiVanish.9288360.svg
  8. 0 0
      dist/static/img/aiWait2.d0390d3.svg
  9. 0 0
      dist/static/img/practice.01fb3fa.svg
  10. 0 0
      dist/static/img/robot3.e6b4e70.svg
  11. 1 0
      dist/static/js/app.a3d21806e84fdfbb5fe9.js
  12. 0 0
      dist/static/js/app.a3d21806e84fdfbb5fe9.js.map
  13. 1 0
      dist/static/js/app.c5adf6495f99c2c4e9e3.js
  14. 1 0
      dist/static/js/app.c5adf6495f99c2c4e9e3.js.map
  15. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  16. 305 0
      src/assets/css/markdownCss.css
  17. 11 8
      src/components/classRoomHelper/component/searchArea.vue
  18. 2 2
      src/components/classRoomHelper/index.vue
  19. 12 1
      src/components/courseDetail.vue
  20. 6 6
      src/components/easy2/studyStudent.vue
  21. 6 6
      src/components/easy3/studyStudent.vue
  22. 6 6
      src/components/studyStudent.vue
  23. 1 1
      src/main.js

+ 4 - 0
dist/index.html
Ver fichero 

@@ -27,7 +27,11 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.47e6f630f330ffe39e84e98cfc387595.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.a3d21806e84fdfbb5fe9.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.dc47f591b6b6eadadfd41709629ede28.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.c5adf6495f99c2c4e9e3.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.47e6f630f330ffe39e84e98cfc387595.css.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/css/app.dc47f591b6b6eadadfd41709629ede28.css.map


+ 0 - 0
dist/static/img/aiTalk.1469289.svg → dist/static/img/aiTalk.2196c9f.svg
Ver fichero


+ 0 - 0
dist/static/img/aiVanish.cc2e3bf.svg → dist/static/img/aiVanish.9288360.svg
Ver fichero


+ 0 - 0
dist/static/img/aiWait2.c8d31c6.svg → dist/static/img/aiWait2.d0390d3.svg
Ver fichero


+ 0 - 0
dist/static/img/practice.25766a7.svg → dist/static/img/practice.01fb3fa.svg
Ver fichero


+ 0 - 0
dist/static/img/robot3.c50070a.svg → dist/static/img/robot3.e6b4e70.svg
Ver fichero


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/js/app.a3d21806e84fdfbb5fe9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.a3d21806e84fdfbb5fe9.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/js/app.c5adf6495f99c2c4e9e3.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 0
dist/static/js/app.c5adf6495f99c2c4e9e3.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 305 - 0
src/assets/css/markdownCss.css
Ver fichero 

@@ -0,0 +1,305 @@
 
+.vditor-reset ul ul ul {
 
+    list-style-type: square
 
+}
 
+
 
+.vditor-reset ul ul {
 
+    list-style-type: circle
 
+}
 
+
 
+.vditor-reset ul {
 
+    list-style-type: disc
 
+}
 
+
 
+.vditor-reset ol,.vditor-reset ul {
 
+    padding-left: 2em;
 
+    margin-top: 0;
 
+    margin-bottom: 16px
 
+}
 
+
 
+.vditor-reset li+li {
 
+    margin-top: .25em
 
+}
 
+
 
+.vditor-reset audio {
 
+    max-width: 100%
 
+}
 
+
 
+.vditor-reset audio:focus {
 
+    outline: none
 
+}
 
+
 
+.vditor-reset video {
 
+    max-height: 90vh;
 
+    max-width: 100%
 
+}
 
+
 
+.vditor-reset img {
 
+    max-width: 100%
 
+}
 
+
 
+.vditor-reset img.emoji {
 
+    cursor: auto;
 
+    max-width: 20px;
 
+    vertical-align: sub
 
+}
 
+
 
+.vditor-reset h1, .vditor-reset h2 {
 
+    padding-bottom: 0.3em;
 
+    border-bottom: 1px solid #eaecef;
 
+}
 
+
 
+.vditor-reset hr {
 
+    background-color: #eaecef;
 
+}
 
+
 
+.vditor-reset blockquote {
 
+    color: #6a737d;
 
+    border-left: .25em solid #eaecef
 
+}
 
+
 
+.vditor-reset iframe {
 
+    border: 1px solid #d1d5da
 
+}
 
+
 
+.vditor-reset table tr {
 
+    border-top: 1px solid #c6cbd1;
 
+    background-color: #fafbfc
 
+}
 
+
 
+.vditor-reset table td, .vditor-reset table th {
 
+    border: 1px solid #dfe2e5
 
+}
 
+
 
+.vditor-reset table tbody tr:nth-child(2n) {
 
+    background-color: #fff
 
+}
 
+
 
+.vditor-reset code:not(.hljs):not(.highlight-chroma) {
 
+    background-color: rgba(27, 31, 35, .05);
 
+}
 
+
 
+.vditor-reset kbd {
 
+    color: #24292e;
 
+    background-color: #fafbfc;
 
+    border: solid 1px #d1d5da;
 
+    box-shadow: inset 0 -1px 0 #d1d5da;
 
+}
 
+
 
+.vditor-speech {
 
+    background-color: #f6f8fa;
 
+    border: 1px solid #d1d5da;
 
+    color: #586069;
 
+}
 
+
 
+.vditor-speech--current, .vditor-speech:hover {
 
+    color: #4285f4;
 
+}
 
+
 
+.vditor-linkcard a {
 
+    background-color: #f6f8fa;
 
+}
 
+
 
+.vditor-linkcard a:visited .vditor-linkcard__abstract {
 
+    color: rgba(88, 96, 105, 0.36);
 
+}
 
+
 
+.vditor-linkcard__title {
 
+    color: #24292e;
 
+}
 
+
 
+.vditor-linkcard__abstract {
 
+    color: #586069;
 
+}
 
+
 
+.vditor-linkcard__site {
 
+    color: #4285f4;
 
+}
 
+
 
+.vditor-linkcard__image {
 
+    background-color: rgba(88, 96, 105, 0.36);
 
+}
 
+
 
+
 
+.vditor-reset h1,.vditor-reset h2,.vditor-reset h3,.vditor-reset h4,.vditor-reset h5,.vditor-reset h6 {
 
+    margin-top: 24px;
 
+    margin-bottom: 16px;
 
+    font-weight: 600;
 
+    line-height: 1.25
 
+}
 
+
 
+.vditor-reset h1:hover .vditor-anchor svg,.vditor-reset h2:hover .vditor-anchor svg,.vditor-reset h3:hover .vditor-anchor svg,.vditor-reset h4:hover .vditor-anchor svg,.vditor-reset h5:hover .vditor-anchor svg,.vditor-reset h6:hover .vditor-anchor svg {
 
+    visibility: visible
 
+}
 
+
 
+.vditor-reset h1 {
 
+    font-size: 1.75em
 
+}
 
+
 
+.vditor-reset h2 {
 
+    font-size: 1.55em
 
+}
 
+
 
+.vditor-reset h3 {
 
+    font-size: 1.38em
 
+}
 
+
 
+.vditor-reset h4 {
 
+    font-size: 1.25em
 
+}
 
+
 
+.vditor-reset h5 {
 
+    font-size: 1.13em
 
+}
 
+
 
+.vditor-reset h6 {
 
+    font-size: 1em
 
+}
 
+
 
+.vditor-reset hr {
 
+    height: 2px;
 
+    padding: 0;
 
+    margin: 24px 0;
 
+    background-color: #eaecef;
 
+    border: 0
 
+}
 
+
 
+.vditor-reset p {
 
+    margin-top: 0;
 
+    margin-bottom: 16px
 
+}
 
+
 
+.vditor-reset blockquote {
 
+    padding: 0 1em;
 
+    color: #6a737d;
 
+    border-left: .25em solid #eaecef;
 
+    margin: 0 0 16px 0
 
+}
 
+
 
+.vditor-reset blockquote>:first-child {
 
+    margin-top: 0
 
+}
 
+
 
+.vditor-reset blockquote>:last-child {
 
+    margin-bottom: 0
 
+}
 
+
 
+.vditor-reset ins>iframe {
 
+    border: 0
 
+}
 
+
 
+.vditor-reset iframe {
 
+    border: 1px solid #d1d5da;
 
+    max-width: 100%;
 
+    -webkit-box-sizing: border-box;
 
+    box-sizing: border-box
 
+}
 
+
 
+.vditor-reset iframe.iframe__video {
 
+    min-width: 80%;
 
+    min-height: 36vh
 
+}
 
+
 
+.vditor-reset table {
 
+    border-collapse: collapse;
 
+    empty-cells: show;
 
+    margin-bottom: 16px;
 
+    overflow: auto;
 
+    border-spacing: 0;
 
+    display: block;
 
+    word-break: keep-all;
 
+    width: 100%
 
+}
 
+
 
+.vditor-reset table tr {
 
+    background-color: #fafbfc;
 
+    border-top: 1px solid #c6cbd1
 
+}
 
+
 
+.vditor-reset table td,.vditor-reset table th {
 
+    padding: 6px 13px;
 
+    border: 1px solid #dfe2e5;
 
+    word-break: normal;
 
+    white-space: nowrap
 
+}
 
+
 
+.vditor-reset table td:first-child:after,.vditor-reset table th:first-child:after {
 
+    content: "";
 
+    display: inline-block;
 
+    vertical-align: top;
 
+    min-height: 24px
 
+}
 
+
 
+.vditor-reset table th {
 
+    font-weight: 600
 
+}
 
+
 
+.vditor-reset table tbody tr:nth-child(2n) {
 
+    background-color: #fff
 
+}
 
+
 
+.vditor-reset code:not(.hljs):not(.highlight-chroma) {
 
+    padding: .2em .4em;
 
+    margin: 0;
 
+    font-size: 85%;
 
+    border-radius: 3px;
 
+    font-family: mononoki,Consolas,Liberation Mono,Menlo,Courier,monospace,Apple Color Emoji,Segoe UI Emoji,Noto Color Emoji,Segoe UI Symbol,Android Emoji,EmojiSymbols;
 
+    word-break: break-word;
 
+    background-size: 20px 20px;
 
+    white-space: pre-wrap
 
+}
 
+
 
+.vditor-reset pre {
 
+    margin: 1em 0
 
+}
 
+
 
+.vditor-reset pre>code {
 
+    margin: 0;
 
+    font-size: 85%;
 
+    padding: .5em;
 
+    border-radius: 5px;
 
+    display: block;
 
+    overflow: auto;
 
+    white-space: pre;
 
+    font-family: mononoki,Consolas,Liberation Mono,Menlo,Courier,monospace,Apple Color Emoji,Segoe UI Emoji,Noto Color Emoji,Segoe UI Symbol,Android Emoji,EmojiSymbols;
 
+    background-size: 20px 20px;
 
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8AgMAAABHkjHhAAAACVBMVEWAgIBaWlo+Pj7rTFvWAAAAA3RSTlMHCAw+VhR4AAAA+klEQVQoz4WSMW7EQAhFPxKWNh2FCx+HkaZI6RRb5DYbyVfIJXLKDCFoMbaTKSw/8ZnPAPjaH2xgZcUNUDADD7D9LtDBCLZ45fbkvo/30K8yeI64pPwl6znd/3n/Oe93P3ho9qeh72btTFzqkz0rsJle8Zr81OLEwZ1dv/713uWqvu2pl+k0fy7MWtj9r/tN5q/02z89qa/L4Dc2LvM93kezPfXlME/O86EbY/V9GB9ePX8G1/6W+/9h1dq/HGfTfzT3j/xNo7522Bfnqe5jO/fvhVthlfk434v3iO9zG/UOphyPeinPl1J8Gtaa7xPTa/Dk+RIs4deMvwGvcGsmsCvJ0AAAAABJRU5ErkJggg==);
 
+    word-break: normal;
 
+    word-wrap: normal
 
+}
 
+
 
+.vditor-reset pre:hover div.vditor-copy {
 
+    display: block
 
+}
 
+
 
+
 
+.vditor-reset kbd {
 
+    display: inline-block;
 
+    padding: 3px 5px;
 
+    font: 11px Consolas,Liberation Mono,Menlo,Courier,monospace;
 
+    line-height: 10px;
 
+    color: #24292e;
 
+    vertical-align: middle;
 
+    background-color: #fafbfc;
 
+    border: 1px solid #d1d5da;
 
+    border-radius: 3px;
 
+    -webkit-box-shadow: inset 0 -1px 0 #d1d5da;
 
+    box-shadow: inset 0 -1px 0 #d1d5da
 
+}
 
+
 
+.vditor-reset summary {
 
+    cursor: pointer
 
+}
 
+
 
+.vditor-reset summary:focus {
 
+    outline: none
 
+}
 
+
 
+.vditor-reset svg {
 
+    height: auto;
 
+    width: auto;
 
+    stroke-width: initial
 
+}
 
+
 
+.vditor-reset blockquote:last-child,.vditor-reset hr:last-child,.vditor-reset ol:last-child,.vditor-reset p:last-child,.vditor-reset pre:last-child,.vditor-reset ul:last-child {
 
+    margin-bottom: 0
 
+}

+ 11 - 8
src/components/classRoomHelper/component/searchArea.vue
Ver fichero 

@@ -1887,7 +1887,7 @@ export default {
 
         this.insertMemorandum(`<span class="btn">搜索视频</span>`);
 
         return this.ajax
 
           .post(`https://gpt4.cocorobo.cn/get_network_search`, {
 
-            engine: "bilibili",
 
+            engine: "bilibili",//bilibili    youtube
 
             keyword: _text
 
           })
 
           .then(res => {
 
@@ -1898,7 +1898,10 @@ export default {
 
               i.title = i.title
 
                 .replaceAll('<em class="keyword">', "")
 
                 .replaceAll("</em>", "");
 
+								// bilibili👇
 
               _resultText += `名称：${i.title}\n简介：${i.description}\n地址：[${i.arcurl}](${i.arcurl})\n\n`;
 
+							//youtube👇
 
+							// _resultText += `名称：${i.title}\n简介：${i.description}\n地址：[${i.link}](${i.link})\n\n`;
 
             });
 
             this.chatList.find(i => i.uid == _uuid).aiContent = _resultText;
 
             this.chatList.find(i => i.uid == _uuid).loading = false;
 
@@ -2142,7 +2145,7 @@ export default {
 
 
       _msg = `
 
 NOTICE
 
-Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 
 ## 目的
 
 你是用户的课堂助手，你需要基于提供给你的课程相关信息，对用户的提问进行回答。
 
@@ -2338,7 +2341,7 @@ ${_atList
 
           this.chatList.find(i => i.uid == _uid).isShowSynchronization = true;
 
           this.chatList.find(i => i.uid == _uid).loading = false;
 
           this.nowChatList.push(this.chatList.find(i => i.uid == _uid));
 
-          this.addAsk(this.chatList.find(i => i.uid == _uid).content);
 
+          // this.addAsk(this.chatList.find(i => i.uid == _uid).content);
 
           // 这里保存对话
 
           this.insertChat(_uid);
 
           return;
 
@@ -2400,7 +2403,7 @@ ${_atList
 
           this.chatList.find(i => i.uid == _uid).isShowSynchronization = true;
 
           this.chatList.find(i => i.uid == _uid).loading = false;
 
           this.nowChatList.push(this.chatList.find(i => i.uid == _uid));
 
-          this.addAsk(this.chatList.find(i => i.uid == _uid).content);
 
+          // this.addAsk(this.chatList.find(i => i.uid == _uid).content);
 
           this.source.close();
 
           this.insertChat(_uid);
 
         } else {
 
@@ -2591,7 +2594,7 @@ ${_atList
 
       let _uuid = uuidv4();
 
 
       let _msg = `
 
-Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
 Instruction: Based on the context, follow "Format example", write content
 
 
@@ -2608,7 +2611,7 @@ Instruction: Based on the context, follow "Format example", write content
 
 输出结果基于“课程信息”，避免提供无关的信息。
 
 搜索建议的结果符合伦理规范。
 
 ## 输出
 
-输出应包括6个相关的搜索建议，每个搜索建议需要以问号的方式结束。
 
+输出应包括5个相关的搜索建议，每个搜索建议需要以问号的方式结束。
 
 请一步步思考如何根据现有信息推送搜索建议，但是不需要输出搜索建议以外的内
 
 
 ## 输出格式
 
@@ -2967,7 +2970,7 @@ Instruction: Based on the context, follow "Format example", write content
 
           // return this.chatLoading = false;
 
           _msg = `
 
 NOTICE
 
-Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 
 ## 目的
 
 你是教师用户的课堂助手，你需要基于提供给你的课程相关信息以及学生的作业数据，就某些具体作业对全班学生进行总结分析。
 
@@ -3168,7 +3171,7 @@ ${_wordData}
 
 
       _msg = `
 
 NOTICE
 
-Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 
 ## 目的
 
 你是教师用户的课堂助手，你需要基于提供给你的课程相关信息以及学生的作业数据，就某些具体作业对全班学生进行总结分析。

+ 2 - 2
src/components/classRoomHelper/index.vue
Ver fichero 

@@ -411,7 +411,7 @@ export default {
 
         });
 
         _textData += "\n";
 
       });
 
-			let _msg = `Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+			let _msg = `Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
 Instruction: Based on the context, follow "Format example", write content
 
 
@@ -688,7 +688,7 @@ let params = {
 
 			this.canUseWangData = false
 
 			this.wangData=""
 
       let _msg = `
 
-Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.if the user speaks Chinese Traditional, the specific text of your answer should also be in Chinese Traditional.
 
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
 Instruction: Based on the context, follow "Format example", write content

+ 12 - 1
src/components/courseDetail.vue
Ver fichero 

@@ -205,7 +205,7 @@
 
         <div class="student_body">
 
           <div class="sLeft" v-if="courseDetail.brief">
 
             <div class="courseT">课程详情</div>
 
-            <div class="courseTd" v-html="courseDetail.brief"></div>
 
+            <div class="courseTd vditor-reset" v-html="MarkdownT(courseDetail.brief)"></div>
 
           </div>
 
           <div :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'">
 
             <div v-if="tType == 1 || tType == 4" class="checkBox">
 
@@ -1090,6 +1090,8 @@ import JSZip from "jszip";
 
 import FileSaver from "file-saver";
 
 import scoreZong from './scoreZong/get.vue'
 
 
+import MarkdownIt from "markdown-it";
 
+
 
 var OpenCC = require("opencc-js");
 
 let converter = OpenCC.Converter({
 
 		from:'cn',
 
@@ -1187,6 +1189,15 @@ export default {
 
       tools: JSON.parse(converter(JSON.stringify(tools))),
 
     };
 
   },
 
+  computed: {
 
+    MarkdownT() {
 
+      return function (c) {
 
+        let md = new MarkdownIt();
 
+        return c
 
+          ? md.render(c) : "";
 
+      };
 
+    },
 
+  },
 
   methods: {
 
 		insertMemorandum(_html,tcid=""){//保存行为操作
 
 			//variable

+ 6 - 6
src/components/easy2/studyStudent.vue
Ver fichero 

@@ -224,10 +224,10 @@
 
           </div>
 
         </div>
 
       </div>
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType)? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -244,7 +244,7 @@
 
               </div>
 
             </el-tooltip>
 
           </div>
 
-          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid)">
 
+          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -9176,7 +9176,7 @@
 
       </div>
 
     </div>
 
 		<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-		<classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+		<classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

+ 6 - 6
src/components/easy3/studyStudent.vue
Ver fichero 

@@ -224,10 +224,10 @@
 
           </div>
 
         </div>
 
       </div>
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -245,7 +245,7 @@
 
             </el-tooltip>
 
           </div>
 
 					<!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid)">
 
+          <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8112,7 +8112,7 @@
 
       </div>
 
     </div>
 
 				<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-		<classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+		<classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

+ 6 - 6
src/components/studyStudent.vue
Ver fichero 

@@ -238,10 +238,10 @@
 
         </div>
 
       </div>
 
       <!-- :class="{ navLeftCss: !mlDialog }" -->
 
-      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
-        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
-          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) ? '100%' : 'calc(100% - 745px)'}">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
 
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }"></div>
 
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
 
+          <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
 
             <div>任务{{ taskCount + 1 }}</div>
 
             <el-tooltip
 
               effect="light"
 
@@ -258,7 +258,7 @@
 
               </div>
 
             </el-tooltip>
 
           </div>
 
-          <div class="btnAll"  v-show="!orgArray.includes(org) && !oidArray.includes(oid)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
+          <div class="btnAll"  v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8080,7 +8080,7 @@
 
         </el-dialog>
 
       </div>
 
 			<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
-      <classRoomHelper :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+      <classRoomHelper v-if="!['2'].includes(tType)" :videoStart="videoStart" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       '&oid=' +

+ 1 - 1
src/main.js
Ver fichero 

@@ -18,7 +18,7 @@ import VueCookies from 'vue-cookies'
 
 import hevueImgPreview from './components/tools/hevue-img-preview'
 
 import drag from './components/directive/el-drag-dialog';
 
 import VueAudio from 'vue-audio-better'
 
-
 
+import './assets/css/markdownCss.css'
 
 
 Vue.use(VideoPlayer).use(VueAudio).use(VueCookies).use(hevueImgPreview, {
 
     clickMaskCLose: true

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio