Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

src/components/pages/Grid.vue

@@ -728,7 +728,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",

src/components/pages/addCourse.vue

@@ -2748,7 +2748,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",
@@ -2803,7 +2803,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",
@@ -2862,7 +2862,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",

src/components/pages/classRoom.vue

@@ -115,7 +115,7 @@ export default {
         {
           cover: [],
           courseId:"9a4e8dbe-132e-438e-97db-b07eb01fa04c",
-          title: "可可乐博模拟展示课件",
+          title: "introduce a festival (Final)",
           time: this.getNowTime(),
         },
       ],

src/components/pages/library.vue

@@ -223,7 +223,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",
@@ -289,7 +289,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",

src/components/pages/liveRoom.vue

@@ -23,7 +23,7 @@
         <div class="logoLive">
           <img src="../../assets/icon/logo.png" alt />
         </div>
-        <div style="color: #fff; line-height: 45px; padding-left: 15px">展示课件</div>
+        <div style="color: #fff; line-height: 45px; padding-left: 15px">introduce a festival (Final)</div>
       </div>
     </div>
     <div class="isNoOther">
@@ -219,6 +219,19 @@
               src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
             ></iframe>
           </div>
+          <div v-if="toolCount == 6" class="tools_child_box">
+            <div class="tools_title">
+              <span>协同文档</span>
+              <div>
+                <img src="../../assets/full.png" class="full" @click="fullTools" />
+                <img src="../../assets/close1.png" class="closeImg" @click="closeTools" />
+              </div>
+            </div>
+            <iframe
+              style="width: 100%; height: 100%; border: none"
+              src="https://cloud.cocorobo.cn/Office/Word/WordEditArea.htm"
+            ></iframe>
+          </div>
           <div v-if="toolCount == 7" class="tools_child_box">
             <div class="tools_title">
               <span>思维网格</span>
@@ -554,15 +567,15 @@ export default {
       tools: [
         "",
         "",
-        "", //选择题
-        "", //倒计时
-        "", //问答题
-        "", //问答题
-        "", //思维导图/电子白板
-        "", //选人回答
-        "", //倒计时、分小组
-        "", //思维导图/电子白板/思维网格
-        "", //查看作业
+        "", 
+        {tools:[12]}, //问答题
+        "", 
+         {tools:[6,14]}, //协同文档
+         {tools:[3,14]}, //思维导图
+        "",
+        "", 
+        "", 
+        "", 
         //1、电子白板 2、便签 3、思维导图 4、问卷调查 5、量规评分 6、协同文档 7、思维网格 8、素材库 9、选择题 10、倒计时 11、问答题 12、选人回答 13、分小组 14、老师对提交作业进行评价
       ],
       howTools: 0,

src/components/pages/studyLibrary.vue

@@ -214,7 +214,7 @@ export default {
             file.name.split(".")[0] +
             new Date().getTime() +
             "." +
-            file.name.split(".")[1],
+            file.name.split(".")[file.name.split(".").length-1],
           ContentType: file.type,
           Body: file,
           "Access-Control-Allow-Credentials": "*",

src/components/tools/wangEnduit.vue

@@ -120,7 +120,7 @@ export default {
                 file.name.split(".")[0] +
                 new Date().getTime() +
                 "." +
-                file.name.split(".")[1],
+                file.name.split(".")[file.name.split(".").length-1],
               ContentType: file.type,
               Body: file,
               "Access-Control-Allow-Credentials": "*",