修改问题

dist/static/css/chunk-455dfc5c.ff5a263c.css → dist/static/css/chunk-026a14f8.8c14d646.css

@@ -1 +1 @@
-.el-button--primary[data-v-e124187a],.el-button--primary[data-v-e124187a]:active,.el-button--primary[data-v-e124187a]:focus,.el-button--primary[data-v-e124187a]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-e124187a] .el-date-editor.el-input,[data-v-e124187a] .el-select{width:100%!important}[data-v-e124187a] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-e124187a]{margin-top:20px;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:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-e124187a]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-e124187a]{margin-bottom:20px}.infoWrap .right[data-v-e124187a]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-e124187a]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-e124187a]{width:150px;height:150px}.salarySet h3[data-v-b7282380]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-b7282380],.salarySet .tableList .right[data-v-b7282380]{float:left}.salarySet .tableList .left[data-v-b7282380]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-b7282380]{width:56%;margin-left:2%}[data-v-b7282380] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-b7282380] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}
+.el-button--primary[data-v-e124187a],.el-button--primary[data-v-e124187a]:active,.el-button--primary[data-v-e124187a]:focus,.el-button--primary[data-v-e124187a]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-e124187a] .el-date-editor.el-input,[data-v-e124187a] .el-select{width:100%!important}[data-v-e124187a] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-e124187a]{margin-top:20px;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:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-e124187a]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-e124187a]{margin-bottom:20px}.infoWrap .right[data-v-e124187a]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-e124187a]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-e124187a]{width:150px;height:150px}.salarySet h3[data-v-6d4f2a1c]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-6d4f2a1c],.salarySet .tableList .right[data-v-6d4f2a1c]{float:left}.salarySet .tableList .left[data-v-6d4f2a1c]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-6d4f2a1c]{width:56%;margin-left:2%}[data-v-6d4f2a1c] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-6d4f2a1c] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-6e7a61a6.a771b8c2.css → dist/static/css/chunk-f1f13d90.2f8a8c9d.css

@@ -1 +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}.inputStyle[data-v-6aa153a0]{width:100px;text-align:center}.title[data-v-5fcb358e]{margin-bottom:20px}.amap-demo[data-v-5fcb358e]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-7d37172b]{visibility:hidden}.cl-container .topFrom[data-v-7d37172b]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-7d37172b]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-7d37172b]{list-style:none}.cl-container .searchForm[data-v-7d37172b]{margin:0 30px}.btnWraps[data-v-7d37172b]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-7d37172b]{margin-right:20px}.inputStyle[data-v-7d37172b]{width:180px}.red[data-v-7d37172b]{color:red}.exportBtn[data-v-7d37172b]{background:#13817a}
+.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}.inputStyle[data-v-6aa153a0]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-63cd9bec]{width:100px;text-align:center}.work[data-v-63cd9bec]{margin-bottom:30px;font-size:16px}.visible[data-v-7d37172b]{visibility:hidden}.cl-container .topFrom[data-v-7d37172b]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-7d37172b]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-7d37172b]{list-style:none}.cl-container .searchForm[data-v-7d37172b]{margin:0 30px}.btnWraps[data-v-7d37172b]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-7d37172b]{margin-right:20px}.inputStyle[data-v-7d37172b]{width:180px}.red[data-v-7d37172b]{color:red}.exportBtn[data-v-7d37172b]{background:#13817a}

src/views/journal/vipApply.vue

@@ -128,7 +128,7 @@
   </div>
 </template>
 <script>
-import { getVipGroupDetail } from '@/api/vipSeting'
+import { getVipGroupDetailForAudit } from '@/api/vipSeting'
 import { queryCountOfUnread, sysMessageList, setRead, vipApplyAudit } from '@/api/journal'
 export default {
   name: 'vipApply',
@@ -239,7 +239,7 @@ export default {
     },
     getVipGroupItem (memo) {
       memo = JSON.parse(memo)
-      getVipGroupDetail({ vipGroupId: memo.vipGroupId }).then(res => {
+      getVipGroupDetailForAudit({ vipGroupId: memo.vipGroupId }).then(res => {
         if (res.code == 200) {
           this.showRight = true
           this.showMessage = res.data

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -129,6 +129,8 @@
 import { vipGroupSalaryList, vipGroupSalarySet, teacherSalaryList, teacherSalaryBatchUpset } from '@/api/teacherManager'
 import { sysConfigList } from '@/api/generalSettings'
 import { findTeacherDefaultSalary } from '@/api/vipSeting' 
+let nowTime = new Date()
+let checkTime = nowTime.getFullYear() + '-' + (nowTime.getMonth() + 1) + '-' + nowTime.getDate()
 export default {
   props: ['teacherId'],
   name: 'salarySet',
@@ -190,7 +192,7 @@ export default {
       musicGroupTable: [],
       ruleList: [],
       vipList: [],
-      startDate: new Date()
+      startDate: checkTime
     }
   },
   created () {
@@ -318,8 +320,6 @@ export default {
     onSave () {
       let teamTable = this.teamTable
       let checkStatus = true
-      console.log(this.startDate)
-      return
       teamTable.forEach(item => {
         if (item.assistantTeacher30MinSalary < 0 || item.assistantTeacher90MinSalary < 0
           || item.mainTeacher30MinSalary < 0 || item.mainTeacher90MinSalary < 0) {

src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -87,7 +87,7 @@ export default {
     init () {
       getTeacherPersonalAttendance({ courseScheduleId: this.courseScheduleId }).then(res => {
         if (res.code == 200) {
-          if (res.data.signInLongitudeLatitude) {
+          if (res.data && res.data.signInLongitudeLatitude) {
             let add = {
               title: '签到点',
               location: res.data.signInLongitudeLatitude.split(',')
@@ -96,7 +96,7 @@ export default {
             this.signInLongitudeLatitude = res.data.signInLongitudeLatitude.split(',')
             this.markers.push(add)
           }
-          if (res.data.schoolLongitudeLatitude) {
+          if (res.data && res.data.schoolLongitudeLatitude) {
             let add = {
               title: '教学点',
               location: res.data.schoolLongitudeLatitude.split(',')

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -398,7 +398,6 @@ export default {
     },
     batchAdjustmentTime () {
       let tempData = this.markAttendance.dataInfo
-      return
       let params = {
         "courseScheduleId": tempData.id,
         "signInStatus": 1,

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://admin.dayaedu.com' // 测试服
-let target = 'http://192.168.3.48:8080' // 乔
+let target = 'http://admin.dayaedu.com' // 测试服
+// let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**