Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

* 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection:
  x z
  优化

VisualInspection/js/other_check/other_check.js

@@ -387,8 +387,9 @@ function refreshUploader(){
         setPersonal();
     });
 
-    $("#check_item_select").delegate("#treeSelect_panel_0","blur",function(){
-        if($("#treeSelect_panel_0").is(":hidden")){
+    $("#check_item_select").delegate("div[id*='treeSelect_panel_'] ","blur",function(){
+        // alert(1)
+        if($(this).is(":hidden")){
             if(map[dept_selectinput.value] != null ){
                 $("#check_score").val( map[dept_selectinput.value]  );
             }else{

VisualInspection/view/other_check/toubleshoot_check.html

@@ -0,0 +1,134 @@
+<link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+<script src="/js/other_check/other_check.js?_inline"></script>
+<!--  start -->
+<div class="container-fluid ">
+        <div class="row">
+             <div>
+                <div class="div-month">
+                    <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                 </div>
+                 <div class="div-roadManage">
+                    <select class="form-control" id="first"></select>
+                </div>
+                <div class="div-station">
+                    <select class="form-control" id="second"></select>
+                </div>
+
+               <div class="col-xs-3">
+                    <div class="input-group">
+                        <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                    </div>
+                </div>
+
+                 <div style="float:right;margin-right:30px;">
+                    <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
+                </div>
+            </div>
+        </div>
+        <hr>
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div>
+        </div>
+        <div class="">
+            
+
+        </div>
+
+</div>
+<!--  end -->          
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">选择人员</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-select"><select class="form-control" id="select-dept"></select></button>
+                        </div>
+                        <div class="div-select"><select class="form-control" id="select-personal"></select></button>
+                        </div>
+                    </div>
+                </div>
+            <div style="width:100%;margin-top:10px;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分类别</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div id="check_item_select" style="position: relative;">
+                        <input class="form-control" id="check_item_id">
+                    </div>
+                     <div class="form-group check_item_group">
+                        <!--<label for="exampleInputPassword4" class="col-sm-2">分类：</label>-->
+                        <div class="col-md-6 col-sm-10">
+                            <div id="check_item_select"></div>
+
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-body" style="display:none;">
+                    <ul id="check_rule_tree2" class="ztree">
+
+                    </ul>
+                </div>
+            </div>
+             <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分描述</span>
+                </div>
+                <div style="width:260px;float:left;">
+                   <input class="form-control" id="remark">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分值</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <input class="form-control" id="check_score" onkeypress="return kkpager.keypress_gopage(event);">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">附件上传</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div class="col-md-10">
+                        <div id="uploaderExample" class="uploader">
+                            <div id="editImage" file_src="" style="overflow:hidden;zoom:1;"></div>
+                            <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
+                            <button type="button" class="btn btn-primary  uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">稽查时间</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div class="div-month2">
+                        <input id="month_date2" class="form-control form-date" type="text" placeholder="请选择" style="height:32px;">
+                    </div>
+                    <select class="form-control" style="width:130px;" id="check_num">
+                        <option value="1">第一次检查</option>
+                        <option value="2">第二次检查</option>
+                        <option value="3">第三次检查</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+        <button class="btn btn-primary" type="button"  style="float:right;" id="save-check"> 保存</button>
+        <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        check_type = 5;
+        init();
+    });
+</script>