2 years ago · 02ea38fce4
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,4 +25,4 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				-    }</style><link href=./static/css/app.74ce4f069f0a5b92220b56f2f7333a37.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.5381b06bfaaab9dbd007.js></script><script type=text/javascript src=./static/js/app.33f1feebc1c12f730ed7.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
 
				+    }</style><link href=./static/css/app.8ebaf7e1f85fcb4a2868f4b1644764af.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.aae8f7d9cec68eff34fe.js></script><script type=text/javascript src=./static/js/app.19f6d77c7ec37aae6610.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
--- a/dist/static/css/app.74ce4f069f0a5b92220b56f2f7333a37.css.map
+++ b/dist/static/css/app.74ce4f069f0a5b92220b56f2f7333a37.css.map
--- a/dist/static/css/app.8ebaf7e1f85fcb4a2868f4b1644764af.css
+++ b/dist/static/css/app.8ebaf7e1f85fcb4a2868f4b1644764af.css
--- a/dist/static/css/app.8ebaf7e1f85fcb4a2868f4b1644764af.css.map
+++ b/dist/static/css/app.8ebaf7e1f85fcb4a2868f4b1644764af.css.map
--- a/dist/static/img/noImg.4e85045.png
+++ b/dist/static/img/noImg.4e85045.png
--- a/dist/static/img/noRoom.30e7fa9.png
+++ b/dist/static/img/noRoom.30e7fa9.png
--- a/dist/static/img/pptImg2.84b4ad9.png
+++ b/dist/static/img/pptImg2.84b4ad9.png
--- a/dist/static/img/topBg.f55b2a4.png
+++ b/dist/static/img/topBg.f55b2a4.png
--- a/dist/static/js/0.86cbf9c691e3dc53b304.js.map
+++ b/dist/static/js/0.86cbf9c691e3dc53b304.js.map
--- a/dist/static/js/app.19f6d77c7ec37aae6610.js
+++ b/dist/static/js/app.19f6d77c7ec37aae6610.js
--- a/dist/static/js/app.19f6d77c7ec37aae6610.js.map
+++ b/dist/static/js/app.19f6d77c7ec37aae6610.js.map
--- a/dist/static/js/app.33f1feebc1c12f730ed7.js
+++ b/dist/static/js/app.33f1feebc1c12f730ed7.js
--- a/dist/static/js/app.33f1feebc1c12f730ed7.js.map
+++ b/dist/static/js/app.33f1feebc1c12f730ed7.js.map
--- a/dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
+++ b/dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
--- a/dist/static/js/vendor.aae8f7d9cec68eff34fe.js
+++ b/dist/static/js/vendor.aae8f7d9cec68eff34fe.js
--- a/dist/static/js/vendor.aae8f7d9cec68eff34fe.js.map
+++ b/dist/static/js/vendor.aae8f7d9cec68eff34fe.js.map
--- a/src/assets/icon/pptImg2.png
+++ b/src/assets/icon/pptImg2.png
--- a/src/components/pages/Grid.vue
+++ b/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": "*",
			
--- a/src/components/pages/addCourse.vue
+++ b/src/components/pages/addCourse.vue
@@ -251,7 +251,10 @@
 
				                 ></el-switch>
			
 
				               </div>
			
 
				             </div>
			
 
				-            <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
			
 
				+            <div
			
 
				+              class="whiteBg"
			
 
				+              style="border-radius: 0; margin-top: 15px; padding-bottom: 20px"
			
 
				+            >
			
 
				               <div class="right_title">评价体系</div>
			
 
				               <div style="width: 95%; margin: 15px auto">
			
 
				                 <div
			
@@ -273,7 +276,9 @@
 
				                       align-items: center;
			
 
				                     "
			
 
				                   >
			
 
				-                    <div style="margin-right: 15px">请选择评价指标</div>
			
 
				+                    <div style="margin-right: 15px; min-width: 120px">
			
 
				+                      请选择评价指标
			
 
				+                    </div>
			
 
				                     <div>
			
 
				                       <el-select
			
 
				                         v-model="evalua"
			
@@ -298,7 +303,7 @@
 
				                   </div>
			
 
				                 </div>
			
 
				                 <div
			
 
				-                  v-if="evalua != ''"
			
 
				+                  v-if="evalua"
			
 
				                   style="
			
 
				                     border: 1px solid #e5e5e5;
			
 
				                     width: 750px;
			
@@ -537,7 +542,16 @@
 
				                           align-items: center;
			
 
				                         "
			
 
				                       >
			
 
				-                        <div style="">任务名称</div>
			
 
				+                        <div
			
 
				+                          style="
			
 
				+                            border-left: 6px solid #5699e8;
			
 
				+                            height: 20px;
			
 
				+                            padding-left: 10px;
			
 
				+                            line-height: 22px;
			
 
				+                          "
			
 
				+                        >
			
 
				+                          任务名称
			
 
				+                        </div>
			
 
				                         <div>
			
 
				                           <input
			
 
				                             type="text"
			
@@ -1451,10 +1465,10 @@
 
				                         </div>
			
 
				                       </div>
			
 
				                       <div
			
 
				-                        v-if="evalua != ''"
			
 
				+                        v-if="evalua"
			
 
				                         style="
			
 
				                           border: 1px solid #e5e5e5;
			
 
				-                          width: 650px;
			
 
				+                          width: 500px;
			
 
				                           margin-top: 20px;
			
 
				                           box-shadow: 3px 1px 15px 3px #e0e0e0;
			
 
				                         "
			
@@ -1480,8 +1494,8 @@
 
				                       ></el-input> -->
			
 
				                           </div>
			
 
				                         </div>
			
 
				-                        <div class="e_add_content">
			
 
				-                          <div class="e_add_list_pbox">
			
 
				+                        <div class="e_add_content" style="width: 100%">
			
 
				+                          <div class="e_add_list_pbox" style="width: 100%">
			
 
				                             <div class="e_add_list_pbox_title">
			
 
				                               <span class="type_title">切换模式</span>
			
 
				                               <div class="type_content">
			
@@ -1681,6 +1695,7 @@
 
				           <el-input
			
 
				             v-model="AttText.title"
			
 
				             auto-complete="off"
			
 
				+            @input="change2"
			
 
				             placeholder="请输入文本标题..."
			
 
				           ></el-input>
			
 
				         </el-form-item>
			
@@ -1769,11 +1784,12 @@
 
				           <div class="people_nav">选择班级</div>
			
 
				         </div>
			
 
				         <el-checkbox-group v-model="checkboxList2" class="people_name">
			
 
				-          <div v-for="(item,index) in grade" :key="item.id" >
			
 
				+          <div v-for="(item, index) in grade" :key="item.id">
			
 
				             <el-checkbox :label="item.id">{{
			
 
				-            item.name ? item.name : "暂无班级可选"}}</el-checkbox>
			
 
				+              item.name ? item.name : "暂无班级可选"
			
 
				+            }}</el-checkbox>
			
 
				             <div>
			
 
				-              <span>{{index}}</span>
			
 
				+              <span>{{ index }}</span>
			
 
				             </div>
			
 
				           </div>
			
 
				         </el-checkbox-group>
			
@@ -2371,7 +2387,7 @@ export default {
 
				         let params = [
			
 
				           {
			
 
				             cid: this.cid,
			
 
				-            chapters: JSON.stringify(this.unitJson).replaceAll(/%/g, "%25"),
			
 
				+            chapters: JSON.stringify(this.unitJson),
			
 
				             uid: this.userid,
			
 
				             unitIndex: _unitIndex,
			
 
				           },
			
@@ -2410,6 +2426,10 @@ export default {
 
				     change(val) {
			
 
				       console.log(val);
			
 
				     },
			
 
				+    change2(val) {
			
 
				+      console.log(val);
			
 
				+      this.$forceUpdate();
			
 
				+    },
			
 
				     handleClose(done) {
			
 
				       done();
			
 
				     },
			
@@ -2737,7 +2757,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": "*",
			
@@ -2792,7 +2812,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": "*",
			
@@ -2851,7 +2871,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": "*",
			
@@ -3259,7 +3279,7 @@ export default {
 
				       let params = [
			
 
				         {
			
 
				           cid: this.cid,
			
 
				-          chapters: JSON.stringify(this.unitJson).replaceAll(/%/g, "%25"),
			
 
				+          chapters: JSON.stringify(this.unitJson),
			
 
				           uid: this.userid,
			
 
				           unitIndex: _unitIndex,
			
 
				         },
			
@@ -3445,6 +3465,9 @@ export default {
 
				         .then(() => {
			
 
				           _this.unitJson = JSON.parse(res.chapters);
			
 
				           _this.steps++;
			
 
				+          setTimeout(() => {
			
 
				+            this.checkEva();
			
 
				+          }, 1000);
			
 
				         })
			
 
				         .catch(() => {
			
 
				           return;
			
@@ -4421,6 +4444,7 @@ export default {
 
				   text-overflow: ellipsis;
			
 
				   /* font-weight: 600; */
			
 
				   margin-right: 20px;
			
 
				+  font-size: 18px;
			
 
				 }
			
 
				 
			
 
				 .chapter_contentbox div:nth-child(2) {
			
@@ -4454,6 +4478,7 @@ export default {
 
				   border-radius: 4px;
			
 
				   box-sizing: border-box;
			
 
				   background: #fff;
			
 
				+  font-size: 18px;
			
 
				 }
			
 
				 
			
 
				 .binfo_input:focus-visible {
			
@@ -4985,13 +5010,13 @@ ol {
 
				 
			
 
				 .addPeople {
			
 
				   background: #fa6060;
			
 
				-  width: 135px;
			
 
				+  width: 150px;
			
 
				   height: 40px;
			
 
				   color: #fff;
			
 
				   border-radius: 5px;
			
 
				   text-align: center;
			
 
				   line-height: 40px;
			
 
				-  font-size: 15px;
			
 
				+  font-size: 14px;
			
 
				   cursor: pointer;
			
 
				   margin-top: 20px;
			
 
				 }
			
@@ -5770,11 +5795,11 @@ ol {
 
				 }
			
 
				 .pjCss {
			
 
				   /* width: 42%; */
			
 
				-  width: calc(100% - 690px);
			
 
				+  width: calc(100% - 520px);
			
 
				   display: flex;
			
 
				   flex-direction: column;
			
 
				   flex-wrap: nowrap;
			
 
				-  align-items: flex-end;
			
 
				+  align-items: flex-start;
			
 
				   margin-top: 1.5%;
			
 
				 }
			
 
				 </style>
			
--- a/src/components/pages/classRoom.vue
+++ b/src/components/pages/classRoom.vue
@@ -115,12 +115,12 @@ export default {
 
				         {
			
 
				           cover: [],
			
 
				           courseId:"9a4e8dbe-132e-438e-97db-b07eb01fa04c",
			
 
				-          title: "湖心亭看雪可可乐博模拟展示课件",
			
 
				+          title: "introduce a festival (Final)",
			
 
				           time: this.getNowTime(),
			
 
				         },
			
 
				       ],
			
 
				       courseName: "",
			
 
				-      mr: require("../../assets/icon/pptImg.png"),
			
 
				+      mr: require("../../assets/icon/pptImg2.png"),
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
--- a/src/components/pages/components/pdf3.vue
+++ b/src/components/pages/components/pdf3.vue
@@ -187,8 +187,8 @@ export default {
 
				     async reportPreview() {
			
 
				       this.src = pdf.createLoadingTask(this.pdfUrl);
			
 
				       this.src.promise.then((pdf) => {
			
 
				-        this.loading.close();
			
 
				         this.numPages = pdf.numPages;
			
 
				+        this.loading.close();
			
 
				       });
			
 
				     },
			
 
				   },
			
--- a/src/components/pages/course.vue
+++ b/src/components/pages/course.vue
@@ -287,7 +287,7 @@ export default {
 
				       //     "&userid=" +
			
 
				       //     this.userid
			
 
				       // );
			
 
				-      window.parent.postMessage({ cid: cid, type: "1" }, "*");
			
 
				+      window.parent.postMessage({ cid: cid, screenType: "2" }, "*");
			
 
				     },
			
 
				     handle_remove(file, fileList) {
			
 
				       var _tmp = this.fileList;
			
--- a/src/components/pages/library.vue
+++ b/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": "*",
			
--- a/src/components/pages/liveRoom.vue
+++ b/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,
			
--- a/src/components/pages/studyLibrary.vue
+++ b/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": "*",
			
--- a/src/components/tools/jsmind2.vue
+++ b/src/components/tools/jsmind2.vue
@@ -378,7 +378,7 @@ export default {
 
				 .jsmind_layout {
			
 
				   display: flex;
			
 
				   flex-direction: column;
			
 
				-  width: 700px;
			
 
				+  /* width: 700px; */
			
 
				   height: calc(100%);
			
 
				   /* height: 500px; */
			
 
				   /* margin: 15px 5px 0 0; */
			
--- a/src/components/tools/wangEnduit.vue
+++ b/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": "*",