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

src/components/pages/components/workData.vue

@@ -158,7 +158,7 @@
             ></div>
           </div>
           <div style="width: 100%">
-            <div style="width:94%;margin: 0 auto;font-size: 26px;">作业查看</div>
+            <div style="width:94%;margin: 0 auto;font-size: 26px;">{{ dataJson.title }}</div>
             <WorksDetail2 :cid="cid" :uid="uid" :ooid="ooid"></WorksDetail2>
             <!-- <el-table
               ref="table"

src/components/pages/components/worksDetail2.vue

@@ -129,14 +129,14 @@
               <div>{{ scope.row.class ? scope.row.class : "暂无班级" }}</div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="course"
             label="课程"
             min-width="20"
             align="center"
             show-overflow-tooltip
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="course"
             label="阶段"
@@ -175,7 +175,7 @@
             width="100px"
             align="center"
           ></el-table-column>
-          <el-table-column label="操作" width="200px">
+          <el-table-column align="center" label="操作" width="260px">
             <template slot-scope="scope">
               <el-button
                 type="primary"
@@ -183,7 +183,7 @@
                 @click="
                   lookWork(scope.row.id, scope.row.userid, 0, scope.$index)
                 "
-                >查看作业</el-button
+                >查看&修改</el-button
               >
               <!-- <el-button
                 type="primary"
@@ -197,7 +197,7 @@
                 @click="
                   lookWork2(scope.row.id, scope.row.userid, scope.row.courseid)
                 "
-                >导出报告</el-button
+                >导出作业</el-button
               >
               <!-- <el-button
                 class="de_button"
@@ -240,7 +240,7 @@
                   size="mini"
                   style="margin-left: 15px;"
                   @click="getPdf"
-                  >导出pdf</el-button
+                  >导出作业集</el-button
                 >
               </div>
 
@@ -1451,9 +1451,9 @@
                             ></el-rate>
                           </div>
                         </div>
-                        <div class="worksTarget"><span>目标</span></div>
+                        <div class="worksTarget" v-if="worksDetail[sIndex].eList[0].target"><span>目标</span></div>
                         <!-- {{ worksDetail[sIndex] }}  -->
-                        <div class="worksTargetCon">
+                        <div class="worksTargetCon" v-if="worksDetail[sIndex].eList[0].target">
                             <div v-for="(item,tarIndex) in worksDetail[sIndex].eList" :key="tarIndex">
                               <span v-if="item.target"> {{ item.target }}</span>
                             </div>
@@ -3321,15 +3321,20 @@ export default {
             }
           }
 
-          for (var i = 0; i < lccjInfo.length; i++) {
-            var lccj = lccjInfo[i];
-            workJson.lccjInfo.push({
-              lccjInfo: JSON.parse(lccj.content),
-              score: lccjInfo[i].score
-                ? JSON.parse(lccjInfo[i].score).wScore
-                : lccjInfo[i].score,
-            });
+          // console.log('lccjInfo',lccjInfo);
+          
+          if (lccjInfo.length > 0) {
+            for (var i = 0; i < lccjInfo.length; i++) {
+              var lccj = lccjInfo[i];
+              workJson.lccjInfo.push({
+                lccjInfo: JSON.parse(lccj.content),
+                score: lccjInfo[i].score
+                  ? JSON.parse(lccjInfo[i].score).wScore
+                  : lccjInfo[i].score,
+              });
+            }
           }
+          
 
           for (var i = 0; i < bgInfo.length; i++) {
             var bg = bgInfo[i];
@@ -3566,30 +3571,35 @@ export default {
             //  console.log(workJson.lccjInfo)
           
           var _lccjInfo = "";
-          if (workJson.lccjInfo[0].lccjInfo.length > 0) {
+          // console.log('workJson.lccjInfo',workJson.lccjInfo);
+          
+          if (workJson.lccjInfo.length>0) {
+            if (workJson.lccjInfo[0].lccjInfo.length > 0) {
             var _lccjInfo = "<h3>排序<h3>";
-            for (var i = 0; i < workJson.lccjInfo[0].lccjInfo.length; i++) {
-              var _div = document.createElement("div");
-              _div.innerHTML = `<h4>第${i+1}题${workJson.lccjInfo[0].lccjInfo[i].sentenceTitle}</h4> `;
-              var _div2 = document.createElement("div");
-              // for (
-              //   var j = 0;
-              //   j < workJson.lccjInfo[0][lccjInfo][i].chooseSenList.length;
-              //   j++
-              // ) {
-              //   _div2.innerHTML += ` 句子 ${j + 1} : ${
-              //     workJson.lccjInfo[0][lccjInfo][i].chooseSenList[j]
-              //   }`;
-              // }
-              _div2.innerHTML+= ` 句子 ${i + 1}:${ workJson.lccjInfo[0].lccjInfo[i].addSentence.join(',')} 选择:${
-                  workJson.lccjInfo[0].lccjInfo[i].chooseSenList.join(',') 
-                } 答案:${
-                  workJson.lccjInfo[0].lccjInfo[i].rightAnswer.join(',') 
-                }`
-              _div.innerHTML += `<div>${_div2.innerHTML}</div>`;
-              _lccjInfo += `<div>${_div.innerHTML}</div>`;
+              for (var i = 0; i < workJson.lccjInfo[0].lccjInfo.length; i++) {
+                var _div = document.createElement("div");
+                _div.innerHTML = `<h4>第${i+1}题${workJson.lccjInfo[0].lccjInfo[i].sentenceTitle}</h4> `;
+                var _div2 = document.createElement("div");
+                // for (
+                //   var j = 0;
+                //   j < workJson.lccjInfo[0][lccjInfo][i].chooseSenList.length;
+                //   j++
+                // ) {
+                //   _div2.innerHTML += ` 句子 ${j + 1} : ${
+                //     workJson.lccjInfo[0][lccjInfo][i].chooseSenList[j]
+                //   }`;
+                // }
+                _div2.innerHTML+= ` 句子 ${i + 1}:${ workJson.lccjInfo[0].lccjInfo[i].addSentence.join(',')} 选择:${
+                    workJson.lccjInfo[0].lccjInfo[i].chooseSenList.join(',') 
+                  } 答案:${
+                    workJson.lccjInfo[0].lccjInfo[i].rightAnswer.join(',') 
+                  }`
+                _div.innerHTML += `<div>${_div2.innerHTML}</div>`;
+                _lccjInfo += `<div>${_div.innerHTML}</div>`;
+              }
             }
           }
+          
 
           var _bg = "";
           if (workJson.bgInfo.length > 0) {

src/components/pages/works.vue

@@ -78,7 +78,7 @@
                 :label="c.name"
               ></el-option>
             </el-select>
-            <div
+            <!-- <div
               style="
                 line-height: 35px;
                 font-size: 14px;
@@ -87,8 +87,8 @@
               "
             >
               目标筛选
-            </div>
-            <el-select v-model="eChoose" @change="search" clear="mbCss">
+            </div> -->
+            <!-- <el-select v-model="eChoose" @change="search" clear="mbCss">
               <el-option label="全部" value="">全部</el-option>
               <el-option
                 v-for="(e, eIndex) in evaJuri"
@@ -96,7 +96,7 @@
                 :value="e.id"
                 :label="e.title"
               ></el-option>
-            </el-select>
+            </el-select> -->
             <el-input
               v-model="cn"
               placeholder="筛选项目名称"
@@ -135,7 +135,7 @@
           >
             <el-table-column
               prop="title"
-              label="项目"
+              label="课程"
               min-width="30"
               align="center"
             ></el-table-column>
@@ -154,7 +154,7 @@
               min-width="30"
               align="center"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="evaTitle"
               label="目标名称"
               min-width="30"
@@ -169,8 +169,8 @@
               label="时间"
               min-width="20"
               align="center"
-            ></el-table-column>
-            <el-table-column label="操作" width="200px">
+            ></el-table-column> -->
+            <el-table-column align="center" label="操作" width="200px">
               <template slot-scope="scope">
                 <!-- <el-button
                 type="primary"
@@ -191,7 +191,7 @@
                   type="primary"
                   size="small"
                   @click="getWorkData(scope.row)"
-                  >查看课程</el-button
+                  >查看作业</el-button
                 >
                 <el-button
                   type="primary"