Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

# Conflicts: # resource/js/unit.js

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
# Conflicts: # resource/js/unit.js
王富生
2 parents a3001c0f d73d9f4b
Showing 3 changed files with 3 additions and 4 deletions
resource/js/unit.js
topages/workfill/workfill.js
topages/workquery/workquery.js
@@ -16,6 +16,7 @@ sysComm = {
 var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
+
 //var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址
@@ -574,4 +575,4 @@ var commonClass = {
-
+$("#loginName").text(fn.getUserName());
@@ -6,7 +6,7 @@ var clicknum = 0;//定义上下周点击次数
 var fun = {
     init:function () {
         //debugger;
-        $("#loginName").text(fn.getUserName());
+
         //初始化项目
         $('.work-projectName').selectpicker('render');
         //获取本周时间
@@ -89,7 +89,6 @@ var fun={
     },
     //工时查询-所有员工及自己或者自己日报
     queryAsraDailyAllForList:function(){
-        debugger;
         var noDataShow = '<div class="nodata-icon" ></div>';
         var req = fun.getParams();
         var opt = {
@@ -99,7 +98,6 @@ var fun={
             url: dataUrl.util.queryAsraDailyAllForList(),
             success: function (res) {
                 if(res != null && res.code =='8888' ){
-                    debugger;
                     var data =  res.data.list;
                     if(data == null || data.length == 0 ){
                         $('#workquery-list-wrap').empty();