Browse Source

修改课时调整的问题

lex-xin 4 years ago
parent
commit
98000884e8

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


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

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

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

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

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


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.2477e34d.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/PeriodAdjust.81a9762e.js


+ 6 - 5
src/views/teacher/PeriodAdjust.vue

@@ -21,7 +21,6 @@
             </van-radio-group>
             <m-empty v-else key="data" />
         </div>
-        
         <van-sticky v-if="dataShow">
             <div class="button-group">
                 <van-button type="default" @click="onDateChange" size="large">课时调整</van-button>
@@ -29,9 +28,7 @@
             </div>
         </van-sticky>
         <van-popup v-model="dataForm.status" position="bottom">
-            <van-datetime-picker v-model="dataForm.currentDate" type="datetime" :min-date="dataForm.minDate" 
-                :max-date="dataForm.maxDate" :formatter="formatter" @cancel="dataForm.status = false" 
-                @confirm="onCurrentConfirm" />
+            <van-datetime-picker v-model="dataForm.currentDate" type="datetime" :min-date="dataForm.minDate" :max-date="dataForm.maxDate" :formatter="formatter" @cancel="dataForm.status = false" @confirm="onCurrentConfirm" />
         </van-popup>
     </div>
 </template>
@@ -163,8 +160,12 @@ export default {
             let m = parseInt(Math.abs(endDate.getTime() - startDate.getTime()) / 1000 / 60)
             let currentStartDate = new Date(value),
                 currentEndDate = new Date(value)
-            
+
             currentEndDate.setMinutes(currentStartDate.getMinutes() + m)
+            if(currentStartDate.toDateString() !== currentEndDate.toDateString()) {
+                this.$toast("课时调整不允许跨天调整")
+                return
+            }
             classStartDateAdjust({
                 actualTeacherId: selectDate.actualTeacherId,
                 id: this.radioSelect,

+ 2 - 2
vue.config.js

@@ -1,8 +1,8 @@
-// let targetUrl = 'http://mteadev.dayaedu.com'
+let targetUrl = 'http://mteadev.dayaedu.com'
 // let targetUrl = 'http://192.168.3.139:8000' // 箭河
 // let targetUrl = 'https://online.dayaedu.com'
 // let targetUrl = 'http://dev.dayaedu.com/'
-let targetUrl = 'http://192.168.3.196:8080'
+// let targetUrl = 'http://192.168.3.196:8080'
 module.exports = {
   chainWebpack: config => {
     config.devtool('inline-source-map')

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