Commit 2c63bba1 authored by 徐来柯's avatar 徐来柯

update items

parent 804ecde1
......@@ -21,7 +21,7 @@
<div class="item">
<div class="item_header" >
<img class="item_img" src="./imgs/title@2x.png" alt="">
<span class="item_title" >文本标题</span>
<span class="item_title" >数值显示</span>
</div>
<div class="item_wrap item_val_wrap">
<div class="item_wrap_content">
......@@ -47,7 +47,7 @@
<div class="item">
<div class="item_header" >
<img class="item_img" src="./imgs/title@2x.png" alt="">
<span class="item_title" >文本标题</span>
<span class="item_title" >电机功率值</span>
</div>
<div class="item_wrap" id="act_torque"></div>
</div>
......@@ -55,7 +55,7 @@
<div class="item">
<div class="item_header" >
<img class="item_img" src="./imgs/title@2x.png" alt="">
<span class="item_title" >文本标题</span>
<span class="item_title" >功率趋势</span>
</div>
<div class="item_wrap" id="torque"></div>
</div>
......@@ -64,7 +64,7 @@
<div class="item">
<div class="item_header" >
<img class="item_img" src="./imgs/title@2x.png" alt="">
<span class="item_title" >文本标题</span>
<span class="item_title" >转矩趋势</span>
</div>
<div class="item_wrap" id="right1"></div>
</div>
......@@ -72,7 +72,7 @@
<div class="item">
<div class="item_header" >
<img class="item_img" src="./imgs/title@2x.png" alt="">
<span class="item_title" >文本标题</span>
<span class="item_title" >电机转矩值</span>
</div>
<div class="item_wrap" id="right2"></div>
</div>
......
......@@ -110,7 +110,7 @@ function getProcess(){
success :function(res) {
let data = []
name.forEach((item, i)=>{
data.push(res.data[i].Value)
data.push(res.data[i].Value ? res.data[i].Value : 0)
})
mycharts.setOption({
yAxis: [
......@@ -277,8 +277,8 @@ function getTorque(){
data1.push(res.data[0].Value)
data2.push(res.data[1].Value)
dataScatter.push(0)
let now = new Date();
xAxis.push(now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds())
// let now = new Date();
xAxis.push(/* now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds() */dayjs(new Date()).format('HH:mm:ss'))
mycharts.setOption({
xAxis:{
data: xAxis
......@@ -564,7 +564,7 @@ function getRight3() {
let str = ``
alarmItem = res.data
alarmItem.forEach((item, index) => {
str += `<div class="list list_red" onmouseover="showTips(event,${index})" id="alarm${index}" >
str += `<div class="list list_red" title="${item.Info}" onmouseover="showTips(event,${index})" id="alarm${index}" >
<span>${item.Info}</span>
</div>`
})
......@@ -573,16 +573,16 @@ function getRight3() {
});
}
function showTips(e, index) {
let tips = layer.tips(alarmItem[index].Info, '#' + e.currentTarget.id, {
tips: 1,
time: 0,
area: 'auto',
maxWidth: 500,
skin: 'table-tips',
});
// function showTips(e, index) {
// let tips = layer.tips(alarmItem[index].Info, '#' + e.currentTarget.id, {
// tips: 1,
// time: 0,
// area: 'auto',
// maxWidth: 500,
// skin: 'table-tips',
// });
e.currentTarget.onmouseleave = function () {
layer.closeAll(tips);
}
}
\ No newline at end of file
// e.currentTarget.onmouseleave = function () {
// layer.close(tips);
// }
// }
\ No newline at end of file
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