diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
index 84d9423c..828f4a79 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
@@ -3,280 +3,276 @@
/* CSS Document */
-
-
-
* {
- margin: 0;
- padding: 0;
- font-family: 'Microsoft Yahei', Arial, Verdana, sans-serif;
+ margin: 0;
+ padding: 0;
+ font-family: 'Microsoft Yahei', Arial, Verdana, sans-serif;
}
html {
- width: 100%;
- height: 100%;
- overflow: hidden;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
}
body {
- height: 100%;
- width: 100%;
- color: #4c4c4c;
- font-size: 14px;
+ height: 100%;
+ width: 100%;
+ color: #4c4c4c;
+ font-size: 14px;
}
.statwrap {
- padding: 1.5% 1%;
- width: 100%;
- height: 100%;
- box-sizing: border-box;
+ padding: 1.5% 1%;
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
}
.headtit {
- height: 3rem;
+ height: 3rem;
}
.seltime {
- display: flex;
- position: absolute;
- /*top: 110px;*/
- right: 1%;
- align-items: center;
+ display: flex;
+ position: absolute;
+ /*top: 110px;*/
+ right: 1%;
+ align-items: center;
}
.seltime > i {
- display: inline-block;
- margin: 0 5px 0 0;
- width: 24px;
- height: 24px;
- background: url(/img/icon_can.png) no-repeat;
- background-size: 100%;
- opacity: .5;
+ display: inline-block;
+ margin: 0 5px 0 0;
+ width: 24px;
+ height: 24px;
+ background: url(/img/icon_can.png) no-repeat;
+ background-size: 100%;
+ opacity: .5;
}
.seltime > span {
- display: inline-block;
- margin: 0 10px;
+ display: inline-block;
+ margin: 0 10px;
}
.seltime > span > select {
- display: inline-block;
- margin: 0 8px 0 0;
- padding: 6px;
- background: #FFFFFF none;
- border: 1px solid #e5e6e7;
- border-radius: 6px;
+ display: inline-block;
+ margin: 0 8px 0 0;
+ padding: 6px;
+ background: #FFFFFF none;
+ border: 1px solid #e5e6e7;
+ border-radius: 6px;
}
.statit {
- display: flex;
- margin: 0.5% 0 1% 0;
- width: 60%;
+ display: flex;
+ margin: 0.5% 0 1% 0;
+ width: 60%;
}
.statit > span {
- display: inline-block;
- margin: 1% 2% 0 0;
- min-width: 6%;
- height: 2.75rem;
- line-height: 1.75;
- color: rgba(0,0,0,0.4);
- font-size: 1.35rem;
- font-weight: 600;
- text-align: center;
- white-space: nowrap;
- cursor: pointer;
+ display: inline-block;
+ margin: 1% 2% 0 0;
+ min-width: 6%;
+ height: 2.75rem;
+ line-height: 1.75;
+ color: rgba(0, 0, 0, 0.4);
+ font-size: 1.35rem;
+ font-weight: 600;
+ text-align: center;
+ white-space: nowrap;
+ cursor: pointer;
}
-.statit>span.actit {
- /*background: url(/img/sel_tab.png) no-repeat center bottom;*/
- border-bottom: 3px solid rgba(12, 94, 249,1);
- color: rgb(12, 94, 249);
+.statit > span.actit {
+ /*background: url(/img/sel_tab.png) no-repeat center bottom;*/
+ border-bottom: 3px solid rgba(12, 94, 249, 1);
+ color: rgb(12, 94, 249);
}
.tab_box {
- position: relative;
- margin: 2rem 0 0;
- height: calc(100% - 10rem);
- clear: both;
- background: #fff;
+ position: relative;
+ margin: 2rem 0 0;
+ height: calc(100% - 10rem);
+ clear: both;
+ background: #fff;
}
.tab_item {
- position: absolute;
- z-index: -999;
- width: 100%;
- height: 100%;
+ position: absolute;
+ z-index: -999;
+ width: 100%;
+ height: 100%;
background-color: white
}
.tab_cont {
- float: left;
- width: 50%;
- height: 100%;
+ float: left;
+ width: 50%;
+ height: 100%;
}
.desktab {
- margin: auto;
- border: 1px solid #ddd;
- border-bottom: 0;
- border-right: 0;
- table-layout: fixed;
+ margin: auto;
+ border: 1px solid #ddd;
+ border-bottom: 0;
+ border-right: 0;
+ table-layout: fixed;
}
.desktab tr {
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
}
.desktab tr:last-child {
- border-bottom: 0;
+ border-bottom: 0;
}
.desktab td, .desktab th, .noborder td {
- padding: 8px 20px;
- height: 36px;
- border: 1px solid #dee2e6;
- border-top: 0;
- border-left: 0;
- color: #666;
- line-height: 20px;
- word-break: keep-all;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
+ padding: 8px 20px;
+ height: 36px;
+ border: 1px solid #dee2e6;
+ border-top: 0;
+ border-left: 0;
+ color: #666;
+ line-height: 20px;
+ word-break: keep-all;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.trodd th {
- height: 40px;
- background: #F5F5F6;
- color: #4c4c4c;
- text-align: left;
+ height: 40px;
+ background: #F5F5F6;
+ color: #4c4c4c;
+ text-align: left;
}
.line-clamp {
- height: 20px;
- overflow: hidden;
- white-space: nowrap;
- -webkit-line-clamp: 1;
- -webkit-box-orient: vertical;
- text-align: left;
- text-overflow: ellipsis;
+ height: 20px;
+ overflow: hidden;
+ white-space: nowrap;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
+ text-align: left;
+ text-overflow: ellipsis;
}
.listhead {
- width: calc(100% - 6px);
+ width: calc(100% - 6px);
}
.listbody {
- position: relative;
- margin-top: -1px;
- width: 100%;
- height: calc(100% - 60px);
- overflow: hidden;
+ position: relative;
+ margin-top: -1px;
+ width: 100%;
+ height: calc(100% - 60px);
+ overflow: hidden;
}
.inner {
- position: absolute;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- overflow-x: hidden;
- overflow-y: scroll;
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.chartbox {
- float: left;
- margin: 2% 2%;
- width: 45%;
- height: 90%;
+ float: left;
+ margin: 2% 2%;
+ width: 45%;
+ height: 90%;
}
.tab-content {
- display: none;
- width: 100%;
- height: calc(100% - 60px);
+ display: none;
+ width: 100%;
+ height: calc(100% - 60px);
}
.tab-content.active {
- display: block;
+ display: block;
}
.cont-box {
- width: 100%;
- height: calc(100% - 60px);
- clear: both;
- overflow-y: auto;
+ width: 100%;
+ height: calc(100% - 60px);
+ clear: both;
+ overflow-y: auto;
}
.chart-box {
- float: left;
- margin: 1% 5%;
- width: 45%;
- height: 45%;
+ float: left;
+ margin: 1% 5%;
+ width: 45%;
+ height: 45%;
}
.static-content {
- float: left;
- clear: both;
- width: 100%;
+ float: left;
+ clear: both;
+ width: 100%;
}
.static-content li p {
- min-width: 20px;
+ min-width: 20px;
}
.static-content li label {
- position: relative;
- margin: 0 5px;
- padding-left: 20px;
+ position: relative;
+ margin: 0 5px;
+ padding-left: 20px;
}
-
.static-content li label:before {
- position: absolute;
- top: 20%;
- left: -5px;
- content: "\f111";
- padding-left: 1rem;
- color: #136efb;
- font-size: 0.85rem;
- font-family: 'FontAwesome';
+ position: absolute;
+ top: 20%;
+ left: -5px;
+ content: "\f111";
+ padding-left: 1rem;
+ color: #136efb;
+ font-size: 0.85rem;
+ font-family: 'FontAwesome';
}
.static-content li span {
- margin: 0 5px 0 10px;
- }
+ margin: 0 5px 0 10px;
+}
.static-content li b {
- color: #136efb;
- font-size: 1.5rem;
+ color: #136efb;
+ font-size: 1.5rem;
}
-
-
-
-
-
-
-
+h1.page-title {
+ float: left;
+ margin: 2.5% 2% 0;
+ font-size: 2.5rem;
+ font-weight: 500;
+ color: #4c4c4c;
+}
/** 滚动条样式 **/
::-webkit-scrollbar-track {
- background-color: #F5F5F5;
+ background-color: #F5F5F5;
}
::-webkit-scrollbar {
- width: 6px;
- height: 10px;
- background-color: #F5F5F5;
+ width: 6px;
+ height: 10px;
+ background-color: #F5F5F5;
}
::-webkit-scrollbar-thumb {
- border-radius: 6px;
- background-color: #ccc;
+ border-radius: 6px;
+ background-color: #ccc;
}
.tab_item2 {
@@ -290,7 +286,8 @@ body {
justify-content: center
}
-.tab_item2 .echarts{
+
+.tab_item2 .echarts {
width: 45%;
height: 45%;
}
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
index aaa3ecfe..096aee34 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
@@ -9,55 +9,139 @@