소스 검색

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

lsc 3 달 전
부모
커밋
82fb931418

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       width: 100%;
       background: #e6eaf0;
       background: #e6eaf0;
       font-family: '黑体';
       font-family: '黑体';
-    }</style><link href=./static/css/app.c25969dd613434955915e327d51aff0f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.062f14352151ff2301df.js></script><script type=text/javascript src=./static/js/app.5fa17a3b1a184bcbbec8.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.1299e44498075ac76f55bb67f5dc842e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.062f14352151ff2301df.js></script><script type=text/javascript src=./static/js/app.2d00459a1658e6c2b9b7.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {
     document.documentElement.addEventListener("touchstart", function (event) {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.1299e44498075ac76f55bb67f5dc842e.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.1299e44498075ac76f55bb67f5dc842e.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/workPage.287aa55fa9d662568cd61a26886be6f2.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/workPage.de6cf713e633f43d1ca1d14773a4ed4b.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/workPage.de6cf713e633f43d1ca1d14773a4ed4b.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.2d00459a1658e6c2b9b7.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.2d00459a1658e6c2b9b7.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/workPage.15afef9dc7e68aad1692.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/workPage.15afef9dc7e68aad1692.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/workPage.9844c264372ed1361ea3.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/workPage.9844c264372ed1361ea3.js.map


+ 1 - 1
dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.287aa55fa9d662568cd61a26886be6f2.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.0c46d4deebf81c844386.js></script><script type=text/javascript src=./static/js/workPage.9844c264372ed1361ea3.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.de6cf713e633f43d1ca1d14773a4ed4b.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.0c46d4deebf81c844386.js></script><script type=text/javascript src=./static/js/workPage.15afef9dc7e68aad1692.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {
     document.documentElement.addEventListener("touchstart", function (event) {

+ 13 - 11
src/components/pages/pptEasy/addCourse.vue

@@ -255,7 +255,7 @@
                   <span>+</span>
                   <span>+</span>
                   <div>AI应用</div>
                   <div>AI应用</div>
                 </div>
                 </div>
-                
+
                 <div class="pta_ba_item pta_ba_item4" @click.stop="openVideoUploadDialog()">
                 <div class="pta_ba_item pta_ba_item4" @click.stop="openVideoUploadDialog()">
                   <svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                   <svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                     <rect width="19" height="19" fill="url(#pattern0_158_1455)"/>
                     <rect width="19" height="19" fill="url(#pattern0_158_1455)"/>
@@ -2357,7 +2357,7 @@
     <CodeEditor ref="CodeEditorRef" @success="addHtmlSuccess"></CodeEditor>
     <CodeEditor ref="CodeEditorRef" @success="addHtmlSuccess"></CodeEditor>
     <InteractiveToolDialog ref="InteractiveToolDialogRef" @addTool="addTool"/>
     <InteractiveToolDialog ref="InteractiveToolDialogRef" @addTool="addTool"/>
     <VideoUploadDialog ref="VideoUploadDialogRef" @uploadLocalVideo="handleLocalVideoUpload" @uploadProgress="handleUploadProgress" @searchBilibili="handleBilibiliSearch"/>
     <VideoUploadDialog ref="VideoUploadDialogRef" @uploadLocalVideo="handleLocalVideoUpload" @uploadProgress="handleUploadProgress" @searchBilibili="handleBilibiliSearch"/>
-    
+
     <!-- Bilibili视频检索弹窗 -->
     <!-- Bilibili视频检索弹窗 -->
     <BilibiliSearchDialog
     <BilibiliSearchDialog
       :visible.sync="dialogVisibleBilibiliSearch"
       :visible.sync="dialogVisibleBilibiliSearch"
@@ -2365,7 +2365,7 @@
       :grade="selectedGradeName"
       :grade="selectedGradeName"
       @addVideo="handleBilibiliVideoAdd"
       @addVideo="handleBilibiliVideoAdd"
     />
     />
-    
+
     <!-- 视频预览弹窗 -->
     <!-- 视频预览弹窗 -->
     <el-dialog
     <el-dialog
       :visible.sync="dialogVisibleVideoPreview"
       :visible.sync="dialogVisibleVideoPreview"
@@ -2398,7 +2398,7 @@
         ></iframe>
         ></iframe>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
-    
+
     <!-- 右下角上传进度显示 -->
     <!-- 右下角上传进度显示 -->
     <div class="upload-progress-container" v-if="uploadProgressList.length > 0">
     <div class="upload-progress-container" v-if="uploadProgressList.length > 0">
       <div class="upload-progress-header" @click="toggleProgressExpand">
       <div class="upload-progress-header" @click="toggleProgressExpand">
@@ -2413,9 +2413,9 @@
               {{item.status === 'uploading' ? '上传中' : item.status === 'completed' ? '已完成' : '上传失败'}}
               {{item.status === 'uploading' ? '上传中' : item.status === 'completed' ? '已完成' : '上传失败'}}
             </span>
             </span>
           </div>
           </div>
-          <el-progress 
+          <el-progress
             v-if="item.status === 'uploading'"
             v-if="item.status === 'uploading'"
-            :percentage="item.progress" 
+            :percentage="item.progress"
             :status="item.status === 'error' ? 'exception' : ''"
             :status="item.status === 'error' ? 'exception' : ''"
             :stroke-width="8"
             :stroke-width="8"
             style="margin-top: 8px;"
             style="margin-top: 8px;"
@@ -2777,8 +2777,8 @@ export default {
     },
     },
     // 动态生成PPT iframe的URL
     // 动态生成PPT iframe的URL
     pptIframeUrl() {
     pptIframeUrl() {
-      const baseUrl = this.isBetaEnv 
-        ? 'https://beta.ppt.cocorobo.cn' 
+      const baseUrl = this.isBetaEnv
+        ? 'https://beta.ppt.cocorobo.cn'
         : 'https://ppt.cocorobo.cn';
         : 'https://ppt.cocorobo.cn';
       return `${baseUrl}/?mode=editor&courseid=${this.cid}`;
       return `${baseUrl}/?mode=editor&courseid=${this.cid}`;
     },
     },
@@ -8187,7 +8187,7 @@ export default {
         // 添加新的进度项
         // 添加新的进度项
         this.uploadProgressList.push(progressData);
         this.uploadProgressList.push(progressData);
       }
       }
-      
+
       // 如果上传完成,3秒后移除
       // 如果上传完成,3秒后移除
       if (progressData.status === 'completed') {
       if (progressData.status === 'completed') {
         setTimeout(() => {
         setTimeout(() => {
@@ -8216,7 +8216,7 @@ export default {
       };
       };
       this.pptCourseJson.toolsList.push(videoItem);
       this.pptCourseJson.toolsList.push(videoItem);
       this.setPPtToolList();
       this.setPPtToolList();
-      
+
       // 更新进度状态为已完成
       // 更新进度状态为已完成
       const progressIndex = this.uploadProgressList.findIndex(item => item.id === videoData.id);
       const progressIndex = this.uploadProgressList.findIndex(item => item.id === videoData.id);
       if (progressIndex !== -1) {
       if (progressIndex !== -1) {
@@ -8538,7 +8538,9 @@ export default {
     }, 500);
     }, 500);
   },
   },
   mounted() {
   mounted() {
-
+    // 清空
+    this.pptCourseJson.toolsList = [];
+    this.setPPtToolList()
     // iframe页面加载完成
     // iframe页面加载完成
     this.$refs.pptIframeRef.onload = () => {
     this.$refs.pptIframeRef.onload = () => {
       console.log("iframe页面加载完成");
       console.log("iframe页面加载完成");

+ 17 - 18
src/components/pages/workPage/components/choiceQuestion.vue

@@ -192,7 +192,7 @@ export default {
 }
 }
 
 
 .cq_title {
 .cq_title {
-  font-size: 35px;
+  font-size: 16px;
   font-weight: bold;
   font-weight: bold;
   text-align: center;
   text-align: center;
   width: 70%;
   width: 70%;
@@ -219,12 +219,12 @@ export default {
 }
 }
 
 
 .cq_changeBtnArea > span{
 .cq_changeBtnArea > span{
-  width: 100px;
-  height: 40px;
+  width: 50px;
+  height: 25px;
   background: #3681FC;
   background: #3681FC;
   border-radius: 8px;
   border-radius: 8px;
   color: #fff;
   color: #fff;
-  font-size: 16px;
+  font-size: 12px;
   text-align: center;
   text-align: center;
   font-weight: 500;
   font-weight: 500;
   display: flex;
   display: flex;
@@ -246,7 +246,7 @@ export default {
 
 
 .cq_type {
 .cq_type {
   margin: 20px 0 40px 0;
   margin: 20px 0 40px 0;
-  font-size: 22px;
+  font-size: 10px;
   color: #808080;
   color: #808080;
 }
 }
 
 
@@ -275,7 +275,7 @@ export default {
   width: 100%;
   width: 100%;
   max-width: 400px;
   max-width: 400px;
   min-width: 300px;
   min-width: 300px;
-  height: 100px;
+  height: 90px;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
@@ -286,7 +286,7 @@ export default {
   margin: auto;
   margin: auto;
   cursor: pointer;
   cursor: pointer;
   transition: 0.3s;
   transition: 0.3s;
-  font-size: 20px;
+  font-size: 14px;
   color: #000;
   color: #000;
   user-select: none;
   user-select: none;
   /* 不可选中 */
   /* 不可选中 */
@@ -305,8 +305,8 @@ export default {
 }
 }
 
 
 .cq_ca_t1_item>img{
 .cq_ca_t1_item>img{
-  width: 80px;
-  height: 80px;
+  width: 60px;
+  height: 60px;
   cursor: pointer;
   cursor: pointer;
   object-fit: cover;
   object-fit: cover;
 }
 }
@@ -315,7 +315,7 @@ export default {
   position: relative;
   position: relative;
   z-index: 2;
   z-index: 2;
   color: #fff;
   color: #fff;
-  font-size: 20px;
+  font-size: 14px;
 }
 }
 
 
 .cq_ca_t1_item > div::after {
 .cq_ca_t1_item > div::after {
@@ -343,20 +343,20 @@ export default {
 
 
 .cq_ca_t2_item{
 .cq_ca_t2_item{
   width: 100%;
   width: 100%;
-  height: 72px;
+  height: auto;
+  min-height: 55px;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: flex-start;
   justify-content: flex-start;
   box-sizing: border-box;
   box-sizing: border-box;
-  padding-left: 40px;
-  padding-right: 20px;
+  padding: 20px;
   margin-bottom: 20px;
   margin-bottom: 20px;
   background: #fff;
   background: #fff;
   box-shadow: 2px 4px 20px 0px rgba(0, 0, 0, 0.2);
   box-shadow: 2px 4px 20px 0px rgba(0, 0, 0, 0.2);
   border-radius: 12px;
   border-radius: 12px;
   cursor: pointer;
   cursor: pointer;
   transition: 0.3s;
   transition: 0.3s;
-  font-size: 20px;
+  font-size: 12px;
   color: #000;
   color: #000;
   user-select: none;
   user-select: none;
   overflow: auto;
   overflow: auto;
@@ -372,7 +372,6 @@ export default {
 .cq_ca_t2_item>span{
 .cq_ca_t2_item>span{
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  white-space: nowrap;
 }
 }
 
 
 .cq_ca_t2_item>img{
 .cq_ca_t2_item>img{
@@ -396,13 +395,13 @@ export default {
   position: relative;
   position: relative;
   z-index: 2;
   z-index: 2;
   color: #fff;
   color: #fff;
-  font-size: 20px;
+  font-size: 14px;
 }
 }
 
 
 .cq_ca_t2_item > div::after {
 .cq_ca_t2_item > div::after {
   content: "";
   content: "";
-  width: 25px;
-  height: 25px;
+  width: 20px;
+  height: 20px;
   background: rgba(252, 207, 0, 1);
   background: rgba(252, 207, 0, 1);
   border-radius: 50%;
   border-radius: 50%;
   position: absolute;
   position: absolute;

+ 2 - 2
src/components/pages/workPage/components/questionsAndAnswers.vue

@@ -181,7 +181,7 @@ export default {
 }
 }
 
 
 .qaa_title {
 .qaa_title {
-  font-size: 35px;
+  font-size: 16px;
   font-weight: bold;
   font-weight: bold;
   text-align: center;
   text-align: center;
   width: 100%;
   width: 100%;
@@ -189,7 +189,7 @@ export default {
 
 
 .qaa_type {
 .qaa_type {
   margin: 20px 0 40px 0;
   margin: 20px 0 40px 0;
-  font-size: 22px;
+  font-size: 10px;
   color: #808080;
   color: #808080;
 }
 }
 
 

+ 0 - 149
src/components/pages/workPage/index_new.vue

@@ -1,154 +1,5 @@
 <template>
 <template>
   <div class="workPage" v-loading="loading">
   <div class="workPage" v-loading="loading">
-    <!-- <div class="wp_tool wp_tool15" v-if="workData && workData.type == 15">
-      <div class="wp_t15_title">{{ workData.json.answerQ }}</div>
-      <span class="wp_type">问答题</span>
-      <div class="wp_tl15_inputArea">
-        <el-input
-          type="textarea"
-          :rows="7"
-          placeholder="请在此输入您的答案..."
-          resize="none"
-          v-model="workData.json.answer"
-        >
-        </el-input>
-      </div>
-      <div class="wp_tl15_uploadFileArea">
-        <div
-          class="wp_tl_btn"
-          @click="uploadImage()"
-          v-loading="loadingUploadFile"
-        >
-          <svg
-            t="1755158440992"
-            class="icon"
-            viewBox="0 0 1024 1024"
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
-            p-id="8270"
-            width="200"
-            height="200"
-          >
-            <path
-              d="M924 1024H100A100 100 0 0 1 0 924V638a40 40 0 0 1 80 0v286a20 20 0 0 0 20 20h824a20 20 0 0 0 20-20V638a40 40 0 0 1 80 0v286a100 100 0 0 1-100 100zM784 352a40 40 0 0 1-28-12L512 97 268 340a40 40 0 0 1-57-57L484 12a40 40 0 0 1 57 0l271 272a40 40 0 0 1-28 68z"
-              fill="#474747"
-              p-id="8271"
-            ></path>
-            <path
-              d="M512 788a40 40 0 0 1-40-40V57a40 40 0 0 1 80 0v691a40 40 0 0 1-40 40z"
-              fill="#474747"
-              p-id="8272"
-            ></path>
-          </svg>
-          <span>上传图片</span>
-        </div>
-        <span>支持JPG、PNG格式,最大5MB</span>
-      </div>
-
-      <div class="wp_tl15_fileList">
-        <div
-          class="wp_tl15_fileList_item"
-          v-for="(item, index) in workData.json.fileList"
-          :key="index"
-        >
-          <img :src="item.url" alt="" @click="previewImage(item)" />
-          <svg
-            @click="deleteFile(index)"
-            t="1755162206922"
-            class="icon"
-            viewBox="0 0 1024 1024"
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
-            p-id="9357"
-            width="200"
-            height="200"
-          >
-            <path
-              d="M512 883.2A371.2 371.2 0 1 0 140.8 512 371.2 371.2 0 0 0 512 883.2z m0 64a435.2 435.2 0 1 1 435.2-435.2 435.2 435.2 0 0 1-435.2 435.2z"
-              fill="#d81e06"
-              p-id="9358"
-            ></path>
-            <path
-              d="M557.056 512l122.368 122.368a31.744 31.744 0 1 1-45.056 45.056L512 557.056l-122.368 122.368a31.744 31.744 0 1 1-45.056-45.056L466.944 512 344.576 389.632a31.744 31.744 0 1 1 45.056-45.056L512 466.944l122.368-122.368a31.744 31.744 0 1 1 45.056 45.056z"
-              fill="#d81e06"
-              p-id="9359"
-            ></path>
-          </svg>
-        </div>
-      </div>
-    </div>
-
-    <div class="wp_tool wp_tool45" v-if="workData && workData.type == 45">
-      <div class="wp_t45_title">练一练</div>
-      <div
-        class="s_b_m_toolItem"
-        v-for="(item, index) in workData.json.testJson"
-        :key="index + '_' + workData.id"
-      >
-        <div class="s_b_m_ti_title">
-          <span>{{ index + 1 }}</span>
-          <svg
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M15.3536 8.35355C15.5488 8.15829 15.5488 7.84171 15.3536 7.64645L12.1716 4.46447C11.9763 4.2692 11.6597 4.2692 11.4645 4.46447C11.2692 4.65973 11.2692 4.97631 11.4645 5.17157L14.2929 8L11.4645 10.8284C11.2692 11.0237 11.2692 11.3403 11.4645 11.5355C11.6597 11.7308 11.9763 11.7308 12.1716 11.5355L15.3536 8.35355ZM1 8.5H15V7.5H1V8.5Z"
-              fill="#3681FC"
-            />
-          </svg>
-
-          <span
-            ><span
-              v-html="
-                renderedFormula(
-                  `<span style='color: #3681FC;''>${
-                    item.type == 1 ? '(单选题):' : '(多选题):'
-                  }</span>${item.teststitle}`
-                )
-              "
-            ></span>
-          </span>
-        </div>
-        <div
-          class="s_b_m_ti_option"
-          v-for="(item2, index2) in item.checkList"
-          @click="chooseAnswer(index, index2)"
-          :key="index + '_' + index2 + 'index2T'"
-          :class="{
-            s_b_m_ti_o_choice:
-              item.type == '1'
-                ? workData.json.testJson[index].userAnswer === index2
-                : workData.json.testJson[index].userAnswer.includes(index2)
-          }"
-        >
-          <div class="s_b_m_ti_o_btn">
-            <span class="s_b_m_ti_o_btn1" v-if="item.type == 1">
-              <span
-                v-if="workData.json.testJson[index].userAnswer === index2"
-              ></span>
-            </span>
-            <span class="s_b_m_ti_o_btn2" v-else>
-              <span
-                v-if="workData.json.testJson[index].userAnswer.includes(index2)"
-              >
-              </span>
-            </span>
-          </div>
-          <span>
-            <img
-              v-if="item2.imgType && item2.imgType === 1"
-              :src="item2.src"
-              alt=""
-              @click.stop="$hevueImgPreview(item2.src)"
-            />
-            <span v-else>{{ item2 }}</span>
-          </span>
-        </div>
-      </div>
-    </div> -->
   <questionsAndAnswers ref="questionsAndAnswersRef" v-if="workData.type === '15'" :workData="workData" @changeWorkData="changeWorkData"/>
   <questionsAndAnswers ref="questionsAndAnswersRef" v-if="workData.type === '15'" :workData="workData" @changeWorkData="changeWorkData"/>
   <choiceQuestion ref="choiceQuestionRef" v-if="workData.type === '45'" :workData="workData" @changeWorkData="changeWorkData"/>
   <choiceQuestion ref="choiceQuestionRef" v-if="workData.type === '45'" :workData="workData" @changeWorkData="changeWorkData"/>
   </div>
   </div>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.