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

1.新 httpclient版本到4.5.6，解决凯歌提出的4.4.1版本存在的连接可能出现失败问题

Browse Source 
2.提交图标样式更改
This commit is contained in:
zhanghongqing
2018-09-10 11:39:04 +08:00
parent 7f918963a0
commit c5fb19c695
23 changed files with 1826 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -2101,7 +2101,9 @@ th {
background-color: #fbfcfd; }
.table-hover > tbody > tr:hover {
background-color: #eef1f5; }
/* background-color: #eef1f5; */
background: rgb(210, 232, 251, 0.8);
}
table col[class*="col-"] {
position: static;
@@ -2126,14 +2128,17 @@ table th[class*="col-"] {
.table > tfoot > tr > th.active,
.table > tfoot > tr.active > td,
.table > tfoot > tr.active > th {
background-color: #eef1f5; }
background: rgb(210, 232, 251, 0.8);
/* background-color: #eef1f5; */ }
.table-hover > tbody > tr > td.active:hover,
.table-hover > tbody > tr > th.active:hover,
.table-hover > tbody > tr.active:hover > td,
.table-hover > tbody > tr:hover > .active,
.table-hover > tbody > tr.active:hover > th {
background-color: #dee5ec; }
/* background-color: #dee5ec; */
background: rgb(210, 232, 251, 0.8);
}
.table > thead > tr > td.success,
.table > thead > tr > th.success,

470
src/main/webapp/static/global/plugins/highcharts/css/data_text.css
View File

@@ -118,8 +118,8 @@ p{
margin-top: 1px;
}
.data_content .data_info>div.info_2 .fl_fc .csNum{
font-size: 5px;
color:#ff4e4e !important;
font-size: 12px;
color:#337ab7 !important;
margin-top: 1px;
}
/* .data_info{
@@ -143,14 +143,14 @@ p{
*zoom: 1; /*IE/7/6*/
}
/************** info end ***********************/
/* 第一行图 */
.data_content .data_main{
width: calc(100% - 30px);
height: 430px;
margin-left: 15px;
}
.data_content .data_main .main_left{
width: 26%;
width: 55%;
}
.data_content .data_main .main_left>div{
width: 100%;
@@ -164,15 +164,12 @@ p{
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main .main_left div.left_1{
/*background: url("../img/chart_1.png") no-repeat center;*/
}
.data_content .data_main .main_left div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main .main_left div .main_title{
width: 230px;
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
@@ -180,7 +177,7 @@ p{
position: absolute;
top: -17px;
left:45%;
margin-left: -90px;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
@@ -189,20 +186,14 @@ p{
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main .main_left div .main_title img{
position: absolute;
top: 8px;
left: 15px;
}
.data_content .data_main .main_center{
width: 46%;
width: 45%;
height: 400px;
}
.data_content .data_main .main_center .center_text{
width: calc(100% - 30px);
width: calc(100% - 16px);
height: 400px;
margin-left: 15px;
margin-right: 15px;
@@ -213,7 +204,6 @@ p{
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
/*background: url("../img/chart_map.png") no-repeat center ;*/
}
.data_content .data_main .main_center .main_title{
width: 250px;
@@ -223,7 +213,7 @@ p{
position: absolute;
top: -17px;
left:50%;
margin-left: -90px;
margin-left: -110px;
color:#fff;
font-size: 18px;
font-weight: 600;
@@ -234,7 +224,7 @@ p{
}
.data_content .data_main .main_right{
width: 28%;
width: 26%;
}
.data_content .data_main .main_right>div{
width: 100%;
@@ -257,40 +247,11 @@ p{
color:#fff;
}
.data_content .data_main .main_right div.right_2{
/*background: url("../img/chart_4.png") no-repeat center;*/
}
/* .data_content .data_main .main_right div.right_2 .chart_text {
width: 18%;
color:#fff;
text-align: center;
margin-top: 12px;
}
.data_content .data_main .main_right div.right_2 .chart_text p{
margin-top: 21px;
}
.data_content .data_main .main_right div.right_2 .chart_text p img{
margin-right: 5px;
margin-top: -4px;
}
.data_content .data_main .main_right div.right_2 .chart_text p:nth-child(1){
font-size: 14px;
font-weight: 600;
} */
/* .data_content .data_main .main_right div.right_2 .text_sum{
text-align: center;
color:#ffff43;
font-weight: 600;
}
.data_content .data_main .main_right div.right_2 .text_sum div:nth-child(2){
font-size: 18px;
font-weight: 600;
} */
.data_content .data_main .main_right div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main .main_right div .main_title{
width: 230px;
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
@@ -298,7 +259,7 @@ p{
position: absolute;
top: -17px;
left:45%;
margin-left: -90px;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
@@ -307,13 +268,257 @@ p{
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main .main_right div .main_title img{
position: absolute;
top: 8px;
left: 15px;
/* 第2行图 */
.data_content .data_main1{
width: calc(100% - 30px);
height: 430px;
margin-left: 15px;
}
.data_content .data_main1 .main_left1{
width: 50%;
}
.data_content .data_main1 .main_left1>div{
width: 100%;
height: 400px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*box-shadow: 0px 0px 10px #3D3D3D inset;*/
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main1 .main_left1 div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main1 .main_left1 div .main_title1{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:45%;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main1 .main_center1{
width: 49%;
height: 400px;
}
.data_content .data_main1 .main_center1 .center_text1{
width: calc(100% - 5px);
height: 400px;
margin-left: 15px;
margin-right: 15px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main1 .main_center1 .main_title1{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
position: absolute;
top: -17px;
left:50%;
margin-left: -110px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main1 .main_right1{
width: 50%;
}
.data_content .data_main1 .main_right1>div{
width: 100%;
height: 400px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main1 .main_right1 div.right_1 .choice{
position: absolute;
top: 25px;
right: 30px;
z-index: 1000;
}
.data_content .data_main1 .main_right1 div.right_1 .choice label{
color:#fff;
}
.data_content .data_main1 .main_right1 div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main1 .main_right1 div .main_title1{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:45%;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
/* 第3行图 */
.data_content .data_main2{
width: calc(100% - 30px);
height: 430px;
margin-left: 15px;
}
.data_content .data_main2 .main_left2{
width: 30%;
}
.data_content .data_main2 .main_left2>div{
width: 100%;
height: 400px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*box-shadow: 0px 0px 10px #3D3D3D inset;*/
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main2 .main_left2 div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main2 .main_left2 div .main_title2{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:45%;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main2 .main_center2{
width: 40%;
height: 400px;
}
.data_content .data_main2 .main_center2 .center_text2{
width: calc(100% - 30px);
height: 400px;
margin-left: 15px;
margin-right: 15px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main2 .main_center2 .main_title2{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
position: absolute;
top: -17px;
left:50%;
margin-left: -110px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
.data_content .data_main2 .main_right2{
width: 30%;
}
.data_content .data_main2 .main_right2>div{
width: 100%;
height: 400px;
box-sizing: border-box;
border: 1px solid #3D3D3D;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
}
.data_content .data_main2 .main_right2 div.right_1 .choice{
position: absolute;
top: 25px;
right: 30px;
z-index: 1000;
}
.data_content .data_main2 .main_right2 div.right_1 .choice label{
color:#fff;
}
.data_content .data_main2 .main_right2 div:nth-child(1){
margin-bottom: 5px;
}
.data_content .data_main2 .main_right2 div .main_title2{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:45%;
margin-left: -100px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
z-index: 1000;
border-radius:18px !important;
}
/* 第4行图 */
.data_content .data_bottom{
width: calc(100% - 30px);
height: 430px;
@@ -324,7 +529,7 @@ p{
}
.data_content .data_bottom .bottom_1{
width: 22%;
width: 26%;
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
@@ -336,11 +541,11 @@ p{
/*background: url("../img/chart_5.png") no-repeat;*/
}
.data_content .data_bottom .bottom_center{
width: 52%;
width: 74%;
height: 430px;
}
.data_content .data_bottom .bottom_2{
width: calc(53% - 10px);
width: calc(53% - 15px);
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
@@ -353,7 +558,7 @@ p{
/*background: url("../img/chart_6.png") no-repeat;*/
}
.data_content .data_bottom .bottom_3{
width: calc(47% - 35px);
width: calc(47% - 15px);
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
@@ -362,30 +567,29 @@ p{
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*background: url("../img/chart_7.png") no-repeat;*/
margin-left:15px;
}
.data_content .data_bottom .bottom_4{
/* .data_content .data_bottom .bottom_4{
width: 26%;
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
box-shadow:-10px 0px 15px #3D3D3D inset, 左边阴影
0px -10px 15px #3D3D3D inset, 上边阴影
10px 0px 15px #3D3D3D inset, 右边阴影
0px 10px 15px #3D3D3D inset;
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*background: url("../img/chart_8.png") no-repeat;*/
}
background: url("../img/chart_8.png") no-repeat;
} */
.data_content .data_bottom div .main_title{
width: 220px;
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:50%;
left:45%;
margin-left: -110px;
color:#fff;
font-size: 18px;
@@ -394,11 +598,6 @@ p{
text-align:center;
border-radius:18px !important;
}
.data_content .data_bottom div .main_title img{
position: absolute;
top: 8px;
left: 15px;
}
.data_content .data_bottom div .main_table tr{
height: 36px;
@@ -443,3 +642,128 @@ p{
10px 0px 15px #3D3D3D inset; /*右边阴影*/
/*0px 10px 15px #3D3D3D inset;*/
}
/* 第5行图 */
.data_content .data_bottom2{
width: calc(100% - 30px);
height: 430px;
margin-left: 15px;
margin-top: 30px;
}
.data_content .data_bottom2 div{
}
.data_content .data_bottom2 .bottom_12{
width: 26%;
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*background: url("../img/chart_5.png") no-repeat;*/
}
.data_content .data_bottom2 .bottom_center2{
width: 74%;
height: 430px;
}
.data_content .data_bottom2 .bottom_22{
width: calc(53% - 15px);
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
margin-left: 15px;
/*background: url("../img/chart_6.png") no-repeat;*/
}
.data_content .data_bottom2 .bottom_32{
width: calc(47% - 15px);
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*background: url("../img/chart_7.png") no-repeat;*/
margin-left:15px;
}
.data_content .data_bottom2 .bottom_42{
width: 26%;
height: 430px;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
0px -10px 15px #3D3D3D inset, /*上边阴影*/
10px 0px 15px #3D3D3D inset, /*右边阴影*/
0px 10px 15px #3D3D3D inset;
position: relative;
box-sizing: border-box;
border: 1px solid #3D3D3D;
/*background: url("../img/chart_8.png") no-repeat;*/
}
.data_content .data_bottom2 div .main_title2{
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;
border-radius: 18px;
position: absolute;
top: -17px;
left:45%;
margin-left: -110px;
color:#fff;
font-size: 18px;
font-weight: 600;
box-sizing: border-box;
text-align:center;
border-radius:18px !important;
}
.data_content .data_bottom2 div .main_table2 tr{
height: 36px;
}
.data_content .data_bottom2 div .main_table2{
width: 100%;
margin-top: 25px;
}
.data_content .data_bottom2 div .main_table2 table{
width: 100%;
}
.data_content .data_bottom2 div .main_table2 thead tr{
height: 36px;
}
.data_content .data_bottom2 div .main_table2 th{
font-size: 14px;
font-weight: 600;
color:#757575;
text-align: center;
}
.data_content .data_bottom2 div .main_table2 th:nth-child(1){
width: 30%;
}
.data_content .data_bottom2 div .main_table2 th:nth-child(2){
width: 35%;
}
.data_content .data_bottom2 div .main_table2 th:nth-child(2){
width: 35%;
}
.data_content .data_bottom2 div .main_table2 td{
color:#3D3D3D;
font-size: 12.8px;
text-align: center;
}
.data_content .data_bottom2 div .main_table2 tbody tr:nth-child(1),
.data_content .data_bottom2 div .main_table2 tbody tr:nth-child(3),
.data_content .data_bottom2 div .main_table2 tbody tr:nth-child(7),
.data_content .data_bottom2 div .main_table2 tbody tr:nth-child(9),
.data_content .data_bottom2 div .main_table2 tbody tr:nth-child(5){
background-color: #303030;
box-shadow:-10px 0px 15px #3D3D3D inset, /*左边阴影*/
10px 0px 15px #3D3D3D inset; /*右边阴影*/
/*0px 10px 15px #3D3D3D inset;*/
}

6
src/main/webapp/static/global/plugins/highcharts/echart.js
View File

@@ -31,7 +31,7 @@
var chart = Highcharts.chart('chart_1', {
chart: {
type: 'pie',
spacing : [40, 0 , 40, 0],
spacing : [40, 40 , 40, 40],
backgroundColor: 'rgba(255, 255, 255, 0)',
plotBackgroundColor:null,
plotBorderWidth:null,
@@ -89,13 +89,13 @@
events: {
mouseOver: function(e) { // 鼠标滑过时动态更新标题
// 标题更新函数，API 地址：https://api.hcharts.cn/highcharts#Chart.setTitle
chart.setTitle({
/*chart.setTitle({
text: '<br>'+e.target.name,
style: {//设置字体颜色
color: '#fff',
fontFamily:'Microsoft YaHei'
},
});
});*/
this.slice();
},
// 鼠标移出时，收回突出显示