wolyshaw 4 gadi atpakaļ
vecāks
revīzija
084ae6a3bd

+ 18 - 2
src/views/teamDetail/componentCourse/infoMsg.vue

@@ -10,6 +10,11 @@
                         :key="index"
                         :title="getTitle(item)"
                         :name="index">
+                        <template slot="title">
+                          <header class="header">
+                            {{item.operatorName}} <span>在</span> {{item.createTime}} <span>修改了</span>
+                          </header>
+                        </template>
                         <infoMsgContent
                           :before="item.previousCourseSchedule"
                           :after="item.currentCourseSchedule"
@@ -43,10 +48,14 @@ export default {
       if (res.code == 200) {
         if (res.data) {
           this.dataList = res.data.map(item => {
+            const parsecurrent = JSON.parse(item.currentCourseSchedule)
+            const currentCourseSchedule = this.filterKeys(parsecurrent)
+            const previousCourseSchedule = this.filterKeys(JSON.parse(item.previousCourseSchedule))
             return {
               ...item,
-              currentCourseSchedule: this.filterKeys(JSON.parse(item.currentCourseSchedule)),
-              previousCourseSchedule: this.filterKeys(JSON.parse(item.previousCourseSchedule)),
+              operatorName: parsecurrent.operatorName,
+              currentCourseSchedule,
+              previousCourseSchedule,
             }
           })
         }
@@ -86,4 +95,11 @@ export default {
     margin-top: 120px;
   }
 }
+.header{
+  >span{
+    color: rgba($color: #000000, $alpha: .6);
+    display: inline-block;
+    margin: 0 6px;
+  }
+}
 </style>

+ 2 - 2
src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -16,8 +16,8 @@
           <el-form-item label="助教老师">
             <!-- <div>{{item.teacherName}}</div> -->
             <div v-if="diff.hasOwnProperty('teacherName')">
-              <el-tag type="danger"><s>{{before.teacherName}}</s></el-tag>
-              <el-tag type="success">{{after.teacherName}}</el-tag>
+              <el-tag v-if="before.teacherName" type="danger"><s>{{before.teacherName}}</s></el-tag>
+              <el-tag v-if="after.teacherName" type="success">{{after.teacherName}}</el-tag>
             </div>
             <div v-else>{{after.teacherName}}</div>
           </el-form-item>