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

管道，流程，数据源切换，大屏，测量点位

Browse Source
This commit is contained in:
Timer
2026-03-08 04:08:33 +08:00
parent b79f345ecc
commit 28e1b2a9f1
21 changed files with 605 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/jsp/pipeline/pipelineDataAdd.jsp
View File

@ -106,6 +106,16 @@
<input type="text" class="form-control" id="pipelineName" name="pipelineName" placeholder="请输入管道名称">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">场内场外</label>
<div class="col-sm-8">
<select class="form-control" id="pipelineArea" name="pipelineArea">
<option value="">请选择</option>
<option value="OUT_SIDE">场外管道</option>
<option value="In_SIDE">场内管道</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">

10
src/main/webapp/jsp/pipeline/pipelineDataEdit.jsp
View File

@ -109,6 +109,16 @@
value="${pipelineData.pipelineName}" placeholder="请输入管道名称">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">场内场外</label>
<div class="col-sm-8">
<select class="form-control" id="pipelineArea" name="pipelineArea">
<option value="">请选择</option>
<option value="OUT_SIDE" ${pipelineData.pipelineArea == 'OUT_SIDE' ? 'selected' : ''}>场外管道</option>
<option value="In_SIDE" ${pipelineData.pipelineArea == 'In_SIDE' ? 'selected' : ''}>场内管道</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">

22
src/main/webapp/jsp/pipeline/pipelineDataList.jsp
View File

@ -137,7 +137,8 @@
page: params.offset / params.limit + 1,
sort: params.sort,
order: params.order,
search_name: $('#search_name').val()
search_name: $('#search_name').val(),
search_pipeline_area: $('#search_pipeline_area').val()
};
}
@ -169,6 +170,20 @@
formatter: function(value, row, index) {
return '<span onclick="viewFun(\'' + row.id + '\');" style="color:#004B97;cursor:pointer;">' + row.pipelineName + '</span>';
}
}, {
field: 'pipelineArea',
title: '场内场外',
align: 'center',
valign: 'middle',
width: '10%',
formatter: function(value, row, index) {
if (value == 'OUT_SIDE') {
return '场外管道';
} else if (value == 'In_SIDE') {
return '场内管道';
}
return value;
}
}, {
field: 'diameterMm',
title: '直径(mm)',
@ -272,6 +287,11 @@
</button>
</security:authorize>
<div class="form-group pull-right form-inline">
<select id="search_pipeline_area" name="search_pipeline_area" class="form-control input-sm" style="width: 120px;">
<option value="">全部区域</option>
<option value="OUT_SIDE">场外管道</option>
<option value="In_SIDE">场内管道</option>
</select>
<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">

12
src/main/webapp/jsp/pipeline/pipelineDataView.jsp
View File

@ -32,6 +32,18 @@
<p class="form-control-static">${pipelineData.pipelineName}</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">场内场外</label>
<div class="col-sm-8">
<p class="form-control-static">
<c:choose>
<c:when test="${pipelineData.pipelineArea == 'OUT_SIDE'}">场外管道</c:when>
<c:when test="${pipelineData.pipelineArea == 'In_SIDE'}">场内管道</c:when>
<c:otherwise>${pipelineData.pipelineArea}</c:otherwise>
</c:choose>
</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">