diff --git a/login/login.html b/login/login.html index f2cddea..28b4413 100644 --- a/login/login.html +++ b/login/login.html @@ -8,7 +8,7 @@ - + @@ -27,7 +27,8 @@ + - + \ No newline at end of file diff --git a/resource/js/unit.js b/resource/js/unit.js index 1172e77..56337d1 100644 --- a/resource/js/unit.js +++ b/resource/js/unit.js @@ -9,15 +9,10 @@ sysComm = { } //阿里云测试环境，别删 -// -// var baseUrl = 'http://192.168.1.196:8088/';// url公用地址 -// var parkcloudbaseUrl = 'http://192.168.1.196:8093/';// url公用地址 -// var authUrl = 'http://192.168.1.196:8088/';// 鉴权URL公用地址s - -var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 +//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 -//var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址 +var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 diff --git a/topages/login/login.js b/topages/login/login.js index 2676938..8e40c41 100644 --- a/topages/login/login.js +++ b/topages/login/login.js @@ -38,6 +38,7 @@ var func ={ dataType: 'json', success: function (res) { if(res != null && res != '' && res !=undefined && res.code =='8888' ){ + $('#login-errorifo').text(''); fn.setToken(res.data.accessToken); fn.setUserName(res.data.userName); diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js index b8b0522..1103c63 100644 --- a/topages/workfill/workfill.js +++ b/topages/workfill/workfill.js @@ -180,6 +180,8 @@ var fun = { dataType:'json', success: function(res){ if(res.success == true){ + var asraId = res.data; + $("#weekday"+id).attr("data-id",asraId); _this.text('编辑'); _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false"); _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');