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

1

Browse Source
This commit is contained in:
Timer
2026-03-08 17:41:53 +08:00
parent d70325751e
commit debeec23da
15 changed files with 323 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/spring-mybatis.xml
View File

@ -250,8 +250,10 @@
</tx:advice>
<bean id="dataSourceScadaBean" class="com.sipai.tools.DataSourceInterceptor"/>
<aop:config>
<aop:pointcut id="transactionPointcut" expression="execution(public * com.sipai.dao.scada.*.*(..))"/>
<aop:pointcut id="dataSourceScadaPointcut" expression="execution(public * com.sipai.dao.scada.*.*(..)))"/>
<!-- <aop:pointcut id="transactionPointcut" expression="execution(public * com.sipai.dao.scada.*.*(..))"/>-->
<!-- <aop:pointcut id="dataSourceScadaPointcut" expression="execution(public * com.sipai.dao.scada.*.*(..)))"/>-->
<aop:pointcut id="transactionPointcut" expression="execution(public * com.sipai.service.*.*(..))"/>
<aop:pointcut id="dataSourceScadaPointcut" expression="execution(public * com.sipai.service.scada.*.*(..)))"/>
<aop:advisor pointcut-ref="transactionPointcut"
advice-ref="txAdvice"/>
<aop:aspect ref="dataSourceScadaBean" order="0">

16
src/main/webapp/jsp/maintenance/repairAdd.jsp
View File

@ -70,8 +70,18 @@
var selectType = $("#repairTypeName").select2({minimumResultsForSearch: 10});
$.post(ext.contextPath + "/maintenance/equipmentPlanType/getSelectList4Code.do", {code:'${Code_Type_Wx}'}, function(data) {
$("#repairTypeName").empty();
// Parse data if it's a string
var jsonData = data;
if(typeof data === 'string') {
try {
jsonData = JSON.parse(data);
} catch(e) {
console.error('Failed to parse JSON:', e);
jsonData = [];
}
}
var selelct_ =$("#repairTypeName").select2({
data: data,
data: jsonData,
placeholder:'请选择',//默认文字提示
allowClear: false,//允许清空
escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
@ -85,7 +95,9 @@
selelct_.on('change',function(e){
$('#repairType').val(e.target.value);
})
},'json');
},'json').fail(function(xhr, status, error) {
console.error('Failed to load repair types:', error);
});
})

24
src/main/webapp/jsp/maintenance/repairEdit.jsp
View File

@ -73,8 +73,18 @@
var selectType = $("#repairTypeName").select2({minimumResultsForSearch: 10});
$.post(ext.contextPath + "/maintenance/equipmentPlanType/getSelectList4Code.do", {code:'${Code_Type_Wx}'}, function(data) {
$("#repairTypeName").empty();
// Parse data if it's a string
var jsonData = data;
if(typeof data === 'string') {
try {
jsonData = JSON.parse(data);
} catch(e) {
console.error('Failed to parse JSON:', e);
jsonData = [];
}
}
var selelct_ =$("#repairTypeName").select2({
data: data,
data: jsonData,
placeholder:'请选择',//默认文字提示
allowClear: false,//允许清空
escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入
@ -84,11 +94,17 @@
formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果
formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择
});
selelct_.val('${repair.repairType}').trigger("change");
// Set saved value if exists
var savedRepairType = '${repair.repairType}';
if(savedRepairType && savedRepairType !== ''){
selelct_.val(savedRepairType).trigger("change");
}
selelct_.on('change',function(e){
$('#repairType').val(e.target.value);
})
},'json');
},'json').fail(function(xhr, status, error) {
console.error('Failed to load repair types:', error);
});
$('#planDate').datepicker({
language: 'zh-CN',
@ -103,7 +119,7 @@
$('#planDate').datepicker('setDate','${repair.planDate.substring(0, 10)}');
//加载维修库table
getWorkContentRepair('${repair.id}','${repair.unitId}','${repair.equipmentId}');
<%--getWorkContentRepair('${repair.id}','${repair.unitId}','${repair.equipmentId}');--%>
//加载消耗品table
getWorkConsume('${repair.id}','${repair.unitId}');
//加载绩效table

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

@ -116,6 +116,18 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">管道材质</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="pipeMaterial" name="pipeMaterial" placeholder="请输入管道材质">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属厂站</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="associatedPlant" name="associatedPlant" placeholder="请输入所属厂站">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">

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

@ -119,6 +119,20 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">管道材质</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="pipeMaterial" name="pipeMaterial"
value="${pipelineData.pipeMaterial}" placeholder="请输入管道材质">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">所属厂站</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="associatedPlant" name="associatedPlant"
value="${pipelineData.associatedPlant}" placeholder="请输入所属厂站">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">

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

@ -138,7 +138,9 @@
sort: params.sort,
order: params.order,
search_name: $('#search_name').val(),
search_pipeline_area: $('#search_pipeline_area').val()
search_pipeline_area: $('#search_pipeline_area').val(),
search_pipe_material: $('#search_pipe_material').val(),
search_associated_plant: $('#search_associated_plant').val()
};
}
@ -184,6 +186,18 @@
}
return value;
}
}, {
field: 'pipeMaterial',
title: '管道材质',
align: 'center',
valign: 'middle',
width: '10%'
}, {
field: 'associatedPlant',
title: '所属厂站',
align: 'center',
valign: 'middle',
width: '10%'
}, {
field: 'diameterMm',
title: '直径(mm)',
@ -292,7 +306,9 @@
<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_pipe_material" name="search_pipe_material" class="form-control input-sm" placeholder="管道材质" style="width: 100px;">
<input type="text" id="search_associated_plant" name="search_associated_plant" class="form-control input-sm" placeholder="所属厂站" style="width: 100px;">
<div class="input-group input-group-sm" style="width: 200px;">
<input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="管道名称">
<div class="input-group-btn">
<button type="button" class="btn btn-default" onclick="dosearch();">

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

@ -44,6 +44,18 @@
</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">${pipelineData.pipeMaterial}</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">${pipelineData.associatedPlant}</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">直径(mm)</label>
<div class="col-sm-8">