Skip to content

C
cmszMonitorAnalysis
Commit 6f6f5639 authored by 莫林毅's avatar 莫林毅
Browse files
Options

修改 '新增参数后 页面不展示'bug 调整界面 '参数'部分的UI

parent e7853639
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 34 deletions
src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java
View file @ 6f6f5639
...@@ -177,6 +177,7 @@ public class ModelParameterConfigurationController { ...@@ -177,6 +177,7 @@ public class ModelParameterConfigurationController {
modelParameter.setParameterCode(paramCode); modelParameter.setParameterCode(paramCode);
modelParameter.setParameterValue(paramValue); modelParameter.setParameterValue(paramValue);
modelParameter.setParameterDataType(paramType); modelParameter.setParameterDataType(paramType);
modelParameter.setIfSystemDefault(0L);
modelParameterDao.save(modelParameter); modelParameterDao.save(modelParameter);
}else{ }else{
// modelParameterService.updateParameterByParameterId(paramName, paramValue, paramType, Long.parseLong(paramId.split(":")[1])); // modelParameterService.updateParameterByParameterId(paramName, paramValue, paramType, Long.parseLong(paramId.split(":")[1]));
......
src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java
View file @ 6f6f5639
...@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap; ...@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -95,8 +96,28 @@ public class AssociateDiagosisDetailController { ...@@ -95,8 +96,28 @@ public class AssociateDiagosisDetailController {
return ""; return "";
} }
@RequestMapping("") @RequestMapping("")
public String lis(Map model, ServletRequest request, HttpSession session)
throws UnsupportedEncodingException, ParseException {
List<Province> provinceList =(List<Province>) provinceDao.findProvince();
model.put("provinceList", provinceList);
return PageURLController.AssociateDiagosisDetail;
}
@RequestMapping("/tableList")
@ResponseBody
public String tableList(){
return "";
}
@RequestMapping("/aaa")
public String list(Map model, ServletRequest request, HttpSession session) public String list(Map model, ServletRequest request, HttpSession session)
throws UnsupportedEncodingException, ParseException { throws UnsupportedEncodingException, ParseException {
......
src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp
View file @ 6f6f5639
...@@ -91,8 +91,14 @@ ...@@ -91,8 +91,14 @@
<tr><td>业务开始时间（<font color="red">必填</font>）：</td><td><input id="businessStartTime" name="businessStartTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessEndTime\')}'})"> </td></tr> <tr><td>业务开始时间（<font color="red">必填</font>）：</td><td><input id="businessStartTime" name="businessStartTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessEndTime\')}'})"> </td></tr>
<tr><td>已添加参数：</td> <tr><td>已添加参数：</td>
<td><table class="table table-hover table-striped" id="displayParam"> <td><table class="table table-hover table-striped" id="displayParam">
<thead> <thead class='col-md-15'>
<tr><th>参数名</th><th>参数编码</th><th>参数值</th><th>参数类型</th><th><a href="javascript:deleteAllTr()">删除所有参数</a></th></tr> <tr>
<th class="col-3 text-center">参数名</th>
<th class="col-3 text-center">参数编码</th>
<th class="col-3 text-center">参数值</th>
<th class="col-3 text-center">参数类型</th>
<th class="col-3 text-center"><a href="javascript:deleteAllTr()">删除所有参数</a></th>
</tr>
</thead> </thead>
<tbody id="addTr"></tbody> <tbody id="addTr"></tbody>
</table></td></tr> </table></td></tr>
...@@ -217,7 +223,7 @@ ...@@ -217,7 +223,7 @@
$.alert("参数编码不能为空"); $.alert("参数编码不能为空");
}else{ }else{
if($("#addTr").find("tr.orange-tr").html()==null){ if($("#addTr").find("tr.orange-tr").html()==null){
var addRow = $("<tr><td>"+paramName+"</td><td>"+paramCode+"</td><td>"+paramValue+"</td><td>"+paramDataType+"</td><td><a href='javascript:;' title='' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>"); var addRow = $("<tr><td>"+paramName+"</td><td>"+paramCode+"</td><td>"+paramValue+"</td><td>"+paramDataType+"</td><td><a href='javascript:;' title='' onclick='deleteRow(this)'>删除</a><a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
$("#addTr").append(addRow); $("#addTr").append(addRow);
$("#paramName").attr("value",""); $("#paramName").attr("value","");
$("#paramValue").attr("value",""); $("#paramValue").attr("value","");
...@@ -262,7 +268,6 @@ ...@@ -262,7 +268,6 @@
ok: function(){ ok: function(){
$("#modelSubmit").attr("disabled",true); $("#modelSubmit").attr("disabled",true);
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
console.log("i "+i);
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#modelMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
...@@ -275,8 +280,7 @@ ...@@ -275,8 +280,7 @@
var paramCode = $(this).find("td").eq(1).html(); var paramCode = $(this).find("td").eq(1).html();
var paramValue = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(3).html(); var paramType = $(this).find("td").eq(3).html();
console.log("paramName "+paramName);
console.log("paramCode "+paramCode);
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
...@@ -302,11 +306,8 @@ ...@@ -302,11 +306,8 @@
cancelValue: "取消", cancelValue: "取消",
}); });
}else{ }else{
alert(2);
$("#modelSubmit").attr("disabled",true); $("#modelSubmit").attr("disabled",true);
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
alert("i "+i);
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#modelMaintainForm");
...@@ -320,10 +321,7 @@ ...@@ -320,10 +321,7 @@
var paramCode = $(this).find("td").eq(1).html(); var paramCode = $(this).find("td").eq(1).html();
var paramValue = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(3).html(); var paramType = $(this).find("td").eq(3).html();
alert("paramName "+paramName);
alert("paramCode "+paramCode);
console.log("paramName "+paramName);
console.log("paramCode "+paramCode);
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
......
src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp
View file @ 6f6f5639
...@@ -93,21 +93,32 @@ ...@@ -93,21 +93,32 @@
<tr><td>业务开始时间（<font color="red">必填</font>）：</td><td><input id="businessStartTime" name="businessStartTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessEndTime\')}'})"> </td></tr> <tr><td>业务开始时间（<font color="red">必填</font>）：</td><td><input id="businessStartTime" name="businessStartTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessEndTime\')}'})"> </td></tr>
<tr><td>业务结束时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="businessEndTime" name="businessEndTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'businessStartTime\')}'})" /></td></tr> <tr><td>业务结束时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="businessEndTime" name="businessEndTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'businessStartTime\')}'})" /></td></tr>
<tr><td>参数：</td> <tr><td>参数：</td>
<td><table class="table table-hover table-striped" id="displayParam"> <td>
<thead> <table class="table table-hover table-striped" id="displayParam">
<tr><th>参数名</th><th>参数编码</th><th>参数值</th><th>参数类型</th><th><a href="javascript:deleteAllTr()">删除所有参数</a></th></tr> <thead class='col-md-15'>
<tr class="row mx-0">
<th class="col-3 text-center">参数名</th>
<th class="col-3 text-center">参数编码</th>
<th class="col-3 text-center">参数值</th>
<th class="col-3 text-center">参数类型</th>
<th class="col-3 text-center"><a href="javascript:deleteAllTr()">删除所有参数</a></th>
</tr>
</thead> </thead>
<tbody id="addTr"> <tbody id="addTr" class='col-md-15'>
<c:forEach var="modelParameterList" items="${modelParameterList}"> <c:forEach var="modelParameterList" items="${modelParameterList}">
<tr> <tr class='row mx-0'>
<td>${modelParameterList.parameterCode}</td> <td class='col-3'>${modelParameterList.parameterCode}</td>
<td>${modelParameterList.parameterName}</td> <td class='col-3'>${modelParameterList.parameterName}</td>
<td>${modelParameterList.parameterValue}</td> <td class='col-3'>${modelParameterList.parameterValue}</td>
<td>${modelParameterList.parameterDataType}</td> <td class='col-3'>${modelParameterList.parameterDataType}</td>
<td><a href="javascript:;" title="参数ID:${modelParameterList.parameterId}" onclick="deleteRow(this,'${modelParameterList.parameterId}')">删除</a>&nbsp;&nbsp;<a href="javascript:;" onclick="updateRow(this)">修改</a></td></tr> <td class='col-3'>
<a href="javascript:;" title="参数ID:${modelParameterList.parameterId}" onclick="deleteRow(this,'${modelParameterList.parameterId}')">删除</a><a href="javascript:;" onclick="updateRow(this)">修改</a>
</td>
</tr>
</c:forEach> </c:forEach>
</tbody> </tbody>
</table></td></tr> </table>
</td></tr>
<tr><td>参数数据类型：</td> <tr><td>参数数据类型：</td>
<td><select class="form-control" id="paramDataType" name="paramDataType"> <td><select class="form-control" id="paramDataType" name="paramDataType">
<c:forEach var="dataTypes" items="${dataTypeList}"> <c:forEach var="dataTypes" items="${dataTypeList}">
...@@ -276,7 +287,7 @@ ...@@ -276,7 +287,7 @@
$.alert("参数编码不能为空"); $.alert("参数编码不能为空");
}else{ }else{
if($("#addTr").find("tr.orange-tr").html()==null){ if($("#addTr").find("tr.orange-tr").html()==null){
var addRow = $("<tr><td>"+paramName+"</td><td>"+paramCode+"</td><td>"+paramValue+"</td><td>"+paramDataType+"</td><td><a href='javascript:;' title='' onclick='deleteRow(this,\"\")'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>"); var addRow = $("<tr class='row mx-0'><td class='col-3'>"+paramName+"</td><td class='col-3'>"+paramCode+"</td><td class='col-3'>"+paramValue+"</td><td class='col-3'>"+paramDataType+"</td><td class='col-3'><a href='javascript:;' title='' onclick='deleteRow(this,\"\")'>删除</a><a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
$("#addTr").append(addRow); $("#addTr").append(addRow);
$("#paramName").attr("value",""); $("#paramName").attr("value","");
$("#paramCode").attr("value",""); $("#paramCode").attr("value","");
...@@ -312,7 +323,7 @@ ...@@ -312,7 +323,7 @@
}else if($("#businessEndTime").val()==""){ }else if($("#businessEndTime").val()==""){
$.alert("业务结束时间不能为空"); $.alert("业务结束时间不能为空");
}else{ }else{
if($.trim($("#paramName").val())!=""){ if($.trim($("#paramName").val())!=""){//如果 参数填写框 存在未填写的 数据
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content: "有参数尚未添加，确定提交", content: "有参数尚未添加，确定提交",
...@@ -330,7 +341,8 @@ ...@@ -330,7 +341,8 @@
var paramValue = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(3).html(); var paramType = $(this).find("td").eq(3).html();
var paramId = $(this).find("td").find("a").attr("title"); var paramId = $(this).find("td").find("a").attr("title");
if(paramId!=""){
if(paramId!=""){//不是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
...@@ -349,7 +361,8 @@ ...@@ -349,7 +361,8 @@
} }
} }
}); });
}else{ }
else{//是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
...@@ -376,7 +389,7 @@ ...@@ -376,7 +389,7 @@
cancel:function(){}, cancel:function(){},
cancelValue: "取消" cancelValue: "取消"
}); });
}else{ }else{//如果 参数填写框 不存在未填写的 数据
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
if(0==i){ if(0==i){
var form = $("#modelUpdateForm"); var form = $("#modelUpdateForm");
...@@ -390,12 +403,13 @@ ...@@ -390,12 +403,13 @@
var paramValue = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(3).html(); var paramType = $(this).find("td").eq(3).html();
var paramId = $(this).find("td").find("a").attr("title"); var paramId = $(this).find("td").find("a").attr("title");
if(paramId!=""){ if(paramId!=""){//不是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
//url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId, //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId, //url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
dataType : "text", dataType : "text",
async: false, async: false,
beforeSend: function(data){}, beforeSend: function(data){},
...@@ -409,12 +423,13 @@ ...@@ -409,12 +423,13 @@
} }
} }
}); });
}else{ }else{//是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
//url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), //url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
dataType : "text", dataType : "text",
beforeSend: function(data){ }, beforeSend: function(data){ },
success:function(){ success:function(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment