正在显示
13 个修改的文件
包含
328 行增加
和
107 行删除
@@ -301,9 +301,9 @@ | @@ -301,9 +301,9 @@ | ||
301 | <div class="classManagementRight" id="classManagementRight0"> | 301 | <div class="classManagementRight" id="classManagementRight0"> |
302 | <div class="classManagementRightTitle" id="classManagementRightTitle0"> | 302 | <div class="classManagementRightTitle" id="classManagementRightTitle0"> |
303 | <ul class="liveInfoLeft" id="liveInfoList0"> | 303 | <ul class="liveInfoLeft" id="liveInfoList0"> |
304 | - <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li> | ||
305 | - <li class="liveInfoLeftLi">未开始</li> | ||
306 | - <li class="liveInfoLeftLi">已结束</li> | 304 | + <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">正在直播</li> |
305 | + <li class="liveInfoLeftLi" data="0">未开始</li> | ||
306 | + <li class="liveInfoLeftLi" data="2">已结束</li> | ||
307 | </ul> | 307 | </ul> |
308 | <div class="liveInfoRight" id="liveInfoRight0"> | 308 | <div class="liveInfoRight" id="liveInfoRight0"> |
309 | <input class="liveInfoRightInput" id="liveInfoRightInput0" type="text"> | 309 | <input class="liveInfoRightInput" id="liveInfoRightInput0" type="text"> |
@@ -516,11 +516,6 @@ | @@ -516,11 +516,6 @@ | ||
516 | </div> | 516 | </div> |
517 | <div class="classManagementRight" id="classManagementRight5"> | 517 | <div class="classManagementRight" id="classManagementRight5"> |
518 | <div class="classManagementRightTitle" id="classManagementRightTitle5"> | 518 | <div class="classManagementRightTitle" id="classManagementRightTitle5"> |
519 | - <ul class="liveInfoLeft" id="liveInfoList5"> | ||
520 | - <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li> | ||
521 | - <li class="liveInfoLeftLi">未开始</li> | ||
522 | - <li class="liveInfoLeftLi">已结束</li> | ||
523 | - </ul> | ||
524 | <div class="liveInfoRight" id="liveInfoRight5"> | 519 | <div class="liveInfoRight" id="liveInfoRight5"> |
525 | <input class="liveInfoRightInput" id="liveInfoRightInput5" type="text"> | 520 | <input class="liveInfoRightInput" id="liveInfoRightInput5" type="text"> |
526 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn5" src="images/nav_link_14.png" alt=""> | 521 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn5" src="images/nav_link_14.png" alt=""> |
@@ -532,6 +527,8 @@ | @@ -532,6 +527,8 @@ | ||
532 | <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div> | 527 | <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div> |
533 | </div> | 528 | </div> |
534 | </div> | 529 | </div> |
530 | + <div class="classManagementRightContent" id="courseContent5"> | ||
531 | + </div> | ||
535 | <div class="classHandlerPageBox" id="classHandlerPageBox5"> | 532 | <div class="classHandlerPageBox" id="classHandlerPageBox5"> |
536 | <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> | 533 | <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> |
537 | <tbody> | 534 | <tbody> |
@@ -618,11 +615,6 @@ | @@ -618,11 +615,6 @@ | ||
618 | </div> | 615 | </div> |
619 | <div class="classManagementRight" id="classManagementRight7"> | 616 | <div class="classManagementRight" id="classManagementRight7"> |
620 | <div class="classManagementRightTitle" id="classManagementRightTitle"> | 617 | <div class="classManagementRightTitle" id="classManagementRightTitle"> |
621 | - <ul class="liveInfoLeft" id="liveInfoList"> | ||
622 | - <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li> | ||
623 | - <li class="liveInfoLeftLi">未开始</li> | ||
624 | - <li class="liveInfoLeftLi">已结束</li> | ||
625 | - </ul> | ||
626 | <div class="liveInfoRight" id="liveInfoRight"> | 618 | <div class="liveInfoRight" id="liveInfoRight"> |
627 | <input class="liveInfoRightInput" id="liveInfoRightInput" type="text"> | 619 | <input class="liveInfoRightInput" id="liveInfoRightInput" type="text"> |
628 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt=""> | 620 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt=""> |
@@ -675,15 +667,6 @@ | @@ -675,15 +667,6 @@ | ||
675 | <li class="liveInfoLeftLi">未开始</li> | 667 | <li class="liveInfoLeftLi">未开始</li> |
676 | <li class="liveInfoLeftLi">已结束</li> | 668 | <li class="liveInfoLeftLi">已结束</li> |
677 | </ul> | 669 | </ul> |
678 | - <ul class="liveInfoLeft userClassList" id="userClassList"> | ||
679 | - <li class="liveInfoLeftLi liveInfoLeftLiCheck">老师</li> | ||
680 | - <li class="liveInfoLeftLi">学生</li> | ||
681 | - <li class="liveInfoLeftLi">兼课</li> | ||
682 | - </ul> | ||
683 | - <ul class="liveInfoLeft userClassList" id="aboutClassList"> | ||
684 | - <li class="liveInfoLeftLi liveInfoLeftLiCheck">课程</li> | ||
685 | - <li class="liveInfoLeftLi">老师</li> | ||
686 | - </ul> | ||
687 | <div class="liveInfoRight" id="liveInfoRight"> | 670 | <div class="liveInfoRight" id="liveInfoRight"> |
688 | <input class="liveInfoRightInput" id="liveInfoRightInput" type="text"> | 671 | <input class="liveInfoRightInput" id="liveInfoRightInput" type="text"> |
689 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt=""> | 672 | <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt=""> |
@@ -696,34 +679,6 @@ | @@ -696,34 +679,6 @@ | ||
696 | </div> | 679 | </div> |
697 | </div> | 680 | </div> |
698 | <div class="classManagementRightContent" id="courseContent"> | 681 | <div class="classManagementRightContent" id="courseContent"> |
699 | - <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" id="t_box" class="t_box"> | ||
700 | - <tbody> | ||
701 | - <tr align="center" height="44" class="tr_center" bgcolor="#fff" bordercolor="#e6e6e6"> | ||
702 | - <th width="9%" class="tr_center"> | ||
703 | - 课堂主题 | ||
704 | - </th> | ||
705 | - <th width="8%" class="tr_center"> | ||
706 | - 课堂号 | ||
707 | - </th> | ||
708 | - <th width="8%" class="tr_center"> | ||
709 | - 老师 | ||
710 | - </th> | ||
711 | - <th width="6%" class="tr_center"> | ||
712 | - 课堂状态 | ||
713 | - </th> | ||
714 | - <th width="24%" class="tr_center"> | ||
715 | - 课堂时间 | ||
716 | - </th> | ||
717 | - <th width="6%" class="tr_center"> | ||
718 | - 在线人数 | ||
719 | - </th> | ||
720 | - <th width="22%" class="tr_center"> | ||
721 | - 操作 | ||
722 | - </th> | ||
723 | - </tr> | ||
724 | - </tbody> | ||
725 | - </table> | ||
726 | - | ||
727 | </div> | 682 | </div> |
728 | <div class="classHandlerPageBox" id="classHandlerPageBox"> | 683 | <div class="classHandlerPageBox" id="classHandlerPageBox"> |
729 | <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> | 684 | <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> |
@@ -147,7 +147,7 @@ class AboutClassApe extends Ape { | @@ -147,7 +147,7 @@ class AboutClassApe extends Ape { | ||
147 | type: "POST", | 147 | type: "POST", |
148 | url: _url, | 148 | url: _url, |
149 | timeout:5000, | 149 | timeout:5000, |
150 | - data:{siteId:ClassDataProxy.siteId,userType:ClassDataProxy.USER_TYPE_1}, | 150 | + data:{siteId:ClassDataProxy.siteId,userType:ClassDataProxy.USER_TYPE_8}, |
151 | headers: {siteId:ClassDataProxy.siteId, | 151 | headers: {siteId:ClassDataProxy.siteId, |
152 | pageno:7, | 152 | pageno:7, |
153 | 'page':ind, | 153 | 'page':ind, |
@@ -157,8 +157,10 @@ class AboutClassApe extends Ape { | @@ -157,8 +157,10 @@ class AboutClassApe extends Ape { | ||
157 | if(_data && _data.code == 200){ | 157 | if(_data && _data.code == 200){ |
158 | let ind = $('#aboutClassList4').find('.liveInfoLeftLiCheck').attr('data'); | 158 | let ind = $('#aboutClassList4').find('.liveInfoLeftLiCheck').attr('data'); |
159 | if(ind == 0 ){ | 159 | if(ind == 0 ){ |
160 | + //显示课程界面 | ||
160 | that._gainUserClassData(_data.returnData.data); | 161 | that._gainUserClassData(_data.returnData.data); |
161 | }else{ | 162 | }else{ |
163 | + //显示老师界面 | ||
162 | that._gainUserClassData1(_data.returnData.data); | 164 | that._gainUserClassData1(_data.returnData.data); |
163 | } | 165 | } |
164 | } | 166 | } |
@@ -8,6 +8,7 @@ import $ from "jquery"; | @@ -8,6 +8,7 @@ import $ from "jquery"; | ||
8 | import ClassDataProxy from "proxy/ClassDataProxy"; | 8 | import ClassDataProxy from "proxy/ClassDataProxy"; |
9 | import dateUI from 'libs/laydate'; | 9 | import dateUI from 'libs/laydate'; |
10 | import ErrorApe from "./ErrorApe"; | 10 | import ErrorApe from "./ErrorApe"; |
11 | +import MessageTypes from "../MessageTypes"; | ||
11 | 12 | ||
12 | let loger = Loger.getLoger('PC-CreateClassApe'); | 13 | let loger = Loger.getLoger('PC-CreateClassApe'); |
13 | 14 | ||
@@ -142,7 +143,7 @@ class CreateClassApe extends Ape { | @@ -142,7 +143,7 @@ class CreateClassApe extends Ape { | ||
142 | "h5Module":h5Module, | 143 | "h5Module":h5Module, |
143 | "partcKey":'', | 144 | "partcKey":'', |
144 | "meetingContent":meetingContent, | 145 | "meetingContent":meetingContent, |
145 | - "userName":classTeacherInfo | 146 | + "loginName":classTeacherInfo |
146 | } | 147 | } |
147 | this.classDateList = dateList; | 148 | this.classDateList = dateList; |
148 | $('#scheduleForm1').hide(); | 149 | $('#scheduleForm1').hide(); |
@@ -248,7 +249,7 @@ class CreateClassApe extends Ape { | @@ -248,7 +249,7 @@ class CreateClassApe extends Ape { | ||
248 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting'; | 249 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting'; |
249 | let userName = window.localStorage.getItem('loginName'); | 250 | let userName = window.localStorage.getItem('loginName'); |
250 | let userType = window.localStorage.getItem('userType'); | 251 | let userType = window.localStorage.getItem('userType'); |
251 | - dateList.siteId = 'markettest'; | 252 | + dateList.siteId = 'networkschool'; |
252 | dateList.userId = '123'; | 253 | dateList.userId = '123'; |
253 | dateList.userName = userName; | 254 | dateList.userName = userName; |
254 | dateList.userType = userType; | 255 | dateList.userType = userType; |
@@ -274,7 +275,7 @@ class CreateClassApe extends Ape { | @@ -274,7 +275,7 @@ class CreateClassApe extends Ape { | ||
274 | } | 275 | } |
275 | _enterClass(_data){ | 276 | _enterClass(_data){ |
276 | window.open(_data.meetingUrl); | 277 | window.open(_data.meetingUrl); |
277 | - that._emit(MessageTypes.ADD_CLASS); | 278 | + this._emit(MessageTypes.ADD_CLASS); |
278 | } | 279 | } |
279 | //清空创建课堂数据 | 280 | //清空创建课堂数据 |
280 | _closeCreateClass(){ | 281 | _closeCreateClass(){ |
@@ -39,9 +39,9 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | @@ -39,9 +39,9 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | ||
39 | <td width="8%" class="tr_main">{_course}</td> | 39 | <td width="8%" class="tr_main">{_course}</td> |
40 | <td width="8%" class="tr_main">{_totalNmu}</td> | 40 | <td width="8%" class="tr_main">{_totalNmu}</td> |
41 | <td width="8%" class="tr_main">{_latest}</td> | 41 | <td width="8%" class="tr_main">{_latest}</td> |
42 | - <td width="10%" class="tr_main tr_mainRight" align="center" > | ||
43 | - <a id="{_removeInd}" class="classHandlePort" href="###">删除</a> | ||
44 | - <a id="{_joinInd}" class="classHandlePort"" data="{_aboutMsg}" href="###">查看约课信息</a> | 42 | + <td width="10%" class="tr_main tr_mainRight" align="center"> |
43 | + <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">删除</a> | ||
44 | + <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">查看约课信息</a> | ||
45 | </td> | 45 | </td> |
46 | </tr> | 46 | </tr> |
47 | `; | 47 | `; |
@@ -72,6 +72,8 @@ class CreateUserApe extends Ape { | @@ -72,6 +72,8 @@ class CreateUserApe extends Ape { | ||
72 | $('#classHandlerEndPage3').on('click',this._endPageHandler.bind(this));//尾页 | 72 | $('#classHandlerEndPage3').on('click',this._endPageHandler.bind(this));//尾页 |
73 | $('#classHandlerSpecificPage3').on('click',this._assignPageHandler.bind(this));//指定页 | 73 | $('#classHandlerSpecificPage3').on('click',this._assignPageHandler.bind(this));//指定页 |
74 | 74 | ||
75 | + $('#courseContent3').on('click','.deleteClass',this._deleteClass.bind(this));//删除课堂 | ||
76 | + | ||
75 | } | 77 | } |
76 | 78 | ||
77 | addEvent() { | 79 | addEvent() { |
@@ -159,7 +161,6 @@ class CreateUserApe extends Ape { | @@ -159,7 +161,6 @@ class CreateUserApe extends Ape { | ||
159 | this.pageNo = pageno; | 161 | this.pageNo = pageno; |
160 | $('#classHandlerPageMsg3').html('第'+page+'页/共'+pageno+'页,有'+count+'个记录'); | 162 | $('#classHandlerPageMsg3').html('第'+page+'页/共'+pageno+'页,有'+count+'个记录'); |
161 | courseContent.append(adminListTit); | 163 | courseContent.append(adminListTit); |
162 | - | ||
163 | if(_dataList){ | 164 | if(_dataList){ |
164 | if(count <= 7){ | 165 | if(count <= 7){ |
165 | $('#classHandlerPageBox3').hide(); | 166 | $('#classHandlerPageBox3').hide(); |
@@ -264,6 +265,30 @@ class CreateUserApe extends Ape { | @@ -264,6 +265,30 @@ class CreateUserApe extends Ape { | ||
264 | this._signName(_name);//判断登录名 | 265 | this._signName(_name);//判断登录名 |
265 | } | 266 | } |
266 | } | 267 | } |
268 | + | ||
269 | + _deleteClass(evt){ | ||
270 | + let id = $(evt.target).attr('data'); | ||
271 | + loger.log('删除',id) | ||
272 | + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/delUserByUserId/' + id; | ||
273 | + let that = this; | ||
274 | + $.ajax({ | ||
275 | + type: "PUT", | ||
276 | + url: _url, | ||
277 | + headers: {siteId:ClassDataProxy.siteId, | ||
278 | + 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, | ||
279 | + success:function(_data){ | ||
280 | + loger.log('删除成功',_data) | ||
281 | + if(_data && _data.code == 200){ | ||
282 | + | ||
283 | + that.detailPage(); | ||
284 | + // that._gainClassData(_data.returnData.data); | ||
285 | + } | ||
286 | + }, | ||
287 | + error:function(error){ | ||
288 | + loger.log(error,'失败') | ||
289 | + } | ||
290 | + }) | ||
291 | + } | ||
267 | _signName(_name){ | 292 | _signName(_name){ |
268 | if(!_name.value){ | 293 | if(!_name.value){ |
269 | _name.focus(); | 294 | _name.focus(); |
@@ -134,7 +134,7 @@ class HomeApe extends Ape { | @@ -134,7 +134,7 @@ class HomeApe extends Ape { | ||
134 | _msgImg :'../images/u373.png', | 134 | _msgImg :'../images/u373.png', |
135 | _classroomTitle : _dataList[i].meetingName, | 135 | _classroomTitle : _dataList[i].meetingName, |
136 | _schoolTime : _getTime, | 136 | _schoolTime : _getTime, |
137 | - _subscribeNum : '12人已预约' | 137 | + _subscribeNum : _dataList[i].reservationNumber+'人预约' |
138 | }) | 138 | }) |
139 | liveList.append(_classifyList); | 139 | liveList.append(_classifyList); |
140 | lanclassList.append(_classifyList); | 140 | lanclassList.append(_classifyList); |
@@ -159,7 +159,7 @@ class LanclassApe extends Ape { | @@ -159,7 +159,7 @@ class LanclassApe extends Ape { | ||
159 | _msgImg :'../images/u373.png', | 159 | _msgImg :'../images/u373.png', |
160 | _classroomTitle : _dataList[i].meetingName, | 160 | _classroomTitle : _dataList[i].meetingName, |
161 | _schoolTime : _getTime, | 161 | _schoolTime : _getTime, |
162 | - _subscribeNum : '0人已预约' | 162 | + _subscribeNum : _dataList[i].reservationNumber+'人预约' |
163 | }) | 163 | }) |
164 | classifyListContent.append(_classifyList); | 164 | classifyListContent.append(_classifyList); |
165 | } | 165 | } |
@@ -159,7 +159,7 @@ class LanclassApe extends Ape { | @@ -159,7 +159,7 @@ class LanclassApe extends Ape { | ||
159 | _msgImg :'../images/u373.png', | 159 | _msgImg :'../images/u373.png', |
160 | _classroomTitle : _dataList[i].meetingName, | 160 | _classroomTitle : _dataList[i].meetingName, |
161 | _schoolTime : _getTime, | 161 | _schoolTime : _getTime, |
162 | - _subscribeNum : '0人已预约' | 162 | + _subscribeNum : _dataList[i].reservationNumber+'人预约' |
163 | }) | 163 | }) |
164 | classifyListContent.append(_classifyList); | 164 | classifyListContent.append(_classifyList); |
165 | } | 165 | } |
@@ -286,7 +286,7 @@ class LoginOrRegister extends Ape { | @@ -286,7 +286,7 @@ class LoginOrRegister extends Ape { | ||
286 | ClassDataProxy.status = true; | 286 | ClassDataProxy.status = true; |
287 | ClassDataProxy.id = _data.returnData.data.id; | 287 | ClassDataProxy.id = _data.returnData.data.id; |
288 | // ClassDataProxy.siteId = _data.returnData.data.siteId; | 288 | // ClassDataProxy.siteId = _data.returnData.data.siteId; |
289 | - ClassDataProxy.siteId = 'markettest' | 289 | + ClassDataProxy.siteId = 'networkschool' |
290 | ClassDataProxy.monicker = _data.returnData.data.userName; | 290 | ClassDataProxy.monicker = _data.returnData.data.userName; |
291 | ClassDataProxy.userEmail = _data.returnData.data.userEmail; | 291 | ClassDataProxy.userEmail = _data.returnData.data.userEmail; |
292 | ClassDataProxy.userMobile = _data.returnData.data.userMobile; | 292 | ClassDataProxy.userMobile = _data.returnData.data.userMobile; |
@@ -48,8 +48,8 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | @@ -48,8 +48,8 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | ||
48 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> | 48 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> |
49 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> | 49 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> |
50 | <a id="{_updateInd}" class="classHandlePort" href="###">修改</a> | 50 | <a id="{_updateInd}" class="classHandlePort" href="###">修改</a> |
51 | - <a id="{_removeInd}" class="classHandlePort deleteClass" href="###">删除</a> | ||
52 | - <a data="{_joinInd}" class="classHandlePort joinClass" href="">加入课堂</a> | 51 | + <a data="{_removeInd}" class="classHandlePort deleteClass" href="#">删除</a> |
52 | + <a data="{_joinInd}" class="classHandlePort joinClass" href="#">加入课堂</a> | ||
53 | </td> | 53 | </td> |
54 | </tr> | 54 | </tr> |
55 | `; | 55 | `; |
@@ -131,8 +131,11 @@ class ManagementHomePageApe extends Ape { | @@ -131,8 +131,11 @@ class ManagementHomePageApe extends Ape { | ||
131 | if(_data.code != 200 ){ | 131 | if(_data.code != 200 ){ |
132 | loger.warn(_data.returnData.data.msg) | 132 | loger.warn(_data.returnData.data.msg) |
133 | } | 133 | } |
134 | - that.classDateList = _data.returnData.data; | ||
135 | - that._gainClassData(_data.returnData.data); | 134 | + if(_data && _data.code == 200){ |
135 | + that.classDateList = _data.returnData.data; | ||
136 | + that._gainClassData(_data.returnData.data); | ||
137 | + } | ||
138 | + | ||
136 | }, | 139 | }, |
137 | error:function(error){ | 140 | error:function(error){ |
138 | console.log(error,'失败') | 141 | console.log(error,'失败') |
@@ -143,10 +146,12 @@ class ManagementHomePageApe extends Ape { | @@ -143,10 +146,12 @@ class ManagementHomePageApe extends Ape { | ||
143 | detailPage(){ | 146 | detailPage(){ |
144 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; | 147 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; |
145 | let that = this; | 148 | let that = this; |
149 | + let status = $('#liveInfoList0').find('.liveInfoLeftLiCheck').attr('data'); | ||
150 | + loger.log('当前点击的状态',status) | ||
146 | $.ajax({ | 151 | $.ajax({ |
147 | type: "POST", | 152 | type: "POST", |
148 | url: _url, | 153 | url: _url, |
149 | - data:{siteId:ClassDataProxy.siteId}, | 154 | + data:{siteId:ClassDataProxy.siteId,meetingStatus:status}, |
150 | headers: {siteId:ClassDataProxy.siteId, | 155 | headers: {siteId:ClassDataProxy.siteId, |
151 | pageno:8, | 156 | pageno:8, |
152 | 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, | 157 | 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, |
@@ -176,7 +181,6 @@ class ManagementHomePageApe extends Ape { | @@ -176,7 +181,6 @@ class ManagementHomePageApe extends Ape { | ||
176 | if(count <= 8){ | 181 | if(count <= 8){ |
177 | $('#classHandlerPageBox0').hide(); | 182 | $('#classHandlerPageBox0').hide(); |
178 | } | 183 | } |
179 | - loger.log('课堂信息',_dataList[0].meetingNumber) | ||
180 | for(let i = 0;i<_dataList.length;i++){ | 184 | for(let i = 0;i<_dataList.length;i++){ |
181 | let _adminList = this._format(adminList,{ | 185 | let _adminList = this._format(adminList,{ |
182 | _meetingName : _dataList[i].meetingName, | 186 | _meetingName : _dataList[i].meetingName, |
@@ -189,7 +193,7 @@ class ManagementHomePageApe extends Ape { | @@ -189,7 +193,7 @@ class ManagementHomePageApe extends Ape { | ||
189 | _mediaInd : 'classMedia'+i, | 193 | _mediaInd : 'classMedia'+i, |
190 | _musicInd : 'classMusic'+i, | 194 | _musicInd : 'classMusic'+i, |
191 | _updateInd : 'classUpdate'+i, | 195 | _updateInd : 'classUpdate'+i, |
192 | - _removeInd : 'classRemove'+i, | 196 | + _removeInd : _dataList[i].id, |
193 | _joinInd : _dataList[i].meetingNumber | 197 | _joinInd : _dataList[i].meetingNumber |
194 | }) | 198 | }) |
195 | courseContent.append(_adminList); | 199 | courseContent.append(_adminList); |
@@ -199,45 +203,34 @@ class ManagementHomePageApe extends Ape { | @@ -199,45 +203,34 @@ class ManagementHomePageApe extends Ape { | ||
199 | } | 203 | } |
200 | //删除课堂 | 204 | //删除课堂 |
201 | _deleteClass(evt){ | 205 | _deleteClass(evt){ |
202 | - let ele = $(evt.target).parent().attr('data'); | ||
203 | - loger.log('删除',ele) | ||
204 | - let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProtDomain + '/3m/meeting/updateToCancel.do'; | ||
205 | - let that = this; | 206 | + let id = $(evt.target).attr('data'); |
207 | + loger.log('删除课堂',id) | ||
208 | + //http://networkshool.xuedianyun.com/3m/conference_domain.do# | ||
206 | $.ajax({ | 209 | $.ajax({ |
207 | - type: "PUT", | ||
208 | - url: _url, | 210 | + type: "POST", |
211 | + url: "http://networkshool.xuedianyun.com/3m/meeting/updateToCancel.do", | ||
209 | dataType: "text", | 212 | dataType: "text", |
210 | - data:"meeting.id=" + ele + "&temp=" + new Date().getTime(), | ||
211 | - headers: {siteId:ClassDataProxy.siteId, | ||
212 | - 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, | 213 | + data:"meeting.id=" + id + "&temp=" + new Date().getTime(), |
213 | success:function(_data){ | 214 | success:function(_data){ |
214 | - if(_data && _data.code == 200){ | ||
215 | - loger.log('删除成功',_data) | ||
216 | - that.detailPage(); | ||
217 | - // that._gainClassData(_data.returnData.data); | ||
218 | - } | 215 | + loger.log('删除课堂',_data) |
216 | + window.location.href = "http://networkshool.xuedianyun.com/3m/conference_domain.do"; | ||
219 | }, | 217 | }, |
220 | error:function(error){ | 218 | error:function(error){ |
221 | loger.log(error,'失败') | 219 | loger.log(error,'失败') |
220 | + window.location.href = "http://networkshool.xuedianyun.com/3m/conference_domain.do"; | ||
222 | } | 221 | } |
223 | }) | 222 | }) |
224 | } | 223 | } |
225 | - playRecord(meetingNumber) { | ||
226 | - let location = "/3m/doPlayRecord.do?meetingNumber=" + meetingNumber; | ||
227 | - window.open(location, target = "_blank"); | ||
228 | - } | ||
229 | _joinClass(evt){ | 224 | _joinClass(evt){ |
230 | let _data = $(evt.target).attr('data'); | 225 | let _data = $(evt.target).attr('data'); |
231 | - // window.open('/3m/attend.do?meetingNumber=' + _data, target = "_blank"); | ||
232 | - // $(evt.target).attr('src','/3m/attend.do?meetingNumber=' + _data); | ||
233 | - $(evt.target).attr('href','http://market.xuedianyun.com/3m/attend.do?meetingNumber=' + _data); | ||
234 | - $(evt.target).attr('target', '_blank'); | 226 | + window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + _data); |
235 | } | 227 | } |
236 | _switchover(evt){ | 228 | _switchover(evt){ |
237 | $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); | 229 | $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); |
238 | } | 230 | } |
239 | _liveInfoLeftLiHandler(evt){ | 231 | _liveInfoLeftLiHandler(evt){ |
240 | this._switchover(evt); | 232 | this._switchover(evt); |
233 | + this.detailPage(); | ||
241 | } | 234 | } |
242 | //工具类 | 235 | //工具类 |
243 | _format(str, obj) { | 236 | _format(str, obj) { |
@@ -74,7 +74,7 @@ class MyCenterApe extends Ape { | @@ -74,7 +74,7 @@ class MyCenterApe extends Ape { | ||
74 | this._curriculumInfo(); | 74 | this._curriculumInfo(); |
75 | } | 75 | } |
76 | $('#teacherMyCenterName').text(ClassDataProxy.loginName); | 76 | $('#teacherMyCenterName').text(ClassDataProxy.loginName); |
77 | - $('.myCenterContentBox').eq(0).show(); | 77 | + $('.myCenterContentBox').eq(0).show().siblings().hide(); |
78 | let newDate = new Date(); | 78 | let newDate = new Date(); |
79 | let newHours = newDate.getHours(); | 79 | let newHours = newDate.getHours(); |
80 | let text = newHours>12?'下午好,':'上午好,' | 80 | let text = newHours>12?'下午好,':'上午好,' |
@@ -146,10 +146,8 @@ class MyCenterApe extends Ape { | @@ -146,10 +146,8 @@ class MyCenterApe extends Ape { | ||
146 | if(setPhone != userMobile){ | 146 | if(setPhone != userMobile){ |
147 | signInfo.userMobile = setPhone; | 147 | signInfo.userMobile = setPhone; |
148 | } | 148 | } |
149 | - loger.log(signInfo) | ||
150 | let that = this; | 149 | let that = this; |
151 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/updateUserByUserId/' + id; | 150 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/updateUserByUserId/' + id; |
152 | - loger.log(_url) | ||
153 | $.ajax({ | 151 | $.ajax({ |
154 | type: "PUT", | 152 | type: "PUT", |
155 | url: _url, | 153 | url: _url, |
@@ -158,21 +156,25 @@ class MyCenterApe extends Ape { | @@ -158,21 +156,25 @@ class MyCenterApe extends Ape { | ||
158 | 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, | 156 | 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, |
159 | data:signInfo, | 157 | data:signInfo, |
160 | success:function(_data){ | 158 | success:function(_data){ |
161 | - loger.log('修改信息成功',_data) | 159 | + loger.log('修改信息',_data) |
162 | //获取个人信息数据 | 160 | //获取个人信息数据 |
163 | if(_data && _data.code == 200){ | 161 | if(_data && _data.code == 200){ |
164 | loger.log('修改信息成功',_data) | 162 | loger.log('修改信息成功',_data) |
165 | ErrorApe.showWarnError('修改信息成功'); | 163 | ErrorApe.showWarnError('修改信息成功'); |
166 | - ClassDataProxy.loginName =_data.returnData.data.loginName; | ||
167 | - ClassDataProxy.monicker = _data.returnData.data.userName; | ||
168 | - ClassDataProxy.userEmail = _data.returnData.data.userEmail; | ||
169 | - ClassDataProxy.userMobile = _data.returnData.data.userMobile; | 164 | + ClassDataProxy.loginName =_data.returnData.data.loginName; |
165 | + ClassDataProxy.monicker = _data.returnData.data.userName; | ||
166 | + ClassDataProxy.userEmail = _data.returnData.data.userEmail; | ||
167 | + ClassDataProxy.userMobile = _data.returnData.data.userMobile; | ||
170 | window.localStorage.setItem('loginName', ClassDataProxy.loginName); | 168 | window.localStorage.setItem('loginName', ClassDataProxy.loginName); |
171 | window.localStorage.setItem('monicker', ClassDataProxy.monicker); | 169 | window.localStorage.setItem('monicker', ClassDataProxy.monicker); |
172 | window.localStorage.setItem('userEmail', ClassDataProxy.userEmail); | 170 | window.localStorage.setItem('userEmail', ClassDataProxy.userEmail); |
173 | window.localStorage.setItem('userMobile', ClassDataProxy.userMobile); | 171 | window.localStorage.setItem('userMobile', ClassDataProxy.userMobile); |
174 | - } | ||
175 | 172 | ||
173 | + }else if(_data.code == 400){ | ||
174 | + ErrorApe.showWarnError('账号未修改'); | ||
175 | + }else{ | ||
176 | + ErrorApe.showWarnError(_data.returnData.data.msg); | ||
177 | + } | ||
176 | }, | 178 | }, |
177 | error:function(error){ | 179 | error:function(error){ |
178 | // alert('老师界面获取数据失败') | 180 | // alert('老师界面获取数据失败') |
@@ -208,10 +210,8 @@ class MyCenterApe extends Ape { | @@ -208,10 +210,8 @@ class MyCenterApe extends Ape { | ||
208 | _accountMobilelBtnHandler(){ | 210 | _accountMobilelBtnHandler(){ |
209 | this.data = 2; | 211 | this.data = 2; |
210 | this._showInputBox(this.data); | 212 | this._showInputBox(this.data); |
211 | - loger.log(this.data) | ||
212 | } | 213 | } |
213 | _myCenterBoxHandler(){ | 214 | _myCenterBoxHandler(){ |
214 | - loger.log(ClassDataProxy.userType) | ||
215 | if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_2){ | 215 | if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_2){ |
216 | return; | 216 | return; |
217 | } | 217 | } |
src/ape/PlayRecordApe.js
0 → 100644
1 | +//* | ||
2 | +// 录制管理模块 | ||
3 | +// */ | ||
4 | + | ||
5 | +import Loger from "../Loger"; | ||
6 | +import Ape from "./Ape"; | ||
7 | +import $ from "jquery"; | ||
8 | +import ClassDataProxy from "proxy/ClassDataProxy"; | ||
9 | +import ErrorApe from "./ErrorApe"; | ||
10 | + | ||
11 | +let loger = Loger.getLoger('PC-PlayRecordApe'); | ||
12 | +const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" class="t_box"> | ||
13 | + <tbody> | ||
14 | + <tr align="center" height="44" class="tr_center" bgcolor="#fff" bordercolor="#e6e6e6"> | ||
15 | + <th width="8%" class="tr_center"> | ||
16 | + 课堂主题 | ||
17 | + </th> | ||
18 | + <th width="8%" class="tr_center"> | ||
19 | + 课堂号 | ||
20 | + </th> | ||
21 | + <th width="8%" class="tr_center"> | ||
22 | + 录制人 | ||
23 | + </th> | ||
24 | + <th width="8%" class="tr_center"> | ||
25 | + 录制开始时间 | ||
26 | + </th> | ||
27 | + <th width="8%" class="tr_center"> | ||
28 | + 录制结束时间 | ||
29 | + </th> | ||
30 | + <th width="10%" class="tr_center"> | ||
31 | + 操作 | ||
32 | + </th> | ||
33 | + </tr> | ||
34 | +`; | ||
35 | +//管理首页 | ||
36 | +const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor="#e6e6e6"> | ||
37 | + <td width="8%" class="tr_main tr_mainLeft">{_loginName}</td> | ||
38 | + <td width="8%" class="tr_main">{_userName}</td> | ||
39 | + <td width="8%" class="tr_main">{_course}</td> | ||
40 | + <td width="8%" class="tr_main">{_totalNmu}</td> | ||
41 | + <td width="8%" class="tr_main">{_latest}</td> | ||
42 | + <td width="10%" class="tr_main tr_mainRight" align="center"> | ||
43 | + <a id="{_removeInd}" class="classHandlePort playRecord" data="{_userName}" href="#">播放</a> | ||
44 | + <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">删除</a> | ||
45 | + <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">设置为非公开</a> | ||
46 | + </td> | ||
47 | + </tr> | ||
48 | +`; | ||
49 | +const adminListEnd = `</tbody></table>`; | ||
50 | +class PlayRecordApe extends Ape { | ||
51 | + constructor() { | ||
52 | + super(); | ||
53 | + this.pageNo = 0; | ||
54 | + this.presentInd = 1; | ||
55 | + this.addEvent(); | ||
56 | + this.init(); | ||
57 | + } | ||
58 | + | ||
59 | + init() { | ||
60 | + | ||
61 | + $('#userClassList5 li').on('click',this._userClassListHandler.bind(this));//用户列表 | ||
62 | + | ||
63 | + //录制回放 | ||
64 | + $('#classHandlerHomePage5').on('click',this._homePageHandler.bind(this));//首页 | ||
65 | + $('#classHandlerUpPage5').on('click',this._upPageHandler.bind(this));//上页 | ||
66 | + $('#classHandlerDownPage5').on('click',this._downPageHandler.bind(this));//下页 | ||
67 | + $('#classHandlerEndPage5').on('click',this._endPageHandler.bind(this));//尾页 | ||
68 | + $('#classHandlerSpecificPage5').on('click',this._assignPageHandler.bind(this));//指定页 | ||
69 | + | ||
70 | + $('#courseContent5').on('click','.playRecord',this.playRecord.bind(this));//回放 | ||
71 | + $('#courseContent5').on('click','.deleteClass',this.deleteRecord.bind(this));//删除 | ||
72 | + | ||
73 | + | ||
74 | + | ||
75 | + } | ||
76 | + | ||
77 | + addEvent() { | ||
78 | + | ||
79 | + } | ||
80 | + | ||
81 | + _switchover(evt){ | ||
82 | + $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); | ||
83 | + } | ||
84 | + playRecord(evt) { | ||
85 | + let ind = $(evt.target).attr('data'); | ||
86 | + window.open("http://networkshool.xuedianyun.com/3m/doPlayRecord.do?meetingNumber=" + ind); | ||
87 | + } | ||
88 | + deleteRecord(evt){ | ||
89 | + let ind = $(evt.target).attr('data'); | ||
90 | + $.ajax({ | ||
91 | + type : 'POST', | ||
92 | + url : 'http://networkshool.xuedianyun.com/recordingMeeting/deleteRecordingMeeting.do', | ||
93 | + dataType: "text", | ||
94 | + data: "recordingMeeting.id=" + id + "&temp=" + new Date().getTime(), | ||
95 | + success : function(_data){ | ||
96 | + loger.log('_data','删除回放数据') | ||
97 | + }, | ||
98 | + error: function () { | ||
99 | + loger.log("Request.failed !"); | ||
100 | + } | ||
101 | + }) | ||
102 | + } | ||
103 | + _userClassListHandler(evt){ | ||
104 | + this._switchover(evt); | ||
105 | + this.detailPage(1); | ||
106 | + } | ||
107 | + //首页 | ||
108 | + _homePageHandler(){ | ||
109 | + this.presentInd = 1; | ||
110 | + this.detailPage(this.presentInd); | ||
111 | + } | ||
112 | + //上页 | ||
113 | + _upPageHandler(){ | ||
114 | + if(this.presentInd >1){ | ||
115 | + this.presentInd--; | ||
116 | + this.detailPage(this.presentInd); | ||
117 | + } | ||
118 | + } | ||
119 | + //下页 | ||
120 | + _downPageHandler(){ | ||
121 | + if(this.presentInd < this.pageNo){ | ||
122 | + this.presentInd++; | ||
123 | + this.detailPage(this.presentInd); | ||
124 | + } | ||
125 | + } | ||
126 | + //尾页 | ||
127 | + _endPageHandler(){ | ||
128 | + this.presentInd = this.pageNo; | ||
129 | + this.detailPage(this.presentInd); | ||
130 | + } | ||
131 | + //指定页 | ||
132 | + _assignPageHandler(){ | ||
133 | + let inputVal = $('#classHandlerPageInfoInput5').val(); | ||
134 | + if(parseInt(inputVal) <= this.pageNo || parseInt(inputVal) >= 1 ){ | ||
135 | + this.detailPage(parseInt(inputVal)); | ||
136 | + } | ||
137 | + } | ||
138 | + detailPage(ind){ | ||
139 | + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; | ||
140 | + let that = this; | ||
141 | + $.ajax({ | ||
142 | + type: "POST", | ||
143 | + url: _url, | ||
144 | + data:{siteId : ClassDataProxy.siteId}, | ||
145 | + headers: {siteId:ClassDataProxy.siteId, | ||
146 | + pageno:7, | ||
147 | + page:ind, | ||
148 | + 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, | ||
149 | + success:function(_data){ | ||
150 | + if(_data && _data.code == 200){ | ||
151 | + loger.log(_data,'录制回放数据信息') | ||
152 | + that._gainUserClassData(_data.returnData.data); | ||
153 | + } | ||
154 | + }, | ||
155 | + error:function(error){ | ||
156 | + console.log(error,'失败') | ||
157 | + } | ||
158 | + }) | ||
159 | + } | ||
160 | + _gainUserClassData(_data){ | ||
161 | + let _dataList = _data.meetingInfo; | ||
162 | + let courseContent = $('#courseContent5'); | ||
163 | + courseContent.empty(); | ||
164 | + let count = _data.count; | ||
165 | + let page = _data.page; | ||
166 | + let pageno = _data.pageno; | ||
167 | + this.pageNo = pageno; | ||
168 | + $('#classHandlerPageMsg5').html('第'+page+'页/共'+pageno+'页,有'+count+'个记录'); | ||
169 | + courseContent.append(adminListTit); | ||
170 | + if(_dataList){ | ||
171 | + if(count <= 7){ | ||
172 | + $('#classHandlerPageBox5').hide(); | ||
173 | + } | ||
174 | + for(let i = 0;i<_dataList.length;i++){ | ||
175 | + let _adminList = this._format(adminList,{ | ||
176 | + _loginName : _dataList[i].meetingName, | ||
177 | + _userName : _dataList[i].meetingNumber, | ||
178 | + _course : _dataList[i].create_user, | ||
179 | + _totalNmu : _dataList[i].beginTime, | ||
180 | + _latest : _dataList[i].endTime, | ||
181 | + _removeInd : 'classDoc'+i, | ||
182 | + _joinInd : 'classMedia'+i, | ||
183 | + _aboutMsg : _dataList[i].id | ||
184 | + }) | ||
185 | + courseContent.append(_adminList); | ||
186 | + } | ||
187 | + courseContent.append(adminListEnd); | ||
188 | + } | ||
189 | + } | ||
190 | + | ||
191 | + //工具类 | ||
192 | + _format(str, obj) { | ||
193 | + return str.replace(/\{(\w+)\}/g, function (match, group, index) { | ||
194 | + return obj[group]; | ||
195 | + }); | ||
196 | + }; | ||
197 | +} | ||
198 | +export default PlayRecordApe; |
@@ -21,6 +21,7 @@ import CreateUserApe from 'ape/CreateUserApe';//创建用户界面 | @@ -21,6 +21,7 @@ import CreateUserApe from 'ape/CreateUserApe';//创建用户界面 | ||
21 | import AboutClassApe from 'ape/AboutClassApe';//约课界面 | 21 | import AboutClassApe from 'ape/AboutClassApe';//约课界面 |
22 | import ListDetailsApe from 'ape/ListDetailsApe';//列表详情 | 22 | import ListDetailsApe from 'ape/ListDetailsApe';//列表详情 |
23 | import AdministratorApe from 'ape/AdministratorApe';//管理员 | 23 | import AdministratorApe from 'ape/AdministratorApe';//管理员 |
24 | +import PlayRecordApe from 'ape/PlayRecordApe';//录制管理 | ||
24 | import MyCenterApe from 'ape/MyCenterApe';//个人中心 | 25 | import MyCenterApe from 'ape/MyCenterApe';//个人中心 |
25 | import SubscribeApe from 'ape/SubscribeApe';//预约 | 26 | import SubscribeApe from 'ape/SubscribeApe';//预约 |
26 | import MessageTypes from "MessageTypes"; | 27 | import MessageTypes from "MessageTypes"; |
@@ -41,12 +42,13 @@ let _createUserApe; | @@ -41,12 +42,13 @@ let _createUserApe; | ||
41 | let _aboutClassApe; | 42 | let _aboutClassApe; |
42 | let _listDetailsApe; | 43 | let _listDetailsApe; |
43 | let _administratorApe; | 44 | let _administratorApe; |
45 | +let _playRecordApe; | ||
44 | let _myCenterApe; | 46 | let _myCenterApe; |
45 | let _subscribeApe; | 47 | let _subscribeApe; |
46 | 48 | ||
47 | class Main { | 49 | class Main { |
48 | constructor() { | 50 | constructor() { |
49 | - this.clientVersion="v1.7.4.20170908"; | 51 | + this.clientVersion="v1.7.5.20170908"; |
50 | loger.warn("clientVersion:"+this.clientVersion); | 52 | loger.warn("clientVersion:"+this.clientVersion); |
51 | 53 | ||
52 | let locationProtocol= location.protocol; | 54 | let locationProtocol= location.protocol; |
@@ -154,7 +156,8 @@ class Main { | @@ -154,7 +156,8 @@ class Main { | ||
154 | //管理员 | 156 | //管理员 |
155 | _administratorApe = new AdministratorApe(); | 157 | _administratorApe = new AdministratorApe(); |
156 | _administratorApe.on(MessageTypes.SWITCH_CLASS,this.switchClass.bind(this)); | 158 | _administratorApe.on(MessageTypes.SWITCH_CLASS,this.switchClass.bind(this)); |
157 | - | 159 | + //录制回放 |
160 | + _playRecordApe = new PlayRecordApe(); | ||
158 | 161 | ||
159 | //个人中心 | 162 | //个人中心 |
160 | _myCenterApe = new MyCenterApe(); | 163 | _myCenterApe = new MyCenterApe(); |
@@ -222,6 +225,7 @@ class Main { | @@ -222,6 +225,7 @@ class Main { | ||
222 | break; | 225 | break; |
223 | case 5: | 226 | case 5: |
224 | //录制管理 | 227 | //录制管理 |
228 | + _playRecordApe.detailPage(1); | ||
225 | break; | 229 | break; |
226 | case 6: | 230 | case 6: |
227 | //站点配置 | 231 | //站点配置 |
@@ -168,6 +168,49 @@ class ClassDataProxy { | @@ -168,6 +168,49 @@ class ClassDataProxy { | ||
168 | } | 168 | } |
169 | return Sys; | 169 | return Sys; |
170 | } | 170 | } |
171 | + //判断是否是直播状态 | ||
172 | + static getTimeCompareSize(start,end){ | ||
173 | + let newDate = Date.parse(new Date()); | ||
174 | + //开始时间 | ||
175 | + let newTime = Date.parse(new Date(start)) | ||
176 | + //结束时间 | ||
177 | + let oldTime = Date.parse(new Date(end)) | ||
178 | + | ||
179 | + if(newDate - oldTime > 0 ){ | ||
180 | + console.log('正在直播') | ||
181 | + return 0; | ||
182 | + }else if(newDate < oldTime < 0){ | ||
183 | + console.log('未开始') | ||
184 | + return 1; | ||
185 | + }else if(newDate - oldTime < 0){ | ||
186 | + console.log('已结束') | ||
187 | + return 2; | ||
188 | + } | ||
189 | + | ||
190 | + | ||
191 | + /*let newTime = new Date(); | ||
192 | + let newStart = new Date(start) | ||
193 | + | ||
194 | + let date = newStart.getDate() - newTime.getDate(); | ||
195 | + | ||
196 | + let newHours = newStart.getHours();//小时 | ||
197 | + let oldHours = newTime.getHours(); | ||
198 | + let newMonth = newStart.getMonth()+1;//月 | ||
199 | + let oldMonth = newTime.getMonth()+1; | ||
200 | + let newDate = newStart.getDate();//日 | ||
201 | + | ||
202 | + let newEndHours = oldHours <10 ? '0' + oldHours : oldHours; | ||
203 | + let newStartHours = newHours <10 ? '0' + newHours : newHours; | ||
204 | + | ||
205 | + let newStartDate = newStart.getDate()+1<10?'0'+newStart.getDate():newStart.getDate(); | ||
206 | + let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay(); | ||
207 | + | ||
208 | + if(date < 0){ | ||
209 | + return '结束了'; | ||
210 | + }else if( date > 0){ | ||
211 | + return '未结束'; | ||
212 | + }*/ | ||
213 | + } | ||
171 | //计算时间差值显示列表 | 214 | //计算时间差值显示列表 |
172 | static getTimeDifference(start,end){ | 215 | static getTimeDifference(start,end){ |
173 | let newTime = new Date(); | 216 | let newTime = new Date(); |
@@ -227,7 +270,7 @@ ClassDataProxy.password ="" | @@ -227,7 +270,7 @@ ClassDataProxy.password ="" | ||
227 | ClassDataProxy.token =""; | 270 | ClassDataProxy.token =""; |
228 | ClassDataProxy.status = false; | 271 | ClassDataProxy.status = false; |
229 | ClassDataProxy.id = ''; | 272 | ClassDataProxy.id = ''; |
230 | -ClassDataProxy.siteId = 'markettest'; | 273 | +ClassDataProxy.siteId = ''; |
231 | ClassDataProxy.userMobile = ''; | 274 | ClassDataProxy.userMobile = ''; |
232 | ClassDataProxy.userEmail = ''; | 275 | ClassDataProxy.userEmail = ''; |
233 | ClassDataProxy.monicker = ""; | 276 | ClassDataProxy.monicker = ""; |
@@ -268,8 +311,8 @@ ClassDataProxy.curVideoQuality = 2;//画面质量 0-低;1-中;2-高; | @@ -268,8 +311,8 @@ ClassDataProxy.curVideoQuality = 2;//画面质量 0-低;1-中;2-高; | ||
268 | ClassDataProxy.ssTunnelAppURL = '';//屏幕共享插件的地址 | 311 | ClassDataProxy.ssTunnelAppURL = '';//屏幕共享插件的地址 |
269 | ClassDataProxy.locationProtocol="http://"; | 312 | ClassDataProxy.locationProtocol="http://"; |
270 | 313 | ||
271 | -//ClassDataProxy.locationProt = "192.168.31.8:3000";//端口 | ||
272 | -ClassDataProxy.locationProt = "123.56.73.119:3000";//端口 | 314 | +ClassDataProxy.locationProt = "192.168.31.8:3000";//端口 |
315 | +//ClassDataProxy.locationProt = "123.56.73.119:3000";//端口 | ||
273 | ClassDataProxy.locationProtDomain = "market.xuedianyun.com/";//端口 | 316 | ClassDataProxy.locationProtDomain = "market.xuedianyun.com/";//端口 |
274 | 317 | ||
275 | ClassDataProxy.SCENE_DOC=0; | 318 | ClassDataProxy.SCENE_DOC=0; |
-
请 注册 或 登录 后发表评论