From 1adcb6e23ce7dfb3c86d7a0dd51993814c7f9d3b Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 30 Jul 2018 09:49:32 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86->=E5=8D=8F=E8=AE=AE=E5=8F=B7=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B3=A8=E9=87=8A=E6=8E=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=86=E7=BB=84ID=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=20(2)=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E9=85=8D=E7=BD=AE=E5=88=86=E7=BB=84?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specific/SpecificServiceCfgController.java     |  2 --
 .../views/specific/specificServiceCfgInfo.jsp      | 14 ++++++++++++--
 .../views/specific/specificServiceCfgList.jsp      |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
index 08d2081c8..769e4390a 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -10,7 +10,6 @@ import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,7 +19,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
 import com.nis.domain.specific.SpecificServiceCfg;
-import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp
index 96601d08c..c738a4264 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp
@@ -38,6 +38,16 @@
 					<div class="form-body">
 						<!-- BEGIN FORM-->	
 						<form:form id="inputForm" modelAttribute="specificServiceCfg"  class="form-horizontal">
+							<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type" />:</label>
+								<div class="col-md-4">
+									<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
+										<label class="radio-inline"><input type="radio" name="cfgType" class="required" value="${dict.itemCode}" disabled
+										<c:if test="${dict.itemCode==specificServiceCfg.cfgType}">checked</c:if>
+										readonly="readonly"/><spring:message code="${dict.itemValue}"/></label>
+									</c:forEach>
+								</div>
+							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
@@ -57,12 +67,12 @@
 									<form:input path="specServiceName" htmlEscape="false" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div> 
-						 	<div class="form-group">
+						 	<%-- <div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="group_id" />:</label>
 								<div class="col-md-4">
 									<form:input path="groupId" htmlEscape="false" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
-							</div> 
+							</div>  --%>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index 802803142..fae6631aa 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -253,7 +253,7 @@
 								   <th><spring:message code="protocol_code"/></th>
 								   <th><spring:message code="protocol_name"/></th>
 								   <th><spring:message code="protocol_desc"/></th>
-								   <th><spring:message code="group_id"/></th>
+								   <%-- <th><spring:message code="group_id"/></th> --%>
 								   <th><spring:message code="is_leaf"/></th>
 								   <th><spring:message code="cfg_type"/></th>
 								   <th class="sort-column op_time"><spring:message code="operate_time"/></th>
@@ -267,7 +267,7 @@
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/specific/specificServiceCfg/form?specServiceId=${specificServiceCfg.specServiceId}&doAction=0">${specificServiceCfg.specServiceCode}</a></td>
 												<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
 												<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
-												<td>${specificServiceCfg.groupId }</td>
+												<%-- <td>${specificServiceCfg.groupId }</td> --%>
 												<td><spring:message code="${fns:getDictLabel('INT_YES_NO',specificServiceCfg.isLeaf,'0')}"></spring:message></td>
 												<td><c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
 													<c:if test="${dict.itemCode==specificServiceCfg.cfgType}"><spring:message code="${dict.itemValue}"/></c:if>