#

src/components/pages/components/studentWorksDetail.vue

@@ -211,7 +211,7 @@
                   size="mini"
                   style="margin-left: 15px;"
                   @click="getPdf"
-                  >导出作业集</el-button
+                  >导出作业</el-button
                 >
               </div>
 
@@ -1861,7 +1861,7 @@ export default {
         let num = 0;
 
         for (const key in val) {
-          if (val[key] || val[key] == 0) {
+          if (val[key] || key != 'content') {
             sco += val[key] * 1;
           }
           num += 1;
@@ -3990,6 +3990,7 @@ export default {
   /* margin: 10px 0 0 30px; */
   margin: 10px 0;
   position: relative;
+  margin-left: 19px;
 }
 .sd_score .score_box > span:nth-child(1) {
   margin-right: 20px;
@@ -5151,7 +5152,7 @@ ol {
   flex-direction: column;
   flex-wrap: nowrap;
   align-items: center;
-  width: 100%;
+  width: 80%;
   flex-wrap: nowrap;
   overflow: auto;
   /* height: 500px; */

src/components/pages/components/worksDetail2.vue

@@ -234,7 +234,7 @@
                 @click="
                   lookWork2(scope.row.id, scope.row.userid, scope.row.courseid, dyList[scope.row.stage].name,dyList[scope.row.stage].taskList[scope.row.task].name)
                 "
-                >导出作业集</el-button
+                >导出作业</el-button
               >
               <!-- <el-button
                 class="de_button"
@@ -1899,12 +1899,11 @@ export default {
       return function (val) {
         let sco = 0
         let num = 0
-
         for (const key in val) {
-          if (val[key]  || val[key] == 0) {
-            sco+= val[key] * 1
+          if (val[key] && key != 'content') {
+            sco += val[key] * 1
           }
-          num+=1
+          num += 1
         }
         return (sco / (num - 1)).toFixed(1)
       }
@@ -3438,13 +3437,18 @@ export default {
               if (workEvaList[p].rate && eList && eList.length) {
                 _rate[p] = JSON.parse(workEvaList[p].rate);
               }
-              _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate));
+              _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate)).filter(e => {return e!='content'});
               for (var i = 0; i < _rateList[p].length; i++) {
                 var _c = Object.keys(workJson.rateList);
                 if (_c.indexOf(_rateList[p][i]) != -1) {
                   workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
                 }
               }
+
+              // console.log('1',JSON.parse(JSON.stringify(_rateList[p])));
+              // console.log('2',JSON.parse(JSON.stringify(this.ooption[p])));
+
+              
               for (var i = 0; i < this.ooption[p].length; i++) {
                 if (_rateList[p].indexOf(this.ooption[p][i].name) != -1) {
                   this.ooption[p][i].value = _rate[p][this.ooption[p][i].name];
@@ -4422,7 +4426,7 @@ export default {
   /* margin: 10px 0 0 30px; */
   margin: 10px 0;
   position: relative;
-
+  margin-left: 19px;
 }
 .sd_score .score_box > span:nth-child(1) {
   margin-right: 20px;
@@ -5255,7 +5259,7 @@ font-size: 14px !important;
   flex-direction: column;
   flex-wrap: nowrap;
   align-items: center;
-  width: 100%;
+  width: 80%;
   flex-wrap: nowrap;
   /* overflow: auto; */
   /* height: 500px; */

src/components/pages/works.vue

@@ -194,7 +194,8 @@
               min-width="20"
               align="center"
             ></el-table-column> -->
-            <el-table-column align="center" label="操作" width="200px">
+              
+              <el-table-column align="center" min-width="30" label="操作" >
               <template slot-scope="scope">
                 <!-- <el-button
                 type="primary"