Merge branch 'dev' into feature-electrophoresis

8dc23dd2 · 车宾 · 8292a587 · b3572fe5 · 8292a587 · 8dc23dd2
Commit 8dc23dd2 authored Oct 11, 2019 by 车宾
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 387 additions and 11 deletions

monitor_index_bg.png src/assets/images/Monitor/monitor_index_bg.png +0 -0

index.vue src/views/Monitor/index.vue +387 -11

No files found.
--- a/src/assets/images/Monitor/monitor_index_bg.png
+++ b/src/assets/images/Monitor/monitor_index_bg.png
--- a/src/views/Monitor/index.vue
+++ b/src/views/Monitor/index.vue