Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

Conflicts: src/components/charts/StatisticsLegend.vue
2021-07-08 09:52:43 +08:00
parent 3292abb764 3382358142
commit 0564718ca6
17 changed files with 671 additions and 115 deletions
--- a/src/components/charts/StatisticsLegend.vue
+++ b/src/components/charts/StatisticsLegend.vue
@@ -97,7 +97,6 @@ export default {
      immediate: true,
      deep: true,
      handler (n) {
-        console.info(n)
      }
    }
  },
@@ -198,4 +197,4 @@ color: deepskyblue;
  white-space: nowrap;
  text-overflow: ellipsis;
 }
-</style>
+</style>