#

src/components/pages/components/exjsmind.vue

@@ -22,7 +22,7 @@ export default {
     return {};
   },
   mounted() {
-    console.log("treeData", this.treeData);
+    // console.log("treeData", this.treeData);
     this.createMindMap();
   },
   watch: {

src/components/pages/components/exportWorksDialog.vue

@@ -280,80 +280,51 @@
                   </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 class="toolBlk">
+                      <img
+                        src="../../../assets/icon/thirdToolList/choose.png"
+                        alt=""
+                      />
+                      <div class="toolTit">
+                        <div>工具{{ lind + 1 }}：选择题</div>
+                        <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"
+                      v-for="(i, index) in l.content[0].testJson"
+                      :key="index + 'm'"
                     >
-                      <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>
+                        题目:{{ i.teststitle }}
+                        <span
+                          v-if="
+                            JSON.stringify(l.content[0].radio[index]) ==
+                              JSON.stringify(i.answer)
+                          "
+                          style="color: #868ce4"
+                          >回答正确</span
+                        >
+                        <span v-else style="color: red">回答错误</span>
+                      </div>
+                      <div
+                        v-if="i.type == 1"
+                        style="display: flex; flex-direction: column"
                       >
-                        <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">
+                        <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
@@ -371,35 +342,74 @@
                                 </div>
                               </div>
                               <span v-else v-html="item2"></span>
-                            </div>
-                          </el-checkbox>
-                        </div>
-                      </el-checkbox-group>
+                            </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>
-                <div v-if="l.tool[0] == 41">
-                  <div class="toolBlk">
+                  <!-- 选择匹配 -->
+                  <div v-if="l.tool[0] == 41">
+                    <div class="toolBlk">
+                      <img
+                        class="toolImg"
+                        src="../../../assets/icon/thirdToolList/select.png"
+                        alt=""
+                      />
+                      <div class="toolTit">
+                        <div>工具{{ lind + 1 }}：选择匹配</div>
+                        <div>
+                          根据前期的了解与实地调研对于项目的了解，进行思考与讨论提出问题。
+                        </div>
+                      </div>
+                    </div>
                     <img
-                      src="../../../assets/icon/thirdToolList/select.png"
+                      @click.stop="previewImg(l.selectJson.url)"
+                      style="max-width: 200px"
+                      :src="l.selectJson.url"
                       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>
+                    <div>
                       <span style="margin-right: 10px">选项:</span
                       ><span
                         style="margin-right: 10px"
@@ -439,76 +449,116 @@
                         }}</span
                       >
                     </div>
-                </div>
-                <div v-if="l.tool[0] == 47">
-                  <div class="toolBlk">
+                  </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
-                      src="../../../assets/icon/fourthToolList/conSentences.png"
+                      @click.stop="previewImg(l.selectJson.url)"
+                      style="max-width: 200px"
+                      :src="l.selectJson.url"
                       alt=""
                     />
-                    <div class="toolTit">
-                      <div>工具{{ lind + 1 }}：排序</div>
-                      <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]"
+                        :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>
-                  <div
-                    v-for="(i, index) in l.content[0]"
-                    :key="index"
-                    style="margin-bottom: 10px"
-                  >
                     <div
-                      style="
+                      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
+                          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>
-                      <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="
+                      <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
+                          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>
-                      正确答案:
-                      <span style="margin: 0 5px">{{
-                        i.addSentence.join(",")
-                      }}</span>
                     </div>
                   </div>
-                </div>
               </div>
 
               <!-- ai作业得分  -->
@@ -873,10 +923,20 @@ export default {
       const content = this.$refs.reportPdf;
 
       html2canvas(content).then(canvas => {
-        const imgData = canvas.toDataURL("image/png");
+
+        var contentWidth = canvas.width;
+        var contentHeight = canvas.height;
+
+      
+          //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+          var imgWidth = 595.28;
+          var imgHeight = (592.28 / contentWidth) * contentHeight;
+
+          var imgData = canvas.toDataURL("image/jpeg", 1.0);
+
         const pdf = new jspdf("p", "pt", [
-          content.offsetWidth,
-          content.offsetHeight
+            imgWidth,
+            imgHeight
         ]);
 
         pdf.addImage(
@@ -884,8 +944,8 @@ export default {
           "PNG",
           0,
           0,
-          content.offsetWidth,
-          content.offsetHeight
+          imgWidth,
+          imgHeight
         );
         pdf.save(
           this.worksDialogCon2.course +
@@ -906,11 +966,20 @@ export default {
       return new Promise((resolve, reject) => {
         html2canvas(content)
           .then(canvas => {
+
+            var contentWidth = canvas.width;
+            var contentHeight = canvas.height;
+
+      
+            //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+            var imgWidth = 595.28;
+            var imgHeight = (592.28 / contentWidth) * contentHeight;
+
+            var imgData = canvas.toDataURL("image/jpeg", 1.0);
           
-            const imgData = canvas.toDataURL("image/png");
             const pdf = new jspdf("p", "pt", [
-              content.offsetWidth,
-              content.offsetHeight
+              imgWidth,
+              imgHeight
             ]);
 
             pdf.addImage(
@@ -918,8 +987,8 @@ export default {
               "PNG",
               0,
               0,
-              content.offsetWidth,
-              content.offsetHeight
+              imgWidth,
+              imgHeight
             );
             var pdfData = {
               pdfName:
@@ -974,7 +1043,7 @@ export default {
               elistData.forEach((e, i) => {
                 framework[i] = {
                   id: i,
-                  name: i.dyName ? i.dyName : "",
+                  name: e.dyName ? e.dyName : "",
                   taskList: []
                 };
                 e.chapterInfo[0].taskJson.forEach((k, kin) => {

src/components/pages/components/lookReport.vue

@@ -196,6 +196,7 @@
         :key="exportW"
         :digNum="digNum"
         :oid="oid"
+        :isAllWork="isAllWork"
         :classAarray="classAarray"
         :multipleSelection="multipleSelection"
         :worksCon="worksDialogCon"
@@ -213,6 +214,29 @@
         ></studentReport>
       </div>
     </el-dialog>
+    <el-dialog
+      title="提示"
+      :visible.sync="workFrame"
+      width="500px"
+      style="overflow: hidden;margin-top: 20vh;"
+      :append-to-body="true"
+      :before-close="handleClose">
+      <span>是否同步导出学生作业集?</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="workFrame = false">取消</el-button>
+        <el-button size="small" type="primary" @click="downloadPdf(0)">仅报告</el-button>
+        <el-button size="small" type="primary" @click="downloadPdf(1)">报告（含作业集）</el-button>
+      </span>
+    </el-dialog>
+    <!-- <div style="width: 30px;" v-if="workFrame">
+      <div style="margin-top: 10px;">提示</div>
+      <div style="width: 100%;text-align: center;margin: 15px 0;">是否同步导出学生作业集?</div>
+      <div>
+        <el-button size="small" @click="workFrame = false">取消</el-button>
+        <el-button size="small" type="primary" @click="downloadPdf(0)">仅报告</el-button>
+        <el-button size="small" type="primary" @click="downloadPdf(1)">报告（含作业集）</el-button>
+      </div>
+    </div> -->
 
   </div>
 </template>
@@ -232,6 +256,11 @@ export default {
       // 查看报告table数据
       lookReportTab: [],
       exportW: 0,
+      // 是否导出作业集
+      isAllWork:false,
+
+      // 导出报告弹框
+      workFrame:false,
       multipleSelection: [],
       worksDialog: false,
       digNum: 0,
@@ -287,6 +316,7 @@ export default {
           console.log(err);
         });
     },
+    // 批量导出
     batchExportPdf() {
       this.$confirm("批量导出报告需要占用您一些时间，是否导出？", "提示", {
         confirmButtonText: "确认",
@@ -304,27 +334,47 @@ export default {
           console.log(err);
         });
     },
+    downloadPdf(val){
+    
+        if (val) {
+          this.isAllWork = true
+        }else{
+          this.isAllWork = false
+        }
+        this.digNum = 0;
+        this.exportW++;
+
+        this.workFrame = false
+        this.worksDialog = true;
+
+        // this.worksDialogCon = val;
+        // this.worksDialog = true;
+
+        // this.multipleSelection = [];
+        // this.multipleSelection.push(val);
+        // this.digNum = 0;
+        // this.exportW++;
+       
+    },
     // 导出报告
     getPdf(val) {
-      this.$confirm("直接导出报告需要占用您一些时间，是否导出？", "提示", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          console.log("val", val);
+      // this.$confirm("直接导出报告需要占用您一些时间，是否导出？", "提示", {
+      //   confirmButtonText: "确认",
+      //   cancelButtonText: "取消",
+      //   type: "warning"
+      // })
+      //   .then(() => {
+      //     console.log("val", val);
+          this.workFrame = true
 
           this.worksDialogCon = val;
-          this.worksDialog = true;
 
           this.multipleSelection = [];
           this.multipleSelection.push(val);
-          this.digNum = 0;
-          this.exportW++;
-        })
-        .catch(err => {
-          console.log(err);
-        });
+      //   })
+      //   .catch(err => {
+      //     console.log(err);
+      //   });
     },
     // 关闭弹框返回查看课程
     pageBack() {

src/components/pages/components/studentWorksDetail.vue

@@ -1483,7 +1483,14 @@
       <div slot="title" class="header-title">
         <div style="color: #fff">查看报告</div>
       </div>
-      <exportDataDialog  :key="checkStudent" :digNum="'2'" :oid="oid" :worksCon="exportData" :cid="checkCourse"></exportDataDialog>
+      <exportDataDialog  
+        :key="checkStudent" 
+        :digNum="'2'" 
+        :oid="oid" 
+        :isAllWork="false"
+        :worksCon="exportData" 
+        :cid="checkCourse"
+      ></exportDataDialog>
 
     </el-dialog>