Jelajahi Sumber

Merge branch 'beta'

lsc 1 tahun lalu
induk
melakukan
0cc7907bc8

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.950b02e0ab4f6fffc20037eab06db226.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.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.4758f15f922a73b6724b.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.57ad633bc2ae36dc6ca8c2a9762c64d8.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.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.a07957d466be6128b035.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.57ad633bc2ae36dc6ca8c2a9762c64d8.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.57ad633bc2ae36dc6ca8c2a9762c64d8.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.a07957d466be6128b035.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.a07957d466be6128b035.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 89 - 66
src/components/pages/aiAddCourse/addCourse.vue

@@ -2390,11 +2390,11 @@
                                 @contextmenu.prevent="openAiDialog2(1, 'aiTask3',itemTaskIndex)"
                                 @click="openAiDialog2(2, 'aiTask3',itemTaskIndex)">重新生成任务</button>
                             </el-tooltip>
-                            <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom">
+                            <!-- <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom">
                               <button class="c_pub_button_confirm" style="margin: 0 0 0 20px;"
                                 @contextmenu.prevent="openAiDialog2(1, 'aiTask3','all')"
                                 @click="openAiDialog2(2, 'aiTask3','all')">重新生成任务</button>
-                            </el-tooltip>
+                            </el-tooltip> -->
                           </div>
                         </div>
                         <!-- padding: 20px; -->
@@ -7604,6 +7604,9 @@ export default {
       }
     },
     steps(newValue, old) {
+      if(newValue == 2){
+        this.steps = old
+      }
       if (newValue == 4) {
         let cPan = 1;
         for (var i = 0; i < this.unitJson.length; i++) {
@@ -16961,15 +16964,16 @@ ${this.courseText && this.aiCallBack == 2 ? '注意,优化原有的<参考内
         }
         // this.$forceUpdate();
       };
+      let _this = this
       this.isTextCancelSource.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.textLoading = false
-        this.ttextLoading = false
-        this.isTextCancelToken = null
-        this.isTextCancelSource.close();
-        this.isTextCancelSource = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.textLoading = false
+        _this.ttextLoading = false
+        _this.isTextCancelToken = null
+        _this.isTextCancelSource.close();
+        _this.isTextCancelSource = null;
       };
     },
     numberToChinese(number) {
@@ -19532,15 +19536,17 @@ ${msg}
         }
         // this.$forceUpdate();
       };
+
+      let _this = _this
       this.isOutlineTaskCancelSource[_tindex2].onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.taskDetailLoading.splice(this.taskDetailLoading.indexOf(loading), 1)
-        this.ttaskDetailLoading.splice(this.ttaskDetailLoading.indexOf(loading), 1)
-        this.isOutlineTaskCancelToken[_tindex2] = null
-        this.isOutlineTaskCancelSource[_tindex2].close();
-        this.isOutlineTaskCancelSource[_tindex2] = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.taskDetailLoading.splice(this.taskDetailLoading.indexOf(loading), 1)
+        _this.ttaskDetailLoading.splice(this.ttaskDetailLoading.indexOf(loading), 1)
+        _this.isOutlineTaskCancelToken[_tindex2] = null
+        _this.isOutlineTaskCancelSource[_tindex2].close();
+        _this.isOutlineTaskCancelSource[_tindex2] = null;
       };
     },
     async aiOutlineDetail(msg, index) {
@@ -19859,15 +19865,17 @@ ${taskArray.length ? '其他任务大纲内容' + taskArray.join(',') : ''}
         }
         // this.$forceUpdate();
       };
+
+      let _this = this
       this.isOutlineTaskCancelSource[_tindex2].onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.taskDetailLoading.splice(this.taskDetailLoading.indexOf(loading), 1)
-        this.ttaskDetailLoading.splice(this.ttaskDetailLoading.indexOf(loading), 1)
-        this.isOutlineTaskCancelToken[_tindex2] = null
-        this.isOutlineTaskCancelSource[_tindex2].close();
-        this.isOutlineTaskCancelSource[_tindex2] = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.taskDetailLoading.splice(this.taskDetailLoading.indexOf(loading), 1)
+        _this.ttaskDetailLoading.splice(this.ttaskDetailLoading.indexOf(loading), 1)
+        _this.isOutlineTaskCancelToken[_tindex2] = null
+        _this.isOutlineTaskCancelSource[_tindex2].close();
+        _this.isOutlineTaskCancelSource[_tindex2] = null;
       };
     },
     async aiDetail2(msg, index) {
@@ -20017,12 +20025,13 @@ ${_this.aiCallBack.taskDetail}
         }
         // this.$forceUpdate();
       };
+      let _this = this
       _source.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.taskDetailLoading2.splice(this.taskDetailLoading2.indexOf(loading), 1)
-        this.ttaskDetailLoading2.splice(this.ttaskDetailLoading2.indexOf(loading), 1)
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.taskDetailLoading2.splice(this.taskDetailLoading2.indexOf(loading), 1)
+        _this.ttaskDetailLoading2.splice(this.ttaskDetailLoading2.indexOf(loading), 1)
         _source.close();
       };
     },
@@ -20174,12 +20183,14 @@ ${msg} 输出格式和内容要求参考#格式与要求
         }
         // this.$forceUpdate();
       };
+
+      let _this = this
       _source.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.taskDetailLoading3.splice(this.taskDetailLoading3.indexOf(loading), 1)
-        this.ttaskDetailLoading3.splice(this.ttaskDetailLoading3.indexOf(loading), 1)
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.taskDetailLoading3.splice(this.taskDetailLoading3.indexOf(loading), 1)
+        _this.ttaskDetailLoading3.splice(this.ttaskDetailLoading3.indexOf(loading), 1)
         _source.close();
       };
     },
@@ -20520,12 +20531,14 @@ ${_text2}`
         }
         // this.$forceUpdate();
       };
+
+      let _this = this
       _source.onerror = function(event) {
           // 处理错误,可以尝试重新连接
-          console.error('EventSource error:', event);
-          this.$message.error("网络错误")
-          this.taskDetailLoading5.splice(this.taskDetailLoading5.indexOf(loading), 1)
-          this.ttaskDetailLoading5.splice(this.ttaskDetailLoading5.indexOf(loading), 1)
+          console.log('EventSource error:', event);
+          _this.$message.error("网络错误")
+          _this.taskDetailLoading5.splice(this.taskDetailLoading5.indexOf(loading), 1)
+          _this.ttaskDetailLoading5.splice(this.ttaskDetailLoading5.indexOf(loading), 1)
           _source.close();
       };
     },
@@ -20697,13 +20710,15 @@ ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templatei
           // 处理流数据
         }
       };
+
+      let _this = this
       _source.onerror = function(event) {
-          // 处理错误,可以尝试重新连接
-          console.error('EventSource error:', event);
-          this.$message.error("网络错误")
-          this.taskDetailLoading5.splice(this.taskDetailLoading5.indexOf(loading), 1)
-          this.ttaskDetailLoading5.splice(this.ttaskDetailLoading5.indexOf(loading), 1)
-          _source.close();
+        // 处理错误,可以尝试重新连接
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.taskDetailLoading5.splice(this.taskDetailLoading5.indexOf(loading), 1)
+        _this.ttaskDetailLoading5.splice(this.ttaskDetailLoading5.indexOf(loading), 1)
+        _source.close();
       };
     },
     aiDetail52getAiContentText(_e, loading, _tindex2, _source){
@@ -20907,12 +20922,14 @@ ${this.aitype == 'aiCpote4' ? '## 目标层\n'+this.cpote['cpote3'] : ''}`
         }
         // this.$forceUpdate();
       };
+
+      let _this = this
       _source.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.cpoteLoading[loading] = false
-        this.cpotetLoading[loading] = false
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.cpoteLoading[loading] = false
+        _this.cpotetLoading[loading] = false
         _source.close();
       };
     },
@@ -21090,15 +21107,17 @@ ${this.teacherCourseText && this.aiCallBack == 2 ? '注意,优化原有的<参
         
         // this.$forceUpdate();
       };
+
+      let _this = this
       this.isTeacherTextCancelSource.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.teacherTextLoading = false
-        this.tteacherTextLoading = false
-        this.isTeacherTextCancelToken = null
-        this.isTeacherTextCancelSource.close();
-        this.isTeacherTextCancelSource = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.teacherTextLoading = false
+        _this.tteacherTextLoading = false
+        _this.isTeacherTextCancelToken = null
+        _this.isTeacherTextCancelSource.close();
+        _this.isTeacherTextCancelSource = null;
       };
     },
     async aitargetTextDetail(msg) {
@@ -21276,15 +21295,17 @@ ${this.targetCourseText && this.aiCallBack == 2 ? '注意,优化原有的<参
         
         // this.$forceUpdate();
       };
+
+      let _this = this
       this.isTargetCancelSource1.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.targetTextLoading = false
-        this.ttargetTextLoading = false
-        this.isTargetCancelToken1 = null
-        this.isTargetCancelSource1.close();
-        this.isTargetCancelSource1 = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.targetTextLoading = false
+        _this.ttargetTextLoading = false
+        _this.isTargetCancelToken1 = null
+        _this.isTargetCancelSource1.close();
+        _this.isTargetCancelSource1 = null;
       };
     },
     async aitargetTextDetail2(msg) {
@@ -21625,15 +21646,17 @@ ${this.targetCourseText && this.aiCallBack == 2 ? '注意,优化原有的<参
         }
         // this.$forceUpdate();
       };
+
+      let _this = this
       this.isTargetCancelSource2.onerror = function(event) {
         // 处理错误,可以尝试重新连接
-        console.error('EventSource error:', event);
-        this.$message.error("网络错误")
-        this.targetTextLoading2 = false
-        this.ttargetTextLoading2 = false
-        this.isTargetCancelToken2 = null
-        this.isTargetCancelSource2.close();
-        this.isTargetCancelSource2 = null;
+        console.log('EventSource error:', event);
+        _this.$message.error("网络错误")
+        _this.targetTextLoading2 = false
+        _this.ttargetTextLoading2 = false
+        _this.isTargetCancelToken2 = null
+        _this.isTargetCancelSource2.close();
+        _this.isTargetCancelSource2 = null;
       };
     },
     async aitargetTextDetail3(msg) {

+ 227 - 33
src/components/pages/components/report.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="r_box">
+  <div class="r_box" v-loading="isLoading">
     <div class="r_cbox">
       <span>学生姓名</span>
       <el-select
@@ -92,16 +92,20 @@ export default {
       cocopiInfo: [],
       wordInfo: [],
       course: {},
+      isLoading:false
     };
   },
   methods: {
     getCourseDetail() {
+      this.isLoading=true
       let params = {
         cid: this.cid,
       };
       this.ajax
         .get(this.$store.state.api + "getCourseWorksReport", params)
         .then((res) => {
+          console.log('res',res.data);
+          
           this.course = res.data[0][0];
           var dyJSON = JSON.parse(res.data[0][0].chapters);
           let dyList = [];
@@ -113,20 +117,24 @@ export default {
             }
           }
           this.dyList = dyList;
+          console.log(' this.dyList', this.dyList);
+          
           this.userAarray = res.data[1];
-          this.imgList = res.data[2];
-          this.askList = res.data[3];
-          this.questList = res.data[4];
-          this.wordList = res.data[5];
-          this.chooseInfo = res.data[6];
+          this.imgList = res.data[2]; //图片
+          this.askList = res.data[3]; //问卷调查
+          this.questList = res.data[4]; //问答
+          this.wordList = res.data[5]; //word等
+          this.chooseInfo = res.data[6]; //选择题
           this.pjInfo = res.data[7]; //个人评价作业
           this.xztkInfo = res.data[8]; //选择匹配作业
           this.lccjInfo = res.data[9]; //排序作业
           this.bgInfo = res.data[10]; //表格作业
           this.cocopiInfo = res.data[11]; //cocopi或源码编辑作业
           this.wordInfo = res.data[12]; //文档作业
+          this.isLoading=false
         })
         .catch((err) => {
+          this.isLoading=false
           console.error(err);
         });
     },
@@ -167,21 +175,11 @@ export default {
 
       let workArray = [];
 
-      // json{
-      //       img: [],
-      //       askList: [],
-      //       questList: {},
-      //       wordList: [],
-      //       chapName: "",
-      //       taskName: "",
-      //       username:""
-      //     }
-
       for (let i = 0; i < _uname.length; i++) {
         for (let chapI = 0; chapI < _chap.length; chapI++) {
           if (_task.length) {
             for (let taskI = 0; taskI < _task.length; taskI++) {
-              let _tI = _task[taskI].split("-");
+              let _tI = _task[taskI].split("-");  //阶段-任务
               if (_tI[0] == _chap[chapI]) {
                 let _workjson = {
                   img: [],
@@ -197,19 +195,19 @@ export default {
                   wordInfo: [],
                   chapName:
                     "第" +
-                    (parseInt(_chap[chapI]) + 1) +
+                    (parseInt(chapI) + 1) +
                     "阶段 " +
-                    this.dyList[_chap[chapI]].name,
+                    this.dyList[chapI].name,
                   taskName:
                     "任务" +
                     (parseInt(_tI[1]) + 1) +
-                    this.dyList[_chap[chapI]].taskList[_tI[1]].name,
+                    this.dyList[chapI].taskList[_tI[1]].name,
                   username: _uname[i].username,
                 };
                 // imgList;askList;questList;wordList;
                 for (let a = 0; a < imgList.length; a++) {
                   if (
-                    imgList[a].stage == _chap[chapI] &&
+                    imgList[a].stage == chapI &&
                     imgList[a].task == _tI[1] &&
                     imgList[a].userid == _uname[i].userid
                   ) {
@@ -218,7 +216,7 @@ export default {
                 }
                 for (let b = 0; b < askList.length; b++) {
                   if (
-                    askList[b].stage == _chap[chapI] &&
+                    askList[b].stage == chapI &&
                     askList[b].task == _tI[1] &&
                     askList[b].userid == _uname[i].userid
                   ) {
@@ -260,14 +258,11 @@ export default {
           } else {
             for (
               let taskI = 0;
-              taskI < this.dyList[_chap[chapI]].taskList.length;
+              taskI < this.dyList[chapI].taskList.length;
               taskI++
             ) {
-              let _tI = [
-                _chap[chapI],
-                this.dyList[_chap[chapI]].taskList[taskI].id,
-              ];
-              if (_tI[0] == _chap[chapI]) {
+              let _tI = [chapI, this.dyList[chapI].taskList[taskI].id];
+              if (_tI[0] == chapI) {
                 let _workjson = {
                   img: [],
                   askList: [],
@@ -282,13 +277,13 @@ export default {
                   wordInfo: [],
                   chapName:
                     "第" +
-                    (parseInt(_chap[chapI]) + 1) +
+                    (parseInt(chapI) + 1) +
                     "阶段 " +
-                    this.dyList[_chap[chapI]].name,
+                    this.dyList[chapI].name,
                   taskName:
                     "任务" +
                     (parseInt(_tI[1]) + 1) +
-                    this.dyList[_chap[chapI]].taskList[_tI[1]].name,
+                    this.dyList[chapI].taskList[_tI[1]].name,
                   username: _uname[i].username,
                 };
                 // imgList;askList;questList;wordList;
@@ -339,6 +334,78 @@ export default {
                     _workjson.wordList.push(element.content);
                   }
                 }
+
+                for (let d = 0; d < chooseInfo.length; d++) {
+                  if (
+                    chooseInfo[d].stage == chapI &&
+                    chooseInfo[d].task == _tI[1] &&
+                    chooseInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = chooseInfo[d];
+                    _workjson.chooseInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < pjInfo.length; d++) {
+                  if (
+                    pjInfo[d].stage == chapI &&
+                    pjInfo[d].task == _tI[1] &&
+                    pjInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = pjInfo[d];
+                    _workjson.pjInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < xztkInfo.length; d++) {
+                  if (
+                    xztkInfo[d].stage == chapI &&
+                    xztkInfo[d].task == _tI[1] &&
+                    xztkInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = xztkInfo[d];
+                    _workjson.xztkInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < lccjInfo.length; d++) {
+                  if (
+                    lccjInfo[d].stage == chapI &&
+                    lccjInfo[d].task == _tI[1] &&
+                    lccjInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = lccjInfo[d];
+                    _workjson.lccjInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < bgInfo.length; d++) {
+                  if (
+                    bgInfo[d].stage == chapI &&
+                    bgInfo[d].task == _tI[1] &&
+                    bgInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = bgInfo[d];
+                    _workjson.bgInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < cocopiInfo.length; d++) {
+                  if (
+                    cocopiInfo[d].stage == chapI &&
+                    cocopiInfo[d].task == _tI[1] &&
+                    cocopiInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = cocopiInfo[d];
+                    _workjson.cocopiInfo.push(element.content);
+                  }
+                }
+                for (let d = 0; d < wordInfo.length; d++) {
+                  if (
+                    wordInfo[d].stage == chapI &&
+                    wordInfo[d].task == _tI[1] &&
+                    wordInfo[d].userid == _uname[i].userid
+                  ) {
+                    const element = wordInfo[d];
+                    _workjson.wordInfo.push(element.content);
+                  }
+                }
+
                 workArray.push(_workjson);
               }
             }
@@ -360,6 +427,8 @@ export default {
         "<div >" + "<h2>" + workJson.chapName + "-" + workJson.username;
       ("</h2>");
       ("</div>");
+      // console.log('workJson',workJson);
+      
       var _subtitle = "<h3>" + workJson.taskName + "</h3>";
       var _img = "";
       if (workJson.img.length > 0) {
@@ -421,15 +490,140 @@ export default {
         }
       }
 
+      
+      var _choose = "";
+      console.log('workJson.chooseInfo',);
+      
+      if (workJson.chooseInfo.length > 0) {
+        let chooseData = JSON.parse(workJson.chooseInfo[0])
+        var _choose = "<h3>选择题</h3>";
+        for (var i = 0; i < chooseData.length; i++) {
+          console.log(chooseData[i]);
+          
+          // var _div = document.createElement("div");
+          // _div.innerHTML = `<h4>标题:${workJson.chooseInfo[i].chooseInfo.testTitle}</h4>`;
+          // for (
+          //   var j = 0;
+          //   j < workJson.chooseInfo[i].chooseInfo.testJson.length;
+          //   j++
+          // ) {
+          //   var _div2 = document.createElement("div");
+          //   _div2.innerHTML = `<h5>第${j + 1}题:${
+          //     workJson.chooseInfo[i].chooseInfo.testJson[j].teststitle
+          //   }  选择:${
+          //     workJson.chooseInfo[i].chooseInfo.testJson[j].answer
+          //   } 答案:${
+          //     workJson.chooseInfo[i].chooseInfo.testJson[j].type == 1 ? workJson.chooseInfo[i].chooseInfo.radio[j] : workJson.chooseInfo[i].chooseInfo.radio[j].join(',')
+          //   }</h5> `;
+          //   var _div3 = document.createElement("div");
+          //   for (
+          //     var z = 0;
+          //     z <
+          //     workJson.chooseInfo[i].chooseInfo.testJson[j].checkList
+          //       .length;
+          //     z++
+          //   ) {
+          //     _div3.innerHTML += `<span style="margin-right:5px">${z}.${
+          //       workJson.chooseInfo[i].chooseInfo.testJson[j].checkList[z]
+          //     }</span>`;
+          //   }
+          //   _div2.innerHTML += `<div>${_div3.innerHTML}</div>`;
+          //   _div.innerHTML += `<div>${_div2.innerHTML}</div>`;
+          // }
+          // _choose += `<div>${_div.innerHTML}</div>`;
+        }
+      }
+
+      var _pjInfo = "";
+      if (workJson.pjInfo.length > 0) {
+        let pjData = JSON.parse(workJson.pjInfo[0]).eStar
+       
+        var _pjInfo = "<h3>个人评价</h3>"
+        pjData.forEach((e,index) => {
+          _pjInfo += `<div>${index + 1}评:${e.eStar}</div>分`;
+        });
+        _pjInfo += `<div>评语:${JSON.parse(workJson.pjInfo[0]).eBzText}</div>分`;
+      }
+
+      var _xztkInfo = "";
+      if (workJson.xztkInfo.length > 0) {
+        var _xztkInfo = "<h3>选择匹配</h3>"
+        for (var i = 0; i < workJson.xztkInfo.length; i++) {
+          _xztkInfo += `<div>${i+1}选:${workJson.xztkInfo[i]}选项</div>`;
+        }
+      }
+     
+      var _lccjInfo = ""
+      if (workJson.lccjInfo.length>0) {
+        let lccjData= JSON.parse(workJson.lccjInfo[0])
+
+          if (lccjData.length > 0) {
+           _lccjInfo = "<h3>排序<h3>";
+            for (var i = 0; i < lccjData.length; i++) {
+              var _div = document.createElement("div");
+              _div.innerHTML = `<h4>第${i+1}题${lccjData[i].sentenceTitle}</h4> `;
+              var _div2 = document.createElement("div");
+              _div2.innerHTML+= ` 句子 ${i + 1}:${ lccjData[i].addSentence.join(',')} 选择:${
+                  lccjData[i].chooseSenList.join(',') 
+                } 答案:${
+                  lccjData[i].rightAnswer.join(',') 
+                }`
+              _div.innerHTML += `<div>${_div2.innerHTML}</div>`;
+              _lccjInfo += `<div>${_div.innerHTML}</div>`;
+            }
+          }
+      }
+          
+
+      // var _bg = "";
+      // if (workJson.bgInfo.length > 0) {
+      //   var _bg = "<h3>表格<h3>";
+      //   for (var i = 0; i < workJson.bgInfo.length; i++) {
+      //     var _div = document.createElement("div");
+      //     _div.innerHTML = `<h4>${workJson.bgInfo[i].bgInfo.text}</h4> `;
+      //     _bg += `<div>${_div.innerHTML}</div>`;
+      //   }
+      // }
+      // var _cocopi = "";
+      // if (workJson.cocopiInfo.length > 0) {
+      //   var _cocopi = "<h3>cocopi<h3>";
+      //   for (var i = 0; i < workJson.cocopiInfo.length; i++) {
+      //     var _div = document.createElement("div");
+      //     _div.innerHTML = `<div style="margin-top:10px"><a href='${workJson.cocopiInfo[i].url}'>${workJson.cocopiInfo[i].url}</a></div>`;
+      //     _cocopi += `<div>${_div.innerHTML}</div>`;
+      //   }
+      // }
+
+      var _word = "";
+      if (workJson.wordInfo.length > 0) {
+        
+        var _word = "<h3>文档<h3>";
+        for (var i = 0; i < workJson.wordInfo.length; i++) {
+          var _div = document.createElement("div");
+          let wrdT = workJson.wordInfo[i]
+          _div.innerHTML = `<h4>${JSON.parse(wrdT).text}</h4> `;
+          _word += `<div>${_div.innerHTML}</div>`;
+        }
+      }
+
+
       if (
         !workJson.img.length &&
         !workJson.askList.length &&
         !workJson.questList.length &&
-        !workJson.wordList.length
+        !workJson.wordList.length &&
+        !workJson.lccjInfo.length &&
+        !workJson.wordInfo.length &&
+        !workJson.pjInfo.length &&
+        !workJson.xztkInfo.length 
+
+
       ) {
         return "";
       }
-      return _title + _subtitle + _img + _ask + _answer + _link;
+      return _title + _subtitle + _img + _ask + _answer + _link  + _lccjInfo   + _word;
+    
+      // return _title + _subtitle + _img + _ask + _answer + _link + _choose + _lccjInfo + _bg + _cocopi + _word;
     },
     async generate(a) {
       // 将html文件中需要用到的数据挂载到store上

+ 9 - 9
src/components/pages/pblCourse/guide.vue

@@ -189,10 +189,10 @@
         <div style="text-wrap: nowrap;">项目标题:</div>
         <el-input v-model.trim="proTit" placeholder="请输入标题"></el-input>
       </div>
-      <div class="digInp">
+      <!-- <div class="digInp">
         <div style="text-wrap: nowrap;">项目选题:</div>
         <el-input v-model.trim="proType" placeholder="请输入选题"></el-input>
-      </div>
+      </div> -->
       <div class="digBtn" @click="addProject">确认</div>
     </el-dialog>
   </div>
@@ -293,13 +293,13 @@ export default {
         });
         return;
       }
-      if (this.proType == "") {
-        this.$message({
-          type: "error",
-          message: "请输入项目选题"
-        });
-        return;
-      }
+      // if (this.proType == "") {
+      //   this.$message({
+      //     type: "error",
+      //     message: "请输入项目选题"
+      //   });
+      //   return;
+      // }
       let params = [
         {
           uid: this.$route.query.userid,

+ 15 - 0
src/components/pages/test/check/index.vue

@@ -1268,6 +1268,21 @@ export default {
         .then(async (res) => {
           this.testJson = res.data[0][0]
           console.log('this.testJson',JSON.parse(JSON.stringify(this.testJson)));
+
+          let a = ''
+          if(this.testJson.juriP){
+              a = this.testJson.juriP
+          }
+          if(this.testJson.juriP2){
+              if(a){
+                  a = this.testJson.juriP+','+this.testJson.juriP2
+              }else {
+                  a = this.testJson.juriP2
+              }
+          }
+          this.testJson.juriP = a
+
+
           if (this.testJson.juriP) {
             let ajuri2 =  this.testJson.juri2.split (',');
             this.TeachingOptions = ajuri2.map((key, index) => ({

+ 14 - 1
src/components/pages/test/index.vue

@@ -857,7 +857,20 @@ export default {
                     this.isLoading = false;
                     this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
                     this.course = res.data[0];
-
+                    for(var i = 0; i < this.course.length; i++) {
+                        let a = ''
+                        if(this.course[i].juriP){
+                            a = this.course[i].juriP
+                        }
+                        if(this.course[i].juriP2){
+                            if(a){
+                                a = this.course[i].juriP+','+this.course[i].juriP2
+                            }else {
+                                a = this.course[i].juriP2
+                            }
+                        }
+                        this.course[i].juriP = a
+                    }
                 })
                 .catch((err) => {
                     this.isLoading = false;

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini