修改用户信息，整理管理员列表

董佳音
Commit 4dcb3fc1fabd199f01e1b82a7b401bdc5eeaf0bf 4dcb3fc1 1 parent 204120c0
dist/stylesheets/style.css
etc/umd.template.html
src/MessageTypes.js
src/ape/AdministratorApe.js
src/ape/CreateClassApe.js
src/ape/CreateUserApe.js
src/ape/LoginOrRegister.js
src/ape/ManagementHomePageApe.js
src/main.js
src/proxy/ClassDataProxy.js
--- a/dist/stylesheets/style.css
查看文件 @4dcb3fc
+++ b/dist/stylesheets/style.css
查看文件 @4dcb3fc
@@ -27,7 +27,7 @@ a {
 }
 a:hover {
-  color: #f30;
+  color: #58afed;
   text-decoration: none;
 }
--- a/etc/umd.template.html
查看文件 @4dcb3fc
+++ b/etc/umd.template.html
查看文件 @4dcb3fc
@@ -426,9 +426,9 @@
                     </div>
                     <div class="classManagementRightTitle" id="classManagementRightTitle3">
                         <ul class="liveInfoLeft userClassList" id="userClassList3">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">老师</li>
-                            <li class="liveInfoLeftLi">学生</li>
-                            <li class="liveInfoLeftLi">兼课</li>
+                            <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">老师</li>
+                            <li class="liveInfoLeftLi" data="8">学生</li>
+                            <li class="liveInfoLeftLi" data="2">兼课</li>
                         </ul>
                         <div class="liveInfoRight" id="liveInfoRight3">
                             <input class="liveInfoRightInput" id="liveInfoRightInput3" type="text">
@@ -515,90 +515,47 @@
                     </div>
                 </div>
                 <div class="classManagementRight" id="classManagementRight5">
-                    <div class="addUserBtn" id="addUserBtn">
-                        <label class="addUserIcon"></label>
-                        <span class="addUserText">添加用户</span>
-                    </div>
-                    <div class="classManagementRightTitle" id="classManagementRightTitle">
-                        <ul class="liveInfoLeft" id="liveInfoList">
+                    <div class="classManagementRightTitle" id="classManagementRightTitle5">
+                        <ul class="liveInfoLeft" id="liveInfoList5">
                             <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li>
                             <li class="liveInfoLeftLi">未开始</li>
                             <li class="liveInfoLeftLi">已结束</li>
                         </ul>
-                        <ul class="liveInfoLeft userClassList" id="userClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">老师</li>
-                            <li class="liveInfoLeftLi">学生</li>
-                            <li class="liveInfoLeftLi">兼课</li>
-                        </ul>
-                        <ul class="liveInfoLeft userClassList" id="aboutClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">课程</li>
-                            <li class="liveInfoLeftLi">老师</li>
-                        </ul>
-                        <div class="liveInfoRight" id="liveInfoRight">
-                            <input class="liveInfoRightInput" id="liveInfoRightInput" type="text">
-                            <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt="">
+                        <div class="liveInfoRight" id="liveInfoRight5">
+                            <input class="liveInfoRightInput" id="liveInfoRightInput5" type="text">
+                            <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn5" src="images/nav_link_14.png" alt="">
                         </div>
-                        <div class="liveInfoCenter" id="liveInfoCenter">
+                        <div class="liveInfoCenter" id="liveInfoCenter5">
                             <span class="liveInfoCenterTime">时间</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveStart"></div>
+                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveStart5"></div>
                             <span class="liveInfoCenterTime">至</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd"></div>
+                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div>
                         </div>
                     </div>
-                    <div class="classManagementRightContent" id="courseContent">
-                        <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" id="t_box" class="t_box">
-                            <tbody>
-                            <tr align="center" height="44" class="tr_center" bgcolor="#fff" bordercolor="#e6e6e6">
-                                <th width="9%" class="tr_center">
-                                    课堂主题
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    课堂号
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    老师
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    课堂状态
-                                </th>
-                                <th width="24%" class="tr_center">
-                                    课堂时间
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    在线人数
-                                </th>
-                                <th width="22%" class="tr_center">
-                                    操作
-                                </th>
-                            </tr>
-                            </tbody>
-                        </table>
-
-                    </div>
-                    <div class="classHandlerPageBox" id="classHandlerPageBox">
+                    <div class="classHandlerPageBox" id="classHandlerPageBox5">
                         <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
                             <tbody>
                             <tr>
                                 <td height="60" colspan="11" class="tr_bottom" style="">
-                                    <span class="classHandlerPageMsg" id="classHandlerPageMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
+                                    <span class="classHandlerPageMsg" id="classHandlerPageMsg5" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
                                     <ul class="classHandlerPageInfoBox">
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerHomePage" id="classHandlerHomePage">首页</span>
+                                            <span class="classHandlerHomePage" id="classHandlerHomePage5">首页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerUpPage" id="classHandlerUpPage">上一页</span>
+                                            <span class="classHandlerUpPage" id="classHandlerUpPage5">上一页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerDownPage" id="classHandlerDownPage">下一页</span>
+                                            <span class="classHandlerDownPage" id="classHandlerDownPage5">下一页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerEndPage" id="classHandlerEndPage">尾页</span>
+                                            <span class="classHandlerEndPage" id="classHandlerEndPage5">尾页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <input id="classHandlerPageInfoInput" class="classHandlerPageInfoInput" type="text">
+                                            <input id="classHandlerPageInfoInput5" class="classHandlerPageInfoInput" type="text">
                                         </li>
                                         <li class="classHandlerPageInfo classHandlerPageInfoCheck">
-                                            <span id="classHandlerSpecificPage">GO</span>
+                                            <span id="classHandlerSpecificPage5">GO</span>
                                         </li>
                                     </ul>
                                 </td>
@@ -608,90 +565,49 @@
                     </div>
                 </div>
                 <div class="classManagementRight" id="classManagementRight6">
-                    <div class="addUserBtn" id="addUserBtn">
-                        <label class="addUserIcon"></label>
-                        <span class="addUserText">添加用户</span>
-                    </div>
-                    <div class="classManagementRightTitle" id="classManagementRightTitle">
+                    <div class="classManagementRightTitle" id="classManagementRightTitle6">
                         <ul class="liveInfoLeft" id="liveInfoList">
                             <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li>
                             <li class="liveInfoLeftLi">未开始</li>
                             <li class="liveInfoLeftLi">已结束</li>
                         </ul>
-                        <ul class="liveInfoLeft userClassList" id="userClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">老师</li>
-                            <li class="liveInfoLeftLi">学生</li>
-                            <li class="liveInfoLeftLi">兼课</li>
-                        </ul>
-                        <ul class="liveInfoLeft userClassList" id="aboutClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">课程</li>
-                            <li class="liveInfoLeftLi">老师</li>
-                        </ul>
-                        <div class="liveInfoRight" id="liveInfoRight">
-                            <input class="liveInfoRightInput" id="liveInfoRightInput" type="text">
-                            <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt="">
+                        <div class="liveInfoRight" id="liveInfoRight6">
+                            <input class="liveInfoRightInput" id="liveInfoRightInput6" type="text">
+                            <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn6" src="images/nav_link_14.png" alt="">
                         </div>
-                        <div class="liveInfoCenter" id="liveInfoCenter">
+                        <div class="liveInfoCenter" id="liveInfoCenter6">
                             <span class="liveInfoCenterTime">时间</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveStart"></div>
+                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveStart6"></div>
                             <span class="liveInfoCenterTime">至</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd"></div>
+                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd6"></div>
                         </div>
                     </div>
-                    <div class="classManagementRightContent" id="courseContent">
-                        <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" id="t_box" class="t_box">
-                            <tbody>
-                            <tr align="center" height="44" class="tr_center" bgcolor="#fff" bordercolor="#e6e6e6">
-                                <th width="9%" class="tr_center">
-                                    课堂主题
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    课堂号
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    老师
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    课堂状态
-                                </th>
-                                <th width="24%" class="tr_center">
-                                    课堂时间
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    在线人数
-                                </th>
-                                <th width="22%" class="tr_center">
-                                    操作
-                                </th>
-                            </tr>
-                            </tbody>
-                        </table>
-
+                    <div class="classManagementRightContent" id="courseContent6">
                     </div>
-                    <div class="classHandlerPageBox" id="classHandlerPageBox">
+                    <div class="classHandlerPageBox" id="classHandlerPageBox6">
                         <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
                             <tbody>
                             <tr>
                                 <td height="60" colspan="11" class="tr_bottom" style="">
-                                    <span class="classHandlerPageMsg" id="classHandlerPageMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
+                                    <span class="classHandlerPageMsg" id="classHandlerPageMsg6" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
                                     <ul class="classHandlerPageInfoBox">
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerHomePage" id="classHandlerHomePage">首页</span>
+                                            <span class="classHandlerHomePage" id="classHandlerHomePage6">首页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerUpPage" id="classHandlerUpPage">上一页</span>
+                                            <span class="classHandlerUpPage" id="classHandlerUpPage6">上一页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerDownPage" id="classHandlerDownPage">下一页</span>
+                                            <span class="classHandlerDownPage" id="classHandlerDownPage6">下一页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <span class="classHandlerEndPage" id="classHandlerEndPage">尾页</span>
+                                            <span class="classHandlerEndPage" id="classHandlerEndPage6">尾页</span>
                                         </li>
                                         <li class="classHandlerPageInfo">
-                                            <input id="classHandlerPageInfoInput" class="classHandlerPageInfoInput" type="text">
+                                            <input id="classHandlerPageInfoInput6" class="classHandlerPageInfoInput" type="text">
                                         </li>
                                         <li class="classHandlerPageInfo classHandlerPageInfoCheck">
-                                            <span id="classHandlerSpecificPage">GO</span>
+                                            <span id="classHandlerSpecificPage6">GO</span>
                                         </li>
                                     </ul>
                                 </td>
@@ -701,25 +617,12 @@
                     </div>
                 </div>
                 <div class="classManagementRight" id="classManagementRight7">
-                    <div class="addUserBtn" id="addUserBtn">
-                        <label class="addUserIcon"></label>
-                        <span class="addUserText">添加用户</span>
-                    </div>
                     <div class="classManagementRightTitle" id="classManagementRightTitle">
                         <ul class="liveInfoLeft" id="liveInfoList">
                             <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li>
                             <li class="liveInfoLeftLi">未开始</li>
                             <li class="liveInfoLeftLi">已结束</li>
                         </ul>
-                        <ul class="liveInfoLeft userClassList" id="userClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">老师</li>
-                            <li class="liveInfoLeftLi">学生</li>
-                            <li class="liveInfoLeftLi">兼课</li>
-                        </ul>
-                        <ul class="liveInfoLeft userClassList" id="aboutClassList">
-                            <li class="liveInfoLeftLi liveInfoLeftLiCheck">课程</li>
-                            <li class="liveInfoLeftLi">老师</li>
-                        </ul>
                         <div class="liveInfoRight" id="liveInfoRight">
                             <input class="liveInfoRightInput" id="liveInfoRightInput" type="text">
                             <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn" src="images/nav_link_14.png" alt="">
@@ -732,34 +635,6 @@
                         </div>
                     </div>
                     <div class="classManagementRightContent" id="courseContent">
-                        <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" id="t_box" class="t_box">
-                            <tbody>
-                            <tr align="center" height="44" class="tr_center" bgcolor="#fff" bordercolor="#e6e6e6">
-                                <th width="9%" class="tr_center">
-                                    课堂主题
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    课堂号
-                                </th>
-                                <th width="8%" class="tr_center">
-                                    老师
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    课堂状态
-                                </th>
-                                <th width="24%" class="tr_center">
-                                    课堂时间
-                                </th>
-                                <th width="6%" class="tr_center">
-                                    在线人数
-                                </th>
-                                <th width="22%" class="tr_center">
-                                    操作
-                                </th>
-                            </tr>
-                            </tbody>
-                        </table>
-
                     </div>
                     <div class="classHandlerPageBox" id="classHandlerPageBox">
                         <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
@@ -794,10 +669,6 @@
                     </div>
                 </div>
                 <div class="classManagementRight" id="classManagementRight8">
-                <div class="addUserBtn" id="addUserBtn">
-                    <label class="addUserIcon"></label>
-                    <span class="addUserText">添加用户</span>
-                </div>
                 <div class="classManagementRightTitle" id="classManagementRightTitle">
                     <ul class="liveInfoLeft" id="liveInfoList">
                         <li class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</li>
@@ -957,7 +828,7 @@
                                         分配给：
                                     </label>
                                     <div class="step_page1_widget">
-                                        <select name="allotSpeaker" id="" class="classThemeInfo classThemeInfoSelect">
+                                        <select name="allotSpeaker" id="classTeacherInfo" class="classThemeInfo classThemeInfoSelect">
                                             <option value="">
                                                 张媛媛
                                             </option>
@@ -1814,7 +1685,7 @@
                 <div class="">
                     <select class="createUserRole" name="createUserRole" id="createUserRole">
                         <option value="0">老师</option>
-                        <option value="1">兼课</option>
+                        <option value="1">监课</option>
                     </select>
                 </div>
                 <div class="removeHandlerBtn">
@@ -1860,11 +1731,11 @@
                             角色：
                         </label>
                         <div class="step_page1_widget">
-                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="1" checked="checked">
+                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="3" checked="checked">
                             <label for="createUserTeacher" class="publicInfo">
                                 老师
                             </label>
-                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="0">
+                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="2">
                             <label for="createUserTeaching" class="publicInfo">
                                 兼课
                             </label>
--- a/src/MessageTypes.js
查看文件 @4dcb3fc
+++ b/src/MessageTypes.js
查看文件 @4dcb3fc
@@ -16,8 +16,9 @@ MessageTypes.HOME_SKIP= "home_skip"; //首页跳转
 //管理员列表
-
 MessageTypes.SWITCH_CLASS= "switch_class"; //创建课堂
+//创建课堂成功
+MessageTypes.ADD_CLASS= "add_class"; //创建课堂
 export default MessageTypes;
--- a/src/ape/AdministratorApe.js
查看文件 @4dcb3fc
+++ b/src/ape/AdministratorApe.js
查看文件 @4dcb3fc
@@ -42,7 +42,8 @@ class AdministratorApe extends Ape {
         if(ind > 1){
             $('.classManagementRight').eq(ind-1).show().siblings().hide();
         }else{
-            $('.classManagementRight').eq(ind).show().siblings().hide();
+            $('#recordUl .recordLi').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
+            $('.classManagementRight').eq(0).show().siblings().hide();
         }
     }
     _dateUI(){
@@ -95,7 +96,7 @@ class AdministratorApe extends Ape {
     //设置弹框位置  方法
     _setMarginTopHandler(_data){
         let clienth = document.documentElement.clientHeight || document.body.clientHeight
-        _data.css('margin-top',(clienth - parseInt(_data.height()))/2)
+        _data.css('margin-top',Math.abs((clienth - parseInt(_data.height()))/2))
     }
 }
 export default AdministratorApe;
--- a/src/ape/CreateClassApe.js
查看文件 @4dcb3fc
+++ b/src/ape/CreateClassApe.js
查看文件 @4dcb3fc
@@ -15,14 +15,14 @@ class CreateClassApe extends Ape {
     constructor() {
         super();
         this.classDateList = {};//创建课堂信息
+        this.teacherArr = [];
         this.isLocalStorage();
+        this.allotSpeaker();
         this.addEvent();
         this.init();
     }
     init() {
-        //判断列表在右侧时取消边距
-        this._judgeListPlace();
         $('#collectYes').hide();
         //默认显示当前时间戳
         this._showPresentTime();
@@ -40,6 +40,7 @@ class CreateClassApe extends Ape {
         //日历插件
         this._dateUI();
+
     }
     addEvent() {
@@ -61,11 +62,6 @@ class CreateClassApe extends Ape {
         $("#meeting_starthour").find("option[value = '"+hours+"']").attr("selected","selected");
         $('#meeting_endhour').find("option[value = '"+ (hours + 2) +"']").attr("selected","selected");
     }
-    _judgeListPlace(){
-        let i=(i%4);
-        $('#classifyListContent').find('.classifyList').eq(i==3).addClass('classifyListR');
-    }
-
     _createClassBtnHandler(){
         $('#createClassBox').show();
         $('#scheduleForm1').show();
@@ -79,31 +75,40 @@ class CreateClassApe extends Ape {
     //获取第一步中老师列表
     allotSpeaker(){
         let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUser';
-        loger.log(ClassDataProxy.siteId,'获取第一步中老师列表')
-        let dateList = {
-            siteId : ClassDataProxy.siteId
-           // userType : 1
-        }
         let that = this;
+        let dataInfo = {
+            siteId : ClassDataProxy.siteId,
+            userType : 1
+        }
         $.ajax({
-            type : "POST",
-            url : _url,
-            data : dateList,
+            type: "POST",
+            url: _url,
             timeout:5000,
-            headers: {'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
+            data:dataInfo,
+            headers: {siteId:ClassDataProxy.siteId,
+                pageno:7,
+                'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
             success:function(_data){
                 //获取课堂数据
-                loger.log(_data,'获取第一步中老师列表')
-                if(_data || _data.code == 0){
-
-                   // that._enterClass(_data.returnData.data);
+                if(_data && _data.code == 200){
+                    that.teacherInfo(_data.returnData.data.users);
                 }
             },
             error:function(error){
-                console.log(error,'失败')
+                //alert('直播数据获取失败')
+                loger.log(error,'直播数据获取失败')
             }
         })
     }
+    teacherInfo(_data){
+        let classTeacherInfo = $('#classTeacherInfo');
+        classTeacherInfo.empty();
+        let option = ``;
+        for(let i = 0;i<_data.length;i++){
+            option += `<option value="${_data[i].loginName}">${_data[i].loginName}</option>`;
+        }
+        classTeacherInfo.append(option);
+    }
     _closeClassHandler(){
         $('#createClassBox').hide();
         this._closeCreateClass();
@@ -117,6 +122,9 @@ class CreateClassApe extends Ape {
         let h5Module = $("input[name='h5Module']:checked").val();//是否支持H5
         let partcKey = $('#partcKey').val();  //课堂密码
         let meetingContent = $("meeting_content").val();//课堂描述
+
+        let classTeacherInfo = $('#classTeacherInfo').val();
+
         if( meetingName.val().length < 1 || meetingName.val().length>32 ){
             meetingName.focus();
             return false;
@@ -133,7 +141,8 @@ class CreateClassApe extends Ape {
             "meetingType":meetingType,
             "h5Module":h5Module,
             "partcKey":'',
-            "meetingContent":meetingContent
+            "meetingContent":meetingContent,
+            "userName":classTeacherInfo
         }
         this.classDateList = dateList;
         $('#scheduleForm1').hide();
@@ -254,6 +263,7 @@ class CreateClassApe extends Ape {
             success:function(_data){
                 //获取课堂数据
                 if(_data && _data.code == 0){
+                    loger.log('创建课堂成功',_data)
                     that._enterClass(_data.returnData.data);
                 }
             },
@@ -264,6 +274,7 @@ class CreateClassApe extends Ape {
     }
     _enterClass(_data){
         window.open(_data.meetingUrl);
+        that._emit(MessageTypes.ADD_CLASS);
     }
     //清空创建课堂数据
     _closeCreateClass(){
--- a/src/ape/CreateUserApe.js
查看文件 @4dcb3fc
+++ b/src/ape/CreateUserApe.js
查看文件 @4dcb3fc
@@ -72,7 +72,6 @@ class CreateUserApe extends Ape {
         $('#classHandlerEndPage3').on('click',this._endPageHandler.bind(this));//尾页
         $('#classHandlerSpecificPage3').on('click',this._assignPageHandler.bind(this));//指定页
-
     }
     addEvent() {
@@ -84,6 +83,7 @@ class CreateUserApe extends Ape {
     }
     _userClassListHandler(evt){
         this._switchover(evt);
+        this.userAdminHandler(1);
     }
     //首页
     _homePageHandler(){
@@ -122,20 +122,24 @@ class CreateUserApe extends Ape {
         let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUser';
         let that = this;
+        let data = $('#userClassList3').find('.liveInfoLeftLiCheck').attr('data');
+        let dataInfo = {
+            siteId : ClassDataProxy.siteId,
+            userType : data
+        }
         $.ajax({
             type: "POST",
             url: _url,
             timeout:5000,
-            data:{siteId:ClassDataProxy.siteId,userType:ClassDataProxy.USER_TYPE_1},
+            data:dataInfo,
             headers: {siteId:ClassDataProxy.siteId,
                 pageno:7,
                 'page':ind,
                 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
             success:function(_data){
-                loger.log(_data,'创建用户界面用户列表数据')
-                loger.log(ClassDataProxy.USER_TYPE_1,'创建用户界面用户列表数据')
                 //获取课堂数据
                 if(_data && _data.code == 200){
+                    //loger.log(_data,'创建用户界面用户列表数据')
                     that._gainUserClassData(_data.returnData.data);
                 }
             },
@@ -155,6 +159,7 @@ class CreateUserApe extends Ape {
         this.pageNo = pageno;
         $('#classHandlerPageMsg3').html('第'+page+'页/共'+pageno+'页，有'+count+'个记录');
         courseContent.append(adminListTit);
+
         if(_dataList){
             if(count <= 7){
                 $('#classHandlerPageBox3').hide();
@@ -242,6 +247,7 @@ class CreateUserApe extends Ape {
                         loger.log(_data,'注册老师账号成功')
                         ErrorApe.showWarnError('注册成功');
                         $('#createUserBox').hide();
+                        that.userAdminHandler(1);
                     }else{
                         ErrorApe.showWarnError(_data.returnData.data.msg);
                     }
--- a/src/ape/LoginOrRegister.js
查看文件 @4dcb3fc
+++ b/src/ape/LoginOrRegister.js
查看文件 @4dcb3fc
@@ -285,8 +285,8 @@ class LoginOrRegister extends Ape {
                         ClassDataProxy.token =_data.returnData.data.token
                         ClassDataProxy.status = true;
                         ClassDataProxy.id = _data.returnData.data.id;
-                        ClassDataProxy.siteId = _data.returnData.data.siteId;
-
+                       // ClassDataProxy.siteId = _data.returnData.data.siteId;
+                        ClassDataProxy.siteId = 'markettest'
                         ClassDataProxy.monicker = _data.returnData.data.userName;
                         ClassDataProxy.userEmail = _data.returnData.data.userEmail;
                         ClassDataProxy.userMobile = _data.returnData.data.userMobile;
--- a/src/ape/ManagementHomePageApe.js
查看文件 @4dcb3fc
+++ b/src/ape/ManagementHomePageApe.js
查看文件 @4dcb3fc
@@ -43,13 +43,13 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="6%" class="tr_main">{_stateInfo}</td>
                                 <td  width="18%" class="tr_main">{_time}</td>
                                 <td width="6%" class="tr_main">{_onlineLen}</td>
-                                <td  width="18%" class="tr_main tr_mainRight" align="center" >
+                                <td  width="18%" class="tr_main tr_mainRight" align="center" data="{_esenglish}">
                                     <a id="{_DocInd}" class="classHandlePort" href="###">文档</a>
                                     <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a>
                                     <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a>
                                     <a id="{_updateInd}" class="classHandlePort" href="###">修改</a>
-                                    <a id="{_removeInd}" class="classHandlePort" href="###">删除</a>
-                                    <a id="{_joinInd}" class="classHandlePort" data="{_esenglish}" href="###">加入课堂</a>
+                                    <a id="{_removeInd}" class="classHandlePort deleteClass" href="###">删除</a>
+                                    <a data="{_joinInd}" class="classHandlePort joinClass" href="">加入课堂</a>
                                 </td>
                             </tr>
 `;
@@ -72,6 +72,9 @@ class ManagementHomePageApe extends Ape {
         $('#classHandlerDownPage0').on('click',this._downPageHandler.bind(this));//下页
         $('#classHandlerEndPage0').on('click',this._endPageHandler.bind(this));//尾页
         $('#classHandlerSpecificPage0').on('click',this._assignPageHandler.bind(this));//指定页
+
+        $('#courseContent0').on('click','.deleteClass',this._deleteClass.bind(this));//删除课堂
+        $('#courseContent0').on('click','.joinClass',this._joinClass.bind(this));//加入课堂
     }
     addEvent() {
@@ -95,7 +98,6 @@ class ManagementHomePageApe extends Ape {
     }
     //下页
     _downPageHandler(){
-        loger.log(this.presentInd,111111)
         if(this.presentInd < this.pageNo){
             this.presentInd++;
             this._pageNumBtnHandler(this.presentInd);
@@ -149,7 +151,8 @@ class ManagementHomePageApe extends Ape {
                 pageno:8,
                 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
             success:function(_data){
-                if(_data || _data.code == 200){
+                if(_data && _data.code == 200){
+                    loger.log('渲染首页数据',_data)
                     that._gainClassData(_data.returnData.data);
                 }
             },
@@ -173,6 +176,7 @@ class ManagementHomePageApe extends Ape {
             if(count <= 8){
                 $('#classHandlerPageBox0').hide();
             }
+            loger.log('课堂信息',_dataList[0].meetingNumber)
             for(let i = 0;i<_dataList.length;i++){
                 let _adminList = this._format(adminList,{
                     _meetingName : _dataList[i].meetingName,
@@ -186,13 +190,49 @@ class ManagementHomePageApe extends Ape {
                     _musicInd : 'classMusic'+i,
                     _updateInd : 'classUpdate'+i,
                     _removeInd : 'classRemove'+i,
-                    _joinInd : 'classJoin'+i
+                    _joinInd : _dataList[i].meetingNumber
                 })
              courseContent.append(_adminList);
             }
             courseContent.append(adminListEnd);
         }
     }
+    //删除课堂
+    _deleteClass(evt){
+        let ele = $(evt.target).parent().attr('data');
+        loger.log('删除',ele)
+        let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProtDomain + '/3m/meeting/updateToCancel.do';
+        let that = this;
+        $.ajax({
+            type: "PUT",
+            url: _url,
+            dataType: "text",
+            data:"meeting.id=" + ele + "&temp=" + new Date().getTime(),
+            headers: {siteId:ClassDataProxy.siteId,
+                'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
+            success:function(_data){
+                if(_data && _data.code == 200){
+                    loger.log('删除成功',_data)
+                    that.detailPage();
+                   // that._gainClassData(_data.returnData.data);
+                }
+            },
+            error:function(error){
+                loger.log(error,'失败')
+            }
+        })
+    }
+    playRecord(meetingNumber) {
+        let location = "/3m/doPlayRecord.do?meetingNumber=" + meetingNumber;
+            window.open(location, target = "_blank");
+    }
+    _joinClass(evt){
+        let _data = $(evt.target).attr('data');
+      //  window.open('/3m/attend.do?meetingNumber=' + _data, target = "_blank");
+      //  $(evt.target).attr('src','/3m/attend.do?meetingNumber=' + _data);
+        $(evt.target).attr('href','http://market.xuedianyun.com/3m/attend.do?meetingNumber=' + _data);
+        $(evt.target).attr('target', '_blank');
+    }
     _switchover(evt){
         $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck');
     }
--- a/src/main.js
查看文件 @4dcb3fc
+++ b/src/main.js
查看文件 @4dcb3fc
@@ -46,7 +46,7 @@ let _subscribeApe;
 class Main {
     constructor() {
-        this.clientVersion="v1.7.2.20170906";
+        this.clientVersion="v1.7.3.20170906";
         loger.warn("clientVersion:"+this.clientVersion);
         let locationProtocol= location.protocol;
@@ -55,18 +55,18 @@ class Main {
         }else {
             ClassDataProxy.locationProtocol="http://";
         }
-        this.localStorage = window.localStorage;
-        //判断当前用户登录身份状态
-        this._localStorageState();
         //获取国际化语言
         this._localConfig();
         //获取地址栏参数
         this.getURLParams();
-
+        this.localStorage = window.localStorage;
+        //判断当前用户登录身份状态
+        this._localStorageState();
         //课堂初始化和启动流程
         this.init();
         //默认显示管理员首页
         this.switchClass(0);
+        this.switchClass(3);
     }
     //获取地址栏参数
@@ -96,6 +96,7 @@ class Main {
                 portal = portal + ":" + port;
             }
             ClassDataProxy.portal = portal || "";
+            ClassDataProxy.siteId = ClassDataProxy.userName;
         }
     }
@@ -143,6 +144,7 @@ class Main {
         _managementHomePageApe = new ManagementHomePageApe();
         //创建课堂
         _createClassApe = new CreateClassApe();
+        _createClassApe.on(MessageTypes.ADD_CLASS,this.addClass.bind(this));
         //创建用户老师
         _createUserApe = new CreateUserApe();
         //创建约课
@@ -177,7 +179,7 @@ class Main {
                 _teacherDetailApe.detailPage();
             }else if(_data.userType == ClassDataProxy.USER_TYPE_2){
                 this._showAdministratorInfo();
-                _administratorApe.detailPage();
+                _managementHomePageApe.detailPage();
             }else if(_data.userType == ClassDataProxy.USER_TYPE_8){
                 _homeApe.detailPage();
             }else if(_data.userType == ClassDataProxy.USER_TYPE_32){
@@ -201,7 +203,7 @@ class Main {
             switch (ind){
                 case 0:
                     //首页
-                    _managementHomePageApe._createClassHomePage();
+                    _managementHomePageApe.detailPage();
                     break;
                 case 1:
                     //创建课堂
@@ -212,11 +214,11 @@ class Main {
                     break;
                 case 3:
                     //用户管理
-                    _createUserApe.userAdminHandler();
+                    _createUserApe.userAdminHandler(1);
                     break;
                 case 4:
                     //约课管理
-                    _aboutClassApe.userAdminHandler();
+                    _aboutClassApe.userAdminHandler(1);
                     break;
                 case 5:
                     //录制管理
@@ -232,12 +234,16 @@ class Main {
                     break;
             }
     }
+    addClass(_data){
+        loger.log('创建课堂成功')
+        _managementHomePageApe.detailPage();
+    }
     //判断登录用户的状态
     _localStorageState(){
         let userType = window.localStorage.getItem('userType')||0;
         let loginName = window.localStorage.getItem('loginName')|| '';
         let id = window.localStorage.getItem('id')|| '';
-        let siteId = window.localStorage.getItem('siteId')|| '';
+        let siteId = window.localStorage.getItem('siteId')|| 'markettest';
         let userMobile = window.localStorage.getItem('userMobile')|| '';
         let userEmail = window.localStorage.getItem('userEmail')|| '';
@@ -291,6 +297,7 @@ class Main {
         $('#lanclassBox').hide();
         $('#classifyListBox').hide();
         $('#recordUl .recordLi').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
+        $('.classManagementRight').eq(0).show().siblings().hide();
     }
     _teacherHome(){
         $('#slideshow').hide();
--- a/src/proxy/ClassDataProxy.js
查看文件 @4dcb3fc
+++ b/src/proxy/ClassDataProxy.js
查看文件 @4dcb3fc
@@ -227,7 +227,7 @@ ClassDataProxy.password =""
 ClassDataProxy.token ="";
 ClassDataProxy.status = false;
 ClassDataProxy.id = '';
-ClassDataProxy.siteId = '';
+ClassDataProxy.siteId = 'markettest';
 ClassDataProxy.userMobile = '';
 ClassDataProxy.userEmail = '';
 ClassDataProxy.monicker = "";
@@ -270,6 +270,7 @@ ClassDataProxy.locationProtocol="http://";
 //ClassDataProxy.locationProt = "192.168.31.8:3000";//端口
 ClassDataProxy.locationProt = "123.56.73.119:3000";//端口
+ClassDataProxy.locationProtDomain = "market.xuedianyun.com/";//端口
 ClassDataProxy.SCENE_DOC=0;
 ClassDataProxy.SCENE_SCREEN_SHARE=1;