update

src/components/pages/addCourse.vue

@@ -574,13 +574,13 @@
                                 item1.type == 3 ||
                                 item1.type == 7
                               " :placeholder="item1.name" @change="
-                                  updataVideoT(
-                                    $event,
-                                    unitIndex,
-                                    chapterIndex,
-                                    index1
-                                  )
-                                " style="
+                                updataVideoT(
+                                  $event,
+                                  unitIndex,
+                                  chapterIndex,
+                                  index1
+                                )
+                              " style="
                                   border: none;
                                   outline: none;
                                   width: 80%;
@@ -1109,6 +1109,14 @@
                               <span>评价描述：</span>
                               <input type="input" v-model="itemTask.eList[eIndex].detail" placeholder="填写评价描述" />
                             </div>
+                            <div class="elist_inptu_text" v-if="evalua">
+                              <span>目标：</span>
+                              <!-- <input type="input" v-model="itemTask.eList[eIndex].target" placeholder="填写评价描述" /> -->
+                              <el-select v-model="itemTask.eList[eIndex].target" placeholder="请选择目标">
+                                <el-option v-for="(e, eIndex) in targetArray" :key="eIndex" :label="e.name" :value="e.name">
+                                </el-option>
+                              </el-select>
+                            </div>
                           </div>
                         </div>
                         <div class="addToolFun" @click="addEList(unitIndex, itemTaskIndex)"
@@ -1817,6 +1825,7 @@ export default {
       myWord: [],
       evaJuri: [],
       evalua: "",
+      targetArray: [],
       eTitle: "",
       eJson: {},
       fid: "", //一级
@@ -4265,6 +4274,7 @@ export default {
         });
     },
     setMindData() {
+      let targetArray = []
       this.data.data = [];
       this.data.data.push({ id: "root", isroot: true, topic: this.eTitle });
       let _eJson = Object.keys(this.eJson);
@@ -4276,6 +4286,11 @@ export default {
           parentid: "root",
           topic: element.name,
         });
+        targetArray.push({
+          id: element.id,
+          parentid: "root",
+          name: element.name,
+        })
         let _eJsonc = Object.keys(element.child);
         let _e2 = element.child;
         for (let j = 0; j < _eJsonc.length; j++) {
@@ -4285,6 +4300,11 @@ export default {
             parentid: element.id,
             topic: _ec.name,
           });
+          targetArray.push({
+            id: _ec.id,
+            parentid: element.id,
+            name: _ec.name,
+          })
           let _eJsonz = Object.keys(_ec.child);
           let _e3 = _ec.child;
           for (let z = 0; z < _eJsonz.length; z++) {
@@ -4294,9 +4314,15 @@ export default {
               parentid: _ec.id,
               topic: _ez.name,
             });
+            targetArray.push({
+              id: _ez.id,
+              parentid: _ec.id,
+              name: _ez.name,
+            })
           }
         }
       }
+      this.targetArray = targetArray
       this.$forceUpdate();
     },
     /*添加评价 */

src/components/pages/components/report/studentAbility.vue

@@ -546,7 +546,7 @@ export default {
           this.setChart();
           let _workW = []
           for (var i = 0; i < _isWorks.length; i++) {
-            if (chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList &&  chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList.length) {
+            if (chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList && chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList.length) {
               _workW.push({ stage: _isWorks[i].stage, task: _isWorks[i].task, rate: JSON.parse(_isWorks[i].rate), elist: chapters[_isWorks[i].stage].chapterInfo[0].taskJson[_isWorks[i].task].eList })
             }
             // else {
@@ -625,30 +625,29 @@ export default {
             //   _workW.push({ stage: _isWorks[i].stage, task: _isWorks[i].task, rate: JSON.parse(_isWorks[i].rate), elist: elist })
             // }
           }
-
-          if (_workW[0].elist[0].target) {
-            for (var i = 0; i < _workW.length; i++) {
-              _workW[i].work = []
-              for (var j = 0; j < _workW[i].elist.length; j++) {
+          for (var i = 0; i < _workW.length; i++) {
+            _workW[i].work = []
+            for (var j = 0; j < _workW[i].elist.length; j++) {
+              if (_workW[i].elist[j].target) {
                 if (randarAarray.indexOf(_workW[i].elist[j].target) == -1) {
                   randarAarray.push(_workW[i].elist[j].target)
                 }
-                // for (var k = 0; k < _workW[i].elist[j].target.length; k++) {
-                //   _workW[i].elist[j].target[k].count = _workW[i].rate[_workW[i].elist[j].value] * _workW[i].elist[j].target[k].per
-                // }
-                _workW[i].work.push({ name: _workW[i].elist[j].value, target: _workW[i].elist[j].target })
-                _workW[i].work[_workW[i].work.length - 1][_workW[i].elist[j].value] = _workW[i].rate[_workW[i].elist[j].value]
-                _workW[i].work[_workW[i].work.length - 1].value = _workW[i].rate[_workW[i].elist[j].value]
               }
+              // for (var k = 0; k < _workW[i].elist[j].target.length; k++) {
+              //   _workW[i].elist[j].target[k].count = _workW[i].rate[_workW[i].elist[j].value] * _workW[i].elist[j].target[k].per
+              // }
+              _workW[i].work.push({ name: _workW[i].elist[j].value, target: _workW[i].elist[j].target })
+              _workW[i].work[_workW[i].work.length - 1][_workW[i].elist[j].value] = _workW[i].rate[_workW[i].elist[j].value]
+              _workW[i].work[_workW[i].work.length - 1].value = _workW[i].rate[_workW[i].elist[j].value]
             }
-            for (var k = 0; k < randarAarray.length; k++) {
-              randarJson.push({ target: randarAarray[k], count: 0, value: 0 })
-              for (var i = 0; i < _workW.length; i++) {
-                for (var j = 0; j < _workW[i].work.length; j++) {
-                  if (_workW[i].work[j].target == randarAarray[k]) {
-                    randarJson[k].count++
-                    randarJson[k].value += _workW[i].work[j].value
-                  }
+          }
+          for (var k = 0; k < randarAarray.length; k++) {
+            randarJson.push({ target: randarAarray[k], count: 0, value: 0 })
+            for (var i = 0; i < _workW.length; i++) {
+              for (var j = 0; j < _workW[i].work.length; j++) {
+                if (_workW[i].work[j].target == randarAarray[k]) {
+                  randarJson[k].count++
+                  randarJson[k].value += _workW[i].work[j].value
                 }
               }
             }