Skip to content

S
sh-ds
Commit 0e558974 authored by 喻春霖's avatar 喻春霖
Browse files
Options

fixed

parents 0a13d2b0 f5193b55
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 64 deletions
eden-authcenter-agent/src/main/resources/static/css/ds.css
View file @ 0e558974
html { html, body {
height: 100vh; width: 100%;
height: 100%;
overflow: hidden;
} }
.ds { .ds {
max-width: 1900px; max-width: 1900px;
...@@ -8,13 +10,14 @@ html { ...@@ -8,13 +10,14 @@ html {
overflow: hidden; overflow: hidden;
} }
.ds-header-img { .ds-header-img {
margin: 2vh 0; margin: 20px 0;
margin-left: 10%; margin-left: 5%;
height: 5vh; width: 252.5px;
height: 40px;
} }
.ds-content { .ds-content {
width: 100%; width: 100%;
height: 79vh; height: calc(100% - 185px);
background: url("../img/bg.png") no-repeat center center; background: url("../img/bg.png") no-repeat center center;
background-size: 100% 100%; background-size: 100% 100%;
overflow: hidden; overflow: hidden;
...@@ -26,7 +29,8 @@ html { ...@@ -26,7 +29,8 @@ html {
/* background: rgba(255, 255, 255, 0.1); */ /* background: rgba(255, 255, 255, 0.1); */
} }
.ds-content-title { .ds-content-title {
padding: 50px 0 20px 0; padding: 2% 0 1% 0;
margin: 1% 0;
text-align: center; text-align: center;
color: white; color: white;
font-weight: 500; font-weight: 500;
...@@ -35,7 +39,7 @@ html { ...@@ -35,7 +39,7 @@ html {
} }
.ds-footer { .ds-footer {
width: 100%; width: 100%;
height: 13vh; height: 105px;
overflow: hidden; overflow: hidden;
background: white url("../img/Login-b.jpg") no-repeat center center; background: white url("../img/Login-b.jpg") no-repeat center center;
} }
...@@ -47,21 +51,24 @@ html { ...@@ -47,21 +51,24 @@ html {
margin-top: 3%; margin-top: 3%;
} }
.ds-content-source { .ds-content-source {
display: flex; /* display: flex; */
max-width: 1000px; max-width: 1000px;
margin: 0 auto; margin: 0 auto;
height: calc(100% - 100px); height: calc(100% - 100px);
} }
.ds-content-city { .ds-content-city {
flex-basis: 400px; /* flex-basis: 400px; */
float: left;
width: 35%;
padding-right: 10px; padding-right: 10px;
height: 100%; height: 100%;
flex-grow: 1; /* flex-grow: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end; */
} }
.ds-content-city-float { .ds-content-city-float {
width: 300px; width: 300px;
margin-left: auto;
} }
.ds-content-city-float > p { .ds-content-city-float > p {
width: 90px; width: 90px;
...@@ -74,8 +81,10 @@ html { ...@@ -74,8 +81,10 @@ html {
margin-left: 10px; margin-left: 10px;
} }
.ds-content-district { .ds-content-district {
flex-basis: 600px; float: left;
flex-grow: 2; width: 58%;
/* flex-basis: 600px;
flex-grow: 2; */
height: 100%; height: 100%;
margin-left: 10px; margin-left: 10px;
} }
...@@ -137,13 +146,12 @@ html { ...@@ -137,13 +146,12 @@ html {
margin-bottom: 8px; margin-bottom: 8px;
} }
.ds-divide-line { .ds-divide-line {
float: left;
width: 2px; width: 2px;
border: 1px rgba(255, 255, 255, 0.795);
margin: 10px 20px; margin: 10px 20px;
height: 40vh; height: 40vh;
background: -webkit-linear-gradient(left, rgba(251, 251, 251, 0.09), rgba(251, 251, 251, 0.59), rgba(251, 251, 251, 0.09)); /* Safari 5.1 - 6.0 */ background-color: rgba(255, 255, 255, 0.795);
background: -o-linear-gradient(right, rgba(251, 251, 251, 0.09), rgba(251, 251, 251, 0.59), rgba(251, 251, 251, 0.09)); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(right, rgba(251, 251, 251, 0.09), rgba(251, 251, 251, 0.59), rgba(251, 251, 251, 0.09)); /* Firefox 3.6 - 15 */
background: linear-gradient(to right, rgba(251, 251, 251, 0.09), rgba(251, 251, 251, 0.59), rgba(251, 251, 251, 0.09));
} }
.szjc-login { .szjc-login {
width: 80%; width: 80%;
...@@ -159,6 +167,21 @@ html { ...@@ -159,6 +167,21 @@ html {
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {
.ds-header-img {
width: 126px;
height: 20px;
margin: 10px 0;
margin-left: 20px;
}
.ds-content {
height: calc(100% - 70px);
}
.ds-footer {
height: 30px;
}
.ds-footer .ds-content-text {
margin: 6px 0;
}
.ds-content-source { .ds-content-source {
display: flex; display: flex;
height: calc(100% - 60px); height: calc(100% - 60px);
...@@ -170,13 +193,12 @@ html { ...@@ -170,13 +193,12 @@ html {
font-size: 20px; font-size: 20px;
} }
.ds-content-city { .ds-content-city {
flex-basis: 350px;
padding-right: 0; padding-right: 0;
height: 100%; height: 100%;
flex-grow: 1; min-width: 210px;
} }
.ds-content-city-float { .ds-content-city-float {
width: 220px; width: 210px;
} }
.ds-content-city-float > p { .ds-content-city-float > p {
font-size: 16px; font-size: 16px;
...@@ -184,7 +206,6 @@ html { ...@@ -184,7 +206,6 @@ html {
margin: 6px 5px; margin: 6px 5px;
} }
.ds-content-district { .ds-content-district {
flex-grow: 1;
margin: 0 auto; margin: 0 auto;
} }
.ds-content-district > p { .ds-content-district > p {
...@@ -201,7 +222,7 @@ html { ...@@ -201,7 +222,7 @@ html {
.idp-btn { .idp-btn {
width: 110px; width: 110px;
height: 40px; height: 40px;
margin: 6px 5px; margin: 6px 1px;
} }
.ds-divide-line { .ds-divide-line {
width: 2px; width: 2px;
...@@ -219,20 +240,17 @@ html { ...@@ -219,20 +240,17 @@ html {
font-size: 25px; font-size: 25px;
} }
.ds-content-city { .ds-content-city {
flex-basis: 400px;
padding-right: 0; padding-right: 0;
height: 100%; height: 100%;
flex-grow: 1;
} }
.ds-content-city-float { .ds-content-city-float {
width: 100%; width: 100%;
float: none;
} }
.ds-content-city-float > p { .ds-content-city-float > p {
font-size: 18px; font-size: 18px;
} }
.ds-content-district { .ds-content-district {
flex-grow: 1; /* flex-grow: 1; */
margin: 0 auto; margin: 0 auto;
} }
.ds-content-district > p { .ds-content-district > p {
...@@ -250,10 +268,8 @@ html { ...@@ -250,10 +268,8 @@ html {
font-size: 25px; font-size: 25px;
} }
.ds-content-city { .ds-content-city {
flex-basis: 400px;
padding-right: 10px; padding-right: 10px;
height: 100%; height: 100%;
flex-grow: 1;
} }
.ds-content-city-float { .ds-content-city-float {
width: 300px; width: 300px;
...@@ -262,7 +278,7 @@ html { ...@@ -262,7 +278,7 @@ html {
font-size: 18px; font-size: 18px;
} }
.ds-content-district { .ds-content-district {
flex-grow: 1; /* flex-grow: 1; */
margin: 0 auto; margin: 0 auto;
} }
.ds-content-district > p { .ds-content-district > p {
......
eden-authcenter-agent/src/main/resources/static/css/statistics.css
View file @ 0e558974
...@@ -10,14 +10,12 @@ body { ...@@ -10,14 +10,12 @@ body {
background-color: white; background-color: white;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} padding: 5px 0;
.flex {
/* flex: 1; */
} }
.statistics-content { .statistics-content {
margin: 6px 6px; margin: 6px 6px;
display: flex; display: flex;
height: calc(100vh - 80px); height: calc(100vh - 90px);
} }
.statistics-content-item { .statistics-content-item {
background-color: white; background-color: white;
...@@ -31,24 +29,41 @@ body { ...@@ -31,24 +29,41 @@ body {
height: 60%; height: 60%;
} }
.statistics-content-item-title { .statistics-content-item-title {
padding: 20px 0 0 20px; padding: 12px 0 0 20px;
font-size: 14px; font-size: 14px;
color: #777c82;
}
.statistics-content-item-title-remark {
float: right;
margin-right: 20px;
font-size: 12px;
} }
.nums-total { .nums-total {
width: 140px; width: 140px;
height: 70px; height: 91px;
display: inline-block; display: inline-block;
background-size: cover !important; background-size: cover !important;
font-size: 12px; font-size: 12px;
} }
.nums-title { .nums-title {
color: white; color: white;
margin: 10px 10px; margin: 20px 10px 10px 10px;
font-weight: 700;
}
.nums-title-num {
color: white;
margin: 0px 10px 20px 10px;
font-weight: 700; font-weight: 700;
} }
.nums-total-nums { .nums-total-nums {
font-size: 18px; font-size: 22px;
} }
.idp-total-nums { .idp-total-nums {
color: rgb(77, 160, 255); color: rgb(77, 160, 255);
} }
.nums-by-idp {
width: 100%;
padding: 8px 20px 0 20px;
display: flex;
justify-content: space-between;
}
\ No newline at end of file
eden-authcenter-agent/src/main/resources/templates/statistics.html
View file @ 0e558974
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
<div class="statistics-content-item item-height-higher"> <div class="statistics-content-item item-height-higher">
<p class="statistics-content-item-title">认证热点单位<span class="statistics-content-item-title-remark">单位：人次</span> <p class="statistics-content-item-title">认证热点单位<span class="statistics-content-item-title-remark">单位：人次</span>
</p> </p>
<div id="user-org" style="height: calc(100% - 40px)"> <div id="user-org" style="height: calc(100% - 40px); margin-top: 8px;">
<p style="padding: 6px 20px 0 20px; color: #5f646a; font-size: 12px; line-height: 1.8;" v-for="item in userOrgList"><span <p style="padding: 5px 20px 0 20px; color: #5f646a; font-size: 12px; line-height: 1.8;" v-for="item in userOrgList"><span
style="color: orange; font-weight: 900; padding-right: 8px;">·</span><span v-text="item.name"></span><span style="color: orange; font-weight: 900; padding-right: 8px;">·</span><span v-text="item.name"></span><span
style="float: right;" v-text="item.count">次</span></p> style="float: right;" v-text="item.count">次</span></p>
</div> </div>
...@@ -139,6 +139,10 @@ ...@@ -139,6 +139,10 @@
<script type="text/javascript"> <script type="text/javascript">
var baseUrl = "/"; var baseUrl = "/";
var colorList = [
'#6c5df1', '#a78bf4', '#fdbf3c', '#ec6367', '#2fcaa8', '#79c161'
]
new Vue({ new Vue({
el: '#app', el: '#app',
data: { data: {
...@@ -225,7 +229,7 @@ ...@@ -225,7 +229,7 @@
}, },
legend: { legend: {
icon: "circle", icon: "circle",
bottom: 10, bottom: 0,
data: ["数字教材", "阅览室", "其他"] data: ["数字教材", "阅览室", "其他"]
}, },
series: [ series: [
...@@ -233,11 +237,9 @@ ...@@ -233,11 +237,9 @@
name: "应用来源", name: "应用来源",
type: "pie", type: "pie",
radius: ["40%", "60%"], radius: ["40%", "60%"],
center: ["50%", "42%"], center: ["50%", "48%"],
label: { label: {
position: 'outside', position: 'outside',
alignTo: 'edge',
margin: 10,
formatter: "{per|{d}%}", formatter: "{per|{d}%}",
rich: { rich: {
per: { per: {
...@@ -365,14 +367,11 @@ ...@@ -365,14 +367,11 @@
type: "pie", type: "pie",
radius: ["30%", "70%"], radius: ["30%", "70%"],
center: ['30%', '50%'], center: ['30%', '50%'],
labelLine: {
show: false
},
label: { label: {
position: 'inner', show: false
formatter: "{per|{d}%}",
rich: {
per: {
color: "black"
}
}
}, },
data: dataBrowser, data: dataBrowser,
itemStyle: { itemStyle: {
...@@ -416,14 +415,11 @@ ...@@ -416,14 +415,11 @@
type: "pie", type: "pie",
radius: ["30%", "70%"], radius: ["30%", "70%"],
center: ['30%', '50%'], center: ['30%', '50%'],
labelLine: {
show: false
},
label: { label: {
position: 'inner', show: false
formatter: "{per|{d}%}",
rich: {
per: {
color: "black"
}
}
}, },
data: dataSystem, data: dataSystem,
itemStyle: { itemStyle: {
...@@ -486,8 +482,9 @@ ...@@ -486,8 +482,9 @@
success: function (result) { success: function (result) {
_this.nums = result.data.all_auth; _this.nums = result.data.all_auth;
_this.numsJcjy = result.data.cas_edu_auth; _this.numsJcjy = result.data.cas_edu_auth;
_this.numsQp = esult.data.qp_auth; _this.numsQp = result.data.qp_auth;
_this.numsSy = esult.data.operator_auth; _this.numsSy = result.data.operator_auth;
_this.numsOfPeople = result.data.num_of_people;
// _this.numsIdpList = result.data.area_auth; // _this.numsIdpList = result.data.area_auth;
// var legend = [], data = []; // var legend = [], data = [];
...@@ -598,7 +595,7 @@ ...@@ -598,7 +595,7 @@
}, },
legend: { legend: {
icon: "circle", icon: "circle",
bottom: 10, bottom: 0,
data: [] data: []
}, },
series: [ series: [
...@@ -606,11 +603,9 @@ ...@@ -606,11 +603,9 @@
name: "访客身份", name: "访客身份",
type: "pie", type: "pie",
radius: ["30%", "50%"], radius: ["30%", "50%"],
center: ["50%", "40%"], center: ["50%", "48%"],
label: { label: {
position: 'outside', position: 'outside',
alignTo: 'edge',
margin: 10,
formatter: "{per|{d}%}", formatter: "{per|{d}%}",
rich: { rich: {
per: { per: {
......
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