diff --git a/admin/css/admin.css b/admin/css/admin.css
index b636670..50199e4 100644
--- a/admin/css/admin.css
+++ b/admin/css/admin.css
@@ -1,3 +1,9 @@
+html,
+body,
+.layui-layout {
+ height: 100%;
+}
+
.pear-admin .layui-header,
.pear-admin .layui-body,
.pear-admin .layui-logo,
@@ -10,7 +16,7 @@
font-size: 20px;
}
-.pear-admin .layui-layout-right .layui-nav-child{
+.pear-admin .layui-layout-right .layui-nav-child {
border: 1px solid whitesmoke;
border-radius: 6px;
width: 150px;
@@ -142,7 +148,7 @@
display: none;
}
-.pear-admin .layui-header .layui-nav-more{
+.pear-admin .layui-header .layui-nav-more {
display: none;
}
@@ -165,15 +171,15 @@
color: white !important;
}
-@media screen and (min-width: 768px){
+@media screen and (min-width: 768px) {
.layui-hide-sm {
- display: inline-block!important;
+ display: inline-block !important;
}
}
-@media screen and (min-width: 769px){
+@media screen and (min-width: 769px) {
.layui-hide-sm {
- display: none!important;
+ display: none !important;
}
}
@@ -182,18 +188,20 @@
.collaspe {
display: none !important;
}
+
.pear-collasped-pe {
display: inline-block !important;
}
-
- .layui-layout-control{
- left: 45px!important;
+
+ .layui-layout-control {
+ left: 45px !important;
}
- .layui-layout-left{
+
+ .layui-layout-left {
padding-left: 10px;
padding-right: 10px;
}
-
+
.pear-mini .bottom-nav {
display: none;
}
diff --git a/admin/css/other/login.css b/admin/css/other/login.css
index ec1621f..6462de2 100644
--- a/admin/css/other/login.css
+++ b/admin/css/other/login.css
@@ -68,9 +68,11 @@
}
body {
+ background-repeat:no-repeat;
background-color: whitesmoke;
+ background-size: 100%;
height: 100%;
-}
+ }
.code {
float: left;
@@ -84,4 +86,4 @@ body {
float: right;
height: 42px;
border: #e6e6e6 1px solid;
-}
+}
\ No newline at end of file
diff --git a/component/pear/modules/admin.js b/component/pear/modules/admin.js
index 06e5e50..312cc7e 100644
--- a/component/pear/modules/admin.js
+++ b/component/pear/modules/admin.js
@@ -457,6 +457,5 @@ layui.define(['table', 'jquery', 'element', 'yaml', 'form', 'tab', 'menu', 'fram
res("返回值");
});
}
-
exports('admin', pearAdmin);
})
diff --git a/index.html b/index.html
index 634fc32..233a0f0 100644
--- a/index.html
+++ b/index.html
@@ -64,12 +64,15 @@
-
+
+
diff --git a/view/echarts/script/line3.js b/view/echarts/script/line3.js
index 9c81967..3e82328 100644
--- a/view/echarts/script/line3.js
+++ b/view/echarts/script/line3.js
@@ -4,106 +4,96 @@ layui.use(['echarts'], function() {
var line3 = echarts.init(document.getElementById('line3'));
const colorList = ["#9E87FF", '#73DDFF', '#fe9a8b', '#F56948', '#9E87FF']
-
+
option = {
- backgroundColor: '#fff',
- title: {
- text: "告警数",
- left: "18px",
- top: "0",
- textStyle: {
- color: "#999",
- fontSize: 12,
- fontWeight: '400'
- }
- },
- color: ['#73A0FA', '#73DEB3', '#FFB761'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'cross',
- crossStyle: {
- color: '#999'
- },
- lineStyle: {
- type: 'dashed'
- }
- }
- },
- grid: {
- left: '25',
- right: '25',
- bottom: '24',
- top: '75',
- containLabel: true
- },
- legend: {
- data: [ '上周', '本周'],
- orient: 'horizontal',
- icon: "rect",
- show: true,
- left: 20,
- top: 25,
- },
- xAxis: {
- type: 'category',
- data: ['爱立信端局', '中兴端局', '爱立信HSS', '中兴HSS', '华为HSS', '华为智能网', '中兴VIMS'],
- splitLine: {
- show: false
- },
- axisTick: {
- show: false
- },
- axisLine: {
- show: false
- },
- },
- yAxis: {
- type: 'value',
- // max: max_value>=100? max_value + 100: max_value+10,
- // max: max_value > 100 ? max_value * 2 : max_value + 10,
- // interval: 10,
- // nameLocation: "center",
- axisLabel: {
- color: '#999',
- textStyle: {
- fontSize: 12
- },
- },
- splitLine: {
- show: true,
- lineStyle: {
- color: '#F3F4F4'
- }
- },
- axisTick: {
- show: false
- },
- axisLine: {
- show: false
- },
- },
- series: [{
- name: '上周',
- type: 'line',
- smooth: true,
- data: [1800,1000,2000,1000,500,100,1200]
- },
- // {
- // name: '钱包笔数',
- // type: 'line',
- // smooth: true,
- // data: [13,54,34,344,35,53]
- // },
- {
- name: '本周',
- type: 'line',
- smooth: true,
- data: [1700,999,1100,899,199,99,1000]
- }
- ]
+ backgroundColor: '#fff',
+ title: {
+ text: "告警数",
+ left: "18px",
+ top: "0",
+ textStyle: {
+ color: "#999",
+ fontSize: 12,
+ fontWeight: '400'
+ }
+ },
+ color: ['#73A0FA', '#73DEB3', '#FFB761'],
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ crossStyle: {
+ color: '#999'
+ },
+ lineStyle: {
+ type: 'dashed'
+ }
+ }
+ },
+ grid: {
+ left: '25',
+ right: '25',
+ bottom: '24',
+ top: '75',
+ containLabel: true
+ },
+ legend: {
+ data: ['上周', '本周'],
+ orient: 'horizontal',
+ icon: "rect",
+ show: true,
+ left: 20,
+ top: 25,
+ },
+ xAxis: {
+ type: 'category',
+ data: ['爱立信端局', '中兴端局', '爱立信HSS', '中兴HSS', '华为HSS', '华为智能网', '中兴VIMS'],
+ splitLine: {
+ show: false
+ },
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ },
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ color: '#999',
+ textStyle: {
+ fontSize: 12
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: '#F3F4F4'
+ }
+ },
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: false
+ },
+ },
+ series: [{
+ name: '上周',
+ type: 'line',
+ smooth: true,
+ data: [1800, 1000, 2000, 1000, 500, 100, 1200]
+ },
+ {
+ name: '本周',
+ type: 'line',
+ smooth: true,
+ data: [1700, 999, 1100, 899, 199, 99, 1000]
+ }
+ ]
};
-
+
line3.setOption(option);
window.onresize = function() {