Skip to content

S
sunac_report
Commit 5dfe46da by sunxin
Options

页面优化

parent 97a34df1
Showing with 24 additions and 21 deletions
pom.xml
......@@ -75,12 +75,14 @@
<groupId>bbdtek</groupId>
<artifactId>bbdtek-geo-split</artifactId>
<version>1.0.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/bbdtek-geo-split-1.0.1.jar</systemPath>
</dependency>
<dependency>
<groupId>bbdtek</groupId>
<artifactId>npl-tire-split</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/npl-tire-split-1.0.0.jar</systemPath>
</dependency>
<!-- geoip2 -->
......@@ -610,6 +612,7 @@
<groupId>com.kingdee.eas.cp.eip.sso.ltpa</groupId>
<artifactId>LTPATokenManager</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/LTPATokenManager-1.0.0.jar</systemPath>
</dependency>
<!--JFreeChart-->
......
src/main/java/com/ejweb/modules/report/service/ReportService.java
......@@ -462,7 +462,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -477,7 +477,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
report.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......@@ -718,7 +718,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -733,7 +733,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--,";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
report.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -141,7 +141,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -156,7 +156,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
report.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......@@ -322,7 +322,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -337,7 +337,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
report.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......@@ -418,7 +418,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -433,7 +433,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
reportEntity1.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......@@ -606,7 +606,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusType!=null){
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
}else{
SupplementTypeStr = SupplementTypeStr + "--";
SupplementTypeStr = SupplementTypeStr + "-";
}
}
......@@ -622,7 +622,7 @@ public class ReportController extends BaseController {
if(ctBbtcBusCategory!=null){
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
}else{
SupplementCategoryStr = SupplementCategoryStr + "--";
SupplementCategoryStr = SupplementCategoryStr + "-";
}
}
reportEntity1.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......@@ -1012,7 +1012,7 @@ public class ReportController extends BaseController {
if (ctBbtcBusType != null) {
SupplementTypeStr = SupplementTypeStr + ctBbtcBusType.getName() + ",";
} else {
SupplementTypeStr = SupplementTypeStr + "--";
/* SupplementTypeStr = SupplementTypeStr + "--";*/
}
}
......@@ -1027,7 +1027,7 @@ public class ReportController extends BaseController {
if (ctBbtcBusCategory != null) {
SupplementCategoryStr = SupplementCategoryStr + ctBbtcBusCategory.getName() + ",";
} else {
SupplementCategoryStr = SupplementCategoryStr + "--";
/* SupplementCategoryStr = SupplementCategoryStr + "--";*/
}
}
reportEntity1.setSupplementCategory(SupplementCategoryStr.substring(0,SupplementCategoryStr.length()-1));
......
src/main/java/com/ejweb/modules/workbench/service/NoticeService.java
......@@ -10,6 +10,7 @@ import com.ejweb.modules.workbench.entity.ReportNotice;
import com.ejweb.modules.workbench.entity.ReportNoticeEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
......@@ -37,6 +38,8 @@ public class NoticeService extends CrudService<ReportNoticeDao, ReportNoticeEnti
page.setCount(noticeList.size());
return page;
}
@Transactional(readOnly = false)
public void updateByPrimaryKeySelective(ReportNotice record) throws Exception{
record.setStatus("1");
noticeMapper.updateByPrimaryKeySelective(record);
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -540,7 +540,7 @@
function getType02() {
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
/* selectNode.append("<option value=''>请选择</option>");*/
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
......@@ -553,7 +553,6 @@
var data2 = returnedData.ctBbtcTypeList;
var supplementType="${report.supplementType}";
supplementType=supplementType+",";
alert(supplementType);
if (data2 != '') {
var slsb=$("#supplementType");
......@@ -588,7 +587,6 @@
var data2 = returnedData.ctBbtcTypeList;
var supplementType="${report.supplementType}";
supplementType=supplementType+",";
alert(supplementType);
if (data2 != '') {
var slsb=$("#supplementType");
......@@ -721,7 +719,6 @@
}
}
/*
*联动查询类型下的类别02 改变业务类型时执行的，和初始化查询不同
*/
......@@ -729,7 +726,7 @@
function getBusCategory02(){
var selectNode = $("#supplementCategory");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
/* selectNode.append("<option value=''>请选择</option>");*/
/*获取类型选项框中的多个值 逗号分隔*/
var ts_describe= $("#supplementType").val();
......@@ -1063,7 +1060,7 @@
</select>--%>
<select id="supplementType" name="supplementType" class="selectpicker bla bla bli" onchange="getBusCategory02()" style="width: 280px" multiple data-live-search="true" >
<option value="">请选择</option>
<%-- <option value="">请选择</option>--%>
<c:if test="${ not empty typeMap}">
<c:forEach items="${typeMap}" var="type" >
......@@ -1088,7 +1085,7 @@
</form:select>--%>
<select id="supplementCategory" name="supplementCategory" class="selectpicker bla bla bli" onchange="resetPageNo()" style="width: 280px" multiple data-live-search="true" >
<option value="">请选择</option>
<%-- <option value="">请选择</option>--%>
<c:if test="${not empty catgoryMap}">
<c:forEach items="${catgoryMap}" var="catgory" >
......
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