wangh
/
aucma-benchmarking-factory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改界面

Browse Source
master
夜笙歌 3 years ago
parent 70bd8d0238
commit f4d1f3e31f
5 changed files with 74 additions and 52 deletions
Show Stats Download Patch File Download Diff File

36
ruoyi-admin/src/main/resources/static/css/board/month.css
Unescape Escape View File

@ -31,19 +31,19 @@ body {
background: url(../../img/board/month/bgFour.gif);
background-size: 100% 100%;
position: absolute;
top:1%;
left:1%;
width:1%;
height:1%;
top: 14%;
left: 50.5%;
width: 23.6%;
height: 40.4%;
}
.cardFour{
background: url(../../img/board/month/bgFour.gif);
background-size: 100% 100%;
position: absolute;
top:1%;
left:1%;
width:1%;
height:1%;
top: 14%;
left: 75.1%;
width: 23.7%;
height: 40.5%;
}
.cardFive{
background: url(../../img/board/month/bgTwo.gif);
@ -67,19 +67,19 @@ body {
background: url(../../img/board/month/bgFour.gif);
background-size: 100% 100%;
position: absolute;
top:1%;
left:1%;
width:1%;
height:1%;
top: 56.8%;
left: 50.5%;
width: 23.6%;
height: 40.4%;
}
.cardEight{
background: url(../../img/board/month/bgFour.gif);
background-size: 100% 100%;
position: absolute;
top:1%;
left:1%;
width:1%;
height:1%;
top: 56.8%;
left: 75.1%;
width: 23.6%;
height: 40.4%;
}
.day{
background: url(../../img/board/month/time.png);
@ -144,8 +144,8 @@ body {
left: 51.5%;
}
.scene{
background: url(../../img/board/month/two.jpg) no-repeat;
background-size: 100% 100%;
/*background: url(../../img/board/month/two.jpg) no-repeat;*/
/*background-size: 100% 100%;*/
position: absolute;
width: 22%;
height: 34%;

BIN
ruoyi-admin/src/main/resources/static/img/board/month/bgFour.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 401 KiB

After

Width:  |  Height:  |  Size: 354 KiB

39
ruoyi-admin/src/main/resources/static/js/board/month.js
Unescape Escape View File

@ -61,31 +61,30 @@ $(() => {
}, document.getElementById("outputStatistics"), '')
})
autoUpdate(url + "/selectHighlightProducts", 40000, data => {
let url = data.map(val => val.picturePath)
$('#HighlightOne').attr("src", `http://10.100.70.5:9090/${url[0]}`)
$('#HighlightTwo').attr("src", `http://10.100.70.5:9090/${url[1]}`)
$('#HighlightThree').attr("src", `http://10.100.70.5:9090/${url[2]}`)
$('#HighlightFour').attr("src", `http://10.100.70.5:9090/${url[3]}`)
let options = {
let urlOne = data.filter(val => val.pictureLocation === 1).map(val => val.picturePath)
let urlTwo = data.filter(val => val.pictureLocation === 2).map(val => val.picturePath)
let optionsOne = {
navButton: false,
sideButton: false,
effects: ['fade', 'slideX', 'slideY', 'page', 'circle', 'rollingX', 'rollingY', 'blindsX', 'blindsY'],
data: [
{
src: `http://10.100.70.5:9090/${url[0]}`,
},
{
src: `http://10.100.70.5:9090/${url[1]}`,
},
{
src: `http://10.100.70.5:9090/${url[2]}`,
},
{
src: `http://10.100.70.5:9090/${url[3]}`,
data: urlOne.map(val => {
return {
src: `http://10.100.70.5:9090/${val}`,
}
]
})
};
$('#slide').vmcSlide(options);
let optionsTwo = {
navButton: false,
sideButton: false,
effects: ['fade', 'slideX', 'slideY', 'page', 'circle', 'rollingX', 'rollingY', 'blindsX', 'blindsY'],
data: urlTwo.map(val => {
return {
src: `http://10.100.70.5:9090/${val}`,
}
})
};
$('#slide').vmcSlide(optionsOne);
$('#scene').vmcSlide(optionsTwo);
})
autoUpdate(url + "/selectBaseQilist", 40000, data => {
let yData = data.map(val => {

43
ruoyi-admin/src/main/resources/static/js/echartsCommon.js
Unescape Escape View File

@ -957,11 +957,11 @@ const lineChart = function (data, id, unit = '') {
yDataTwoName: "百分比"
}
}
let min = Math.ceil(Math.min(...data.yData))
let max = Math.ceil(Math.max(...data.yData))
let min = Math.ceil(Math.min(...data.yData,...(data.yDataTwo || [])))
let max = Math.ceil(Math.max(...data.yData,...(data.yDataTwo || [])))
let option = {
grid: {
top: '20%',
top: '28%',
left: '5%',
right: '5%',
bottom: '8%',
@ -1036,12 +1036,12 @@ const lineChart = function (data, id, unit = '') {
symbolSize: 4, //标记的大小
itemStyle: {
//折线拐点标志的样式
color: '#f3454b',
color: '#14bd2d',
borderWidth: '2',
borderColor: '#f3454b',
borderColor: '#14bd2d',
},
lineStyle: {
color: '#f3454b',
color: '#14bd2d',
},
label: {
//图形上的文本标签
@ -1050,7 +1050,7 @@ const lineChart = function (data, id, unit = '') {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
color: "#14bd2d",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.5 * vw,
@ -1067,9 +1067,9 @@ const lineChart = function (data, id, unit = '') {
symbolSize: 4, //标记的大小
itemStyle: {
//折线拐点标志的样式
color: '#5f3caf',
color: '#3094ea',
borderWidth: '2',
borderColor: '#462f84',
borderColor: '#3094ea',
},
lineStyle: {
color: '#3094ea',
@ -1081,13 +1081,36 @@ const lineChart = function (data, id, unit = '') {
show: true,
position: "top",
textStyle: {
color: "#3254b8",
color: "#3094ea",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.5 * vw,
},
},
},
areaStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: "rgb(76,82,193,0.7)",
},
{
offset: 0.8,
color: "rgb(191,194,220,0.4)",
},
],
false
),
shadowColor: "rgba(0, 0, 0, 0.1)",
shadowBlur: 10,
},
},
data: data.yDataTwo,
},
],

8
ruoyi-admin/src/main/resources/templates/broad/month.html
Unescape Escape View File

@ -31,12 +31,12 @@
<body style="display:flex;">
<div class="cardOne" id="cardOne"></div>
<div class="cardTwo" id="cardTwo"></div>
<!--<div class="cardThree" id="cardThree"></div>-->
<!--<div class="cardFour" id="cardFour"></div>-->
<div class="cardThree" id="cardThree"></div>
<div class="cardFour" id="cardFour"></div>
<div class="cardFive" id="cardFive"></div>
<div class="cardSix" id="cardSix"></div>
<!--<div class="cardSeven" id="cardSeven"></div>-->
<!--<div class="cardEight" id="cardEight"></div>-->
<div class="cardSeven" id="cardSeven"></div>
<div class="cardEight" id="cardEight"></div>
<div id="Tips"></div>
<div id="total"></div>
<day class="time" id="time"></day>

Write Preview
Loading…
Cancel
Save