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

src/components/pages/aiAddCourse/addCourse.vue

@@ -5549,7 +5549,7 @@ export default {
       imageloading2: false,
       searchImageValue: "",
       ppage: 1,
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       oldIndex: 0,
       dragType: "",
       oldUnitIndex: 0,

src/components/pages/components/studentReport.vue

@@ -1,6 +1,10 @@
 <template>
   <div style="width: 100%; height: 100%">
-    <div class="sr_head">学生成长报告</div>
+    <div class="sr_head">
+      学生成长报告
+      <el-button type="primary" size="small" @click="downloadFile('https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/student01-%E5%AD%A6%E7%94%9F%E6%88%90%E9%95%BF%E6%8A%A5%E5%91%8A1719315423787.pdf');">导出报告</el-button>
+      
+    </div>
     <div class="sr_body">
       <div class="sr_box">
         <div class="sr_first">
@@ -74,6 +78,50 @@ export default {
       this.scoid = this.oid;
     },
   },
+  methods: {
+    downloadFile(url){
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      let url2 = url;
+      let _url2 = "";
+      if (
+        url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url2 = url2.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url2 = url2;
+      }
+      let _this = this;
+
+      _this.downLoading = true
+      var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+      let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+      var params = {
+        Bucket: "ccrb",
+        Key: name
+      };
+      s3.getObject(params, function (err, data) {
+        _this.downLoading = false
+        if (err) console.log(err, err.stack); // an error occurred
+        else {
+          let url = window.URL.createObjectURL(new Blob([data.Body]));
+          let a = document.createElement("a");
+          a.name = 'student01-学生成长报告.pdf';
+          a.href = url;
+          a.download = 'student01-学生成长报告.pdf';
+          a.click();
+          console.log(data); 
+        }          // sxuccessful response
+
+      });
+    },
+  },
   created() {
     this.userid = this.checkStudent;
     this.courseid = this.checkCourse;

src/components/pages/easy/addCourse.vue

@@ -4658,6 +4658,11 @@ import sourceDialog from "../teacherSource/dialog.vue";
 import interVideo from "../interVideo/index.vue";
 import englishRight from "./commpont/englishRight.vue";
 import EnglishVoice from '../EnglishVoice/index.vue'
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -4894,7 +4899,7 @@ export default {
       ppage: 1,
       imageList: [],
       heightPx: '100%',
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       oldIndex: 0,
       oldData: null,
       newIndex: "",

src/components/pages/newCourse/addCourse.vue

@@ -7375,6 +7375,11 @@ import interVideo from "../interVideo/index.vue";
 import englishRight from "../components/englishRight.vue";
 import evaBox from "../evaBox/index.vue";
 import EnglishVoice from "../EnglishVoice/index.vue";
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -7625,7 +7630,7 @@ export default {
       imageloading: false,
       searchImageValue: "",
       ppage: 1,
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       oldIndex: 0,
       dragType: "",
       oldUnitIndex: 0,

src/components/pages/student/addCourse.vue

@@ -2387,6 +2387,11 @@ import * as imageConversion from "image-conversion";
 import courseDetailVue from "../courseDetail.vue";
 import sourceDialog from "../teacherSource/dialog.vue";
 import { tools as toolsData } from "../../../common/tools.js";
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -2701,7 +2706,7 @@ export default {
       newIndex: "",
       checkUnitIndex: 0,
       isdrag: '',
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
     };
   },
   directives: {

src/components/pages/synergyCourse/addCourse.vue

@@ -2706,6 +2706,11 @@ import weilaiData from "../components/weilai.js";
 import sourceDialog from "../teacherSource/dialog.vue";
 import interVideo from "../interVideo/index.vue";
 import groupBox from "./group/group.vue"
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -2940,7 +2945,7 @@ export default {
       ppage: 1,
       imageList: [],
       heightPx: '100%',
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       pageSize: 20,
       total: 0,
       page: 0,

src/components/pages/task/addCourse.vue

@@ -8226,6 +8226,11 @@ import weilaiData from "../components/weilai.js";
 import sourceDialog from "../teacherSource/dialog.vue";
 import interVideo from "../interVideo/index.vue";
 import englishRight from "./commpont/englishRight.vue";
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -8460,7 +8465,7 @@ export default {
       ppage: 1,
       imageList: [],
       heightPx: "100%",
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       oldIndex: 0,
       oldData: null,
       newIndex: "",

src/components/pages/trainCourse/addCourse.vue

@@ -3911,6 +3911,11 @@ import weilaiData from "../components/weilai.js";
 import sourceDialog from "../teacherSource/dialog.vue";
 import interVideo from "../interVideo/index.vue";
 import englishRight from "../components/englishRight.vue";
+var OpenCC = require("opencc-js");
+let converter = OpenCC.Converter({
+		from:'hk',
+		to:'cn'
+})
 
 export default {
   components: {
@@ -4152,7 +4157,7 @@ export default {
       imageloading: false,
       searchImageValue: "",
       ppage: 1,
-      toolsData: toolsData,
+      toolsData: JSON.parse(converter(JSON.stringify(toolsData))),
       oldIndex: 0,
       dragType:'',
       oldUnitIndex: 0,

src/components/pages/works.vue

@@ -529,8 +529,6 @@ export default {
       (this.page2 = 1), this.getStudnet();
     },
     getStudnet(row) {
-      this.downloadFile('https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/student01-%E5%AD%A6%E7%94%9F%E6%88%90%E9%95%BF%E6%8A%A5%E5%91%8A1719315423787.pdf');
-      return
       //获取作业
       this.signDialog = true;
       this.isLoading2 = true;