页面修改

src/components/course/classlog-form.vue

 <style>
-  .classLog{
-    margin:0 20px;
-    height:600px;
-    overflow:auto;
+  .classLog {
+    margin: 0 20px;
+    height: 600px;
+    overflow: auto;
   }
+
   .classLog::-webkit-scrollbar {
     width: 3px;
     height: 3px;
     background-color: #F5F5F5;
   }
+
   /*!*定义滚动条轨道 内阴影+圆角*!*/
   .classLog::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
     border-radius: 10px;
     background-color: #F5F5F5;
   }
+
   /*!*定义滑块 内阴影+圆角*!*/
   .classLog::-webkit-scrollbar-thumb {
     border-radius: 10px;
     -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
     background-color: #0ae;
   }
-  .classLog_Title{
-    font-size:14px;
+
+  .classLog_Title {
+    font-size: 14px;
     font-weight: bold;
-    color:#2D2D2D;
+    color: #2D2D2D;
   }
+
 </style>
 <template>
   <div class="classLog" style="margin:0 20px;">
@@ -68,15 +73,14 @@
         dataList: [],
       }
     },
-    created() {
-      this.msg.School_Id = this.setingObj.School_Id;
-      this.msg.ClassId = this.setingObj.ClassId;
-    },
+    created() {},
     mounted() {
       this.getClassLog();
     },
     methods: {
       getClassLog() {
+        this.msg.School_Id = this.setingObj.School_Id;
+        this.msg.ClassId = this.setingObj.ClassId;
         queryClassLogPageList(this.msg).then(res => {
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
@@ -84,6 +88,11 @@
         })
       },
     },
+    watch: {
+      setingObj: function (val, oldval) {
+        this.getClassLog();
+      }
+    }
   }
 
 </script>

src/components/course/classstu-form.vue

@@ -122,7 +122,6 @@
             align: 'left'
           }
         ],
-
         stuMsg: {
 
         },
@@ -149,24 +148,16 @@
       }
     },
     created() {
+
+    },
+    mounted() {
       this.getStudentData();
       this.getStudentList();
     },
-    mounted() {},
     methods: {
       //获取学员信息
       getStudentData() {
-        queryClassStudent({
-          ClassId: this.setingObj.ClassId,
-          School_Id: this.setingObj.School_Id
-        }).then(res => {
-          if (res.Code == 1) {
-            this.studentList = res.Data;
-          }
-        })
-      },
-      //获取学员信息
-      getStudentData() {
+        this.studentList = [];
         queryClassStudent({
           ClassId: this.setingObj.ClassId,
           School_Id: this.setingObj.School_Id
@@ -254,6 +245,12 @@
         }
       }
     },
+    watch: {
+      setingObj: function (val, oldval) {
+        this.getStudentData();
+        this.getStudentList();
+      }
+    }
   }
 
 </script>

src/components/course/lesson-form.vue

@@ -87,63 +87,77 @@
     text-align: center;
     border-radius: 50%;
   }
-  .StudentInfo_List{
+
+  .StudentInfo_List {
     display: flex;
-    width:100%;
-    margin:0 20px;
-    padding:0 40px 0 20px;
+    width: 100%;
+    margin: 0 20px;
+    padding: 0 40px 0 20px;
     justify-content: space-between;
-    border-bottom:1px solid #d1d1d1;
+    border-bottom: 1px solid #d1d1d1;
   }
-  .Show_SignBack{
-    margin:20px;
-    color:#2961FE;
+
+  .Show_SignBack {
+    margin: 20px;
+    color: #2961FE;
   }
-  .Lessicon_Edit:hover{
-    color:red;
+
+  .Lessicon_Edit:hover {
+    color: red;
   }
-  .Less_Close:hover{
-    color:red;
+
+  .Less_Close:hover {
+    color: red;
   }
-  .lessStudentList{
-    margin-top:10px;
+
+  .lessStudentList {
+    margin-top: 10px;
   }
-  .lessStuTitle{
-    margin:20px;
-    padding-left:20px;
-    font-size:12px;
+
+  .lessStuTitle {
+    margin: 20px;
+    padding-left: 20px;
+    font-size: 12px;
   }
-  .lessStuInnerList{
-    display:flex;
-    margin:0 40px;
+
+  .lessStuInnerList {
+    display: flex;
+    margin: 0 40px;
     min-height: 300px;
   }
-  .lessList{
-    width:90px;
-    height:110px;
-    border:1px solid #d1d1d1;
+
+  .lessList {
+    width: 90px;
+    height: 110px;
+    border: 1px solid #d1d1d1;
     border-radius: 5px;
     text-align: center;
-    margin-right:10px;
+    margin-right: 10px;
     cursor: pointer;
     box-shadow: 4px 4px 5px #d1d1d1;
   }
-  .less_Isout{
-    font-size:12px;
-    color:#2961FE;
+
+  .less_Isout {
+    font-size: 12px;
+    color: #2961FE;
   }
-  .classQue{
+
+  .classQue {
     background-color: rgb(63, 196, 255);
   }
-  .classChu{
+
+  .classChu {
     background-color: #f2f2f2;
   }
-  .classChu .commonLessName{
-    color:#000;
+
+  .classChu .commonLessName {
+    color: #000;
   }
-  .classQue .commonLessName{
-    color:#fff;
+
+  .classQue .commonLessName {
+    color: #fff;
   }
+
 </style>
 <template>
   <div v-if="!isShowSign">
@@ -178,8 +192,8 @@
                     v-model="isSetMore" />
                   <template v-if="isSetMore==1">
                     <q-select filled stack-label option-value="RoomId" option-label="RoomName"
-                      v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" :dense="false"
-                      class="col-6 q-pb-lg" emit-value map-options />
+                      v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
+                      :dense="false" class="col-6 q-pb-lg" emit-value map-options />
                     <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
                       <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
                     </div>
@@ -189,8 +203,8 @@
                           ref="StartTime" class="col-6 q-pr-lg q-pb-lg" label="" :rules="[val => !!val || '请填写开始时间']" />
                       </div>
                       <div class="col-6">
-                        <q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.EndTime" ref="EndTime"
-                          class="col-6 q-pr-lg q-pb-lg" label="" :rules="[val => !!val || '请填写开始时间']" />
+                        <q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.EndTime"
+                          ref="EndTime" class="col-6 q-pr-lg q-pb-lg" label="" :rules="[val => !!val || '请填写开始时间']" />
                       </div>
                       <div class="delBtnStyle">
                         <i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
@@ -198,7 +212,8 @@
                     </div>
                   </template>
                   <q-card-actions align="right" class="bg-white">
-                    <q-btn label="取消" flat color="grey-10" @click="isShowMenu=false" style="font-weight:400 !important" />
+                    <q-btn label="取消" flat color="grey-10" @click="isShowMenu=false"
+                      style="font-weight:400 !important" />
                     <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveSteps" />
                   </q-card-actions>
                 </div>
@@ -223,8 +238,8 @@
                         <div class="calenderDialog">
                           <div style="margin:10px 0 15px 0;">{{item.ClassDateStr}}课程安排</div>
                           <q-select filled stack-label option-value="TId" option-label="TeacherName"
-                            v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
-                            class="col-6 q-pb-lg" emit-value map-options />
+                            v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师"
+                            :dense="false" class="col-6 q-pb-lg" emit-value map-options />
                           <!-- <div class="calenderClassDate">
                             <div>上课时间:{{item.ClassDateStr}}</div>
                             <div>
@@ -247,7 +262,8 @@
                               v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
                               :dense="false" class="col-6 q-pb-lg" emit-value map-options />
                             <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
-                              <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
+                              <q-btn @click="addStep()" size="10px" round color="primary"
+                                icon="iconfont icon-img_haha" />
                             </div>
                             <div class="row wrap" style="position:relative;"
                               v-for="(subItem,subIndex) in addMsg.PlanTimeList">
@@ -348,10 +364,8 @@
           </div>
         </div>
         <q-card-actions align="right" class="bg-white" v-if="isShowSignBtn&&isSigned">
-          <q-btn label="取消" flat color="grey-10"
-            style="font-weight:400 !important" @click="isShowSign=false" />
-          <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
-            @click="saveSign()" />
+          <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="isShowSign=false" />
+          <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveSign()" />
         </q-card-actions>
 
       </div>
@@ -409,19 +423,26 @@
         isShowEdit: false, //是否显示修改弹出
         isShowCanlder: false, //是否显示日历修改日期
 
-        isShowSign:false,
-        dayMsg:{  //获取某一天的计划信息请求
-          ClassPlanId:0,
-          School_Id:0,
-          ClassId:0
+        isShowSign: false,
+        dayMsg: { //获取某一天的计划信息请求
+          ClassPlanId: 0,
+          School_Id: 0,
+          ClassId: 0
         },
-        dayObj:{},
-        isShowSignBtn:false, //是否显示签到提交按钮
-        comChecked:{}, //点击选中复制
-        isSigned:true
+        dayObj: {},
+        isShowSignBtn: false, //是否显示签到提交按钮
+        comChecked: {}, //点击选中复制
+        isSigned: true
       }
     },
     created() {
+
+    },
+    mounted() {
+      this.initData();
+    },
+    methods: {
+      initData() {
         this.$nextTick(() => {
           // 点击上个月
           let prevBtn1 = document.querySelector('.el-calendar__button-group .el-button-group>button:nth-child(1)');
@@ -442,12 +463,10 @@
           prevBtn3.addEventListener('click', () => {
             var d = new Date(this.value);
             var datetime = d.getFullYear() + '-' + (d.getMonth() + 1);
-
             this.getClassPlan(datetime);
           })
         })
-    },
-    mounted() {
+
         var day2 = new Date();
         day2.setTime(day2.getTime());
         var s2 = day2.getFullYear() + "-" + (day2.getMonth() + 1);
@@ -457,7 +476,6 @@
         this.addMsg.TeacherId = this.setingObj.Teacher_Id;
         this.addMsg.ClassDate = this.setingObj.OpenTime;
       },
-    methods: {
       //获取第一个字
       GetFirst(val) {
         if (val) {
@@ -564,9 +582,9 @@
         });
       },
       //点击日历
-      getClicked(item){
-        if(item.IsEndDate){
-          this.isShowSign=true;
+      getClicked(item) {
+        if (item.IsEndDate) {
+          this.isShowSign = true;
           this.dayMsg.ClassPlanId = item.ClassPlanId;
           this.dayMsg.School_Id = this.setingObj.School_Id;
           this.dayMsg.ClassId = this.setingObj.ClassId;
@@ -575,68 +593,73 @@
         }
       },
       //获取某一天的计划信息
-      getDayClassPlan(){
+      getDayClassPlan() {
         GetDayClassPlan(this.dayMsg).then(res => {
           if (res.Code == 1) {
             this.dayObj = res.Data;
             var d = new Date();
-             var datetime = d.getFullYear() + '-' + (d.getMonth() + 1)+ '-'+ d.getDate();
-             if(this.dayObj.ClassDate==datetime){
-               this.isShowSignBtn=true;
-             }else{
-               this.isShowSignBtn=false;
-             }
-             var count=0;
-             this.dayObj.GuestList.forEach(x=>{
-               if(x.IsCheck==-1){
+            var datetime = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
+            if (this.dayObj.ClassDate == datetime) {
+              this.isShowSignBtn = true;
+            } else {
+              this.isShowSignBtn = false;
+            }
+            var count = 0;
+            this.dayObj.GuestList.forEach(x => {
+              if (x.IsCheck == -1) {
                 count++;
               }
             })
-             if(count==this.dayObj.GuestList.length){
-                this.isSigned=true;
-             }else{
-                this.isSigned=false;
+            if (count == this.dayObj.GuestList.length) {
+              this.isSigned = true;
+            } else {
+              this.isSigned = false;
             }
-             this.dayObj.GuestList.forEach(x=>{
-               if(this.isShowSignBtn&&x.IsCheck==-1){
-                 x.IsCheck=0;
+            this.dayObj.GuestList.forEach(x => {
+              if (this.isShowSignBtn && x.IsCheck == -1) {
+                x.IsCheck = 0;
               }
             })
           }
         })
       },
       //点击切换签到
-      changeStatus(item){
-        if(this.isShowSignBtn){
-          if(item.IsCheck==0){
-            item.IsCheck=1;
-          }else{
-            item.IsCheck=0;
+      changeStatus(item) {
+        if (this.isShowSignBtn) {
+          if (item.IsCheck == 0) {
+            item.IsCheck = 1;
+          } else {
+            item.IsCheck = 0;
           }
         }
       },
       //点击签到
-      saveSign(){
+      saveSign() {
         let signMsg = [];
-        this.dayObj.GuestList.forEach(x=>{
-          let obj={
-            classId:this.setingObj.ClassId,
-            ClassDate:this.comChecked.ClassDateStr,
-            ClassRoomId:this.comChecked.ClassRoomId,
-            School_Id:this.setingObj.School_Id,
-            TeacherId:this.comChecked.TeacherId,
-            OrderGuestId:x.Id,
-            CheckStatus:x.IsCheck
+        this.dayObj.GuestList.forEach(x => {
+          let obj = {
+            classId: this.setingObj.ClassId,
+            ClassDate: this.comChecked.ClassDateStr,
+            ClassRoomId: this.comChecked.ClassRoomId,
+            School_Id: this.setingObj.School_Id,
+            TeacherId: this.comChecked.TeacherId,
+            OrderGuestId: x.Id,
+            CheckStatus: x.IsCheck
           }
           signMsg.push(obj);
         })
         addClassCheck(signMsg).then(res => {
           if (res.Code == 1) {
-            this.isShowSign=false;
+            this.isShowSign = false;
           }
         })
       }
     },
+    watch: {
+      setingObj: function (val, oldval) {
+        this.initData();
+      }
+    }
   }
 
 </script>

src/components/course/record-form.vue

@@ -27,7 +27,7 @@
     background: #ffffff;
     text-align: center;
     line-height: 30px;
-    color:#fff;
+    color: #fff;
   }
 
   .cicle1:first-child {
@@ -43,23 +43,28 @@
     padding-left: 20px;
     background-color: #F0F5FB;
   }
-  .recordForm .reCordRed{
-    color:#FDD5dc;
+
+  .recordForm .reCordRed {
+    color: #FDD5dc;
     background-color: #F72E52;
   }
-  .recordForm .reCordBlue{
-    color:#2961FE;
+
+  .recordForm .reCordBlue {
+    color: #2961FE;
     background-color: #D4DFFF;
   }
-  .recordForm .reCordOrange{
-    color:#F28C1D;
+
+  .recordForm .reCordOrange {
+    color: #F28C1D;
     background-color: #FCE8D2;
   }
-.timecenter_Line{
-  border-left:1px solid #366595; 
-  position:absolute;
-  left:130px;
-}  
+
+  .timecenter_Line {
+    border-left: 1px solid #366595;
+    position: absolute;
+    left: 130px;
+  }
+
 </style>
 <template>
   <div class="page-body">
@@ -72,7 +77,8 @@
         </div>
       </div>
       <div>
-        <div class="col-10" style="margin-top:30px;display:flex;" v-if="dataList.resultList&&dataList.resultList.length>0">
+        <div class="col-10" style="margin-top:30px;display:flex;"
+          v-if="dataList.resultList&&dataList.resultList.length>0">
           <div class="col-4" id="timeleft">
             <div v-for="item in dataList.resultList">
               {{item.YearStr}}-{{item.MonthStr}}-{{item.DayStr}}
@@ -132,16 +138,17 @@
       }
     },
     created() {
-      this.msg.School_Id = this.setingObj.School_Id;
-      this.msg.ClassId = this.setingObj.ClassId;
-      this.msg.TeacherId = this.setingObj.Teacher_Id;
-      this.getRecord();
+
     },
     mounted() {
+      this.getRecord();
       this.GetTeacherList();
     },
     methods: {
       getRecord() {
+        this.msg.School_Id = this.setingObj.School_Id;
+        this.msg.ClassId = this.setingObj.ClassId;
+        this.msg.TeacherId = this.setingObj.Teacher_Id;
         GetClassPlanLogPageList(this.msg).then(res => {
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
@@ -169,10 +176,16 @@
       getTop(index) {
         return index * 77 + 'px';
       },
-      getHeight(data){
-        return (data.length-1)*80+'px'
+      getHeight(data) {
+        return (data.length - 1) * 80 + 'px'
       }
     },
+    watch: {
+      setingObj: function (val, oldval) {
+        this.getRecord();
+        this.GetTeacherList();
+      }
+    }
   }
 
 </script>

src/pages/course/classManage.vue

@@ -22,7 +22,8 @@
           <q-select @input="getClassList" standout="bg-primary text-white" option-value="SId" option-label="SName"
             v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
         </div>
-      </div>    </div>
+      </div>
+    </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
@@ -70,7 +71,8 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="订单中心" @click="gotoOrder(props.row)"></q-btn>
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="订单中心"
+              @click="gotoOrder(props.row)"></q-btn>
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="收支明细"></q-btn>
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
               @click="EditCourse(props.row)" />
@@ -276,6 +278,8 @@
       },
       //点击班级名称
       getClassInfo(obj) {
+        this.classObjOption = null;
+        this.isShowClassInfo = false;
         this.classObjOption = obj;
         this.isShowClassInfo = true;
       }