Commit 58053bf3 authored by wanli's avatar wanli

🐞 fix(): 解决切换设备数据污染问题

parent 9b869e37
...@@ -145,6 +145,7 @@ export default { ...@@ -145,6 +145,7 @@ export default {
}); });
wsNotify.eventBus.$on("clear-evm-chart", () => { wsNotify.eventBus.$on("clear-evm-chart", () => {
chart.clear();
this.setOptions(); this.setOptions();
}); });
}, },
......
...@@ -169,6 +169,7 @@ export default { ...@@ -169,6 +169,7 @@ export default {
}); });
wsNotify.eventBus.$on("clear-lvgl-chart", () => { wsNotify.eventBus.$on("clear-lvgl-chart", () => {
chart.clear()
this.setOptions() this.setOptions()
}); });
}, },
......
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
}); });
wsNotify.eventBus.$on("clear-system-chart", () => { wsNotify.eventBus.$on("clear-system-chart", () => {
chart.clear()
this.setOptions() this.setOptions()
}) })
}, },
......
...@@ -791,7 +791,6 @@ export default { ...@@ -791,7 +791,6 @@ export default {
// 将设备发送过来的消息存储到浏览器中 // 将设备发送过来的消息存储到浏览器中
// 这里可以优化,将所有数据,保存到indexed datebase中 // 这里可以优化,将所有数据,保存到indexed datebase中
const m = deepClone(msg); const m = deepClone(msg);
if (!this.deviceList) { if (!this.deviceList) {
this.deviceList = []; this.deviceList = [];
} }
...@@ -858,6 +857,10 @@ export default { ...@@ -858,6 +857,10 @@ export default {
wsNotify.eventBus.$emit("clear-evm-chart"); wsNotify.eventBus.$emit("clear-evm-chart");
wsNotify.eventBus.$emit("clear-lvgl-chart"); wsNotify.eventBus.$emit("clear-lvgl-chart");
// 清空各个表格数据
this.imageList = []
this.pngList = []
// this.processData(this.devices[this.device]); // this.processData(this.devices[this.device]);
// this.resetData(); // this.resetData();
}, },
......
''' '''
Author: your name Author: your name
Date: 2021-07-22 19:01:41 Date: 2021-07-22 19:01:41
LastEditTime: 2021-07-26 13:05:19 LastEditTime: 2021-07-26 16:51:21
LastEditors: Please set LastEditors LastEditors: Please set LastEditors
Description: In User Settings Edit Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\tests\http_interval.py FilePath: \evm-store\tools\build_out\tests\http_interval.py
''' '''
import json import json
import time import time
import signal
import random import random
import requests import requests
from threading import Timer, Thread from threading import Timer, Thread
thread_list = []
def sig_handler(sig, frame):
try:
global thread_list
for t in thread_list:
t.stop()
t.join()
except Exception as e:
print(e)
exit(0)
def send_request(imei): def send_request(imei):
payload = { payload = {
...@@ -94,7 +106,7 @@ def send_request(imei): ...@@ -94,7 +106,7 @@ def send_request(imei):
'png_file_size': random.randint(0, 10000) 'png_file_size': random.randint(0, 10000)
}) })
r = requests.post("http://store.evmiot.com/api/v1/evm_store/monitor", data=json.dumps(payload)) r = requests.post("http://localhost:3000/api/v1/evm_store/monitor", data=json.dumps(payload))
print(r.status_code) print(r.status_code)
print(r.json()) print(r.json())
...@@ -119,14 +131,22 @@ class myThread(Thread): ...@@ -119,14 +131,22 @@ class myThread(Thread):
if __name__ == "__main__": if __name__ == "__main__":
# send_request() # send_request()
signal.signal(signal.SIGTERM, sig_handler)
signal.signal(signal.SIGINT, sig_handler)
# 创建新线程 # 创建新线程
thread1 = myThread(1, "Thread-1", 1, "352099001761481") thread1 = myThread(1, "Thread-1", 1, "352099001761481")
thread2 = myThread(2, "Thread-2", 2, "866866040000447") thread2 = myThread(2, "Thread-2", 2, "866866040000447")
thread_list.append(thread1)
thread_list.append(thread2)
thread1.setDaemon('True')
thread1.setDaemon('True')
# 开启新线程 # 开启新线程
thread1.start() thread1.start()
thread2.start() thread2.start()
thread1.join() # thread1.join()
thread2.join() # thread2.join()
print("退出主线程") print("退出主线程")
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