From 8464e7a709c82d35d6020227e89fb210837c3e2c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 26 Mar 2021 12:41:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue    |  3 ---
 frontend/src/views/chart/view/ChartEdit.vue | 17 +++--------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 0836c30843..a2c989fadc 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -498,9 +498,6 @@ export default {
     sceneClick(data, node) {
       this.$store.dispatch('chart/setViewId', null)
       this.$store.dispatch('chart/setViewId', data.id)
-      this.$store.dispatch('chart/setTableId', null)
-      this.$store.dispatch('chart/setTableId', data.tableId)
-      // this.$router.push('/chart/chart-edit')
       this.$emit('switchComponent', { name: 'ChartEdit' })
     },
 
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9bf2d85b7b..be5d0f5872 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1,8 +1,5 @@
 <template>
-  <!--TODO 慢慢完善，写个DEMO-->
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-    <span v-show="false">{{ tableId }}</span>
-    <span v-show="false">{{ sceneId }}</span>
     <span v-show="false">{{ vId }}</span>
     <el-row style="height: 40px;background-color: white" class="padding-lr">
       <span style="line-height: 40px;">{{ view.name }}</span>
@@ -284,15 +281,6 @@ export default {
     }
   },
   computed: {
-    tableId() {
-      // console.log(this.$store.state.chart.tableId);
-      this.initTableData(this.$store.state.chart.tableId)
-      return this.$store.state.chart.tableId
-    },
-    sceneId() {
-      // console.log(this.$store.state.chart.sceneId);
-      return this.$store.state.chart.sceneId
-    },
     vId() {
       // console.log(this.$store.state.chart.viewId);
       this.getData(this.$store.state.chart.viewId)
@@ -330,9 +318,9 @@ export default {
     save() {
       const view = JSON.parse(JSON.stringify(this.view))
       view.id = this.view.id
-      view.sceneId = this.sceneId
+      view.sceneId = this.view.sceneId
       view.name = this.table.name
-      view.tableId = this.$store.state.chart.tableId
+      view.tableId = this.view.tableId
       // view.xaxis.forEach(function(ele) {
       //   if (!ele.summary || ele.summary === '') {
       //     ele.summary = 'sum'
@@ -372,6 +360,7 @@ export default {
     getData(id) {
       if (id) {
         post('/chart/view/getData/' + id, null).then(response => {
+          this.initTableData(response.data.tableId)
           this.view = JSON.parse(JSON.stringify(response.data))
           this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
           this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []