From de4e43af4e429c460d2bbc6f77f3f1056496a269 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Feb 2021 19:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/store/modules/recipes.js                    | 8 ++++----
 .../RecipesView/RecipesAspectCom/BarChart.vue             | 4 +++-
 .../RecipesView/RecipesAspectCom/PieChart.vue             | 4 +++-
 .../custom/recipesBuild/RecipesView/RecipesCom/index.vue  | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index 3f67d02e9..cc7729370 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -86,16 +86,16 @@ const actions = {
     });
     //
     getDicts("cus_cus_unit").then(response => {
-      commit("healthDataLoading", { cusUnitOptions: response.data });
+      commit("updateStateData", { cusUnitOptions: response.data });
     });
     getDicts("cus_cus_weight").then(response => {
-      commit("healthDataLoading", { cusWeightOptions: response.data });
+      commit("updateStateData", { cusWeightOptions: response.data });
     });
     getDicts("cus_dishes_type").then(response => {
-      commit("healthDataLoading", { typeOptions: response.data });
+      commit("updateStateData", { typeOptions: response.data });
     });
     getDicts("cus_dishes_type").then(response => {
-      commit("healthDataLoading", { dishesTypeOptions: response.data });
+      commit("updateStateData", { dishesTypeOptions: response.data });
     });
 
     //
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/BarChart.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/BarChart.vue
index 6c9ca5d12..cb9dc7837 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/BarChart.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/BarChart.vue
@@ -138,7 +138,9 @@ export default {
   watch: {
     data(newVal, oldVal) {
       if (newVal) {
-        this.updateChart(newVal);
+        this.$nextTick(() => {
+          this.updateChart(newVal);
+        });
       }
     },
   },
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/PieChart.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/PieChart.vue
index 9ae52dad5..a5cd784f7 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/PieChart.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/PieChart.vue
@@ -174,7 +174,9 @@ export default {
   watch: {
     data(newVal, oldVal) {
       if (newVal) {
-        this.updateChart(newVal[0]);
+        this.$nextTick(() => {
+          this.updateChart(newVal[0]);
+        });
       }
     },
   },
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
index a3be3349b..1e22525a2 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -242,7 +242,7 @@ export default {
           }
           return arr;
         }, []);
-      // console.log(mData);
+      console.log(mData);
       return mData;
     },
     ...mapGetters(["typeDict"]),