Parcourir la source

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

SanHQin il y a 5 jours
Parent
commit
dee6d94e75

+ 1 - 1
dist/index.html

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

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.8704239d1338d6cf7f778d81c5648e1e.css.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.fd1db0dbf03996013626130e90def283.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/css/app.fd1db0dbf03996013626130e90def283.css.map


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


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


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


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


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


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.5705fe39c93139b12330.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/app.5705fe39c93139b12330.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 33 - 16
src/components/easy2/studyStudent.vue

@@ -11080,12 +11080,14 @@
           <div class="cont" v-html="commentDetail.works.text"></div>
         </div>
         <div
-          class="worksAnswer codeFileBox"
           v-if="commentDetail.works && commentDetail.type == 12"
-          @click="downloadFile(commentDetail.works)"
         >
-          <img src="../../assets/icon/codeFile.png" />
-          <div>点击下载文件</div>
+        <!-- class="worksAnswer codeFileBox" -->
+        <!-- @click="downloadFile(commentDetail.works)" -->
+
+          <!-- <img src="../../assets/icon/codeFile.png" />
+          <div>点击下载文件</div> -->
+          <div style="margin-top: 15px;" v-html="commentDetail.works"></div>
         </div>
         <div
           class="worksAnswer codeFileBox"
@@ -13825,7 +13827,8 @@ export default {
       dialogVisibleTxt:false,
       TxtMd :'',
       languageSetting: 0, //0中文 1繁体 2英文
-      toolListS:[]
+      toolListS:[],
+      commentDetailCopy:''
     };
   },
   methods: {
@@ -16113,10 +16116,19 @@ export default {
         wIndex: wIndex,
         gindex: gindex,
         gid: gid,
-      };
-      this.commentDetail = [];
+      };  
       this.commentDialogVisible = true;
+
+      // console.log('wwwwww',w)
+      if(JSON.stringify(this.commentDetailCopy) == JSON.stringify(w.works)) return
+      
+      this.commentDetailCopy = w.works
+
+
+      this.commentDetail = [];
       this.commentDetail = w;
+
+      
       if (w.works && w.type == 1) {
         // this.pptImgUrl = "";
         var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
@@ -16152,7 +16164,12 @@ export default {
           ].toolChoose[toolIndex].rateJson;
       } else if (w.works && w.type == 10) {
         this.commentDetail.works = JSON.parse(this.commentDetail.works);
-      } else if (w.works && w.type == 13) {
+      } else if (w.works && w.type == 12) {
+        getFile(this.commentDetail.works).then(res => {
+          this.commentDetail.works = res.data;
+        });
+        // this.commentDetail.works = JSON.parse(this.commentDetail.works);
+      }else if (w.works && w.type == 13) {
         this.wordJson =
           this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
             this.taskCount
@@ -24199,10 +24216,10 @@ export default {
   justify-content: center;
 }
 
-.answerBg > div:nth-child(1) {
+/* .answerBg > div:nth-child(1) { */
   /* font-size: 22px;
   padding: 25px 0 10px; */
-}
+/* } */
 
 .answerContent {
   width: 215px;
@@ -25781,8 +25798,8 @@ ol {
   top: -25px;
 }
 
-.group_workBox {
-}
+/* .group_workBox {
+} */
 
 .group_workBox + .group_workBox {
   margin-top: 20px;
@@ -26272,11 +26289,11 @@ ol {
   overflow: hidden;
   transition: all 0.5s;
 }
-.toolChild {
+/* .toolChild { */
   /* margin: 0 0 0 17px;
   padding: 0 0 0 20px;
   border-left: 1px solid #d7d7d7; */
-}
+/* } */
 
 .toolChild > div + div{
   margin-top:5px;
@@ -26299,7 +26316,7 @@ ol {
   width: 100%;
 }
 
-.toolChild > div::before {
+/* .toolChild > div::before { */
   /* content: "";
   width: 15px;
   height: 1px;
@@ -26308,7 +26325,7 @@ ol {
   top: 24px;
   left: -20px;
   display: block; */
-}
+/* } */
 
 .isGjCss {
   /* color: #0061ff; */

+ 1 - 1
src/components/index.vue

@@ -1099,7 +1099,7 @@ export default {
 }
 
 .all_choose>span {
-  min-width: 80px;
+  min-width: 85px;
   display: block;
   letter-spacing: 14px;
 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff