fix：解决冲突

2022-11-17 18:05:36 +08:00
parent 336b131d94 99bc195001
commit 12879ffe52
75 changed files with 1114 additions and 4269 deletions
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -164,12 +164,6 @@ export default {
    fromEndpoint: {
      type: Boolean,
      default: false
-    },
-    variables: {
-      type: Array,
-      default: () => {
-        return []
-      }
    }
  },
  mixins: [rz, editRigthBox],
@@ -183,6 +177,9 @@ export default {
  computed: {
    chartLastPosition () {
      return this.$store.getters.getChartLastPosition
+    },
+    variables () {
+      return this.$store.state.panel.variablesArr
    }
  },
  data () {