Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta'

lsc 10 months ago
parent
6672ea1e92 aa9630da63
commit
847a4b5679
13 changed files with 640 additions and 86 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.495892e4baa50d732f4946780f603a10.css
  3. 0 0
      dist/static/css/app.495892e4baa50d732f4946780f603a10.css.map
  4. 0 0
      dist/static/css/app.7326af2cec5074c72954f84cc6a19f46.css
  5. 0 0
      dist/static/js/app.3e069b7251da762b2909.js
  6. 0 0
      dist/static/js/app.3e069b7251da762b2909.js.map
  7. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  8. 80 54
      src/components/pages/aiAddCourse/addCourse.vue
  9. 9 6
      src/components/pages/components/exjsmind.vue
  10. 18 4
      src/components/pages/components/exportDataDialog.vue
  11. 1 1
      src/components/pages/components/exportWorksDialog.vue
  12. 498 15
      src/components/pages/components/report.vue
  13. 33 5
      src/components/pages/components/studentWorksDetail.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.7326af2cec5074c72954f84cc6a19f46.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.bba3ed5aca95350eeef8.js></script><script type=text/javascript src=./static/js/app.08c0fe2c191c93a56295.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.495892e4baa50d732f4946780f603a10.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.bba3ed5aca95350eeef8.js></script><script type=text/javascript src=./static/js/app.3e069b7251da762b2909.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) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.495892e4baa50d732f4946780f603a10.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.495892e4baa50d732f4946780f603a10.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7326af2cec5074c72954f84cc6a19f46.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.3e069b7251da762b2909.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.3e069b7251da762b2909.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 80 - 54
src/components/pages/aiAddCourse/addCourse.vue
View File 

@@ -195,13 +195,13 @@
 
                               style="justify-content: center; min-width: 175px"></el-switch> -->
 
                               style="justify-content: center; min-width: 175px"></el-switch> -->
 
                           <span>生成模式：</span>
 
                           <span>生成模式：</span>
 
                           <el-radio-group v-model="isuseT" style="display: flex; align-items: center" @change="changeIsuseT">
 
                           <el-radio-group v-model="isuseT" style="display: flex; align-items: center" @change="changeIsuseT">
 
-                            <div class="all_choose info_radio" style="margin-left: 10px">
 
+                            <div class="all_choose info_radio">
 
                               <el-radio :label="false">从零开始生成</el-radio>
 
                               <el-radio :label="false">从零开始生成</el-radio>
 
                             </div>
 
                             </div>
 
                             <div class="all_choose info_radio" style="margin-left: 10px">
 
                             <div class="all_choose info_radio" style="margin-left: 10px">
 
                               <el-radio :label="true">从已有教案生成</el-radio>
 
                               <el-radio :label="true">从已有教案生成</el-radio>
 
                             </div>
 
                             </div>
 
-                            <div class="all_choose info_radio">
 
+                            <div class="all_choose info_radio" style="margin-left: 10px">
 
                               <el-radio :label="1">对话模式生成</el-radio>
 
                               <el-radio :label="1">对话模式生成</el-radio>
 
                             </div>
 
                             </div>
 
                             <div class="all_choose info_radio" style="margin-left: 10px">
 
                             <div class="all_choose info_radio" style="margin-left: 10px">
 
@@ -7330,7 +7330,7 @@ import JSZip from "jszip";
 
 import evaList from "./evaList.vue";
 
 import evaList from "./evaList.vue";
 
 import MindTask from "./jsmind2";
 
 import MindTask from "./jsmind2";
 
 import ConvertApi from 'convertapi-js'
 
 import ConvertApi from 'convertapi-js'
 
-let convertApi = ConvertApi.auth('secret_8jZzewWvAJluEjTR')
 
+let convertApi = ConvertApi.auth('secret_U1EO5rhgMCnoBnBT')
 
 
 
 var OpenCC = require("opencc-js");
 
 var OpenCC = require("opencc-js");
 
 let converter = OpenCC.Converter({
 
 let converter = OpenCC.Converter({
 
@@ -9767,19 +9767,20 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
       // });
 
       // });
 
       // const file = new File([blob], dname, { type: 'application/msword' });
 
       // const file = new File([blob], dname, { type: 'application/msword' });
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
-      let params = convertApi.createParams()
 
-      params.add('file', file)
 
-      try {
 
-        let result = await convertApi.convert('docx', 'docx', params)
 
-        file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
-          return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
-        });
 
-        await this.beforeUploadHtml(file, index, callback)
 
-      } catch (error) {
 
-        console.log('=================','报错')
 
-        await this.beforeUploadHtml(file, index, callback)
 
-        return
 
-      }
 
+      // let params = convertApi.createParams()
 
+      // params.add('file', file)
 
+      // try {
 
+      //   let result = await convertApi.convert('docx', 'docx', params)
 
+      //   file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
+      //     return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
+      //   });
 
+      //   await this.beforeUploadHtml(file, index, callback)
 
+      // } catch (error) {
 
+      //   console.log('=================','报错')
 
+      //   await this.beforeUploadHtml(file, index, callback)
 
+      //   return
 
+      // }
 
+      await this.beforeUploadHtml(file, index, callback)
 
 
 
     },
 
     },
 
     async generateExport(a, html, index) {
 
     async generateExport(a, html, index) {
 
@@ -9817,20 +9818,21 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
       // 创建文件流
 
       // 创建文件流
 
 
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
-      let params = convertApi.createParams()
 
-      params.add('file', file)
 
-      try {
 
-        let result = await convertApi.convert('docx', 'docx', params)
 
-        file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
-          return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
-        });
 
+      // let params = convertApi.createParams()
 
+      // params.add('file', file)
 
+      // try {
 
+      //   let result = await convertApi.convert('docx', 'docx', params)
 
+      //   file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
+      //     return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
+      //   });
 
 
 
-        // 执行下载
 
-        saveAs(file, dname);
 
-      } catch (error) {
 
-        saveAs(file, dname);
 
-        // this.$message.error('导出失败')
 
-      }
 
+      //   // 执行下载
 
+      //   saveAs(file, dname);
 
+      // } catch (error) {
 
+      //   saveAs(file, dname);
 
+      //   // this.$message.error('导出失败')
 
+      // }
 
+      saveAs(file, dname);
 
     
     
       // return file
 
       // return file
 
     },
 
     },
 
@@ -9872,16 +9874,18 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
         let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
         let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
         let params = convertApi.createParams()
 
         let params = convertApi.createParams()
 
         params.add('file', file)
 
         params.add('file', file)
 
-        try {
 
-          let result = await convertApi.convert('docx', 'docx', params)
 
-          file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
-            return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
-          });
 
+        resolve(file);  // 通过 Promise 返回 File 对象
 
 
 
-          resolve(file);  // 通过 Promise 返回 File 对象
 
-        } catch (error) {
 
-          resolve('');  // 通过 Promise 返回 File 对象
 
-        }
 
+        // try {
 
+        //   let result = await convertApi.convert('docx', 'docx', params)
 
+        //   file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
+        //     return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
+        //   });
 
+
 
+        //   resolve(file);  // 通过 Promise 返回 File 对象
 
+        // } catch (error) {
 
+        //   resolve('');  // 通过 Promise 返回 File 对象
 
+        // }
 
 
 
       });
 
       });
 
     },
 
     },
 
@@ -9987,18 +9991,19 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
       // });
 
       // });
 
       // const file = new File([blob], dname, { type: 'application/msword' });
 
       // const file = new File([blob], dname, { type: 'application/msword' });
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
       let file = new File([blob], dname, { type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' });
 
-      let params = convertApi.createParams()
 
-      params.add('file', file)
 
-      try {
 
-        let result = await convertApi.convert('docx', 'docx', params)
 
-        file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
-          return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
-        });
 
-        await this.beforeUploadHtml2(file, index, callback)
 
-      } catch (error) {
 
-        await this.beforeUploadHtml2(file, index, callback)
 
-        return;
 
-      }
 
+      // let params = convertApi.createParams()
 
+      // params.add('file', file)
 
+      // try {
 
+      //   let result = await convertApi.convert('docx', 'docx', params)
 
+      //   file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
+      //     return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
+      //   });
 
+      //   await this.beforeUploadHtml2(file, index, callback)
 
+      // } catch (error) {
 
+      //   await this.beforeUploadHtml2(file, index, callback)
 
+      //   return;
 
+      // }
 
+      await this.beforeUploadHtml2(file, index, callback)
 
     },
 
     },
 
     beforeUploadHtml2(event, index, callback) {
 
     beforeUploadHtml2(event, index, callback) {
 
         var file = event;
 
         var file = event;
 
@@ -10729,6 +10734,17 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
           // loading.close();
 
           // loading.close();
 
           return;
 
           return;
 
         }
 
         }
 
+        if (
 
+          ['DOC'].indexOf(
 
+              file.name
 
+                .split(".")
 
+              [file.name.split(".").length - 1].toLocaleUpperCase()
 
+            ) !== -1
 
+          ) {
 
+          this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
+          this.inputShow = true;
 
+          return;
 
+        }
 
 
 
         if (type == 3) {
 
         if (type == 3) {
 
           var b = [
 
           var b = [
 
@@ -10841,6 +10857,8 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
             file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
             file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
               return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
               return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
             });
 
             });
 
+            console.log(result)
 
+            console.log(file)
 
           } catch (error) {
 
           } catch (error) {
 
             cfindex2++;
 
             cfindex2++;
 
             if(type == 14){
 
             if(type == 14){
 
@@ -10882,13 +10900,13 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
             
             
               _this.$forceUpdate();
 
               _this.$forceUpdate();
 
             }, 1000);
 
             }, 1000);
 
-            _this.$message.error("上传失败");
 
+            _this.inputShow = true;
 
+            _this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
             // 捕捉到这个convertApi.convert报错就不要往下走了
 
             // 捕捉到这个convertApi.convert报错就不要往下走了
 
             return; // 直接返回，不继续执行后续代码
 
             return; // 直接返回，不继续执行后续代码
 
           }
 
           }
 
 
 
-          console.log(result)
 
-          console.log(file)
 
+
 
           // return;
 
           // return;
 
         }
 
         }
 
 
 
@@ -17955,6 +17973,13 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
           });
 
           });
 
           return;
 
           return;
 
         }
 
         }
 
+        if(callback != 'all' && !this.unitJson[0].chapterInfo[0].taskJson[callback].taskDetail3){
 
+          this.$message({
 
+            message: `请先生成任务${callback}的教案在执行此操作`,
 
+            type: "warning"
 
+          });
 
+          return;
 
+        }
 
         this.aitype = type
 
         this.aitype = type
 
         this.aiText = this.aiJson.aiTaskG2
 
         this.aiText = this.aiJson.aiTaskG2
 
         this.aiCallBack = callback
 
         this.aiCallBack = callback
 
@@ -18727,7 +18752,8 @@ ${msg3}
 
           let _this = this
 
           let _this = this
 
           function processNext() {
 
           function processNext() {
 
             if (ij < _this.unitJson[0].chapterInfo[0].taskJson.length) {
 
             if (ij < _this.unitJson[0].chapterInfo[0].taskJson.length) {
 
-              if(!_this.taskGLoading[ij][1]){
 
+              if(!_this.taskGLoading[ij][1] || !_this.unitJson[0].chapterInfo[0].taskJson[ij].taskDetail3){
 
+                _this.taskGLoading[ij][1] = false
 
                 ij++;
 
                 ij++;
 
                 processNext();
 
                 processNext();
 
                 return;
 
                 return;

+ 9 - 6
src/components/pages/components/exjsmind.vue
View File 

@@ -85,13 +85,16 @@ export default {
 
 
 
 <style scoped>
 
 <style scoped>
 
 .exjsmind >>> jmnode {
 
 .exjsmind >>> jmnode {
 
-  font-size: 12px !important;
 
-  display: flex;
 
-  align-items: center;
 
-  justify-content: center;
 
-  min-width: 20px;
 
-  max-width: 300px;
 
+
 
+  /* display: flex; */
 
+  /* align-items: center; */
 
+  /* justify-content: center; */
 
+  /* min-width: 20px; */
 
+  max-width: 250px;
 
   overflow: hidden;
 
   overflow: hidden;
 
+  letter-spacing: 3px;
 
+  font-size: 12px !important;
 
+  /* flex-wrap: wrap; */
 
   /* white-space: wrap; */
 
   /* white-space: wrap; */
 
 }
 
 }
 
 </style>
 
 </style>

+ 18 - 4
src/components/pages/components/exportDataDialog.vue
View File 

@@ -2665,12 +2665,14 @@ export default {
 
 
 
     // 编辑
 
     // 编辑
 
     extCon(val) {
 
     extCon(val) {
 
-      this.exitCon.splice(val, 1, false);
 
+      // this.exitCon.splice(val, 1, false);
 
+      this.$set(this.exitCon, val, false);
 
     },
 
     },
 
     // 确定
 
     // 确定
 
     qutCon(val, mc) {
 
     qutCon(val, mc) {
 
-      console.log("qutCon");
 
-      this.exitCon.splice(val, 1, true);
 
+      // console.log("qutCon");
 
+      // this.exitCon.splice(val, 1, true);
 
+      this.$set(this.exitCon, val, true);
 
 
 
       this.AiAnalysisCon2Copy[mc] = this.AiAnalysisCon2[mc];
 
       this.AiAnalysisCon2Copy[mc] = this.AiAnalysisCon2[mc];
 
       this.upOneData();
 
       this.upOneData();
 
@@ -3087,6 +3089,18 @@ export default {
 
           scoList[index] = scoList[index] / e.length;
 
           scoList[index] = scoList[index] / e.length;
 
         }
 
         }
 
       });
 
       });
 
+      // let repeatWorkCopyTwo = []
 
+
 
+      // repeatWorkCopy.forEach((e,i)=>{
 
+      //   repeatWorkCopyTwo[i]= []
 
+      //   if (e.length) {
 
+      //     e.forEach(k=>{
 
+      //       repeatWorkCopyTwo[i].push(k.sco)
 
+      //     })
 
+      //   }
 
+      //   repeatWorkCopyTwo[i]=
 
+      // })
 
+
 
 
 
       this.claScoFoldLineData = scoList.map(e => {
 
       this.claScoFoldLineData = scoList.map(e => {
 
         if (e == 0) {
 
         if (e == 0) {
 
@@ -4066,7 +4080,7 @@ export default {
 
 .zhBlockCon2 > div {
 
 .zhBlockCon2 > div {
 
   display: flex;
 
   display: flex;
 
   flex-wrap: wrap;
 
   flex-wrap: wrap;
 
-
 
+  overflow: auto;
 
   flex: 1;
 
   flex: 1;
 
 }
 
 }
 
 .zhBlockCon2 > div > span {
 
 .zhBlockCon2 > div > span {

+ 1 - 1
src/components/pages/components/exportWorksDialog.vue
View File 

@@ -1351,7 +1351,7 @@ export default {
 
   display: flex;
 
   display: flex;
 
   flex-direction: column;
 
   flex-direction: column;
 
   padding: 0 110px;
 
   padding: 0 110px;
 
-  padding-bottom: 30px;
 
+  padding-bottom: 100px;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   font-family: PingFang SC;
 
   font-family: PingFang SC;
 
 }
 
 }

+ 498 - 15
src/components/pages/components/report.vue
View File 

@@ -88,7 +88,9 @@
 
       <el-button class="btn" type="primary" @click="confirmPdf">确定</el-button>
 
       <el-button class="btn" type="primary" @click="confirmPdf">确定</el-button>
 
     </div>
 
     </div>
 
 
 
-    <!-- 自定义导出作业pdf弹框 -->
 
+
 
+
 
+
 
     <el-dialog
 
     <el-dialog
 
       :visible.sync="worksDialog"
 
       :visible.sync="worksDialog"
 
       :before-close="handleClose"
 
       :before-close="handleClose"
 
@@ -100,6 +102,487 @@
 
         <div style="color: #fff">{{dataJson.state == 5 ?"按任务导出" :'自定义导出' + ':' +dataJson.title }}</div>
 
         <div style="color: #fff">{{dataJson.state == 5 ?"按任务导出" :'自定义导出' + ':' +dataJson.title }}</div>
 
       </div>
 
       </div>
 
 
 
+      <div class="worksDiaCon" ref="reportPdf">
 
+        <div style="margin-bottom: 30px;font-size: 42px;">
 
+          {{ dataJson.title }}
 
+        </div>
 
+        <!-- <div
 
+          v-for="(userP, upi) in pdfUser"
 
+          style="background-color: #fff;border-radius: 8px;margin-top: 10px;"
 
+          :key="upi + 'upi'" 
+        >-->
 
+          <!-- <div style="padding: 10px;box-sizing: border-box;">
 
+            <h1>{{ userP.username }}</h1>
 
+          </div> -->
 
+
 
+          <div
 
+            v-for="(i, wip) in workList"
 
+           
+            :key="i.id"
 
+            class="stageCon"
 
+          >
 
+          <!-- v-if="
 
+              isStage(i.taskList, userP.userid) &&
 
+                (chap.length ? chap.indexOf(wip) != -1 : true)
 
+            " -->
 
+            <div v-if="dataJson.state != 5" class="stageTit">
 
+              第{{ i.id * 1 + 1 }}阶段<span v-if="i.name">:{{ i.name }}</span>
 
+            </div>
 
+            <div
 
+              v-for="k in i.taskList"
 
+              :key="k.task + 'a'"
 
+              
+              style="margin-bottom: 15px"
 
+            >
 
+            <!-- v-if="isTask(k.toolEList, userP.userid, k)" -->
 
+              <div
 
+                style="
 
+                    width: 100%;
 
+                    display: flex;
 
+                    justify-content: space-between;
 
+                    margin-bottom: 10px;
 
+                  "
 
+              >
 
+                <div class="taskTitInd">
 
+                  <span>任务{{ k.task + 1 }}</span>
 
+                  <span>{{ k.taskTit }}</span>
 
+                </div>
 
+                <div></div>
 
+              </div>
 
+              <div v-if="k.taskDetail" class="taskBri">
 
+                <div v-html="k.taskDetail"></div>
 
+              </div>
 
+              <div
 
+                class="WorksCon"
 
+                v-for="(l, lind) in k.toolEList"
 
+                :key="lind + 'l'"
 
+              >
 
+                <div
 
+                  v-if="l.content && l.content.length"
 
+                  v-for="(imgp, imgIdx) in l.content"
 
+                  :key="imgIdx + 'img'"
 
+                >
 
+                  <!-- <div
 
+                    v-if="
 
+                      (imgp && imgp[0] && imgp[0].userid == userP.userid) ||
 
+                        imgp.userid == userP.userid
 
+                    "
 
+                  > -->
 
+                  <div
 
+                    v-for="(userP, upi) in pdfUser"
 
+                    style="background-color: #fff;border-radius: 8px;margin-top: 10px;"
 
+                    :key="upi + 'upi'"
 
+                  >
 
+                    <div  v-if="
 
+                      (imgp && imgp[0] && imgp[0].userid == userP.userid) ||
 
+                        imgp.userid == userP.userid
 
+                    ">
 
+                      <div style="padding: 10px;box-sizing: border-box;">
 
+                        <h1>{{ userP.username }}</h1>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 15">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/thirdToolList/answer.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：问答工具</div>
 
+                            <div>提问：{{ l.content[0][0].answerTitle }}</div>
 
+                          </div>
 
+                        </div>
 
+                        <div class="answerTxt">
 
+                          回答:{{ l.content[0][0].answer }}
 
+                        </div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 52">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/fourthToolList/text.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：文档工具</div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <div class="answerTxt" v-html="l.content[0].text"></div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 16 || l.tool[0] == 50">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            v-if="l.tool[0] == 16"
 
+                            src="../../../assets/icon/thirdToolList/work.png"
 
+                            alt=""
 
+                          />
 
+                          <img
 
+                            v-if="l.tool[0] == 50"
 
+                            src="../../../assets/icon/thirdToolList/plwork.png"
 
+                            alt=""
 
+                          />
 
+
 
+                          <div class="toolTit">
 
+                            <div>
 
+                              工具{{ lind + 1 }}：{{
 
+                                l.tool[0] == 16 ? "作业提交" : "批量上传"
 
+                              }}
 
+                            </div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <div v-for="(i, codex) in l.content" :key="codex + 'co'">
 
+                          <div class="answerTxt" v-html="i.con"></div>
 
+                        </div>
 
+                      </div>
 
+                      <div
 
+                        v-if="l.tool[0] == 7 || l.tool[0] == 1 || l.tool[0] == 3"
 
+                      >
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            v-if="l.tool[0] == 1"
 
+                            src="../../../assets/icon/secondToolList/whiteBoard.png"
 
+                            alt=""
 
+                          />
 
+                          <img
 
+                            v-if="l.tool[0] == 3"
 
+                            src="../../../assets/icon/secondToolList/mindMapping.png"
 
+                            alt=""
 
+                          />
 
+                          <img
 
+                            v-if="l.tool[0] == 7"
 
+                            src="../../../assets/icon/secondToolList/mindNetwork.png"
 
+                            alt=""
 
+                          />
 
+
 
+                          <div class="toolTit">
 
+                            <div>
 
+                              工具{{ lind + 1 }}：{{
 
+                                l.tool[0] == 1
 
+                                  ? "电子白板"
 
+                                  : l.tool[0] == 7
 
+                                  ? "思维网格"
 
+                                  : "思维导图"
 
+                              }}
 
+                            </div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <img
 
+                          style="max-width: 200px"
 
+                          :src="l.content[0].con"
 
+                          alt=""
 
+                        />
 
+                        <div>{{ l.content[0].con }}</div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 48">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/fourthToolList/table.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：表格</div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <el-form>
 
+                          <div class="cont" v-html="l.content[0].text"></div>
 
+                        </el-form>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 4">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/thirdToolList/ask.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：问卷调查</div>
 
+                            <div>标题:{{ l.content[0][0].askJson.askTitle }}</div>
 
+                          </div>
 
+                        </div>
 
+
 
+                        <div
 
+                          style="margin-bottom: 5px"
 
+                          v-for="(i, index) in l.content[0][0].askJson.askJson"
 
+                          :key="index"
 
+                        >
 
+                          <div>题目：{{ i.askstitle }}</div>
 
+                          <el-radio-group
 
+                            v-if="!i.type"
 
+                            v-model="l.content[0][0].anwer[index]"
 
+                          >
 
+                            <el-radio
 
+                              v-for="(item2, checkIndex) in i.checkList"
 
+                              :key="checkIndex + 'b'"
 
+                              :label="checkIndex"
 
+                              disabled
 
+                            >
 
+                              {{ item2 }}
 
+                            </el-radio>
 
+                          </el-radio-group>
 
+                          <el-checkbox-group
 
+                            v-model="l.content[0][0].anwer[index]"
 
+                            v-else
 
+                          >
 
+                            <div class="radioBox">
 
+                              <el-checkbox
 
+                                v-for="(item2, checkIndex) in i.checkList"
 
+                                :key="checkIndex + 'c'"
 
+                                :label="checkIndex"
 
+                                disabled
 
+                              >
 
+                                {{ item2 }}
 
+                              </el-checkbox>
 
+                            </div>
 
+                          </el-checkbox-group>
 
+                        </div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 45">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/thirdToolList/choose.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：选择题</div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <div
 
+                          v-for="(i, index) in l.content[0].testJson"
 
+                          :key="index + 'm'"
 
+                        >
 
+                          <div>题目:{{ i.teststitle }}</div>
 
+                          <div
 
+                            v-if="i.type == 1"
 
+                            style="display: flex; flex-direction: column"
 
+                          >
 
+                            <el-radio-group v-model="l.content[0].radio[index]">
 
+                              <div class="radioBox">
 
+                                <el-radio
 
+                                  v-for="(item2, checkIndex) in i.checkList"
 
+                                  :key="checkIndex + 'b'"
 
+                                  :label="checkIndex"
 
+                                  disabled
 
+                                  :class="[
 
+                                    i.answer == checkIndex
 
+                                      ? 'redioStyle5'
 
+                                      : 'redioStyle2'
 
+                                  ]"
 
+                                >
 
+                                  <div
 
+                                    v-if="
 
+                                      item2 && item2.imgType && item2.imgType == 1
 
+                                    "
 
+                                  >
 
+                                    <div
 
+                                      class="inImg"
 
+                                      @click.stop="previewImg(item2.src)"
 
+                                    >
 
+                                      <img
 
+                                        style="display: block"
 
+                                        :src="item2.src"
 
+                                        alt=""
 
+                                      />
 
+                                    </div>
 
+                                    <span>{{ item2.src }}</span>
 
+                                  </div>
 
+                                  <span v-else v-html="item2"></span>
 
+                                </el-radio>
 
+                              </div>
 
+                            </el-radio-group>
 
+                          </div>
 
+                          <div class="radioBox">
 
+                            <el-checkbox-group
 
+                              v-model="l.content[0].radio[index]"
 
+                              v-if="i.type == '2'"
 
+                            >
 
+                              <div class="radioBox">
 
+                                <el-checkbox
 
+                                  v-for="(item2, checkIndex) in i.checkList"
 
+                                  :key="checkIndex + 'c'"
 
+                                  :label="checkIndex"
 
+                                  disabled
 
+                                  :class="[
 
+                                    i.answer.includes(checkIndex)
 
+                                      ? 'redioStyle3'
 
+                                      : 'redioStyle4'
 
+                                  ]"
 
+                                >
 
+                                  <div style="display: flex">
 
+                                    <div
 
+                                      v-if="
 
+                                        item2 &&
 
+                                          item2.imgType &&
 
+                                          item2.imgType == 1
 
+                                      "
 
+                                    >
 
+                                      <div
 
+                                        class="inImg"
 
+                                        @click.stop="previewImg(item2.src)"
 
+                                      >
 
+                                        <img
 
+                                          style="display: block"
 
+                                          :src="item2.src"
 
+                                          alt=""
 
+                                        />
 
+                                      </div>
 
+                                    </div>
 
+                                    <span v-else v-html="item2"></span>
 
+                                  </div>
 
+                                </el-checkbox>
 
+                              </div>
 
+                            </el-checkbox-group>
 
+                          </div>
 
+                        </div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 41">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/thirdToolList/select.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：选择匹配</div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <img
 
+                          style="max-width: 200px"
 
+                          :src="l.selectJson.url"
 
+                          alt=""
 
+                        />
 
+                        <div>
 
+                          {{ l.selectJson.url }}
 
+                        </div>
 
+                        <div>
 
+                          <span style="margin-right: 10px">选项:</span
 
+                          ><span
 
+                            style="margin-right: 10px"
 
+                            v-for="(item, itInd) in l.selectJson.select"
 
+                            :key="itInd"
 
+                            >{{ item }}</span
 
+                          >
 
+                        </div>
 
+                        <div>
 
+                          <span style="margin-right: 10px">答案:</span>
 
+
 
+                          <span
 
+                            style="margin-right: 10px"
 
+                            v-for="(item, itInd) in l.content[0].con"
 
+                            :key="itInd"
 
+                            >{{ itInd + 1 }}、{{
 
+                              l.selectJson.select[item]
 
+                            }}</span
 
+                          >
 
+                        </div>
 
+                      </div>
 
+                      <div v-if="l.tool[0] == 47">
 
+                        <div class="toolBlk">
 
+                          <img
 
+                            src="../../../assets/icon/fourthToolList/conSentences.png"
 
+                            alt=""
 
+                          />
 
+                          <div class="toolTit">
 
+                            <div>工具{{ lind + 1 }}：排序</div>
 
+                            <div>
 
+                              根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
 
+                            </div>
 
+                          </div>
 
+                        </div>
 
+                        <div
 
+                          v-for="(i, index) in l.content[0]"
 
+                          :key="index"
 
+                          style="margin-bottom: 10px"
 
+                        >
 
+                          <div
 
+                            style="
 
+                              height: 20px;
 
+                              display: flex;
 
+                              align-items: center;
 
+                              flex-wrap: wrap;
 
+                            "
 
+                          >
 
+                            题目:
 
+                            <div
 
+                              class="sortTool"
 
+                              v-for="(i, index) in i.addSentence"
 
+                              :key="index"
 
+                            >
 
+                              {{ i }}
 
+                            </div>
 
+                            <span
 
+                              v-if="
 
+                                JSON.stringify(i.chooseSenList) ==
 
+                                  JSON.stringify(i.addSentence)
 
+                              "
 
+                              style="color: #868ce4"
 
+                              >回答正确</span
 
+                            >
 
+                            <span v-else style="color: red">回答错误</span>
 
+                          </div>
 
+                          <div
 
+                            style="
 
+                              margin: 10px 0;
 
+                              display: flex;
 
+                              align-items: center;
 
+                              flex-wrap: wrap;
 
+                            "
 
+                          >
 
+                            学生回答:
 
+                            <div
 
+                              class="sortTool"
 
+                              v-for="(i, index) in i.chooseSenList"
 
+                              :key="index"
 
+                            >
 
+                              {{ i }}
 
+                            </div>
 
+                          </div>
 
+                          <div>
 
+                            正确答案:
 
+                            <span style="margin: 0 5px">{{
 
+                              i.addSentence.join(",")
 
+                            }}</span>
 
+                          </div>
 
+                        </div>
 
+                      </div>
 
+                    </div>
 
+                  </div>
 
+                  <!-- </div> -->
 
+                </div>
 
+              </div>
 
+            </div>
 
+          </div>
 
+        <!-- </div> -->
 
+      </div>
 
+    </el-dialog>
 
+
 
+
 
+
 
+    <!-- 自定义导出作业pdf弹框 -->
 
+    <!-- <el-dialog
 
+      :visible.sync="worksDialog"
 
+      :before-close="handleClose"
 
+      class="worksDialogCSSExp"
 
+      :append-to-body="true"
 
+      :fullscreen="true"
 
+    >
 
+      <div slot="title" class="header-title">
 
+        <div style="color: #fff">{{dataJson.state == 5 ?"按任务导出" :'自定义导出' + ':' +dataJson.title }}</div>
 
+      </div>
 
+
 
       <div class="worksDiaCon" ref="reportPdf">
 
       <div class="worksDiaCon" ref="reportPdf">
 
         <div style="margin-bottom: 30px;font-size: 42px;">
 
         <div style="margin-bottom: 30px;font-size: 42px;">
 
           {{ dataJson.title }}
 
           {{ dataJson.title }}
 
@@ -549,7 +1032,7 @@
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
-    </el-dialog>
 
+    </el-dialog> -->
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -716,7 +1199,7 @@ export default {
 
               taskName += `${e.name}、`;
 
               taskName += `${e.name}、`;
 
             }
 
             }
 
           });
 
           });
 
-          taskName = taskName.slice(0 , -1 ) + '-'
 
+          taskName = taskName.slice(0 , -1 )
 
 
 
           pdf.save(className + this.dataJson.title + "-" + taskName + ".pdf");
 
           pdf.save(className + this.dataJson.title + "-" + taskName + ".pdf");
 
         } else {
 
         } else {
 
@@ -734,17 +1217,17 @@ export default {
 
       this.ajax
 
       this.ajax
 
         .get(this.$store.state.api + "getCourseWorksReport1", params)
 
         .get(this.$store.state.api + "getCourseWorksReport1", params)
 
         .then(res => {
 
         .then(res => {
 
-          res.data[1];
 
-          res.data[3]; //问卷
 
-          res.data[4]; //问答题
 
-          res.data[5];
 
-          res.data[6]; //选择题
 
-          res.data[7]; //个人评价作业
 
-          res.data[8]; //选择匹配作业
 
-          res.data[9]; //排序作业
 
-          res.data[10]; //表格作业
 
-          res.data[11]; //cocopi或源码编辑作业
 
-          res.data[12]; //文档作业
 
+          // res.data[1];
 
+          // res.data[3]; //问卷
 
+          // res.data[4]; //问答题
 
+          // res.data[5];
 
+          // res.data[6]; //选择题
 
+          // res.data[7]; //个人评价作业
 
+          // res.data[8]; //选择匹配作业
 
+          // res.data[9]; //排序作业
 
+          // res.data[10]; //表格作业
 
+          // res.data[11]; //cocopi或源码编辑作业
 
+          // res.data[12]; //文档作业
 
           this.workEvaList = res.data[13];
 
           this.workEvaList = res.data[13];
 
           this.userAarrayCopy = JSON.parse(JSON.stringify(res.data[14]));
 
           this.userAarrayCopy = JSON.parse(JSON.stringify(res.data[14]));
 
           this.userAarray = res.data[14];
 
           this.userAarray = res.data[14];
 
@@ -901,7 +1384,7 @@ export default {
 
       }
 
       }
 
       console.log("this.pdfUser", this.pdfUser);
 
       console.log("this.pdfUser", this.pdfUser);
 
 
 
-      this.worksDialog = true;
 
+        this.worksDialog = true;        
       setTimeout(() => {
 
       setTimeout(() => {
 
         this.getPdf();
 
         this.getPdf();
 
       }, 500);
 
       }, 500);

+ 33 - 5
src/components/pages/components/studentWorksDetail.vue
View File 

@@ -200,7 +200,7 @@
 
             <div style="color: #fff">查看&批改</div>
 
             <div style="color: #fff">查看&批改</div>
 
           </div>
 
           </div>
 
 
 
-          <LookWorks :id="checkCourse" :isStu="1" :studentId="studentId" :key="countM"></LookWorks>
 
+          <LookWorks @childExportPdfSetBtn="childExportPdfSetBtn" :id="checkCourse" :isStu="1" :studentId="studentId" :key="countM"></LookWorks>
 
 
 
           <!-- <div v-else class="zyBoxC" ref="reportPdf">
 
           <!-- <div v-else class="zyBoxC" ref="reportPdf">
 
             <div class="courseTitle" v-if="allWorks.course">
 
             <div class="courseTitle" v-if="allWorks.course">
 
@@ -1496,7 +1496,20 @@
 
         :typeNum = "1"
 
         :typeNum = "1"
 
       ></studentReport>
 
       ></studentReport>
 
     </div>
 
     </div>
 
-   
+
 
+
 
+    <el-dialog
 
+      :visible.sync="worksDialog"
 
+      :before-close="handleClose"
 
+      class="worksDialogCSSExp"
 
+      :append-to-body="true"
 
+      :fullscreen="true"
 
+    >
 
+      <div slot="title" class="header-title">
 
+        <div style="color: #fff">导出作业集</div>
 
+      </div>
 
+      <exportWorksDialog  :key="exportW" :digNum="digNum" :oid="oid" :worksDialog.sync="worksDialog" :worksDialogCon="worksDialogCon" :uid="exportPdfSetUid" :cid="checkCourse"></exportWorksDialog>
 
+    </el-dialog>
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -1508,6 +1521,8 @@ import saveAs from "file-saver";
 
 import html2canvas from "html2canvas";
 
 import html2canvas from "html2canvas";
 
 import LookWorks from "./lookWork.vue";
 
 import LookWorks from "./lookWork.vue";
 
 import exportDataDialog from "./exportDataDialog.vue";
 
 import exportDataDialog from "./exportDataDialog.vue";
 
+import exportWorksDialog from "./exportWorksDialog.vue";
 
+
 
 
 
 import jspdf from "jspdf";
 
 import jspdf from "jspdf";
 
 export default {
 
 export default {
 
@@ -1515,8 +1530,8 @@ export default {
 
     StudentData,
 
     StudentData,
 
     studentReport,
 
     studentReport,
 
     LookWorks,
 
     LookWorks,
 
-    exportDataDialog
 
-
 
+    exportDataDialog,
 
+    exportWorksDialog
 
   },
 
   },
 
   props: ["uid", "ooid", "oorg","username","dialogVisibleS"],
 
   props: ["uid", "ooid", "oorg","username","dialogVisibleS"],
 
   data() {
 
   data() {
 
@@ -1747,7 +1762,12 @@ export default {
 
       exportData:'',
 
       exportData:'',
 
       DState:'',
 
       DState:'',
 
       cid:'',
 
       cid:'',
 
-      countM: 0
 
+      countM: 0,
 
+      worksDialog:false,
 
+      worksDialogCon:'',
 
+      exportPdfSetUid:'',
 
+      digNum:2,
 
+      exportW:0
 
     };
 
     };
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
@@ -1804,6 +1824,14 @@ export default {
 
     goTo(path) {
 
     goTo(path) {
 
       this.$router.push(path);
 
       this.$router.push(path);
 
     },
 
     },
 
+    // 子元素调用父元素 按任务查看导出作业集
 
+    childExportPdfSetBtn(val) {
 
+      this.worksDialog = true;
 
+      this.worksDialogCon = val.con;
 
+      this.exportPdfSetUid = val.uid;
 
+      this.digNum = 0;
 
+      this.exportW++
 
+    },
 
     backPage(){
 
     backPage(){
 
       this.$emit("StuCancel");
 
       this.$emit("StuCancel");
 
     },
 
     },

Some files were not shown because too many files changed in this diff