Commit dd338cf9 by 杨琪琪

ocr折线图:全区-可切秒,修改切换全区/地市时图表legend未重置问题

parent 82c1f24a
...@@ -125,10 +125,14 @@ ...@@ -125,10 +125,14 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs4 interval-box"> <div class="layui-form-item layui-col-xs4 interval-box">
<div class="layui-input-block"> <div class="layui-input-block flex flex-row flex-align">
<input type="radio" lay-filter="radio-time" name="interval" value="hour" title="时"> <input type="radio" lay-filter="radio-time" name="interval" value="hour" title="时">
<input type="radio" lay-filter="radio-time" name="interval" value="minute" title="分"> <input type="radio" lay-filter="radio-time" name="interval" value="minute" title="分">
<input type="radio" lay-filter="radio-time" name="interval" value="second" title="秒"> <div id="radio-second" style="width: fit-content">
<input type="radio" lay-filter="radio-time" name="interval"
value="second"
title="秒">
</div>
</div> </div>
</div> </div>
</form> </form>
...@@ -181,6 +185,7 @@ ...@@ -181,6 +185,7 @@
var datazoom_end_n = 100; var datazoom_end_n = 100;
var datazoom_broken_start_n = 0; var datazoom_broken_start_n = 0;
var datazoom_broken_end_n = 100; var datazoom_broken_end_n = 100;
var isLineRestart = false;
// 确保layui和echarts已经加载 // 确保layui和echarts已经加载
layui.config({ layui.config({
...@@ -209,6 +214,12 @@ ...@@ -209,6 +214,12 @@
// 全区/地市 切换监听 // 全区/地市 切换监听
form.on('switch(area)', function (data) { form.on('switch(area)', function (data) {
let checked = data.elem.checked;
if (checked) {
$("#radio-second").show();
} else {
$("#radio-second").hide();
}
if (timeLineChart) { if (timeLineChart) {
timeLineChart.clear(); timeLineChart.clear();
} }
...@@ -358,13 +369,13 @@ ...@@ -358,13 +369,13 @@
// 开启定时器 // 开启定时器
function startInterval() { function startInterval() {
// callInterval(); callInterval();
restartBrokenLineInterval(true); restartBrokenLineInterval(true);
// getServerMonitoring(true); getServerMonitoring(true);
// monitorInterval = setInterval(function () { monitorInterval = setInterval(function () {
// getServerMonitoring(); getServerMonitoring();
// }, 5000) }, 5000)
// refreshTableInterval(); refreshTableInterval();
} }
startInterval(); startInterval();
...@@ -435,6 +446,8 @@ ...@@ -435,6 +446,8 @@
option = defaultLineOptions; option = defaultLineOptions;
if (showLegend) { if (showLegend) {
option.legend.data = legendData; option.legend.data = legendData;
} else {
option.legend.data = [];
} }
let fData = form.val('areaForm'); let fData = form.val('areaForm');
// 坐标轴最小间隔 // 坐标轴最小间隔
...@@ -487,6 +500,7 @@ ...@@ -487,6 +500,7 @@
if (!fData.isRegion) { if (!fData.isRegion) {
displayType = "detailed" displayType = "detailed"
} }
isLineRestart = false;
let startDate = fData.day ? `${fData.year}-${fData.month}-${fData.day}` : fData.month ? `${fData.year}-${fData.month}` : fData.year; let startDate = fData.day ? `${fData.year}-${fData.month}-${fData.day}` : fData.month ? `${fData.year}-${fData.month}` : fData.year;
axios({ axios({
url: gatewayUrl + '/stat/getBrokenLineData', url: gatewayUrl + '/stat/getBrokenLineData',
...@@ -520,8 +534,10 @@ ...@@ -520,8 +534,10 @@
updateLineChart({dataObject: YArrObject, showLegend: true}, isNotMerge); updateLineChart({dataObject: YArrObject, showLegend: true}, isNotMerge);
} }
} }
isLineRestart = true
}).catch(function (err) { }).catch(function (err) {
console.log(' --- 接口请求失败,抛出异常 --- ', err) console.log(' --- 接口请求失败,抛出异常 --- ', err)
isLineRestart = true
}) })
} }
...@@ -535,7 +551,9 @@ ...@@ -535,7 +551,9 @@
brokenLineInterval = null; brokenLineInterval = null;
} }
brokenLineInterval = setInterval(function () { brokenLineInterval = setInterval(function () {
getBrokenLineData(); if (isLineRestart) {
getBrokenLineData();
}
}, 5000) }, 5000)
} }
......
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