Skip to content

X
xzxt-control
Commit b02bd2ca by caojingji
Options

20190313---wangling---修改菜单样式

parent 9a94e60f
Showing with 91 additions and 30 deletions
src/main/java/com/cc/bean/BaseModel.java
......@@ -24,7 +24,7 @@ public class BaseModel {
protected String gxrLxdh = null;
protected Date gxsj = null;
protected String gxsj = null;
protected String lrdwdm = null;
......@@ -161,11 +161,11 @@ public class BaseModel {
this.gxrLxdh = gxrLxdh;
}
public Date getGxsj() {
public String getGxsj() {
return gxsj;
}
public void setGxsj(Date gxsj) {
public void setGxsj(String gxsj) {
this.gxsj = gxsj;
}
......
src/main/java/com/cc/bean/Sjsblog.java
package com.cc.bean;
import com.cc.bean.BaseModel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class Sjsblog extends BaseModel {
//主键
......@@ -26,8 +23,7 @@ public class Sjsblog extends BaseModel {
//上报状态描述
private String sbztdesc = null;
//返回回执时间
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fhsj = null;
private String fhsj = null;
//返回回执开始时间
private String fhsjStart = null;
//返回回执结束时间
......@@ -95,10 +91,10 @@ public class Sjsblog extends BaseModel {
public void setRn(String rn) {
this.rn = rn;
}
public Date getFhsj() {
public String getFhsj() {
return fhsj;
}
public void setFhsj(Date fhsj) {
public void setFhsj(String fhsj) {
this.fhsj = fhsj;
}
public String getLrsjStart() {
......
src/main/java/com/cc/controller/BssjbdController.java
......@@ -6,7 +6,6 @@ import com.cc.common.util.JdbcUtil;
import com.cc.service.SjjhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
......
src/main/resources/resources/sjsblog/css/style.css
......@@ -9,10 +9,12 @@ a:hover{
text-decoration: none;
cursor: pointer;
}
a:visited {
/*a:visited {
color: #56AADC;
text-decoration: none;
}
}*/
.logo a{font-size:25px;}
li.list{line-height: 0;}
.heade-box{
position: relative;
height:65px;
......@@ -94,14 +96,16 @@ a:visited {
line-height: 36px;
padding-left: 10px;
font-size: 14px;
background-color: #f1f1f1;
background-color: rgba(0,0,0,0.3);
border: 1px solid #ccc;
border-bottom: 1px dashed #ccc;
color: #666;
border-color: rgba(255,255,255,.1);
color: #fff;
font-weight: bold;
}
.cxtj table{
border: 1px solid #ccc;
border-color: rgba(255,255,255,.1);
border-top: none;
width: 100%;
color:#333;
......@@ -112,6 +116,7 @@ a:visited {
/*}*/
.cxtj table tr{
border: 1px dashed #f2f2f2;
border-color: rgba(255,255,255,.1);
}
.cxtj table td{
/* border: 1px dashed #e5e5e5; */
......@@ -124,6 +129,8 @@ a:visited {
height: 26px;
line-height: 26px;
border: 1px solid #ccc;
border-color: rgba(255,255,255,.5);
background:none !important;
border-radius: 4px;
width: 80%;
top:-2px;
......@@ -201,11 +208,12 @@ span.easyui-fluid.combo{
margin-top: 10px;
}
.statistics{
background-color: #f1f1f1;
background-color: rgba(0,0,0,0.3);
height: 36px;
color:#fff;
line-height: 36px;
padding-left: 20px;
border: 1px solid #ccc;
/*border: 1px solid #ccc;*/
border-bottom: none;
}
.st-span{
......@@ -274,3 +282,13 @@ a.left-list-ftitle:hover{
}
#set_table_btn0,.export-excel{float: right; position: relative;top:5px;}
#set_table_btn0{margin-right: 15px;}
.dataTables_wrapper .dataTables_length, .dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_processing, .dataTables_wrapper .dataTables_paginate{color:#fff !important;}
body .dataTables_wrapper .dataTables_paginate .paginate_button.disabled,body .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, body .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{color:#fff !important;}
table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd {
background-color: rgba(255,255,255,.3) !important;
}
select,option{color:#000 !important;background: none;}
.cxtj table input[type='text']{width:100%;}
.wrapper .left-nav #nav li a{width:100% !important;}
table.dataTable tbody tr{background-color:rgba(0,0,0,.1) !important;}
.Wdate{border:none !important;}
src/main/webapp/WEB-INF/common/index.jsp
......@@ -54,7 +54,7 @@
<div class="left-nav">
<div id="side-nav">
<ul id="nav">
<li class="list" current>
<li class="list">
<a href="main">
<i class="fa fa-bar-chart"></i>
监控数据
......@@ -63,7 +63,7 @@
</li>
<li class="list" >
<a href="javascript:;">
<a href="javascript:void(0);">
<i class="fa fa-desktop"></i>
应用管理
<i class="iconfont nav_right">&#xe697;</i>
......@@ -153,7 +153,7 @@
</li>
<li class="list">
<a href="javascript:;">
<i class="fa fa-user-o"></i>
<i class="fa fa-th-list"></i>
部省数据交换日志
<i class="iconfont nav_right">&#xe697;</i>
</a>
......
src/main/webapp/WEB-INF/view/sjsblog/bssjbd.jsp
......@@ -16,18 +16,26 @@
<link rel="stylesheet" type="text/css" href="sjsblog/css/layer/skin/default/layer.css">
<link rel="stylesheet" href="sjsblog/datepicker/skin/WdatePicker.css">
<link type="text/css" rel="stylesheet" href="sjsblog/css/jquery.alert.css" />
<link rel="stylesheet" href="layui/css/layui.css" media="all">
<link rel="stylesheet" href="css/xadmin.css">
<!-- 覆盖公共样式 -->
<link rel="stylesheet" href="sjsblog/css/cover.css">
<script type="text/javascript" src="sjsblog/js/jquery-1.11.3.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.alert.js"></script>
<!-- 引入公共js-->
<script type="text/javascript" src="js/common.js"></script>
<!-- 引入公共页面-->
<jsp:include page="../../common/index.jsp"></jsp:include>
<style>
html,body{overflow:auto;}
</style>
</head>
<body>
<div class="cxtj">
<div class="page-content">
<div class="content">
<div class="cxtj">
<form name="gmfnetasjxxForm">
<fieldset>
<legend>比对条件</legend>
......@@ -69,7 +77,7 @@
</fieldset>
</form>
</div>
<div class="main-table-div">
<div class="main-table-div">
<div class="statistics">查询结果 </div>
<div style="margin-top:10px">
<table id="fmqlist" class="display" cellspacing="0" width="100%" style="text-align: center; table-layout:fixed;">
......@@ -85,6 +93,8 @@
</table>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="sjsblog/js/jquery.min.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="sjsblog/css/layer/layer.js"></script>
......@@ -103,8 +113,8 @@
{data: "",width:'10%',render: function(data, type, row, meta) {return nulltostr("<input class='checbox16' name='choose' type='checkbox' value='"+row.tableName+"@"+row.xxzjbh+"@"+row.md5+"' />");}},
{data: "tableName",width:'20%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "xxzjbh",width:'20%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "sjgxsj",width:'20%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "bjgxsj",width:'30%',render: function(data, type, row, meta) {return nulltostr(data);}}
{data: "sjgxsj",width:'20%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}},
{data: "bjgxsj",width:'30%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}}
];
var data = {};
data["tableName"] = $("#tableName").val();
......
src/main/webapp/WEB-INF/view/sjsblog/sjsbtj.jsp
......@@ -24,14 +24,21 @@
</style>
<!-- tipswindown -->
<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/sjsblog/css/tipswindown.css"/>
<script type="text/javascript" src="sjsblog/js/jquery.min.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/sjsblog/js/tipswindown.js"></script>
<script src="${pageContext.request.contextPath}/sjsblog/js/wow.min.js"></script>
<!-- 引入公共js-->
<script type="text/javascript" src="js/common.js"></script>
<!-- 引入公共页面-->
<jsp:include page="../../common/index.jsp"></jsp:include>
<style>
html,body{overflow:auto;}
</style>
</head>
<body>
<div class="cxtj">
<div class="page-content">
<div class="content">
<div class="cxtj">
<fieldset>
<legend>查询条件</legend>
<div class="search" id="search">
......@@ -69,15 +76,19 @@
<tr>
<td class="ar" width="13.3%">请求开始时间：</td>
<td width="20%">
<span class="textbox">
<input id="lrsjStart" name="lrsjStart" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'lrsjEnd\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span>
</td>
<td class="ar" width="13.3%">结束时间：</td>
<td width="20%">
<span class="textbox">
<input id="lrsjEnd" name="lrsjEnd" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'lrsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span>
</td>
<td class="ar" width="13.3%">比对状态：</td>
<td width="20%">
......@@ -91,15 +102,19 @@
<tr>
<td class="ar" width="13.3%">改写开始时间：</td>
<td width="20%">
<span class="textbox">
<input id="gxsjStart" name="gxsjStart" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'gxsjEnd\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span>
</td>
<td class="ar" width="13.3%">结束时间：</td>
<td width="20%">
<span class="textbox">
<input id="gxsjEnd" name="gxsjEnd" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'gxsjStart\')}',dateFmt:'yyyy-MM-dd HH:mm'})"/>
</span>
</td>
<td class="ar" ></td>
<td width="20%"> </td>
......@@ -107,15 +122,19 @@
<tr>
<td class="ar" width="13.3%">回执开始时间：</td>
<td width="20%">
<span class="textbox">
<input id="fhsjStart" name="fhsjStart" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'fhsjEnd\')}',dateFmt:'yyyy-MM-dd'})"/>
</span>
</td>
<td class="ar" width="13.3%">结束时间：</td>
<td width="20%">
<span class="textbox">
<input id="fhsjEnd" name="fhsjEnd" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'fhsjStart\')}',dateFmt:'yyyy-MM-dd'})"/>
</span>
</td>
<td class="ar" ></td>
<td width="20%"> </td>
......@@ -159,8 +178,8 @@
<!-- table end-->
</div>
<script type="text/javascript" src="sjsblog/js/jquery.min.js"></script>
</div>
</div>
<script type="text/javascript" src="sjsblog/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="sjsblog/js/function-zdy.js"></script>
......
src/main/webapp/WEB-INF/view/sjsblog/sjsbyztj.jsp
......@@ -22,12 +22,18 @@
<script type="text/javascript" src="sjsblog/js/jquery-1.11.3.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.dataTables.js"></script>
<script type="text/javascript" src="sjsblog/js/jquery.alert.js"></script>
<!-- 引入公共js-->
<script type="text/javascript" src="js/common.js"></script>
<!-- 引入公共页面-->
<jsp:include page="../../common/index.jsp"></jsp:include>
<style>
html,body{overflow:auto;}
</style>
</head>
<body>
<div class="cxtj">
<div class="page-content">
<div class="content">
<div class="cxtj">
<form name="gmfnetasjxxForm">
<fieldset>
<legend>查询条件</legend>
......@@ -57,15 +63,19 @@
<tr>
<td class="ar" width="13.3%">录入时间起：</td>
<td width="20%">
<span class="textbox">
<input id="lrsjStart" name="lrsjStart" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'lrsjEnd\')}',dateFmt:'yyyy-MM-dd'})"/>
</span>
</td>
<td class="ar" width="13.3%">至：</td>
<td width="20%">
<span class="textbox">
<input id="lrsjEnd" name="lrsjEnd" class="Wdate" type="text"
onkeypress=""
onFocus="WdatePicker({minDate:'#F{$dp.$D(\'lrsjStart\')}',dateFmt:'yyyy-MM-dd'})"/>
</span>
</td>
</tr>
......@@ -81,7 +91,7 @@
</fieldset>
</form>
</div>
<div class="main-table-div">
<div class="main-table-div">
<div class="statistics">查询结果 </div>
<div style="margin-top:10px">
<table id="sbsjFaillist" class="display" cellspacing="0" width="100%" style="text-align: center; table-layout:fixed;">
......@@ -98,6 +108,8 @@
</table>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="sjsblog/js/jquery.min.js"></script>
<script type="text/javascript" src="sjsblog/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="sjsblog/css/layer/layer.js"></script>
......@@ -117,7 +129,7 @@
{data: "sjbbh",width:'20%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "ywxxdm",width:'20%',render: function(data, type, row, meta) {return nulltostr(data);}},
{data: "lrsj",width:'20%',render: function(data, type, row, meta) {if(data){data=data.substring(0,19);}return nulltostr(data);}},
{data: "failerror",width:'30%',render: function(data, type, row, meta) {return nulltostr("<div class='ellipsis-td' style='' title="+row.failerror+">"+row.failerror+"</div>");}}
{data: "failerror",width:'30%',render: function(data, type, row, meta) {return nulltostr2("<div class='ellipsis-td' style='' title="+row.failerror+">"+row.failerror+"</div>");}}
];
var data = {};
data["sjbbh"] = $("#sjbbh").val();
......@@ -190,6 +202,13 @@
});
return tabelDataServer;
};
function nulltostr2(str){
if(str=="<div class='ellipsis-td' style='' title=null>null</div>"){
return " ";
}else{
return str;
}
}
function nulltostr(str){
if(str==null){
return " ";
......
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