11wqe1 3 tháng trước cách đây
mục cha
commit
f6ddf126f8

+ 6 - 6
src/components/pages/components/exportWorksDialog.vue

@@ -831,7 +831,7 @@ export default {
       oid: this.$route.query.oid,
       org: this.$route.query.org,
       uid2: this.uid,
-      worksDialogCon2: this.worksDialogCon,
+      worksDialogCon2: JSON.parse(JSON.stringify(this.worksDialogCon)),
       courseName: "",
       loading: false,
       tableData: [],
@@ -905,10 +905,10 @@ export default {
 
         delete valT.content;
         delete valT.comment;
-        console.log("valT", JSON.parse(JSON.stringify(val)));
+        // console.log("valT", JSON.parse(JSON.stringify(val)));
 
         let data = Object.values(valT);
-        console.log("data", JSON.parse(JSON.stringify(data)));
+        // console.log("data", JSON.parse(JSON.stringify(data)));
 
         let new1 = data.reduce(function(pre, next, index) {
           return pre + next * 1;
@@ -930,7 +930,7 @@ export default {
           }
         });
 
-        console.log("TimeList", TimeList);
+        // console.log("TimeList", TimeList);
         TimeList.sort(function(a, b) {
           return a - b; //从小到大排序
         });
@@ -1058,7 +1058,7 @@ export default {
             let framework = [];
             if (res.data[0].length) {
               let elistData = JSON.parse(res.data[0][0].chapters);
-              console.log("elistData", JSON.parse(JSON.stringify(elistData)));
+              // console.log("elistData", JSON.parse(JSON.stringify(elistData)));
 
               elistData.forEach((e, i) => {
                 framework[i] = {
@@ -1267,7 +1267,7 @@ export default {
               });
             });
 
-            console.log("framework", JSON.parse(JSON.stringify(framework)));
+            // console.log("framework", JSON.parse(JSON.stringify(framework)));
 
             this.Kloading = false;
 

+ 11 - 4
src/components/pages/components/lookWork.vue

@@ -817,6 +817,7 @@
 
 <script>
 import MarkdownIt from "markdown-it";
+import { myMixin } from "@/mixins/mixin.js"
 
 const getFile = url => {
   return new Promise((resolve, reject) => {
@@ -858,6 +859,8 @@ const getFile = url => {
   });
 };
 export default {
+  mixins: [ myMixin ],
+
   props: {
     id: {
       type: String
@@ -1136,8 +1139,12 @@ export default {
       // console.log(params);
       this.ajax
         .post(this.$store.state.api + "updateWorksEvaTwo1", params)
-        .then(res => {})
+        .then(res => {
+            this.addOp3('1', "", { courseid: this.cid ,type: "course_homeWorkScore_edit" }, "success")
+        })
         .catch(err => {
+          this.addOp3('1', "", { courseid: this.cid ,type: "course_homeWorkScore_edit" }, err)
+
           this.$message.error("评价失败");
           console.error(err);
         });
@@ -1198,11 +1205,11 @@ export default {
             var wordInfo = res.data[12]; //文档作业
             this.workEvaList = res.data[13];
 
-            // console.log('res.data[0][0]',res.data[0][0]);
-            if (res.data[0] && res.data[0][0] && res.data[0][0].length) {
+            // console.log('res.data[0][0]',res.data[0]);
+            if (res.data[0] && res.data[0].length) {
                 this.resData = JSON.parse(JSON.stringify(res.data[0][0]));
             }else{
-              this.resData=[]
+                this.resData=[]
             }
 
             this.courseName = res.data[0][0].course;

+ 11 - 1
src/components/pages/components/studentWorksDetail.vue

@@ -1515,7 +1515,12 @@
       <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>
+      <exportWorksDialog  
+      :key="exportW" :digNum="digNum" 
+      :oid="oid" :worksDialog.sync="worksDialog" 
+      :worksDialogCon="worksDialogCon" 
+      :uid="exportPdfSetUid" 
+      :cid="checkCourse"></exportWorksDialog>
     </el-dialog>
   </div>
 </template>
@@ -1529,10 +1534,13 @@ import html2canvas from "html2canvas";
 import LookWorks from "./lookWork.vue";
 import exportDataDialog from "./exportDataDialog.vue";
 import exportWorksDialog from "./exportWorksDialog.vue";
+import { myMixin } from "@/mixins/mixin.js"
 
 
 import jspdf from "jspdf";
 export default {
+  mixins: [ myMixin ],
+
   components: {
     StudentData,
     studentReport,
@@ -1833,6 +1841,8 @@ export default {
     },
     // 子元素调用父元素 按任务查看导出作业集
     childExportPdfSetBtn(val) {
+      this.addOp3('1', "", { courseid: val.con.id ,type: "course_homeWork_export" }, "success")
+
       this.worksDialog = true;
       this.worksDialogCon = val.con;
       this.exportPdfSetUid = val.uid;

+ 10 - 0
src/components/pages/components/worksDetail2.vue

@@ -1615,7 +1615,11 @@ import saveAs from "file-saver";
 import html2canvas from "html2canvas";
 import jspdf from "jspdf";
 import LookWork from "./lookWork.vue";
+import { myMixin } from "@/mixins/mixin.js"
+
 export default {
+  mixins: [ myMixin ],
+
   components: {
     StudentData,
     LookWork,
@@ -1966,6 +1970,7 @@ export default {
       })
       .then(() => {
         this.exportPdfSetAllWork()
+
       })
       .catch(() => {
         return;
@@ -2005,6 +2010,8 @@ export default {
     },
     // 按任务查看导出作业集
     exportPdfSetBtn(uid, con) {
+      this.addOp3('1', "", { courseid: this.id ,type: "course_homeWork_export" }, "success")
+
       this.worksDialog = true;
       this.worksDialogCon = con;
       this.exportPdfSetUid = uid;
@@ -2014,6 +2021,7 @@ export default {
     },
     // 子元素调用父元素 按任务查看导出作业集
     childExportPdfSetBtn(val) {
+      this.addOp3('1', "", { courseid: val.con.id ,type: "course_homeWork_export" }, "success")
       this.worksDialog = true;
       this.worksDialogCon = val.con;
       this.exportPdfSetUid = val.uid;
@@ -2023,6 +2031,8 @@ export default {
     },
     // 导出所有作业
     exportPdfSetAllWork(){
+      this.addOp3('1', "", { courseid: this.id ,type: "course_homeWork_exportS" }, "success")
+
       this.worksDialog = true;
       this.digNum = 1
       this.exportW++

+ 10 - 0
src/components/pages/studentManage/student.vue

@@ -254,7 +254,11 @@
 <script>
 import $ from "jquery";
 import pinyin from "../../../../node_modules/js-pinyin/index";
+import { myMixin } from "@/mixins/mixin.js"
+
 export default {
+  mixins: [ myMixin ],
+
   data() {
     return {
       tableHeight: "500px",
@@ -509,6 +513,8 @@ export default {
             message: "新增成功",
             type: "success",
           });
+          this.addOp3('1', "", { type: "student_user_add" }, "success")
+
           this.dialogVisible = false;
           this.sPhone = "";
           this.sName = "";
@@ -519,6 +525,8 @@ export default {
         })
         .catch((err) => {
           this.isLoading = false;
+          this.addOp3('1', "", { type: "student_user_add" }, err)
+
           this.$message({
             message: "新增失败",
             type: "error",
@@ -590,7 +598,9 @@ export default {
         ) {
           this.importCount = 1;
           this.importfxx(this.fileTemp);
+          this.addOp3('1', "", { type: "student_user_adds" }, "success")
         } else {
+          this.addOp3('1', "", { type: "student_user_adds" }, "附件格式错误")
           this.$message({
             type: "warning",
             message: "附件格式错误,请删除后重新上传!",

+ 10 - 0
src/components/pages/synergyCourse/course.vue

@@ -298,7 +298,11 @@
 import "../../../common/aws-sdk-2.235.1.min";
 import EditorBar from "../../../components/tools/wangEnduit";
 // import CourseProblem from "./components/courseProblem";
+import { myMixin } from "@/mixins/mixin.js"
+
 export default {
+  mixins: [ myMixin ],
+
   components: { EditorBar },
   data() {
     return {
@@ -485,6 +489,8 @@ export default {
       }
     },
     goToCourse3(courseId) {
+      this.addOp3('1', "", { type: "CocoNote_standard_add" }, "success")
+
       if (courseId) {
         this.$router.push(
           "/synergyCourse/add?cid=" +
@@ -523,6 +529,8 @@ export default {
       return param= param<10?('0'+param):param
     },
     goToCourseSimple(){
+      this.addOp3('1', "", { type: "CocoNote_fast_add" }, "success")
+
       let params = [
         {
           uid: this.userid,
@@ -572,6 +580,8 @@ export default {
       }
     },
     open(cid, uid) {
+      this.addOp3('1', "", { courseid: cid , type: "CocoNote_open" }, "success")
+
       if (uid == this.userid ||  window.topU.US.userInfo.role==1) {
          window.topU.postMessage(
           {

+ 7 - 0
src/components/pages/works.vue

@@ -525,8 +525,13 @@ import "../../common/aws-sdk-2.235.1.min.js";
 import StudentWorksDetail from "./components/studentWorksDetail.vue";
 import exportDataDialog from "./components/exportDataDialog.vue";
 import lookReport from './components/lookReport'
+import { myMixin } from "@/mixins/mixin.js"
+
+
 
 export default {
+  mixins: [ myMixin ],
+
   components: {
     WorkDate,
     Report,
@@ -762,6 +767,8 @@ export default {
       }
     },
     getWorkData(res) {
+      this.addOp3('1', "", { courseid: res.courseId ,type: "course_homeWork_open" }, "success")
+
       this.dataJson = res;
       this.dialogVisible = true;
     },

+ 2 - 0
src/mixins/mixin.js

@@ -61,6 +61,8 @@ export const myMixin = {
         object: JSON.stringify(object), //执行信息传json
         status: status //成功返回success。失败返回error的信息
       };
+      console.log('params',params);
+      
       this.ajax
         .post(this.$store.state.apiM + "updateUserData2", [params])
         .then(res => {