BJ_web_developers / workreport

Commit a37976b240c1c4d88ae55a80414885633d54fbb2

Authored by 王富生
2 parents 4c87a8b7 2b0ce64b

Merge remote-tracking branch 'origin/test' into test 

# Conflicts:
#	resource/js/unit.js
Inline Side-by-side
Showing 4 changed files with 8 additions and 9 deletions
login/login.html
  View file @a37976b
... ... @@ -8,7 +8,7 @@
8 8 <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
9 9 <link rel="stylesheet" href="../resource/public/commoncss.css?a=2">
10 10 <link rel="stylesheet" href="../topages/login/login.css">
11   - <script src="../resource/js/unit.js"></script>
  11 +
12 12  
13 13 </head>
14 14 <body>
... ... @@ -27,7 +27,8 @@
27 27  
28 28  
29 29 <script src="../resource/lib/jquery/jquery.min.js"></script>
  30 + <script src="../resource/js/unit.js"></script>
30 31 <script src="../topages/login/login.js?a=1"></script>
31   -<script src="../resource/js/unit.js?a=1"></script>
  32 +<!--<script src="../resource/js/unit.js?a=1"></script>-->
32 33 </body>
33 34 </html>
34 35 \ No newline at end of file
... ...
resource/js/unit.js
  View file @a37976b
... ... @@ -9,15 +9,10 @@ sysComm = {
9 9 }
10 10  
11 11 //阿里云测试环境，别删
12   -//
13   -// var baseUrl = 'http://192.168.1.196:8088/';// url公用地址
14   -// var parkcloudbaseUrl = 'http://192.168.1.196:8093/';// url公用地址
15   -// var authUrl = 'http://192.168.1.196:8088/';// 鉴权URL公用地址s
16   -
17   -var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
18 12  
  13 +//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
19 14  
20   -//var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址
  15 +var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
21 16  
22 17  
23 18  
... ...
topages/login/login.js
  View file @a37976b
... ... @@ -38,6 +38,7 @@ var func ={
38 38 dataType: 'json',
39 39 success: function (res) {
40 40 if(res != null && res != '' && res !=undefined && res.code =='8888' ){
  41 +
41 42 $('#login-errorifo').text('');
42 43 fn.setToken(res.data.accessToken);
43 44 fn.setUserName(res.data.userName);
... ...
topages/workfill/workfill.js
  View file @a37976b
... ... @@ -180,6 +180,8 @@ var fun = {
180 180 dataType:'json',
181 181 success: function(res){
182 182 if(res.success == true){
  183 + var asraId = res.data;
  184 + $("#weekday"+id).attr("data-id",asraId);
183 185 _this.text('编辑');
184 186 _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
185 187 _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
... ...