wangh
/
dlts_device_cockpit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改显示

Browse Source
master
夜笙歌 8 months ago
parent 3ccc30a394
commit ad8f4490d0
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
haiwei-admin/src/main/resources/static/board/board.js
Unescape Escape View File

@ -79,7 +79,6 @@ $(() => {
left: 38
},
]
console.log(data)
let html = ``
po.forEach((e, i) => {
html += `<div class="status" style="top:${e.top}%;left:${e.left}%">
@ -101,7 +100,6 @@ $(() => {
let chart = null
let chart1 = (el, data) => {
console.log('chart', chart)
let xData = Object.keys(data?.[0] || {})?.filter(e => e !== 'time') || []
let series = xData.map(e => {
let dataA = data?.map(val => val[e]) || []
@ -250,5 +248,4 @@ const tableHeadChange = (e, val) => {
} else {
tableHeadChangeArr = tableHeadChangeArr.filter(v => v !== e)
}
console.log(tableHeadChangeArr)
}

57
haiwei-admin/src/main/resources/templates/board/board1.html
Unescape Escape View File

@ -12,6 +12,10 @@
<script src="../../js/tableAnimation.js"></script>
<script>
let pageSize = 10
let pageNum = 1
let pagesNum = 0
let status = {
rightInfoS: false,
bottomBtn1S: false,
@ -79,6 +83,10 @@
$(el).css({
backgroundImage: status.bottomBtn2S ? 'url("../../board/img/btn1bg.png")' : 'url("../../board/img/btnbg.png")'
})
pageSize = 10
pageNum = 1
pagesNum = 0
$("#chart2").empty()
break
case 3:
@ -111,15 +119,12 @@
}
})
}
let pageSize = 10
let pageNum = 1
let pagesNum = 0
const Modal2SearchReq = async (params) => {
await $.get(ctx + 'broad/home/queryParamData', {...params,pageSize,pageNum}, (e) => {
const Modal2SearchReq = async (params) => {
await $.get(ctx + 'broad/home/queryParamData', {...params, pageSize, pageNum}, (e) => {
pagesNum = Math.ceil(e.total / 10)
let data = e.rows
$("#chart2").empty()
tableHeadChangeArr =[
tableHeadChangeArr = [
"采集时间",
"一体机A转速",
"一体机A电流",
@ -143,7 +148,7 @@
data: data.map((val, i) => [i, val.recordTime, val['speedA'],
val['currentA'], val['pressureHead'], val['tempHead'], val['currentCutter'], val['speedCutter']]),
index: true,
fontColor: '#03BCD4 ',
fontColor: '#03BCD4',
indexBGC: '#86F3FF',
headerBGC: '#092A77',
oddRowBGC: '#092A77',
@ -158,9 +163,9 @@
</a>
</li>
`)
new Array(Math.ceil(data.length % 10)).fill(1).map((i,k)=>{
new Array(Math.ceil(e.total / 10)).fill(1).map((i, k) => {
$("#Pagination").append(`
<li pageId="${k+1}" class="page" onclick="pageClick(this,${k+1})"><a href="#">${k+1}</a></li>
<li pageId="${k + 1}" class="page" onclick="pageClick(this,${k + 1})"><a href="#">${k + 1}</a></li>
`)
})
$("#Pagination").append(`
@ -178,7 +183,7 @@
}
const Modal2Search = async () => {
let params = {}
params.timeInterval=$('#timeInterval').val();
params.timeInterval = $('#timeInterval').val();
if ($('#startTime2').val()) {
params.beginTime = new Date($('#startTime2').val())
}
@ -189,12 +194,13 @@
$($(".page")[0]).addClass('active')
$($(".page")[0]).siblings().removeClass('active')
}
const pageClick = (e) =>{
const pageClick = (e,i) => {
$(e).addClass('active')
$(e).siblings().removeClass('active')
pageNum = e
pageNum = i
let params = {}
params.timeInterval=$('#timeInterval').val();
params.timeInterval = $('#timeInterval').val();
if ($('#startTime2').val()) {
params.beginTime = new Date($('#startTime2').val())
}
@ -203,13 +209,14 @@
}
Modal2SearchReq(params)
}
const pre = () =>{
const pre = () => {
pageNum -= 1
if(pageNum < 1){
if (pageNum < 1) {
pageNum = 1
}
let params = {}
params.timeInterval=$('#timeInterval').val();
params.timeInterval = $('#timeInterval').val();
if ($('#startTime2').val()) {
params.beginTime = new Date($('#startTime2').val())
}
@ -218,13 +225,13 @@
}
Modal2SearchReq(params)
}
const Next = () =>{
const Next = () => {
pageNum += 1
if(pageNum > pagesNum){
if (pageNum > pagesNum) {
pageNum = pagesNum
}
let params = {}
params.timeInterval=$('#timeInterval').val();
params.timeInterval = $('#timeInterval').val();
if ($('#startTime2').val()) {
params.beginTime = new Date($('#startTime2').val())
}
@ -244,10 +251,10 @@
}
const derive2 = () => {
let params = {
colms:tableHeadChangeArr.toString()
colms: tableHeadChangeArr.toString()
}
params.timeInterval=$('#timeInterval').val();
params.timeInterval = $('#timeInterval').val();
if ($('#startTime2').val()) {
params.beginTime = new Date($('#startTime2').val())
}
@ -296,7 +303,7 @@
<div id="statusD">
</div>
<div id="centerInfoDiv" class="centerInfoDiv" >
<div class="centerInfoDiv" id="centerInfoDiv">
</div>
@ -312,7 +319,7 @@
<div class="centerModalInfo">
<div style="display: inline-block">
<span style="font-size: 1vw;color: #fff">时间间隔:</span>
<select id="timeInterval1" class="form-control m-b" style="width: 10vw;height:2vw;display: inline-block"
<select class="form-control m-b" id="timeInterval1" style="width: 10vw;height:2vw;display: inline-block"
th:with="type=${@dict.getType('time_interval')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
@ -357,8 +364,8 @@
type="text">
</div>
<div style="display: inline-block">
<span style="font-size: 1vw;color: #fff">时间间隔:</span>
<select id="timeInterval" class="form-control m-b" style="width: 10vw;height:2vw;display: inline-block"
<span style="font-size: 1vw;color: #fff">时间间隔： </span>
<select class="form-control m-b" id="timeInterval" style="width: 10vw;height:2vw;display: inline-block"
th:with="type=${@dict.getType('time_interval')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>

Write Preview
Loading…
Cancel
Save