03/10 18:46

千万别提交

src/views/evaluateManager/evaluateDetail.vue

@@ -41,14 +41,20 @@
               <p class="row">训练时长:{{ commitWrap.timers }}</p>
               <p class="title">授课内容</p>
               <el-divider></el-divider>
-              <p class="row">乐理：</p>
-              <p class="row">曲子:</p>
-              <p class="row">教材:</p>
+              <p class="row">乐理：{{ musicTheory }}</p>
+              <p class="row">曲子: {{ song}}</p>
+              <p class="row">教材: {{teachingMaterial }}</p>
             </div>
             <div class="cardWrapright">
               <p class="title">点评</p>
               <el-divider></el-divider>
-              <p class="row" v-for="(item,index) in askList">{{index+1+':'+item}}</p>
+              <div v-if="version == 1">
+                <p class="row" v-for="(item,index) in askList">{{index+1+':'+item}}</p>
+              </div>
+              <div v-if="version == 2">
+                <p class="row" v-for="(item,index) in askList">{{item}}</p>
+              </div>
+
               <!-- <div class="textWrap"></div> -->
             </div>
           </div>
@@ -60,8 +66,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { getGroupReviews, getReviewsInfo } from "@/api/buildTeam";
-import {subjectJsonOld,
-    subjectJson} from '@/utils/questionJson'
+import { subjectJsonOld, subjectJson } from "@/utils/questionJson";
 export default {
   components: { pagination },
   data() {
@@ -76,8 +81,8 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      subjectJsonOld:subjectJsonOld ,
-      subjectJson:subjectJson,
+      subjectJsonOld: subjectJsonOld,
+      subjectJson: subjectJson,
       askList: [],
       commitWrap: {
         time: "",
@@ -85,7 +90,11 @@ export default {
         soundName: "",
         count: "",
         timers: ""
-      }
+      },
+      version: null,
+      musicTheory: null,
+      teachingMaterial: null,
+      song: null
     };
   },
   activated() {
@@ -118,19 +127,90 @@ export default {
       getReviewsInfo({ id: this.evaluateId }).then(res => {
         if (res.code == 200) {
           this.isLook = true;
-          if(res.data.version == 1){
-             this.askList = res.data.item.split(",").map((item, index) => {
-            return this.subjectJsonOld[index + 1][item];
-          });
-          }else if(res.data.version == 2){
-                this.askList = res.data.item.split(",").map((item, index) => {
-            return this.subjectJson[index + 1][item];
-          });
+          this.version = res.data.version;
+          if (res.data.version == 1) {
+            this.askList = res.data.item.split(",").map((item, index) => {
+              return this.subjectJsonOld[index + 1][item];
+            });
+          } else if (res.data.version == 2) {
+            // this.askList = res.data.item.split(",").map((item, index) => {
+            // return this.subjectJson[index + 1][item];
+            // });
+            let some = {
+              one: 1,
+              two: 2,
+              three: 3,
+              four: 4,
+              five: 5,
+              six: 6,
+              seven: 7,
+              eight: 8
+            };
+            this.item = JSON.parse(res.data.item);
+            console.log(this.item);
+            this.askList = []
+            for (let key in this.item) {
+              switch (key) {
+                case "one": {
+                  this.askList.push('1:'+this.subjectJson[1][this.item[key]])
+                  break;
+                }
+                case "two": {
+                      this.askList.push('2:'+this.subjectJson[2][this.item[key]])
+                  break;
+                }
+                case "three": {
+                      this.askList.push('3:'+this.subjectJson[3][this.item[key]])
+                  break;
+                }
+                case "four": {
+                      this.askList.push('4:'+this.subjectJson[4][this.item[key]])
+                  break;
+                }
+                case "five": {
+                      this.askList.push('5:'+this.subjectJson[5][this.item[key]])
+                  break;
+                }
+                case "six": {
+                      this.askList.push('6:'+this.subjectJson[6][this.item[key]])
+                  break;
+                }
+                case "seven":
+                  {
+                        this.askList.push('7:'+this.subjectJson[7][this.item[key]])
+                        break;
+                  }
+                  
+                case "eight": {
+                      this.askList.push('8:'+this.subjectJson[8][this.item[key]])
+                  break;
+                }
+              }
+           
+              // this.askList.push(this.subjectJson[])
+            }
+              this.askList.sort((a,b)=>{
+                return parseInt(a)-parseInt(b)
+              })
+              // console.log( this.askList)
+
+            this.musicTheory = JSON.parse(res.data.musicTheory)
+              .map(item => {
+                return item.str;
+              })
+              .join(",");
+
+            this.teachingMaterial = JSON.parse(res.data.teachingMaterial)
+              .map(item => {
+                return item.str;
+              })
+              .join(",");
+            this.song = res.data.song;
           }
-         
+
           this.commitWrap = {
             time: res.data.createTime,
-            teacher:res.data.teacher,
+            teacher: res.data.teacher,
             soundName: res.data.subjectName,
             count: res.data.times,
             timers: res.data.totalMinutes