Skip to content

3
3DWeb
Commit 2c63bba1 authored by 徐来柯's avatar 徐来柯
Browse files
Options

update items

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