Commit 5993e2d4512c84e51312aa0d85b224772c6f0a58
1 parent
909cfbfb
登录模块提交
Showing
3 changed files
with
65 additions
and
35 deletions
resource/js/unit.js
| ... | ... | @@ -36,13 +36,19 @@ dataUrl.util = { |
| 36 | 36 | login: function () { |
| 37 | 37 | return parkcloudbaseUrl + 'oauth/login'; |
| 38 | 38 | }, |
| 39 | + //退出登录 | |
| 39 | 40 | getLoginOut:function(){ |
| 40 | 41 | return parkcloudbaseUrl + 'oauth/loginout'; |
| 42 | + }, | |
| 43 | + //查询项目列表 | |
| 44 | + queryAsraProjectForList:function(){ | |
| 45 | + return parkcloudbaseUrl + 'asraProject/queryAsraProjectForList'; | |
| 41 | 46 | } |
| 42 | 47 | |
| 43 | 48 | |
| 44 | 49 | |
| 45 | 50 | |
| 51 | + | |
| 46 | 52 | } |
| 47 | 53 | |
| 48 | 54 | var fn ={ |
| ... | ... | @@ -107,12 +113,9 @@ var fn ={ |
| 107 | 113 | }, |
| 108 | 114 | //登出系统 |
| 109 | 115 | loginOut: function () { |
| 110 | - debugger; | |
| 111 | - | |
| 116 | + //debugger; | |
| 112 | 117 | var token = fn.getToken(); |
| 113 | - | |
| 114 | 118 | if (token != "" && token != null) { |
| 115 | - | |
| 116 | 119 | var opt = { |
| 117 | 120 | method: "post", |
| 118 | 121 | url: dataUrl.util.getLoginOut(), |
| ... | ... | @@ -120,12 +123,9 @@ var fn ={ |
| 120 | 123 | sessionStorage.clear() |
| 121 | 124 | fn.setToken(''); |
| 122 | 125 | fn.toLoginPage(); |
| 123 | - | |
| 124 | 126 | } |
| 125 | 127 | }; |
| 126 | 128 | sysAjax(opt); |
| 127 | - | |
| 128 | - | |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | }, |
| ... | ... | @@ -134,6 +134,30 @@ var fn ={ |
| 134 | 134 | sessionStorage.setItem("sys_parkLot", ''); |
| 135 | 135 | window.location.href = '../login/login.html' |
| 136 | 136 | }, |
| 137 | + /** | |
| 138 | + * 查询项目信息 | |
| 139 | + * @param projectId 可以为空 | |
| 140 | + */ | |
| 141 | + getAsraProject: function (projectId, callBack) { | |
| 142 | + if(projectId == null || projectId == ""){ | |
| 143 | + projectId=null; | |
| 144 | + } | |
| 145 | + var req = { | |
| 146 | + id: projectId | |
| 147 | + }; | |
| 148 | + var opt = { | |
| 149 | + data: JSON.stringify(req), | |
| 150 | + method: "POST", | |
| 151 | + async: false, | |
| 152 | + url: dataUrl.util.queryAsraProjectForList(), | |
| 153 | + success: function (res) { | |
| 154 | + callBack(res.data); | |
| 155 | + | |
| 156 | + } | |
| 157 | + } | |
| 158 | + sysAjax(opt); | |
| 159 | + } | |
| 160 | + | |
| 137 | 161 | }; |
| 138 | 162 | |
| 139 | 163 | DateUtil = { | ... | ... |
topages/workfill/workfill.html
| ... | ... | @@ -16,10 +16,8 @@ |
| 16 | 16 | </div> |
| 17 | 17 | <div class="workfill-list-projectnamewrap"> |
| 18 | 18 | <div class="pos-abs workfill-projectCon"> |
| 19 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 20 | - <option value="1">企业云</option> | |
| 21 | - <option value="2">任你停</option> | |
| 22 | - <option value="3">政府云</option> | |
| 19 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName1"> | |
| 20 | + | |
| 23 | 21 | </select> |
| 24 | 22 | </div> |
| 25 | 23 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -41,10 +39,8 @@ |
| 41 | 39 | </div> |
| 42 | 40 | <div class="workfill-list-projectnamewrap"> |
| 43 | 41 | <div class="pos-abs workfill-projectCon"> |
| 44 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 45 | - <option value="1">企业云</option> | |
| 46 | - <option value="2">任你停</option> | |
| 47 | - <option value="3">政府云</option> | |
| 42 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName2"> | |
| 43 | + | |
| 48 | 44 | </select> |
| 49 | 45 | </div> |
| 50 | 46 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -66,10 +62,8 @@ |
| 66 | 62 | </div> |
| 67 | 63 | <div class="workfill-list-projectnamewrap"> |
| 68 | 64 | <div class="pos-abs workfill-projectCon"> |
| 69 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 70 | - <option value="1">企业云</option> | |
| 71 | - <option value="2">任你停</option> | |
| 72 | - <option value="3">政府云</option> | |
| 65 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName3"> | |
| 66 | + | |
| 73 | 67 | </select> |
| 74 | 68 | </div> |
| 75 | 69 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -91,10 +85,8 @@ |
| 91 | 85 | </div> |
| 92 | 86 | <div class="workfill-list-projectnamewrap"> |
| 93 | 87 | <div class="pos-abs workfill-projectCon"> |
| 94 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 95 | - <option value="1">企业云</option> | |
| 96 | - <option value="2">任你停</option> | |
| 97 | - <option value="3">政府云</option> | |
| 88 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName4"> | |
| 89 | + | |
| 98 | 90 | </select> |
| 99 | 91 | </div> |
| 100 | 92 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -116,10 +108,8 @@ |
| 116 | 108 | </div> |
| 117 | 109 | <div class="workfill-list-projectnamewrap"> |
| 118 | 110 | <div class="pos-abs workfill-projectCon"> |
| 119 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 120 | - <option value="1">企业云</option> | |
| 121 | - <option value="2">任你停</option> | |
| 122 | - <option value="3">政府云</option> | |
| 111 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName5"> | |
| 112 | + | |
| 123 | 113 | </select> |
| 124 | 114 | </div> |
| 125 | 115 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -141,10 +131,8 @@ |
| 141 | 131 | </div> |
| 142 | 132 | <div class="workfill-list-projectnamewrap"> |
| 143 | 133 | <div class="pos-abs workfill-projectCon"> |
| 144 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 145 | - <option value="1">企业云</option> | |
| 146 | - <option value="2">任你停</option> | |
| 147 | - <option value="3">政府云</option> | |
| 134 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName6"> | |
| 135 | + | |
| 148 | 136 | </select> |
| 149 | 137 | </div> |
| 150 | 138 | <div class="workfill-list-projectname display-none">项目名称</div> |
| ... | ... | @@ -166,10 +154,8 @@ |
| 166 | 154 | </div> |
| 167 | 155 | <div class="workfill-list-projectnamewrap"> |
| 168 | 156 | <div class="pos-abs workfill-projectCon"> |
| 169 | - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true"> | |
| 170 | - <option value="1">企业云</option> | |
| 171 | - <option value="2">任你停</option> | |
| 172 | - <option value="3">政府云</option> | |
| 157 | + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName7"> | |
| 158 | + | |
| 173 | 159 | </select> |
| 174 | 160 | </div> |
| 175 | 161 | <div class="workfill-list-projectname display-none">项目名称</div> | ... | ... |
topages/workfill/workfill.js
| ... | ... | @@ -16,6 +16,8 @@ var fun = { |
| 16 | 16 | $('#time-opr-nowtime').text(todaytime); |
| 17 | 17 | // |
| 18 | 18 | fun.logout(); |
| 19 | + //获取项目 | |
| 20 | + fun.getAsraProject(); | |
| 19 | 21 | }, |
| 20 | 22 | timeoprprevbtn:function () { |
| 21 | 23 | $('#time-opr-nextbtn').removeClass('display-none'); |
| ... | ... | @@ -45,6 +47,24 @@ var fun = { |
| 45 | 47 | $(document).on('click','#logoutId',function(){ |
| 46 | 48 | fn.loginOut(); |
| 47 | 49 | }); |
| 50 | + }, | |
| 51 | + /***获取项目下拉框.*/ | |
| 52 | + getAsraProject:function(){ | |
| 53 | + //debugger; | |
| 54 | + fn.getAsraProject("",function(data){ | |
| 55 | + var html=""; | |
| 56 | + $.each(data,function(index,row){ | |
| 57 | + html+='<option value="'+row.id+'">'+row.projecName+'</option>'; | |
| 58 | + }); | |
| 59 | + if(html != null && html != ""){ | |
| 60 | + for(var i=1;i<8;i++){ | |
| 61 | + $("#work-projectName"+i).empty(); | |
| 62 | + $("#work-projectName"+i).append(html); | |
| 63 | + $("#work-projectName"+i).selectpicker('refresh'); | |
| 64 | + | |
| 65 | + } | |
| 66 | + } | |
| 67 | + }); | |
| 48 | 68 | } |
| 49 | 69 | }; |
| 50 | 70 | fun.init(); | ... | ... |