fix conflicts

2021-09-24 19:07:16 +00:00
parent a804fef890 abd7a2b749
commit e05ffa7c65
14 changed files with 249 additions and 66 deletions
--- a/resources/assets/js/home/TaskMetrics/VueCharts.vue
+++ b/resources/assets/js/home/TaskMetrics/VueCharts.vue
@@ -106,13 +106,10 @@ export default {
            onClick() {
               this.$emit("onChangeLevel", el);
            },
+            data: el,
          });
        }
      });
-      res.push({
-        label: this.$t("ID_SELECT"),
-        onClick() {},
-      });
      switch (this.level) {
        case 0:
          return {