Browse Source

修改请假

lex-xin 5 năm trước cách đây
mục cha
commit
64f887d0f6

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/css/Leave.b2b1215d.css


+ 0 - 1
dist/css/PeriodAdjust.2c1a2119.css

@@ -1 +0,0 @@
-.periodadjust[data-v-587ae01d]{height:100vh;position:relative;background-color:#f3f4f8}.periodadjust .container[data-v-587ae01d]{min-height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden;position:relative}.periodadjust .button-group[data-v-587ae01d]{width:100%}.periodadjust .button-group .van-button[data-v-587ae01d]{font-size:.16rem;width:50%}.periodadjust .button-group .van-button--primary[data-v-587ae01d]{background:#14928a;border-color:#14928a}[data-v-587ae01d] .van-icon-underway-o{font-size:.18rem}[data-v-587ae01d] .van-cell__title{font-size:.16rem;color:#444}[data-v-587ae01d] .van-cell-group{margin-top:.05rem}.title-content[data-v-587ae01d]{-webkit-box-flex:1;-ms-flex:1 auto;flex:1 auto;font-weight:700}.title-content .van-cell__label[data-v-587ae01d]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-587ae01d]{margin-right:.05rem}[data-v-587ae01d] .van-cell__label,[data-v-587ae01d] .van-cell__value{color:#444;font-size:.14rem}[data-v-587ae01d] .van-cell__label span,[data-v-587ae01d] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-587ae01d]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-587ae01d]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-587ae01d] .van-radio__icon--disabled .van-icon{border-color:transparent;background:#fff}[data-v-587ae01d] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-587ae01d] .icon{margin-top:.3rem}

+ 1 - 0
dist/css/PeriodAdjust.c1a7d05c.css

@@ -0,0 +1 @@
+.periodadjust[data-v-aa93dd46]{height:100vh;position:relative;background-color:#f3f4f8}.periodadjust .container[data-v-aa93dd46]{min-height:calc(100vh - 50px);overflow-y:auto;overflow-x:hidden;position:relative}.periodadjust .button-group[data-v-aa93dd46]{width:100%}.periodadjust .button-group .van-button[data-v-aa93dd46]{font-size:.16rem;width:50%}.periodadjust .button-group .van-button--primary[data-v-aa93dd46]{background:#14928a;border-color:#14928a}[data-v-aa93dd46] .van-icon-underway-o{font-size:.18rem}[data-v-aa93dd46] .van-cell__title{font-size:.16rem;color:#444}[data-v-aa93dd46] .van-cell-group{margin-top:.05rem}.title-content[data-v-aa93dd46]{-webkit-box-flex:1;-ms-flex:1 auto;flex:1 auto;font-weight:700}.title-content .van-cell__label[data-v-aa93dd46]{font-weight:400;margin-top:.06rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.title-content .van-icon-location[data-v-aa93dd46]{margin-right:.05rem}[data-v-aa93dd46] .van-cell__label,[data-v-aa93dd46] .van-cell__value{color:#444;font-size:.14rem}[data-v-aa93dd46] .van-cell__label span,[data-v-aa93dd46] .van-cell__value span{padding-right:.1rem}.input-cell[data-v-aa93dd46]{padding:.12rem .16rem .2rem}.input-cell .van-radio[data-v-aa93dd46]{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-aa93dd46] .van-radio__icon--disabled .van-icon{border-color:transparent;background:#fff}[data-v-aa93dd46] .van-radio__icon--checked .van-icon{background:#f97215;border-color:#f97215}[data-v-aa93dd46] .icon{margin-top:.3rem}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/index.html


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/js/Leave.618367fb.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/js/Leave.6a5129d9.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/js/PeriodAdjust.b782a1bc.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/js/PeriodAdjust.f772e3ee.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/js/app.ab1720c0.js


+ 20 - 0
src/views/teacher/Leave.vue

@@ -161,6 +161,16 @@ export default {
                 }
             })
         },
+        getDateInfo(value) { // 获取时间
+            let tempValue = value
+            if(typeof value !== 'object') {
+                tempValue = value.replace(/-/ig, '/')
+            }
+            let d = new Date(tempValue)
+            let hour = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
+            let minute = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
+            return hour + ':' + minute + ':00'
+        },
         onSubmit() {
             let searchList = this.searchList
             if(!searchList.startText || !searchList.endText) {
@@ -192,8 +202,18 @@ export default {
                     status = true
                 }
                 let tempI = Object.assign({}, item)
+                
+                let startStr = '2019/12/18 ' + this.getDateInfo(item.startClassTime),
+                endStr = '2019/12/18 ' + this.getDateInfo(item.endClassTime)
+                let startDate = new Date(startStr),
+                    endDate = new Date(endStr)
+                let m = parseInt(Math.abs(startDate.getTime() - endDate.getTime()) / 1000 / 60)
                 tempI.classDate = this.getFormatDate(item.changeAllTime) + ':00'
                 tempI.startClassTime = this.getFormatDate(item.changeAllTime) + ':00'
+                let tempEndClassTime = new Date() //临时时间
+                let currentDate = new Date(item.changeAllTime)
+                tempEndClassTime.setMinutes(currentDate.getMinutes() + m)
+                tempI.endClassTime = this.getFormatDate(tempEndClassTime) + ':00'
                 coursesScheduleJson.push({
                     befor: item,
                     after: tempI

+ 2 - 2
src/views/teacher/PeriodAdjust.vue

@@ -151,8 +151,8 @@ export default {
                 }
             })
 
-            let startStr = '2019/10/10 ' + this.getDateInfo(selectDate.startClassTime),
-                endStr = '2019/10/10 ' + this.getDateInfo(selectDate.endClassTime)
+            let startStr = '2019/12/18 ' + this.getDateInfo(selectDate.startClassTime),
+                endStr = '2019/12/18 ' + this.getDateInfo(selectDate.endClassTime)
             let startDate = new Date(startStr),
                 endDate = new Date(endStr)
             let m = parseInt(Math.abs(endDate.getTime() - startDate.getTime()) / 1000 / 60)

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác