Răsfoiți Sursa

修改统计分析页面无法显示收费站列表bug

minitiger 8 ani în urmă
părinte
comite
41e2570fe6

+ 2 - 2
VisualInspection/js/config.js

@@ -18,8 +18,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        // return "http://server_yanhai.jsxt.jsjtyxt.com/"
-        return "http://localhost:8089/"
+        return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+        // return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

+ 7 - 6
VisualInspection/js/mytask/check.js

@@ -844,15 +844,16 @@ function getCheckItems() {
             showRemoveBtn: false
         }
     };
-
-    post_common_service('checkRule/getItemListByRuleType', {rule_type:1}, function(data) {
-        console.log(data);
+    var param = {"rule_type":1};
+    console.log(param);
+    post_common_service('checkRule/getItemListByRuleType', param , function(data) {
+        // console.log(data);
         zdata = [];
         for (var i = 0; i < data.length; i++) {
             var m = data[i];
             zdata.push(genNode(m));
         }
-        console.log(zdata);
+        // console.log(zdata);
         menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
     }, function(error) {
 
@@ -860,7 +861,7 @@ function getCheckItems() {
 }
 
 function addobj_checkitem(data) {
-    console.log(data.subCheckItem);
+    // console.log(data.subCheckItem);
     var zdata = [];
     if (typeof(data.subCheckItem) != "undefined" && data.subCheckItem != null &&
         data.subCheckItem.length > 0) {
@@ -885,7 +886,7 @@ function genNode(m) {
     //zdataItem["content"] = m.name;
     if (m.score) zdataItem["name"] = m.name + '(' + m.score + ')';
     zdataItem["open"] = true;
-    console.log(m.subCheckItem);
+    // console.log(m.subCheckItem);
     zdataItem["children"] = addobj_checkitem(m);
     return zdataItem;
 }

+ 2 - 2
VisualInspection/js/other_check/other_check.js

@@ -61,7 +61,7 @@ var al_data = [];
         var zNodes = [];
         check_item_tree = $.fn.zTree.init($("#check_rule_tree2"), {}, zNodes);
 
-        getCheckItems();
+        getOtherCheckItems();
 
         $("#check_item_select input").on("click", function() {
             //debugger;
@@ -466,7 +466,7 @@ function refreshUploader(){
         }
     }
 
-    function getCheckItems() {
+    function getOtherCheckItems() {
      function zTreeOnRename(event, treeId, treeNode, isCancel) {
          alert(treeNode.tId + ", " + treeNode.name);
      }

+ 9 - 9
VisualInspection/js/statistics/appeal.js

@@ -44,7 +44,7 @@ $(function() {
     }
 
 
-    if (road_manager) {
+    // if (road_manager) {
         getFsStationList(road_manager, function(obj) {
             $("#fs_station").html(obj);
             var dept;
@@ -55,16 +55,16 @@ $(function() {
             // 初始化查询
             getFsWorkInfo();
         });
-    } else {
-        // 初始化查询
-        getFsWorkInfo();
-    }
+    // } else {
+    //     // 初始化查询
+    //     getFsWorkInfo();
+    // }
     // 导管中心选择
     $("#center_manage").change(function() {
         var center_manage_id = GV(this);
-        if (center_manage_id == '') {
-            $("#fs_station,#fs_employee").html('');
-        } else {
+        // if (center_manage_id == '') {
+        //     $("#fs_station,#fs_employee").html('');
+        // } else {
             getFsStationList(center_manage_id, function(obj) {
                 $("#fs_station").html(obj);
                 var dept;
@@ -73,7 +73,7 @@ $(function() {
                 }
                 $("#fs_station").val(dept);
             });
-        }
+        // }
     })
 
     // 查询

+ 6 - 6
VisualInspection/js/statistics/change_attendance.js

@@ -27,7 +27,7 @@ $(function() {
             // 检索
             getFsWorkInfo(0);
         }, userId);
-    });
+    },true);
 
     $.jeDate("#sel_month", {
         isinitVal: true,
@@ -62,9 +62,9 @@ $(function() {
     // 导管中心选择
     $("#center_manage").change(function() {
         var center_manage_id = GV(this);
-        if (center_manage_id == '') {
-            $("#fs_station,#fs_employee").html('');
-        } else {
+        // if (center_manage_id == '') {
+        //     $("#fs_station,#fs_employee").html('');
+        // } else {
             getFsStationList(center_manage_id, function(obj) {
                 $("#fs_station").html(obj);
                 //默认选中第一个
@@ -74,8 +74,8 @@ $(function() {
                     $("#fs_station").val(dept);
                 }
             });
-        }
-    })
+        // }
+    },true)
 
     // 查询
     $("#searchBtn").click(function() {

+ 8 - 8
VisualInspection/js/statistics/change_work.js

@@ -35,21 +35,21 @@ $(function(){
     // 收费站中心选择
     $("#fs_station").change(function(){
         var fee_station_id = GV(this);
-        if(fee_station_id == ''){
-            $("#fs_employee").html('');
-        }else{
+        // if(fee_station_id == ''){
+        //     $("#fs_employee").html('');
+        // }else{
             getFsEmployee(fee_station_id,function(obj){
                 $("#fs_employee").html(obj);
             });
-        }
+        // }
     })
 
     // 导管中心选择
     $("#center_manage").change(function(){
         var center_manage_id = GV(this);
-        if(center_manage_id == ''){
-            $("#fs_station,#fs_employee").html('');
-        }else{
+        // if(center_manage_id == ''){
+        //     $("#fs_station,#fs_employee").html('');
+        // }else{
             getFsStationList(center_manage_id,function(obj){
                 $("#fs_station").html(obj);
                 var dept;
@@ -58,7 +58,7 @@ $(function(){
                 }
                 $("#fs_station").val(dept);
             });
-        }
+        // }
     })
 
     // 查询

+ 6 - 6
VisualInspection/js/statistics/common_attendance.js

@@ -32,7 +32,7 @@ $(function() {
                 // 检索
                 getFsWorkInfo(0);
             }, userId);
-        });
+        },true);
 
         // 当初始化月份值
         var months = month_method_2();
@@ -64,9 +64,9 @@ $(function() {
         // 导管中心选择
         $("#center_manage").change(function() {
             var center_manage_id = GV(this);
-            if (center_manage_id == '') {
-                $("#fs_station,#fs_employee").html('');
-            } else {
+            // if (center_manage_id == '') {
+            //     $("#fs_station,#fs_employee").html('');
+            // } else {
                 getFsStationList(center_manage_id, function(obj) {
                     $("#fs_station").html(obj);
                     //默认选中第一个
@@ -76,8 +76,8 @@ $(function() {
                         $("#fs_station").val(dept);
                     }
                 });
-            }
-        })
+            // }
+        },true)
 
         // 查询
         $("#searchBtn").click(function() {

+ 8 - 3
VisualInspection/js/statistics/common_statistic.js

@@ -92,11 +92,16 @@ function getFsStationList(center_manage_id,func,hasAll){
     //    func(str);
     // },function(error){
     // });
-    var data = cache_road_manager_fee_list_map.get(center_manage_id);
+    var data;
+    if(center_manage_id){
+        data = cache_road_manager_fee_list_map.get(center_manage_id);
+    }else{
+        data = $.zui.store.get("cache_fee_station_list");
+    }
     var str = '';
-    if(data.length > 0){
+    if(data && data.length > 0){
         str = "<option value=''>全部</option>";
-        if(hasAll==false) str="";
+        if(hasAll) str="";
         for(var i=0;i<data.length;i++){
             str += "<option value="+data[i].deptid+">"+data[i].name+"</option>";  
         }

+ 9 - 9
VisualInspection/js/statistics/common_work.js

@@ -23,7 +23,7 @@ $(function() {
             // 检索
             getFsWorkInfo();
         });
-    });
+    },false);
 
     // 当前月份初始化
     // $("#sel_month").val(getM()-1);
@@ -38,21 +38,21 @@ $(function() {
     // 收费站中心选择
     $("#fs_station").change(function() {
         var fee_station_id = GV(this);
-        if (fee_station_id == '') {
-            $("#fs_employee").html('');
-        } else {
+        // if (fee_station_id == '') {
+        //     $("#fs_employee").html('');
+        // } else {
             getFsEmployee(fee_station_id, function(obj) {
                 $("#fs_employee").html(obj);
             });
-        }
+        // }
     })
 
     // 导管中心选择
     $("#center_manage").change(function() {
         var center_manage_id = GV(this);
-        if (center_manage_id == '') {
-            $("#fs_station,#fs_employee").html('');
-        } else {
+        // if (center_manage_id == '') {
+        //     $("#fs_station,#fs_employee").html('');
+        // } else {
             getFsStationList(center_manage_id, function(obj) {
                 $("#fs_station").html(obj);
                 var dept;
@@ -61,7 +61,7 @@ $(function() {
                 }
                 $("#fs_station").val(dept);
             });
-        }
+        // }
     })
 
     // 查询

+ 11 - 9
VisualInspection/js/user/addUser.js

@@ -7,6 +7,7 @@ function loadUserData(nodedata) {
     var pnode = nodedata;
     resetform();
 
+
     var enable = true;
 
     if (edittype == "update") {
@@ -31,17 +32,18 @@ function loadUserData(nodedata) {
             isMultiple: true
         });
     }
-    // role_selectinput.closeDropDownMenu();
+    role_selectinput.unbind();
+    role_selectinput.closeDropDownMenu();
 
-    // if (!enable) {
-    //     role_selectinput.unbind();
-    //     $("#user_role_select").attr("disabled", true);
-    // } else {
-    //     $("#user_role_select").attr("disabled", false);
-    //     role_selectinput.bindings();
-    // }
+    if (!enable) {
+        role_selectinput.unbind();
+        $("#user_role_select").attr("disabled", true);
+    } else {
+        $("#user_role_select").attr("disabled", false);
+        role_selectinput.bindings();
+    }
 
-    // $(".ComboTreeItemChlid").find("input").prop('checked', false);
+    $(".ComboTreeItemChlid").find("input").prop('checked', false);
 
     if (edittype == "edit" || edittype == "update") {
         usertemp = nodedata;

+ 4 - 4
VisualInspection/view/statistics/operation_management_integration.html

@@ -5,16 +5,16 @@
         <form  class="form-horizontal">
             <div class="form-group">
                 <div class="from-label"><label>查询日期</label></div>
-                <div class="col-sm-3">
+                <div class="col-sm-2">
                     <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-2">
                     <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
                 </div>
-                <div class="col-sm-5">
+                <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
                 </div>
-                <div class="col-sm-6">
+                <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="exportExcel()" >导出Excel</button>
                 </div>
             </div>