Browse Source

03/11 11:38

后台修改
261568008@qq.com 5 years ago
parent
commit
d476e6cc2b

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-0e7e4d14.237fa94a.css

@@ -0,0 +1 @@
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-core[data-v-3439f0b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.m-core .left[data-v-3439f0b0]{width:550px}.m-core .right[data-v-3439f0b0]{margin-left:30px;min-width:600px}.m-core .right .box-card[data-v-3439f0b0]{width:100%;min-height:500px}.m-core .right .box-card .cardWrap[data-v-3439f0b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;margin-top:30px}.m-core .right .box-card .cardWrap .row[data-v-3439f0b0]{line-height:30px;font-size:14px}.m-core .right .box-card .cardWrap .title[data-v-3439f0b0]{text-align:center}.m-core .right .box-card .cardWrap .cardWrapleft[data-v-3439f0b0],.m-core .right .box-card .cardWrap .cardWrapright[data-v-3439f0b0]{width:48%}.m-core .right .box-card .cardWrap .cardWrapright .textWrap[data-v-3439f0b0]{margin-top:20px;width:100%;border:1px solid #999;min-height:100px}

+ 0 - 1
dist/static/css/chunk-8dbba132.ed88495f.css

@@ -1 +0,0 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-core[data-v-9feecb16]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.m-core .left[data-v-9feecb16]{width:550px}.m-core .right[data-v-9feecb16]{margin-left:30px;min-width:600px}.m-core .right .box-card[data-v-9feecb16]{width:100%;min-height:500px}.m-core .right .box-card .cardWrap[data-v-9feecb16]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;margin-top:30px}.m-core .right .box-card .cardWrap .row[data-v-9feecb16]{line-height:30px;font-size:14px}.m-core .right .box-card .cardWrap .title[data-v-9feecb16]{text-align:center}.m-core .right .box-card .cardWrap .cardWrapleft[data-v-9feecb16],.m-core .right .box-card .cardWrap .cardWrapright[data-v-9feecb16]{width:48%}.m-core .right .box-card .cardWrap .cardWrapright .textWrap[data-v-9feecb16]{margin-top:20px;width:100%;border:1px solid #999;min-height:100px}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.753c7c39.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-0e7e4d14.b6dbf4c2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-8dbba132.8f904412.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-f6deba5e.b4e1933d.js


+ 16 - 13
src/views/evaluateManager/evaluateDetail.vue

@@ -32,24 +32,27 @@
           评价详情
           <div class="cardWrap">
             <div class="cardWrapleft">
-              <p class="title">授课内容</p>
+              <p class="title">课程信息</p>
               <el-divider></el-divider>
               <p class="row">评价时间:{{commitWrap.time }}</p>
               <p class="row">老师: {{commitWrap.teacher}}</p>
               <p class="row">声部:{{ commitWrap.soundName }}</p>
               <p class="row">训练次数:{{ commitWrap.count }}</p>
               <p class="row">训练时长:{{ commitWrap.timers }}</p>
-              <p class="title">授课内容</p>
+              <div  v-if="version == 2">
+                <p class="title">授课内容</p>
               <el-divider></el-divider>
               <p class="row">乐理:{{ musicTheory }}</p>
               <p class="row">曲子: {{ song}}</p>
               <p class="row">教材: {{teachingMaterial }}</p>
+              </div>
+              
             </div>
             <div class="cardWrapright">
-              <p class="title">点评</p>
+              <p class="title">课程点评</p>
               <el-divider></el-divider>
               <div v-if="version == 1">
-                <p class="row" v-for="(item,index) in askList">{{index+1+':'+item}}</p>
+                <p class="row" v-for="(item,index) in askList">{{subjectJsonOld[index+1].title+' : '+item}}</p>
               </div>
               <div v-if="version == 2">
                 <p class="row" v-for="(item,index) in askList">{{item}}</p>
@@ -152,37 +155,37 @@ export default {
             for (let key in this.item) {
               switch (key) {
                 case "one": {
-                  this.askList.push('1:'+this.subjectJson[1][this.item[key]])
+                  this.askList.push(this.subjectJson[1].title+' : '+this.subjectJson[1][this.item[key]])
                   break;
                 }
                 case "two": {
-                      this.askList.push('2:'+this.subjectJson[2][this.item[key]])
+                      this.askList.push(this.subjectJson[2].title+' : '+this.subjectJson[2][this.item[key]])
                   break;
                 }
                 case "three": {
-                      this.askList.push('3:'+this.subjectJson[3][this.item[key]])
+                      this.askList.push(this.subjectJson[3].title+' : '+this.subjectJson[3][this.item[key]])
                   break;
                 }
                 case "four": {
-                      this.askList.push('4:'+this.subjectJson[4][this.item[key]])
+                      this.askList.push(this.subjectJson[4].title+' : '+this.subjectJson[4][this.item[key]])
                   break;
                 }
                 case "five": {
-                      this.askList.push('5:'+this.subjectJson[5][this.item[key]])
+                      this.askList.push(this.subjectJson[5].title+' : '+this.subjectJson[5][this.item[key]])
                   break;
                 }
                 case "six": {
-                      this.askList.push('6:'+this.subjectJson[6][this.item[key]])
+                      this.askList.push(this.subjectJson[6].title+' : '+this.subjectJson[6][this.item[key]])
                   break;
                 }
                 case "seven":
                   {
-                        this.askList.push('7:'+this.subjectJson[7][this.item[key]])
+                        this.askList.push(this.subjectJson[7].title+' : '+this.subjectJson[7][this.item[key]])
                         break;
                   }
                   
                 case "eight": {
-                      this.askList.push('8:'+this.subjectJson[8][this.item[key]])
+                      this.askList.push(this.subjectJson[8].title+' : '+this.subjectJson[8][this.item[key]])
                   break;
                 }
               }
@@ -210,7 +213,7 @@ export default {
 
           this.commitWrap = {
             time: res.data.createTime,
-            teacher: res.data.teacher,
+            teacher: res.data.teacher&&res.data.teacher.name,
             soundName: res.data.subjectName,
             count: res.data.times,
             timers: res.data.totalMinutes

+ 1 - 1
src/views/evaluateManager/evaluateList.vue

@@ -93,7 +93,7 @@
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" @click="gotoEvakuateDetail(scope.row)">查看</el-button>
+                <el-button type="text" v-permission="'evaluateList/look'" @click="gotoEvakuateDetail(scope.row)">查看</el-button>
               </div>
             </template>
           </el-table-column>

Some files were not shown because too many files changed in this diff