xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
Timer
2026-04-09 09:09:00 +08:00
parent 78ec2cbe85
commit f89ab0f90d
2 changed files with 409 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/sipai/controller/user/ProcessSectionController.java
View File

@ -242,11 +242,20 @@ public class ProcessSectionController {
@RequestMapping("/getProcessSection4Select.do") @RequestMapping("/getProcessSection4Select.do")
public String getProcessSection4Select(HttpServletRequest request, Model model) { public String getProcessSection4Select(HttpServletRequest request, Model model) {
String companyId = request.getParameter("companyId"); // 默认查询JSBZ??? String companyId = request.getParameter("companyId"); // 默认查询JSBZ???
// 使用unitService获取Unit信息，因为companyId来自tb_unit表 // companyId在不同页面可能来自tb_unit或tb_company，统一兼容两种来源
Unit unit = this.unitService.getUnitById(companyId); 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 + "' "; 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 String bizs = "";//公司下属所有厂id
List<Unit> blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId); List<Unit> blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId);
if (blist != null && blist.size() > 0) { if (blist != null && blist.size() > 0) {
@ -258,7 +267,7 @@ public class ProcessSectionController {
} }
bizs = bizs.replace(",", "','"); 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 + "') ) "; 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 + "' "; wherestr += " and unit_id='" + companyId + "' ";
} }
if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) { 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++) { for (int i = 0; i < processSections.size(); i++) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("id", processSections.get(i).getCode()); 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)) { if (!processSections.get(i).getUnitId().equals(ProcessSection.UnitId_Sys)) {
jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")"); jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")");
} else { } else {
jsonObject.put("text", processSections.get(i).getSname()); 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()); jsonObject.put("text", processSections.get(i).getSname());
} }

318
src/main/webapp/jsp/work/KPIPointList.jsp
View File

@ -1,71 +1,77 @@
<%@ page language="java" pageEncoding="UTF-8"%> <%@ page language="java" pageEncoding="UTF-8" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ 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/functions" prefix="fn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="com.sipai.entity.base.ServerObject"%> <%@ page import="com.sipai.entity.base.ServerObject" %>
<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security"%> <%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security" %>
<!DOCTYPE html> <!DOCTYPE html>
<!-- <html lang="zh-CN"> --> <!-- <html lang="zh-CN"> -->
<!-- BEGIN HEAD --> <!-- BEGIN HEAD -->
<head> <head>
<title><%= ServerObject.atttable.get("TOPTITLE")%></title> <title><%= ServerObject.atttable.get("TOPTITLE")%>
</title>
<!-- 引用页头及CSS页--> <!-- 引用页头及CSS页-->
<jsp:include page="/jsp/inc.jsp"></jsp:include> <jsp:include page="/jsp/inc.jsp"></jsp:include>
<style type="text/css"> <style type="text/css">
.select2-container .select2-selection--single{ .select2-container .select2-selection--single {
height:34px; height: 34px;
line-height: 34px; line-height: 34px;
} }
.select2-selection__arrow{
margin-top:3px; .select2-selection__arrow {
margin-top: 3px;
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
var companyId = ""; var companyId = "";
var showMaintenanceList = function(id) { var showMaintenanceList = function (id) {
$.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId:id} , function(data) { $.post(ext.contextPath + '/maintenance/showMaintenanceList4Equipment.do', {equipmentId: id}, function (data) {
$("#subDiv").html(data); $("#subDiv").html(data);
openModal('subMaintenanceModal'); openModal('subMaintenanceModal');
}); });
}; };
var showHandleDetailList = function(id) { var showHandleDetailList = function (id) {
stopBubbleDefaultEvent(); stopBubbleDefaultEvent();
$.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId:id} , function(data) { $.post(ext.contextPath + '/maintenance/showHandleDetailList4Equipment.do', {equipmentId: id}, function (data) {
$("#subDiv").html(data); $("#subDiv").html(data);
openModal('handleDetailModal'); openModal('handleDetailModal');
}); });
}; };
var viewEquipmentFun = function(equipmentName,equipmentCardID,id) { var viewEquipmentFun = function (equipmentName, equipmentCardID, id) {
$.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {equipmentName:equipmentName,equipmentCardID:equipmentCardID,id:id} , function(data) { $.post(ext.contextPath + '/equipment/viewEquipmentCard.do', {
equipmentName: equipmentName,
equipmentCardID: equipmentCardID,
id: id
}, function (data) {
$("#subEquipmentDiv").html(data); $("#subEquipmentDiv").html(data);
openModal('subEquipmentModal'); openModal('subEquipmentModal');
}); });
}; };
var addFun = function() { var addFun = function () {
$.post(ext.contextPath + '/work/kpipoint/add.do', {} , function(data) { $.post(ext.contextPath + '/work/kpipoint/add.do', {}, function (data) {
$("#subDiv").html(data); $("#subDiv").html(data);
openModal('subModal'); openModal('subModal');
}); });
}; };
var editFun = function(id) { var editFun = function (id) {
stopBubbleDefaultEvent(); stopBubbleDefaultEvent();
$.post(ext.contextPath + '/work/kpipoint/edit.do', {id:id} , function(data) { $.post(ext.contextPath + '/work/kpipoint/edit.do', {id: id}, function (data) {
$("#subDiv").html(data); $("#subDiv").html(data);
openModal('subModal'); openModal('subModal');
}); });
}; };
var viewFun = function(id){ var viewFun = function (id) {
$.post(ext.contextPath + '/work/kpipoint/view.do', {id:id} , function(data) { $.post(ext.contextPath + '/work/kpipoint/view.do', {id: id}, function (data) {
$("#subDiv").html(data); $("#subDiv").html(data);
openModal('subModal'); openModal('subModal');
}); });
}; };
var deleteFun = function(id) { var deleteFun = function (id) {
stopBubbleDefaultEvent(); stopBubbleDefaultEvent();
swal({ swal({
text: "您确定要删除此记录？", text: "您确定要删除此记录？",
@ -87,13 +93,13 @@ var companyId = "";
} }
} }
}) })
.then(function(willDelete) { .then(function (willDelete) {
if (willDelete) { if (willDelete) {
$.post(ext.contextPath + '/work/kpipoint/delete.do', {id : id}, function(data) { $.post(ext.contextPath + '/work/kpipoint/delete.do', {id: id}, function (data) {
if(data==1){ if (data == 1) {
$("#table").bootstrapTable('refresh'); $("#table").bootstrapTable('refresh');
}else{ } else {
showAlert('d','删除失败','mainAlertdiv'); showAlert('d', '删除失败', 'mainAlertdiv');
} }
}); });
@ -101,15 +107,15 @@ var companyId = "";
}); });
}; };
//删除多条资产类型数据 //删除多条资产类型数据
var deletesFun = function() { var deletesFun = function () {
var checkedItems = $("#table").bootstrapTable('getSelections'); var checkedItems = $("#table").bootstrapTable('getSelections');
var datas=""; var datas = "";
$.each(checkedItems, function(index, item){ $.each(checkedItems, function (index, item) {
datas+=item.id+","; datas += item.id + ",";
}); });
if(datas==""){ if (datas == "") {
showAlert('d','请先选择记录','mainAlertdiv'); showAlert('d', '请先选择记录', 'mainAlertdiv');
}else{ } else {
swal({ swal({
text: "您确定要删除此记录？", text: "您确定要删除此记录？",
dangerMode: true, dangerMode: true,
@ -130,13 +136,13 @@ var companyId = "";
} }
} }
}) })
.then(function(willDelete) { .then(function (willDelete) {
if (willDelete) { if (willDelete) {
$.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids:datas} , function(data) { $.post(ext.contextPath + '/work/kpipoint/deletes.do', {ids: datas}, function (data) {
if(data>0){ if (data > 0) {
$("#table").bootstrapTable('refresh'); $("#table").bootstrapTable('refresh');
}else{ } else {
showAlert('d','删除失败','mainAlertdiv'); showAlert('d', '删除失败', 'mainAlertdiv');
} }
}); });
@ -144,115 +150,123 @@ var companyId = "";
}); });
} }
}; };
var dosearch = function() { var dosearch = function () {
$("#table").bootstrapTable('refresh'); $("#table").bootstrapTable('refresh');
}; };
var refreshSelect = function() { var loadProcessSectionSelect = function (bizId) {
var selelct_ =$("#processSection").select2({ 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, data: null,
placeholder:'请选择',//默认文字提示 placeholder: '请选择',//默认文字提示
allowClear: true,//允许清空 allowClear: true,//允许清空
escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入 escapeMarkup: function (markup) {
return markup;
}, // 自定义格式化防止xss注入
language: "zh-CN", language: "zh-CN",
minimumInputLength: 0, minimumInputLength: 0,
minimumResultsForSearch: 10,//数据超过十个启用搜索框 minimumResultsForSearch: 10,//数据超过十个启用搜索框
}); });
$("#processSection").empty(); $("#processSection").empty();
// $("#table").bootstrapTable('refresh', {data:null}); // $("#table").bootstrapTable('refresh', {data:null});
$(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
}; };
$(function() { $(function () {
$.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function(data) { $.post(ext.contextPath + "/user/getSearchBizsByUserId4Select.do", {}, function (data) {
if(data.length == 1){ if (data.length == 1) {
//选择厂区为一个厂时隐藏选择框 //选择厂区为一个厂时隐藏选择框
$("#search_code").css("display", "none"); $("#search_code").css("display", "none");
$("#company").text(data[0].text); $("#company").text(data[0].text);
companyId=data[0].id; companyId = data[0].id;
loadProcessSectionSelect(companyId);
dosearch(); dosearch();
$.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { } else {
$("#processSection").empty(); // 当前页面可能不展示厂区下拉（search_code被注释），兜底按当前厂区/首个厂区加载工艺段
var selelct_ =$("#processSection").select2({ if ($("#search_code").length == 0) {
data: data, companyId = (typeof unitId !== "undefined" && unitId) ? unitId : data[0].id;
cache : false, loadProcessSectionSelect(companyId);
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(); dosearch();
}); return;
}
},'json');
}else{
$("#company").css("display", "none"); $("#company").css("display", "none");
var selelct=$("#search_code").select2({ var selelct = $("#search_code").select2({
data : data , data: data,
placeholder:'请选择',//默认文字提示 placeholder: '请选择',//默认文字提示
allowClear: true,//允许清空 allowClear: true,//允许清空
escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入 escapeMarkup: function (markup) {
return markup;
}, // 自定义格式化防止xss注入
language: "zh-CN", language: "zh-CN",
minimumInputLength: 0, minimumInputLength: 0,
minimumResultsForSearch: 10,//数据超过十个启用搜索框 minimumResultsForSearch: 10,//数据超过十个启用搜索框
formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatResult: function formatRepo(repo) {
formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 return repo.text;
}, // 函数用来渲染结果
formatSelection: function formatRepoSelection(repo) {
return repo.text;
} // 函数用于呈现当前的选择
}); });
$(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'})
selelct.val('').trigger("change"); selelct.val('').trigger("change");
refreshSelect(); refreshSelect();
selelct.on("change",function(e){ selelct.on("change", function (e) {
companyId= $(this).val(); companyId = $(this).val();
dosearch(); dosearch();
refreshSelect(); refreshSelect();
$.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { loadProcessSectionSelect(companyId);
$("#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'); }, 'json');
$("#table").bootstrapTable({ // 对应table标签的id $("#table").bootstrapTable({ // 对应table标签的id
url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url url: ext.contextPath + '/work/kpipoint/getlist.do', // 获取表格数据的url
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
striped: true, //表格显示条纹，默认为false striped: true, //表格显示条纹，默认为false
pagination: true, // 在表格底部显示分页组件，默认false pagination: true, // 在表格底部显示分页组件，默认false
pageList: [10, 20,50], // 设置页面可以显示的数据条数 pageList: [10, 20, 50], // 设置页面可以显示的数据条数
pageSize: 50, // 页面数据条数 pageSize: 50, // 页面数据条数
pageNumber: 1, // 首页页码 pageNumber: 1, // 首页页码
sidePagination: 'server', // 设置为服务器端分页 sidePagination: 'server', // 设置为服务器端分页
queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求 queryParams: function (params) { // 请求服务器数据时发送的参数，可以在这里添加额外的查询参数，返回false则终止请求
return { return {
rows: params.limit, // 每页要显示的数据条数 rows: params.limit, // 每页要显示的数据条数
page: params.offset/params.limit+1, // 每页显示数据的开始页码 page: params.offset / params.limit + 1, // 每页显示数据的开始页码
sort: params.sort, // 要排序的字段 sort: params.sort, // 要排序的字段
order: params.order, order: params.order,
search_name : $('#search_name').val(), search_name: $('#search_name').val(),
companyId: unitId, companyId: companyId,
pSectionId: $("#processSection").val(), pSectionId: $("#processSection").val(),
} }
}, },
@ -264,55 +278,55 @@ var companyId = "";
columns: [ columns: [
{ {
checkbox: true, // 显示一个勾选框 checkbox: true, // 显示一个勾选框
},{ }, {
field: 'mpointid', // 返回json数据中的name field: 'mpointid', // 返回json数据中的name
title: '测量点编号', // 表格表头显示文字 title: '测量点编号', // 表格表头显示文字
align: 'center', // 左右居中 align: 'center', // 左右居中
valign: 'middle' // 上下居中 valign: 'middle' // 上下居中
},{ }, {
field: 'mpointname', // 返回json数据中的name field: 'mpointname', // 返回json数据中的name
title: '测量点名称', // 表格表头显示文字 title: '测量点名称', // 表格表头显示文字
align: 'center', // 左右居中 align: 'center', // 左右居中
valign: 'middle' // 上下居中 valign: 'middle' // 上下居中
},{ }, {
field: 'bizid', // 返回json数据中的name field: 'bizid', // 返回json数据中的name
title: '所属厂区', // 表格表头显示文字 title: '所属厂区', // 表格表头显示文字
align: 'center', // 左右居中 align: 'center', // 左右居中
valign: 'middle' // 上下居中 valign: 'middle' // 上下居中
},{ }, {
field: 'processectionname', // 返回json数据中的name field: 'processectionname', // 返回json数据中的name
title: '工艺段', // 表格表头显示文字 title: '工艺段', // 表格表头显示文字
align: 'center', // 左右居中 align: 'center', // 左右居中
valign: 'middle' // 上下居中 valign: 'middle' // 上下居中
},{ }, {
field: 'grade', // 返回json数据中的name field: 'grade', // 返回json数据中的name
title: '重要等级', // 表格表头显示文字 title: '重要等级', // 表格表头显示文字
align: 'center', // 左右居中 align: 'center', // 左右居中
valign: 'middle' valign: 'middle'
},{ }, {
title: "操作", title: "操作",
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
width: 120, // 定义列的宽度，单位为像素px width: 120, // 定义列的宽度，单位为像素px
formatter: function (value, row, index) { formatter: function (value, row, index) {
var buts=""; var buts = "";
buts+= '<security:authorize buttonUrl="work/scadaPic/edit.do">'; 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 += '<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>';
buts+= '<security:authorize buttonUrl="work/scadaPic/delete.do">'; 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 += '<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 += '</security:authorize>';
buts='<div class="btn-group" >'+buts+'</div>'; buts = '<div class="btn-group" >' + buts + '</div>';
return buts; return buts;
} }
} }
], ],
onLoadSuccess: function(){ //加载成功时执行 onLoadSuccess: function () { //加载成功时执行
adjustBootstrapTableView("table"); adjustBootstrapTableView("table");
}, },
onLoadError: function(){ //加载失败时执行 onLoadError: function () { //加载失败时执行
console.info("加载数据失败"); console.info("加载数据失败");
} }
@ -320,11 +334,11 @@ var companyId = "";
}); });
</script> </script>
</head> </head>
<body onload="initMenu()" class="hold-transition ${cu.themeclass} sidebar-mini"> <body onload="initMenu()" class="hold-transition ${cu.themeclass} sidebar-mini">
<div class="wrapper"> <div class="wrapper">
<!-- 引用top --> <!-- 引用top -->
<%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%> <%-- <jsp:include page="/jsp/top.jsp"></jsp:include> --%>
<!-- 菜单栏 --> <!-- 菜单栏 -->
@ -332,9 +346,9 @@ var companyId = "";
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1 id ="head_title"></h1> <h1 id="head_title"></h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a id ='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li> <li><a id='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
<!-- <li class="active">Here</li> --> <!-- <li class="active">Here</li> -->
</ol> </ol>
</section> </section>
@ -343,7 +357,7 @@ var companyId = "";
<div id="mainAlertdiv"></div> <div id="mainAlertdiv"></div>
<div id="subDiv"></div> <div id="subDiv"></div>
<div id="mpSubDiv"></div> <div id="mpSubDiv"></div>
<div > <div>
<!-- <div class="form-group"> <!-- <div class="form-group">
<label class="form-label" id="companylabel">水厂：</label> <label class="form-label" id="companylabel">水厂：</label>
<label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label> <label class="form-label" id="company" style="width:180px;border: none;background: transparent;" ></label>
@ -354,23 +368,30 @@ var companyId = "";
<div class="form-group form-inline"> <div class="form-group form-inline">
<div class="btn-group" style="width: 220px;padding-bottom:10px;"> <div class="btn-group" style="width: 220px;padding-bottom:10px;">
<security:authorize buttonUrl="work/scadaPic/add.do"> <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="addFun();"><i
<button type="button" class="btn btn-default btn-sm" onclick="deletesFun();"><i class="fa fa-trash-o"></i> 删除</button> 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> </security:authorize>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group pull-right" > <div class="form-group pull-right">
<div class="input-group input-group-sm" style="width: 250px;"> <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="编号"> <input type="text" id="search_name" name="search_name" class="form-control pull-right"
placeholder="编号">
<div class="input-group-btn"> <div class="input-group-btn">
<button class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i></button> <button class="btn btn-default" onclick="dosearch();"><i class="fa fa-search"></i>
</button>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group pull-right"> <div class="form-group pull-right">
<label class="form-label">工艺段</label> <label class="form-label">工艺段</label>
<select class="form-control select2 " id="processSection" name ="processSection" style="width: 220px;"></select> <select class="form-control select2 " id="processSection" name="processSection"
style="width: 220px;"></select>
</div> </div>
</div> </div>
@ -378,29 +399,32 @@ var companyId = "";
</div> </div>
</section> </section>
<!-- /.content --> <!-- /.content -->
</div> </div>
<%-- <jsp:include page="/jsp/bottom.jsp"></jsp:include> --%> <%-- <jsp:include page="/jsp/bottom.jsp"></jsp:include> --%>
<%-- <jsp:include page="/jsp/side.jsp"></jsp:include> --%> <%-- <jsp:include page="/jsp/side.jsp"></jsp:include> --%>
</div> </div>
</body> </body>
<!-- 文件上传--> <!-- 文件上传-->
<link rel="stylesheet" href="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/css/fileinput.min.css"/> <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/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" src="<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js" charset="utf-8"></script> --%>
<script type="text/javascript"> <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/fileinput.min.js\"></sc" + "ript>")
document.write("<scr"+"ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc"+"ript>") document.write("<scr" + "ipt src=\"<%=request.getContextPath()%>/node_modules/bootstrap-fileinput/js/locales/zh.js\"></sc" + "ript>")
</script> </script>
<!-- 引入ChartJS--> <!-- 引入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.min.js"
<script type="text/javascript" src="<%=request.getContextPath()%>/node_modules/chart.js/dist/Chart.bundle.min.js" charset="utf-8"></script> 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--> <!-- 引入daterangepicker-->
<link rel="stylesheet" href="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.css"/> <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/moment.min.js"
<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js" charset="utf-8"></script> charset="utf-8"></script>
<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/bootstrap-daterangepicker/daterangepicker.js"
charset="utf-8"></script>
<!-- echarts--> <!-- 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/echarts.js" charset="utf-8"></script>
<script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/macarons.js" charset="utf-8"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/plugins/echarts/macarons.js" charset="utf-8"></script>