Commit 6e813baf by 李君

优化

1 parent e975f1a4
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
if (_width >= _xy) { if (_width >= _xy) {
width = _xy width = _xy
height = parseInt(_xy * _height / _width) height = parseInt(_xy * _height / _width)
this.radix = (_width / _xy).toFixed(0) this.radix = (_width / _xy).toFixed(2)
} else if (_width < _xy) { } else if (_width < _xy) {
width = _width * this.scaleVal width = _width * this.scaleVal
height = _height * this.scaleVal height = _height * this.scaleVal
...@@ -186,8 +186,8 @@ ...@@ -186,8 +186,8 @@
if (status === 'floor') { if (status === 'floor') {
coordinate.mapPoints.forEach(item => { coordinate.mapPoints.forEach(item => {
gateVal.push([ gateVal.push([
(item.x / this.normalWidth * width).toFixed(0), (item.x / this.normalWidth * width).toFixed(2),
(item.y / this.normalWidth * height).toFixed(0) (item.y / this.normalWidth * height).toFixed(2)
]) ])
}) })
this.editGateXY.val = gateVal this.editGateXY.val = gateVal
...@@ -277,13 +277,13 @@ ...@@ -277,13 +277,13 @@
let height = this.getStyleFn(id, 'height'); let height = this.getStyleFn(id, 'height');
let ev = e || window.event; let ev = e || window.event;
let eleRect = ev.target.getBoundingClientRect(); let eleRect = ev.target.getBoundingClientRect();
let _top = (eleRect.top - ev.target.clientTop).toFixed(0); let _top = (eleRect.top - ev.target.clientTop).toFixed(2);
let _left = (eleRect.left - ev.target.clientLeft).toFixed(0); let _left = (eleRect.left - ev.target.clientLeft).toFixed(2);
let startX = ev.pageX - _left - $(document).scrollLeft(); let startX = ev.pageX - _left - $(document).scrollLeft();
let startY = ev.pageY - _top - $(document).scrollTop(); let startY = ev.pageY - _top - $(document).scrollTop();
let xVal = (startX * this.normalWidth / width).toFixed(0); let xVal = (startX * this.normalWidth / width).toFixed(2);
let yVal = (startY * this.normalHeight / height).toFixed(0); let yVal = (startY * this.normalHeight / height).toFixed(2);
let canvas = document.getElementById(canvasId); let canvas = document.getElementById(canvasId);
if (!canvas.getContext) return; if (!canvas.getContext) return;
......
...@@ -181,6 +181,7 @@ export default { ...@@ -181,6 +181,7 @@ export default {
chart_bottom: null, chart_bottom: null,
time1: null, time1: null,
time2: null, time2: null,
time3: null,
tableData: [], tableData: [],
counterTypeData:[], counterTypeData:[],
warningNum:0, warningNum:0,
...@@ -289,9 +290,11 @@ export default { ...@@ -289,9 +290,11 @@ export default {
}); });
this.time1 = setInterval(() => { this.time1 = setInterval(() => {
this.updateTime = moment().format("YYYY-MM-DD HH:mm:ss"); this.updateTime = moment().format("YYYY-MM-DD HH:mm:ss");
this.getStatistics();
this.getDistribution(); this.getDistribution();
}, 1000); }, 1000);
this.time3 = setInterval(() => {
this.getStatistics();
}, 10000);
this.time2 = setInterval(() => { this.time2 = setInterval(() => {
this.getchart(false); this.getchart(false);
this.getCustomersOverview() this.getCustomersOverview()
...@@ -304,6 +307,9 @@ export default { ...@@ -304,6 +307,9 @@ export default {
if (this.time2) { if (this.time2) {
clearInterval(this.time2); clearInterval(this.time2);
} }
if (this.time3) {
clearInterval(this.time3);
}
}, },
deactivated() { deactivated() {
if (this.time1) { if (this.time1) {
...@@ -312,6 +318,9 @@ export default { ...@@ -312,6 +318,9 @@ export default {
if (this.time2) { if (this.time2) {
clearInterval(this.time2); clearInterval(this.time2);
} }
if (this.time3) {
clearInterval(this.time3);
}
}, },
computed: { computed: {
tableHeight() { tableHeight() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!