gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
zhanghongqing
2018-03-07 09:44:46 +08:00
parent e60e9a57ea
commit 44a80c5771
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -39,7 +39,7 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button> onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
@@ -51,7 +51,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message> <i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
</div> </div>
<div class="tools"> <div class="tools">
<!-- <a href="javascript:;" class="collapse" data-original-title="" <!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -73,11 +73,11 @@
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option> <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option> <form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
</form:select> </form:select>
<spring:message code="request_number"/> : <spring:message code="函号"/> :
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search"> <form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" > <c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option> <form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach> </c:forEach>
@@ -85,15 +85,15 @@
<button type="button" class="btn btn-default btn-sm" onclick="return page()"> <button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message> <i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button> </button>
<spring:message code="sort"/> : <spring:message code="排序"/> :
<form:select path="page.orderBy" class="selectpicker select2"> <form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
<form:option value=""><spring:message code="select"/></form:option> <form:option value=""></form:option>
<form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option> <form:option value="createTime asc">按创建时间顺序</form:option>
<form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option> <form:option value="createTime desc">按创建时间倒序</form:option>
<form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option> <form:option value="editTime asc">按修改时间顺序</form:option>
<form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option> <form:option value="editTime desc">按修改时间倒序</form:option>
<form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option> <form:option value="auditTime asc">按审核时间顺序</form:option>
<form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option> <form:option value="auditTime desc">按审核时间倒序</form:option>
</form:select> </form:select>
</div> </div>
</form:form> </form:form>
@@ -102,26 +102,26 @@
<table class="table table-striped table-bordered table-condensed text-nowrap"> <table class="table table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th><spring:message code="seq"/></th> <th>序列</th>
<th><spring:message code="config_describe"/></th> <th>配置描述</th>
<th><spring:message code="key_word"/></th> <th>配置关键词</th>
<th><spring:message code="block_type"/></th> <th>管控类型</th>
<!-- <th>业务id</th> --> <!-- <th>业务id</th> -->
<th><spring:message code="letter"/></th> <th>来函</th>
<!-- <th>编译id</th> --> <!-- <th>编译id</th> -->
<th><spring:message code="whether_area_block"/></th> <th>是否区域管控</th>
<th><spring:message code="type"/></th> <th>分类</th>
<th><spring:message code="attribute"/></th> <th>性质</th>
<th><spring:message code="label"/></th> <th>标签</th>
<!-- <th>区域生效id</th> --> <!-- <th>区域生效id</th> -->
<th><spring:message code="valid_identifier"/></th> <th>有效标识</th>
<th><spring:message code="is_audit"/></th> <th>是否审核</th>
<th><spring:message code="creator"/></th> <th>创建人员</th>
<th><spring:message code="config_time"/></th> <th>配置时间</th>
<th><spring:message code="editor"/></th> <th>修改人员</th>
<th><spring:message code="edit_time"/></th> <th>修改时间</th>
<th><spring:message code="auditor"/></th> <th>审核人员</th>
<th><spring:message code="audit_time"/></th> <th>审核时间</th>
<th><spring:message code="operation"></spring:message></th> <th><spring:message code="operation"></spring:message></th>
</tr> </tr>
</thead> </thead>