From f89ab0f90d7b3e7f2b5600c05c5568dc6a2db1a6 Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Thu, 9 Apr 2026 09:09:00 +0800
Subject: [PATCH] bug

---
 .../user/ProcessSectionController.java        |  22 +-
 src/main/webapp/jsp/work/KPIPointList.jsp     | 760 +++++++++---------
 2 files changed, 409 insertions(+), 373 deletions(-)

diff --git a/src/main/java/com/sipai/controller/user/ProcessSectionController.java b/src/main/java/com/sipai/controller/user/ProcessSectionController.java
index ee570fbc..52eb0dee 100644
--- a/src/main/java/com/sipai/controller/user/ProcessSectionController.java
+++ b/src/main/java/com/sipai/controller/user/ProcessSectionController.java
@@ -242,11 +242,20 @@ public class ProcessSectionController {
     @RequestMapping("/getProcessSection4Select.do")
     public String getProcessSection4Select(HttpServletRequest request, Model model) {
         String companyId = request.getParameter("companyId"); // 默认查询JSBZ???
-        // 使用unitService获取Unit信息，因为companyId来自tb_unit表
+        // companyId在不同页面可能来自tb_unit或tb_company，统一兼容两种来源
         Unit unit = this.unitService.getUnitById(companyId);
+        String unitType = null;
+        if (unit != null) {
+            unitType = unit.getType();
+        } else if (companyId != null && !companyId.isEmpty()) {
+            Company company = this.unitService.getCompById(companyId);
+            if (company != null) {
+                unitType = company.getType();
+            }
+        }
 
         String wherestr = "where 1=1 and active='" + CommString.Active_True + "' ";
-        if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+        if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
             String bizs = "";//公司下属所有厂id
             List<Unit> blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId);
             if (blist != null && blist.size() > 0) {
@@ -258,7 +267,7 @@ public class ProcessSectionController {
             }
             bizs = bizs.replace(",", "','");
             wherestr += " and (unit_id='" + ProcessSection.UnitId_Sys + "' or (code not in (select code from tb_process_section where unit_id='" + ProcessSection.UnitId_Sys + "')) and  unit_id in ('" + bizs + "') ) ";
-        } else if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_BIZ)) { // B 水厂
+        } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { // B 水厂
             wherestr += " and unit_id='" + companyId + "' ";
         }
         if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
@@ -273,13 +282,16 @@ public class ProcessSectionController {
             for (int i = 0; i < processSections.size(); i++) {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("id", processSections.get(i).getCode());
-                if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_COMPANY)) { //  "C";//公司
+                if (CommString.UNIT_TYPE_COMPANY.equals(unitType)) { //  "C";//公司
                     if (!processSections.get(i).getUnitId().equals(ProcessSection.UnitId_Sys)) {
                         jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")");
                     } else {
                         jsonObject.put("text", processSections.get(i).getSname());
                     }
-                } else if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_BIZ)) { //  "B";//水厂
+                } else if (CommString.UNIT_TYPE_BIZ.equals(unitType)) { //  "B";//水厂
+                    jsonObject.put("text", processSections.get(i).getSname());
+                } else {
+                    // 兜底，避免前端下拉出现有id无text导致显示为空
                     jsonObject.put("text", processSections.get(i).getSname());
                 }
 
diff --git a/src/main/webapp/jsp/work/KPIPointList.jsp b/src/main/webapp/jsp/work/KPIPointList.jsp
index 8c32ee14..ec57207b 100644
--- a/src/main/webapp/jsp/work/KPIPointList.jsp
+++ b/src/main/webapp/jsp/work/KPIPointList.jsp
@@ -1,406 +1,430 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ page import="com.sipai.entity.base.ServerObject"%>
-<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security"%>
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="com.sipai.entity.base.ServerObject" %>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
 <!DOCTYPE html>
 <!-- <html lang="zh-CN"> -->
 <!-- BEGIN HEAD -->
 <head>
-<title><%= ServerObject.atttable.get("TOPTITLE")%></title>
+    <title><%= ServerObject.atttable.get("TOPTITLE")%>
+    </title>
 
-<!-- 引用页头及CSS页-->
-<jsp:include page="/jsp/inc.jsp"></jsp:include>
-<style type="text/css">
-    .select2-container .select2-selection--single{  
-      height:34px;  
-      line-height: 34px;  
-    }
-    .select2-selection__arrow{
-    margin-top:3px;
-    }  
-</style>
-<script type="text/javascript">
-var companyId = "";
-	var showMaintenanceList = function(id) {
-	    $.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId:id} , function(data) {
-	        $("#subDiv").html(data);
-	        openModal('subMaintenanceModal');
-	    }); 
-	};
-	var showHandleDetailList = function(id) {
-		stopBubbleDefaultEvent();
-        $.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId:id} , function(data) {
-            $("#subDiv").html(data);
-            openModal('handleDetailModal');
-        }); 
-    };
-    var viewEquipmentFun = function(equipmentName,equipmentCardID,id) {
-        $.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {equipmentName:equipmentName,equipmentCardID:equipmentCardID,id:id} , function(data) {
-            $("#subEquipmentDiv").html(data);
-            openModal('subEquipmentModal');
-        }); 
-    };
+    <!-- 引用页头及CSS页-->
+    <jsp:include page="/jsp/inc.jsp"></jsp:include>
+    <style type="text/css">
+        .select2-container .select2-selection--single {
+            height: 34px;
+            line-height: 34px;
+        }
 
-	var addFun = function() {
-        $.post(ext.contextPath + '/work/kpipoint/add.do', {} , function(data) {
-            $("#subDiv").html(data);
-            openModal('subModal');
-        }); 
-	};
+        .select2-selection__arrow {
+            margin-top: 3px;
+        }
+    </style>
+    <script type="text/javascript">
+        var companyId = "";
+        var showMaintenanceList = function (id) {
+            $.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subMaintenanceModal');
+            });
+        };
+        var showHandleDetailList = function (id) {
+            stopBubbleDefaultEvent();
+            $.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('handleDetailModal');
+            });
+        };
+        var viewEquipmentFun = function (equipmentName, equipmentCardID, id) {
+            $.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {
+                equipmentName: equipmentName,
+                equipmentCardID: equipmentCardID,
+                id: id
+            }, function (data) {
+                $("#subEquipmentDiv").html(data);
+                openModal('subEquipmentModal');
+            });
+        };
 
-	var editFun = function(id) {
-		stopBubbleDefaultEvent();
-        $.post(ext.contextPath + '/work/kpipoint/edit.do', {id:id} , function(data) {
-        	$("#subDiv").html(data);
-        	openModal('subModal');
-        }); 
-	};
+        var addFun = function () {
+            $.post(ext.contextPath + '/work/kpipoint/add.do', {}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subModal');
+            });
+        };
 
-	var viewFun = function(id){
-	     $.post(ext.contextPath + '/work/kpipoint/view.do', {id:id} , function(data) {
-        	$("#subDiv").html(data);
-        	openModal('subModal');
-        }); 
-	};
+        var editFun = function (id) {
+            stopBubbleDefaultEvent();
+            $.post(ext.contextPath + '/work/kpipoint/edit.do', {id: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subModal');
+            });
+        };
+
+        var viewFun = function (id) {
+            $.post(ext.contextPath + '/work/kpipoint/view.do', {id: id}, function (data) {
+                $("#subDiv").html(data);
+                openModal('subModal');
+            });
+        };
+
+        var deleteFun = function (id) {
+            stopBubbleDefaultEvent();
+            swal({
+                text: "您确定要删除此记录？",
+                dangerMode: true,
+                buttons: {
+                    cancel: {
+                        text: "取消",
+                        value: null,
+                        visible: true,
+                        className: "btn btn-default btn-sm",
+                        closeModal: true,
+                    },
+                    confirm: {
+                        text: "确定",
+                        value: true,
+                        visible: true,
+                        className: "btn btn-danger btn-sm",
+                        closeModal: true
+                    }
+                }
+            })
+                .then(function (willDelete) {
+                    if (willDelete) {
+                        $.post(ext.contextPath + '/work/kpipoint/delete.do', {id: id}, function (data) {
+                            if (data == 1) {
+                                $("#table").bootstrapTable('refresh');
+                            } else {
+                                showAlert('d', '删除失败', 'mainAlertdiv');
+                            }
+                        });
 
-	var deleteFun = function(id) {
-		stopBubbleDefaultEvent();
-		swal({
-			  text: "您确定要删除此记录？",
-			  dangerMode: true,
-			  buttons: {
-				    cancel: {
-				        text: "取消",
-				        value: null,
-				        visible: true,
-				        className: "btn btn-default btn-sm",
-				        closeModal: true,
-				      },
-				      confirm: {
-				        text: "确定",
-				        value: true,
-				        visible: true,
-				        className: "btn btn-danger btn-sm",
-				        closeModal: true
-				      }
-				}
-			})
-            .then(function(willDelete) {
-			  if (willDelete) {
-                $.post(ext.contextPath + '/work/kpipoint/delete.do', {id : id}, function(data) {
-                    if(data==1){
-                    	$("#table").bootstrapTable('refresh');
-                    }else{
-                    	showAlert('d','删除失败','mainAlertdiv'); 
                     }
                 });
-			    
-			  }
-			});
-	};
-	//删除多条资产类型数据
-	var deletesFun = function() {
-	    var checkedItems = $("#table").bootstrapTable('getSelections');
-	    var datas="";
-	    $.each(checkedItems, function(index, item){
-	        datas+=item.id+",";
-	    }); 
-	    if(datas==""){
-	    	showAlert('d','请先选择记录','mainAlertdiv');
-	    }else{
-	    	swal({
-	              text: "您确定要删除此记录？",
-	              dangerMode: true,
-	              buttons: {
-	                    cancel: {
-	                        text: "取消",
-	                        value: null,
-	                        visible: true,
-	                        className: "btn btn-default btn-sm",
-	                        closeModal: true,
-	                      },
-	                      confirm: {
-	                        text: "确定",
-	                        value: true,
-	                        visible: true,
-	                        className: "btn btn-danger btn-sm",
-	                        closeModal: true
-	                      }
-	                }
-	            })
-	            .then(function(willDelete) {
-	              if (willDelete) {
-	            	  $.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids:datas} , function(data) {
-	            		  if(data>0){
-	                          $("#table").bootstrapTable('refresh');
-	                      }else{
-	                          showAlert('d','删除失败','mainAlertdiv'); 
-	                      }
-	                  });
-	                
-	              }
-	            });
-	    }
-	};
-    var dosearch = function() {
-        $("#table").bootstrapTable('refresh');
-    };
-    var refreshSelect = function() {
-        var selelct_ =$("#processSection").select2({
-            data: null,
-            placeholder:'请选择',//默认文字提示
-            allowClear: true,//允许清空
-            escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-            language: "zh-CN", 
-            minimumInputLength: 0,
-            minimumResultsForSearch: 10,//数据超过十个启用搜索框
-        });
-        $("#processSection").empty(); 
-        // $("#table").bootstrapTable('refresh', {data:null});
-        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-    };
-    
-    
-    $(function() {
-    	 $.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function(data) {
-  		   if(data.length == 1){
-  		       //选择厂区为一个厂时隐藏选择框
-  			   $("#search_code").css("display", "none");
-  			   $("#company").text(data[0].text);
-  			   companyId=data[0].id;
-  			   dosearch();
-  		       $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
-                 $("#processSection").empty(); 
-                 var selelct_ =$("#processSection").select2({
+        };
+        //删除多条资产类型数据
+        var deletesFun = function () {
+            var checkedItems = $("#table").bootstrapTable('getSelections');
+            var datas = "";
+            $.each(checkedItems, function (index, item) {
+                datas += item.id + ",";
+            });
+            if (datas == "") {
+                showAlert('d', '请先选择记录', 'mainAlertdiv');
+            } else {
+                swal({
+                    text: "您确定要删除此记录？",
+                    dangerMode: true,
+                    buttons: {
+                        cancel: {
+                            text: "取消",
+                            value: null,
+                            visible: true,
+                            className: "btn btn-default btn-sm",
+                            closeModal: true,
+                        },
+                        confirm: {
+                            text: "确定",
+                            value: true,
+                            visible: true,
+                            className: "btn btn-danger btn-sm",
+                            closeModal: true
+                        }
+                    }
+                })
+                    .then(function (willDelete) {
+                        if (willDelete) {
+                            $.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids: datas}, function (data) {
+                                if (data > 0) {
+                                    $("#table").bootstrapTable('refresh');
+                                } else {
+                                    showAlert('d', '删除失败', 'mainAlertdiv');
+                                }
+                            });
+
+                        }
+                    });
+            }
+        };
+        var dosearch = function () {
+            $("#table").bootstrapTable('refresh');
+        };
+        var loadProcessSectionSelect = function (bizId) {
+            if (!bizId) {
+                refreshSelect();
+                return;
+            }
+            $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId: bizId}, function (data) {
+                $("#processSection").empty();
+                var selelct_ = $("#processSection").select2({
+                    data: data,
+                    cache: false,
+                    placeholder: '请选择',
+                    allowClear: true,
+                    escapeMarkup: function (markup) {
+                        return markup;
+                    },
+                    language: "zh-CN",
+                    minimumInputLength: 0,
+                    minimumResultsForSearch: 10,
+                    formatResult: function formatRepo(repo) {
+                        return repo.text;
+                    },
+                    formatSelection: function formatRepoSelection(repo) {
+                        return repo.text;
+                    }
+                });
+                $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'});
+                selelct_.val('').trigger("change");
+                selelct_.off("change").on("change", function () {
+                    dosearch();
+                });
+            }, 'json');
+        };
+        var refreshSelect = function () {
+            var selelct_ = $("#processSection").select2({
+                data: null,
+                placeholder: '请选择',//默认文字提示
+                allowClear: true,//允许清空
+                escapeMarkup: function (markup) {
+                    return markup;
+                }, // 自定义格式化防止xss注入
+                language: "zh-CN",
+                minimumInputLength: 0,
+                minimumResultsForSearch: 10,//数据超过十个启用搜索框
+            });
+            $("#processSection").empty();
+            // $("#table").bootstrapTable('refresh', {data:null});
+            $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
+        };
+
+
+        $(function () {
+            $.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function (data) {
+                if (data.length == 1) {
+                    //选择厂区为一个厂时隐藏选择框
+                    $("#search_code").css("display", "none");
+                    $("#company").text(data[0].text);
+                    companyId = data[0].id;
+                    loadProcessSectionSelect(companyId);
+                    dosearch();
+                } else {
+                    // 当前页面可能不展示厂区下拉（search_code被注释），兜底按当前厂区/首个厂区加载工艺段
+                    if ($("#search_code").length == 0) {
+                        companyId = (typeof unitId !== "undefined" && unitId) ? unitId : data[0].id;
+                        loadProcessSectionSelect(companyId);
+                        dosearch();
+                        return;
+                    }
+                    $("#company").css("display", "none");
+                    var selelct = $("#search_code").select2({
                         data: data,
-                        cache : false,
-                        placeholder:'请选择',//默认文字提示
+                        placeholder: '请选择',//默认文字提示
                         allowClear: true,//允许清空
-                        escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-                        language: "zh-CN", 
+                        escapeMarkup: function (markup) {
+                            return markup;
+                        }, // 自定义格式化防止xss注入
+                        language: "zh-CN",
                         minimumInputLength: 0,
                         minimumResultsForSearch: 10,//数据超过十个启用搜索框
-                        formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-                        formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-                  });  
-                 $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-                 selelct_.val('').trigger("change");
-                 selelct_.on("change",function(e){
-                     dosearch();
-                 });
-                 
-             },'json'); 
-  		   }else{
-  			   $("#company").css("display", "none");
-  			   var selelct=$("#search_code").select2({
-  				  data : data ,
-  		          placeholder:'请选择',//默认文字提示
-  		          allowClear: true,//允许清空
-  		          escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-  		          language: "zh-CN", 
-  		          minimumInputLength: 0,
-  		          minimumResultsForSearch: 10,//数据超过十个启用搜索框
-  		          formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-  		          formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-  		        }); 
-  		        $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		        selelct.val('').trigger("change");
-  		        refreshSelect();
-  		        selelct.on("change",function(e){
-  		            companyId= $(this).val();
-  		            dosearch();
-  		            refreshSelect();
-  		            $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) {
-  		               $("#processSection").empty(); 
-  		               var selelct_ =$("#processSection").select2({
-  		                      data: data,
-  		                      cache : false,
-  		                      placeholder:'请选择',//默认文字提示
-  		                      allowClear: true,//允许清空
-  		                      escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
-  		                      language: "zh-CN", 
-  		                      minimumInputLength: 0,
-  		                      minimumResultsForSearch: 10,//数据超过十个启用搜索框
-  		                      formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
-  		                      formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
-  		                });  
-  		               $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'})
-  		               selelct_.val('').trigger("change");
-  		               selelct_.on("change",function(e){
-  		                   dosearch();
-  		               });
-  		           },'json');   
-  		        });  
-  		   }
-         },'json');  
-       
-        $("#table").bootstrapTable({ // 对应table标签的id
-            url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url
-            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-            striped: true,  //表格显示条纹，默认为false
-            pagination: true, // 在表格底部显示分页组件，默认false
-            pageList: [10, 20,50], // 设置页面可以显示的数据条数
-            pageSize: 50, // 页面数据条数
-            pageNumber: 1, // 首页页码
-            sidePagination: 'server', // 设置为服务器端分页
-            queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求
-                return {
-                    rows: params.limit, // 每页要显示的数据条数
-                    page: params.offset/params.limit+1, // 每页显示数据的开始页码
-                    sort: params.sort, // 要排序的字段
-                    order: params.order,
-                    search_name : $('#search_name').val(),
-                    companyId: unitId,
-                    pSectionId: $("#processSection").val(),
+                        formatResult: function formatRepo(repo) {
+                            return repo.text;
+                        }, // 函数用来渲染结果
+                        formatSelection: function formatRepoSelection(repo) {
+                            return repo.text;
+                        } // 函数用于呈现当前的选择
+                    });
+                    $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
+                    selelct.val('').trigger("change");
+                    refreshSelect();
+                    selelct.on("change", function (e) {
+                        companyId = $(this).val();
+                        dosearch();
+                        refreshSelect();
+                        loadProcessSectionSelect(companyId);
+                    });
                 }
-            },
-            sortName: 'grade', // 要排序的字段
-            sortOrder: 'asc', // 排序规则
-            onClickRow: function (row) {//单击行事件,执行查看功能
-            	viewFun(row.id);
-            }, 
-            columns: [
-                {
-	                  checkbox: true, // 显示一个勾选框
-	            },{
-                    field: 'mpointid', // 返回json数据中的name
-                    title: '测量点编号', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'mpointname', // 返回json数据中的name
-                    title: '测量点名称', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'bizid', // 返回json数据中的name
-                    title: '所属厂区', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'processectionname', // 返回json数据中的name
-                    title: '工艺段', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle' // 上下居中
-                },{
-                    field: 'grade', // 返回json数据中的name
-                    title: '重要等级', // 表格表头显示文字
-                    align: 'center', // 左右居中
-                    valign: 'middle'
-                },{
-                    title: "操作",
-                    align: 'center',
-                    valign: 'middle',
-                    width: 120, // 定义列的宽度，单位为像素px
-                    formatter: function (value, row, index) {
-                        var buts="";
-                           buts+= '<security:authorize buttonUrl="work/scadaPic/edit.do">';
-	                	   buts+= '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
-	                	   buts+= '</security:authorize>';
-	                	   
-	                	   buts+= '<security:authorize buttonUrl="work/scadaPic/delete.do">';
-                           buts+='<button class="btn btn-default btn-sm" title="删除" onclick="deleteFun(\''+row.id+'\')"><i class="fa fa fa-trash-o"></i><span class="hidden-md hidden-lg">删除</span></button';
-                           buts+= '</security:authorize>';
-                           
-	                       buts='<div class="btn-group" >'+buts+'</div>';
-                        return buts;
+            }, 'json');
+
+            $("#table").bootstrapTable({ // 对应table标签的id
+                url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url
+                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+                striped: true,  //表格显示条纹，默认为false
+                pagination: true, // 在表格底部显示分页组件，默认false
+                pageList: [10, 20, 50], // 设置页面可以显示的数据条数
+                pageSize: 50, // 页面数据条数
+                pageNumber: 1, // 首页页码
+                sidePagination: 'server', // 设置为服务器端分页
+                queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求
+                    return {
+                        rows: params.limit, // 每页要显示的数据条数
+                        page: params.offset / params.limit + 1, // 每页显示数据的开始页码
+                        sort: params.sort, // 要排序的字段
+                        order: params.order,
+                        search_name: $('#search_name').val(),
+                        companyId: companyId,
+                        pSectionId: $("#processSection").val(),
                     }
+                },
+                sortName: 'grade', // 要排序的字段
+                sortOrder: 'asc', // 排序规则
+                onClickRow: function (row) {//单击行事件,执行查看功能
+                    viewFun(row.id);
+                },
+                columns: [
+                    {
+                        checkbox: true, // 显示一个勾选框
+                    }, {
+                        field: 'mpointid', // 返回json数据中的name
+                        title: '测量点编号', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'mpointname', // 返回json数据中的name
+                        title: '测量点名称', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'bizid', // 返回json数据中的name
+                        title: '所属厂区', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'processectionname', // 返回json数据中的name
+                        title: '工艺段', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle' // 上下居中
+                    }, {
+                        field: 'grade', // 返回json数据中的name
+                        title: '重要等级', // 表格表头显示文字
+                        align: 'center', // 左右居中
+                        valign: 'middle'
+                    }, {
+                        title: "操作",
+                        align: 'center',
+                        valign: 'middle',
+                        width: 120, // 定义列的宽度，单位为像素px
+                        formatter: function (value, row, index) {
+                            var buts = "";
+                            buts += '<security:authorize buttonUrl="work/scadaPic/edit.do">';
+                            buts += '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
+                            buts += '</security:authorize>';
+
+                            buts += '<security:authorize buttonUrl="work/scadaPic/delete.do">';
+                            buts += '<button class="btn btn-default btn-sm" title="删除" onclick="deleteFun(\'' + row.id + '\')"><i class="fa fa fa-trash-o"></i><span class="hidden-md hidden-lg">删除</span></button';
+                            buts += '</security:authorize>';
+
+                            buts = '<div class="btn-group" >' + buts + '</div>';
+                            return buts;
+                        }
+                    }
+                ],
+                onLoadSuccess: function () {  //加载成功时执行
+                    adjustBootstrapTableView("table");
+                },
+                onLoadError: function () {  //加载失败时执行
+                    console.info("加载数据失败");
                 }
-            ],
-            onLoadSuccess: function(){  //加载成功时执行
-                adjustBootstrapTableView("table");
-            },
-            onLoadError: function(){  //加载失败时执行
-                  console.info("加载数据失败");
-            }
-      
-      })
-        
-       
-    });
-</script>
+
+            })
+
+
+        });
+    </script>
 
 </head>
 <body onload="initMenu()" class="hold-transition ${cu.themeclass} sidebar-mini">
-    <div class="wrapper">
-        <!-- 引用top -->
-       <%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%>
-        <!-- 菜单栏 -->
-        <%-- <jsp:include page="/jsp/left.jsp"></jsp:include>  --%>
-        <div class="content-wrapper">
-             <!-- Content Header (Page header) -->
-             <section class="content-header">
-               <h1 id ="head_title"></h1>
-               <ol class="breadcrumb">
-                 <li><a id ='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
-                 <!-- <li class="active">Here</li> -->
-               </ol>
-             </section>
-             <!-- Main content -->
-             <section class="content container-fluid">
-                <div id="mainAlertdiv"></div>
-                <div id="subDiv"></div>
-                <div id="mpSubDiv"></div>
-                <div >
-                    <!-- <div class="form-group">
-	                                <label class="form-label" id="companylabel">水厂：</label>
-	                                <label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label>
-	                                 <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
-	                </div> -->
-                    <div class="form-group form-inline" style="padding:0;">
+<div class="wrapper">
+    <!-- 引用top -->
+    <%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%>
+    <!-- 菜单栏 -->
+    <%-- <jsp:include page="/jsp/left.jsp"></jsp:include>  --%>
+    <div class="content-wrapper">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+            <h1 id="head_title"></h1>
+            <ol class="breadcrumb">
+                <li><a id='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
+                <!-- <li class="active">Here</li> -->
+            </ol>
+        </section>
+        <!-- Main content -->
+        <section class="content container-fluid">
+            <div id="mainAlertdiv"></div>
+            <div id="subDiv"></div>
+            <div id="mpSubDiv"></div>
+            <div>
+                <!-- <div class="form-group">
+                                <label class="form-label" id="companylabel">水厂：</label>
+                                <label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label>
+                                 <select class="form-control select2 "  id="search_code" name ="search_code" style="width: 220px;"></select>
+                </div> -->
+                <div class="form-group form-inline" style="padding:0;">
+                    <div class="form-group  form-inline">
                         <div class="form-group  form-inline">
-	                        <div class="form-group  form-inline">
-	                             <div class="btn-group" style="width: 220px;padding-bottom:10px;">
-							<security:authorize buttonUrl="work/scadaPic/add.do">
-								<button type="button" class="btn btn-default btn-sm" onclick="addFun();"><i class="fa fa-plus"></i> 新增</button>
-								<button type="button" class="btn btn-default btn-sm" onclick="deletesFun();"><i class="fa fa-trash-o"></i> 删除</button>
-							</security:authorize>
-					</div>
-	                        </div>
-                        </div>
-                        <div class="form-group pull-right" >
-                             <div class="input-group input-group-sm" style="width: 250px;">
-                               <input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="编号">
-                               <div class="input-group-btn">
-                                 <button  class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i></button>
-                               </div>
+                            <div class="btn-group" style="width: 220px;padding-bottom:10px;">
+                                <security:authorize buttonUrl="work/scadaPic/add.do">
+                                    <button type="button" class="btn btn-default btn-sm" onclick="addFun();"><i
+                                            class="fa fa-plus"></i> 新增
+                                    </button>
+                                    <button type="button" class="btn btn-default btn-sm" onclick="deletesFun();"><i
+                                            class="fa fa-trash-o"></i> 删除
+                                    </button>
+                                </security:authorize>
                             </div>
                         </div>
-                       <div class="form-group pull-right">
-	                            <label class="form-label">工艺段</label>
-	                            <select class="form-control select2 "  id="processSection" name ="processSection" style="width: 220px;"></select>
-	                        </div>
                     </div>
-                          
-                    <table id="table"></table>
+                    <div class="form-group pull-right">
+                        <div class="input-group input-group-sm" style="width: 250px;">
+                            <input type="text" id="search_name" name="search_name" class="form-control pull-right"
+                                   placeholder="编号">
+                            <div class="input-group-btn">
+                                <button class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group pull-right">
+                        <label class="form-label">工艺段</label>
+                        <select class="form-control select2 " id="processSection" name="processSection"
+                                style="width: 220px;"></select>
+                    </div>
                 </div>
-                
-                 
-            
-             </section>
-             <!-- /.content -->
-        </div>
-        <%--  <jsp:include page="/jsp/bottom.jsp"></jsp:include>  --%>
-       <%-- <jsp:include page="/jsp/side.jsp"></jsp:include>  --%>
+
+                <table id="table"></table>
+            </div>
+
+
+        </section>
+        <!-- /.content -->
     </div>
+    <%--  <jsp:include page="/jsp/bottom.jsp"></jsp:include>  --%>
+    <%-- <jsp:include page="/jsp/side.jsp"></jsp:include>  --%>
+</div>
 </body>
 <!-- 文件上传-->
 <link rel="stylesheet" href="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/css/fileinput.min.css"/>
 <%-- <script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js" charset="utf-8"></script>  --%>
 <script type="text/javascript">
-document.write("<scr"+"ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js\"></sc"+"ript>")
-document.write("<scr"+"ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc"+"ript>")
-</script> 
+    document.write("<scr" + "ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/fileinput.min.js\"></sc" + "ript>")
+    document.write("<scr" + "ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc" + "ript>")
+</script>
 <!-- 引入ChartJS-->
-<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.bundle.min.js" charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.min.js"
+        charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.bundle.min.js"
+        charset="utf-8"></script>
 <!-- 引入daterangepicker-->
-<link rel="stylesheet"  href="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.css"/>
-<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/moment.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js" charset="utf-8"></script>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.css"/>
+<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/moment.min.js"
+        charset="utf-8"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js"
+        charset="utf-8"></script>
 <!-- echarts-->
 <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/echarts.js" charset="utf-8"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/macarons.js" charset="utf-8"></script>