update

src/components/pages/components/worksDetail2.vue

@@ -204,10 +204,10 @@
                               ].src
                             )
                           " :src="
-                              worksDetail[sIndex].img[
-                                worksDetail[sIndex].imgIndex
-                              ].src
-                            " alt />
+                            worksDetail[sIndex].img[
+                              worksDetail[sIndex].imgIndex
+                            ].src
+                          " alt />
                         </div>
                         <div class="thumbnail" v-if="
                           worksDetail[sIndex].img &&
@@ -769,29 +769,30 @@ export default {
               }
               workJson[k].rateList.content = "";
               this.ooption[k] = _ooption;
-            } else {
-              _ooption = [];
-              workJson[k].eList = [
-                { value: "意识能力", detail: "", score: 5 },
-                { value: "科学探究能力", detail: "", score: 5 },
-                { value: "实践创新能力", detail: "", score: 5 },
-                { value: "学习反思能力", detail: "", score: 5 },
-                { value: "工程思维能力", detail: "", score: 5 },
-              ];
-              for (var i = 0; i < workJson[k].eList.length; i++) {
-                _ooption.push({ value: 0, name: workJson[k].eList[i].value });
-                workJson[k].rateList[workJson[k].eList[i].value] = 0;
-              }
-              workJson[k].rateList.content = "";
-              this.ooption[k] = [
-                { value: 0, name: "意识能力" },
-                { value: 0, name: "科学探究能力" },
-                { value: 0, name: "实践创新能力" },
-                { value: 0, name: "学习反思能力" },
-                { value: 0, name: "工程思维能力" },
-              ];
             }
-            if (res.data[0][k].rate) {
+            // else {
+            //   _ooption = [];
+            //   workJson[k].eList = [
+            //     { value: "意识能力", detail: "", score: 5 },
+            //     { value: "科学探究能力", detail: "", score: 5 },
+            //     { value: "实践创新能力", detail: "", score: 5 },
+            //     { value: "学习反思能力", detail: "", score: 5 },
+            //     { value: "工程思维能力", detail: "", score: 5 },
+            //   ];
+            //   for (var i = 0; i < workJson[k].eList.length; i++) {
+            //     _ooption.push({ value: 0, name: workJson[k].eList[i].value });
+            //     workJson[k].rateList[workJson[k].eList[i].value] = 0;
+            //   }
+            //   workJson[k].rateList.content = "";
+            //   this.ooption[k] = [
+            //     { value: 0, name: "意识能力" },
+            //     { value: 0, name: "科学探究能力" },
+            //     { value: 0, name: "实践创新能力" },
+            //     { value: 0, name: "学习反思能力" },
+            //     { value: 0, name: "工程思维能力" },
+            //   ];
+            // }
+            if (res.data[0][k].rate && eList && eList.length) {
               _rate[k] = JSON.parse(res.data[0][k].rate);
               _rateList[k] = Object.keys(JSON.parse(res.data[0][k].rate));
               for (var i = 0; i < _rateList[k].length; i++) {
@@ -889,6 +890,10 @@ export default {
           this.dialogVisible3 = true;
           setTimeout(() => {
             for (var p = 0; p < res.data[0].length; p++) {
+              if (!this.ooption[p]) {
+                this.chartObj[p] = null;
+                continue
+              }
               var _ooption = JSON.parse(JSON.stringify(this.ooption[p]));
               var _option = JSON.parse(JSON.stringify(this.radarOption));
               _option.radar.indicator = [];
@@ -1200,6 +1205,9 @@ export default {
     },
     updatePj() {
       for (var i = 0; i < this.worksDetail.length; i++) {
+        if (!this.worksDetail[i].eList.length) {
+          continue
+        }
         this.updateWorks(
           this.worksDetail[i].scopeId,
           this.worksDetail[i].rateList,
@@ -1225,7 +1233,7 @@ export default {
         _option.radar.indicator.push({ name: _ooption[i].name, max: 5 });
         _option.series[0].data[0].value.push(_ooption[i].value);
       }
-      if (this.chartObj) {
+      if (this.chartObj && this.chartObj[k]) {
         // _option.series[0].data = _ooption;
         this.chartObj[k].setOption(_option);
       } else {
@@ -1270,7 +1278,13 @@ export default {
           }
           // this.uploadBoolean = false;
           // this.dialogVisible2 = false;
-          if (k == this.worksDetail.length - 1) {
+          let _k = 0
+          for (var i = 0; i < this.worksDetail.length; i++) {
+            if (this.worksDetail[i].eList.length) {
+              _k = i
+            }
+          }
+          if (k == _k) {
             this.$message({
               message: "评价成功",
               type: "success",

src/components/pages/components/worksDetail3.vue

@@ -586,6 +586,15 @@ export default {
           var pptInfo = res.data[5];
           var workJson = [];
           for (var k = 0; k < res.data[0].length; k++) {
+            this.allWorks = res.data[0][k];
+            this.chapInfo.push(JSON.parse(res.data[0][k].chapters));
+            chapters.push(JSON.parse(res.data[0][k].chapters));
+            if (!chapters[0][res.data[0][k].stage].chapterInfo[0].taskJson[
+              res.data[0][k].task
+            ]) {
+              continue
+            }
+
             workJson.push({
               img: [],
               imgIndex: 0,
@@ -598,9 +607,9 @@ export default {
               stagetask: "",
               time: "",
             });
-            this.allWorks = res.data[0][k];
-            this.chapInfo.push(JSON.parse(res.data[0][k].chapters));
-            chapters.push(JSON.parse(res.data[0][k].chapters));
+            // this.allWorks = res.data[0][k];
+            // this.chapInfo.push(JSON.parse(res.data[0][k].chapters));
+            // chapters.push(JSON.parse(res.data[0][k].chapters));
             eList =
               chapters[0][res.data[0][k].stage].chapterInfo[0].taskJson[
                 res.data[0][k].task
@@ -617,29 +626,30 @@ export default {
               }
               workJson[k].rateList.content = "";
               this.ooption[k] = _ooption;
-            } else {
-              _ooption = [];
-              workJson[k].eList = [
-                { value: "意识能力", detail: "", score: 5 },
-                { value: "科学探究能力", detail: "", score: 5 },
-                { value: "实践创新能力", detail: "", score: 5 },
-                { value: "学习反思能力", detail: "", score: 5 },
-                { value: "工程思维能力", detail: "", score: 5 },
-              ];
-              for (var i = 0; i < workJson[k].eList.length; i++) {
-                _ooption.push({ value: 0, name: workJson[k].eList[i].value });
-                workJson[k].rateList[workJson[k].eList[i].value] = 0;
-              }
-              workJson[k].rateList.content = "";
-              this.ooption[k] = [
-                { value: 0, name: "意识能力" },
-                { value: 0, name: "科学探究能力" },
-                { value: 0, name: "实践创新能力" },
-                { value: 0, name: "学习反思能力" },
-                { value: 0, name: "工程思维能力" },
-              ];
             }
-            if (res.data[0][k].rate) {
+            //  else {
+            //   _ooption = [];
+            //   workJson[k].eList = [
+            //     { value: "意识能力", detail: "", score: 5 },
+            //     { value: "科学探究能力", detail: "", score: 5 },
+            //     { value: "实践创新能力", detail: "", score: 5 },
+            //     { value: "学习反思能力", detail: "", score: 5 },
+            //     { value: "工程思维能力", detail: "", score: 5 },
+            //   ];
+            //   for (var i = 0; i < workJson[k].eList.length; i++) {
+            //     _ooption.push({ value: 0, name: workJson[k].eList[i].value });
+            //     workJson[k].rateList[workJson[k].eList[i].value] = 0;
+            //   }
+            //   workJson[k].rateList.content = "";
+            //   this.ooption[k] = [
+            //     { value: 0, name: "意识能力" },
+            //     { value: 0, name: "科学探究能力" },
+            //     { value: 0, name: "实践创新能力" },
+            //     { value: 0, name: "学习反思能力" },
+            //     { value: 0, name: "工程思维能力" },
+            //   ];
+            // }
+            if (res.data[0][k].rate && eList && eList.length > 0) {
               _rate[k] = JSON.parse(res.data[0][k].rate);
               _rateList[k] = Object.keys(JSON.parse(res.data[0][k].rate));
               for (var i = 0; i < _rateList[k].length; i++) {
@@ -737,6 +747,10 @@ export default {
           this.dialogVisible3 = true;
           setTimeout(() => {
             for (var p = 0; p < res.data[0].length; p++) {
+              if (!this.ooption[p]) {
+                this.chartObj[p] = null;
+                continue
+              }
               var _ooption = JSON.parse(JSON.stringify(this.ooption[p]));
               var _option = JSON.parse(JSON.stringify(this.radarOption));
               _option.radar.indicator = [];