修改主题

package.json

@@ -33,6 +33,7 @@
     "npm": "^6.13.0",
     "nprogress": "0.2.0",
     "numeral": "^2.0.6",
+    "object-diff": "0.0.4",
     "path-to-regexp": "2.4.0",
     "qrcodejs2": "0.0.2",
     "qs": "^6.8.0",

src/App.vue

@@ -86,6 +86,7 @@ body {
 }
 </style>
 <style lang="scss">
+$--color-primary: teal;
 .el-table {
   width: 99.9% !important;
 }

src/layout/components/TagsView.vue

@@ -80,7 +80,6 @@ export default {
       return route.path === this.$route.path
     },
     syncTagViewAndSaveForm() {
-      console.log(this.$store.state.tagsView.visitedViews)
       const keys = this.$store.state.tagsView.visitedViews.map(item => item.fullPath)
       const searchs = new Searchs()
       const sks = Object.keys(searchs.getSearchs())

src/main.js

@@ -3,10 +3,11 @@ import ElementUI from 'element-ui'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import 'default-passive-events'
 import 'babel-polyfill'
+import './theme/index.css'
 
 // import './global.scss'
 
-import 'element-ui/lib/theme-chalk/index.css'
+// import 'element-ui/lib/theme-chalk/index.css'
 import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import '@/styles/index.scss' // global css
@@ -65,7 +66,7 @@ export const $message = new DonMessage()
 Vue.prototype.$message = $message
 
 // 全局移除数字滚动
-document.addEventListener('mousewheel', function (event) {
+document.addEventListener('mousewheel', function () {
   if (document.activeElement.type === 'number') {
     document.activeElement.blur()
   }

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -10,34 +10,10 @@
                         :key="index"
                         :title="getTitle(item)"
                         :name="index">
-        <el-form :inline='true'>
-          <el-form-item label="课程名称"
-                        style="width:300px">
-            <div>{{item.name}}</div>
-          </el-form-item>
-          <el-form-item label="主教老师"
-                        style="width:300px">
-            <div>{{item.actualTeacherName}}</div>
-          </el-form-item>
-          <br>
-          <el-form-item label="助教老师"
-                        style="width:300px">
-            <div>{{item.teacherName}}</div>
-          </el-form-item>
-          <el-form-item label="上课时间"
-                        style="width:300px">
-            <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div>
-          </el-form-item>
-          <br>
-          <el-form-item label="课程时长"
-                        style="width:300px">
-            <div>{{getTimers(item)}}分钟</div>
-          </el-form-item>
-          <el-form-item label="课程类型"
-                        style="width:300px">
-            <div>{{item.teachMode| teachMode}}</div>
-          </el-form-item>
-        </el-form>
+                        <infoMsgContent
+                          :before="item.previousCourseSchedule"
+                          :after="item.currentCourseSchedule"
+                        />
       </el-collapse-item>
     </el-collapse>
     <div v-if="dataList.length <= 0"
@@ -52,27 +28,46 @@ import dayjs from 'dayjs';
 import {
   queryCourseAdjustDetail,
 } from "@/api/buildTeam";
+import infoMsgContent from './infoMsgContent'
 export default {
   props: ['courseScheduleId'],
   data () {
     return {
-      activeName: '',
-      dataList: []
+      activeName: 0,
+      dataList: [],
     }
   },
+  components: { infoMsgContent },
   mounted () {
     queryCourseAdjustDetail({ courseScheduleId: this.courseScheduleId }).then(res => {
       if (res.code == 200) {
         if (res.data) {
-          this.dataList = res.data
+          this.dataList = res.data.map(item => {
+            return {
+              ...item,
+              currentCourseSchedule: this.filterKeys(JSON.parse(item.currentCourseSchedule)),
+              previousCourseSchedule: this.filterKeys(JSON.parse(item.previousCourseSchedule)),
+            }
+          })
         }
       }
     })
-    console.log(this.courseScheduleId)
   },
   methods: {
+    filterKeys(item) {
+      return {
+        name: item.name,
+        actualTeacherName: item.actualTeacherName,
+        teacherName: item.teacherName,
+        startClassTime: item.startClassTime,
+        classDate: item.classDate,
+        endClassTime: item.endClassTime,
+        teachMode: item.teachMode,
+        timers: this.getTimers(item)
+      }
+    },
     getTitle (item) {
-      return item.operatorName + '在' + item.auditTime + '修改了'
+      return item.operatorName + ' 在 ' + item.createTime + ' 修改了'
     },
     getTimers (item) {
       return diffTimerFormMinute(dayjs(item.classDate).format('YYYY-MM-DD'), dayjs(item.startClassTime).format('HH:mm'), dayjs(item.endClassTime).format('HH:mm'))

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <el-form :inline='true'>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="主教老师">
+            <!-- <div>{{item.actualTeacherName}}</div> -->
+            <div v-if="diff.hasOwnProperty('actualTeacherName')">
+              <el-tag type="danger"><s>{{before.actualTeacherName}}</s></el-tag>
+              <el-tag type="success">{{after.actualTeacherName}}</el-tag>
+            </div>
+            <div v-else>{{after.actualTeacherName}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <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>
+            </div>
+            <div v-else>{{after.teacherName}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上课时间">
+            <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
+            <div v-if="diff.hasOwnProperty('startClassTime')">
+              <el-tag type="danger"><s>{{ before.startClassTime ? before.startClassTime.substr(0, 16) : '' }}-{{ before.endClassTime ? before.endClassTime.substr(11,5) : ''}}</s></el-tag>
+              <el-tag type="success">{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</el-tag>
+            </div>
+            <div v-else>{{ after.startClassTime ? after.startClassTime.substr(0, 16) : '' }}-{{ after.endClassTime ? after.endClassTime.substr(11,5) : ''}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="课程时长">
+            <!-- <div>{{getTimers(item)}}分钟</div> -->
+            <div v-if="diff.hasOwnProperty('timers')">
+              <el-tag type="danger"><s>{{before.timers}} 分钟</s></el-tag>
+              <el-tag type="success">{{after.timers}} 分钟</el-tag>
+            </div>
+            <div v-else>{{after.timers}} 分钟</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="课程类型">
+            <!-- <div>{{item.teachMode| teachMode}}</div> -->
+            <div v-if="diff.hasOwnProperty('teachMode')">
+              <el-tag type="danger"><s>{{before.teachMode | teachMode}}</s></el-tag>
+              <el-tag type="success">{{after.teachMode | teachMode}}</el-tag>
+            </div>
+            <div v-else>{{after.teachMode | teachMode}}</div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+import ObjectDiff from 'object-diff'
+export default {
+  props: ['before', 'after'],
+  computed: {
+    diff() {
+      return ObjectDiff(this.before, this.after)
+    }
+  },
+}
+</script>
+<style lang="less" scoped>
+
+</style>