From 5f84333c30d8d86ff931ba22a0141b0408937401 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Mar 2021 16:58:19 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/store/modules/recipes.js        |  32 +-
 .../recipesBuild/InfoView/BarChart/index.vue  | 180 ------------
 .../DailyAnalyzeCom/PieChart/index.vue        | 276 ++++++++++++++++++
 .../InfoView/DailyAnalyzeCom/index.vue        | 110 +++++++
 .../WeaklyAnalyzeCom/BarChart/index.vue       | 221 ++++++++++++++
 .../InfoView/WeaklyAnalyzeCom/index.vue       | 110 +++++++
 .../custom/recipesBuild/InfoView/index.vue    |  62 ++--
 7 files changed, 763 insertions(+), 228 deletions(-)
 delete mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue

diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index 3f3d903d7..ba1e69807 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -512,13 +512,13 @@ const getters = {
         (obj, cur) => {
           cur.igdList.forEach(igd => {
             obj.pWeight += (igd.weight / 100) * igd.proteinRatio;
-            obj.pHeat = obj.pWeight * 4;
+            obj.pCalories = obj.pWeight * 4;
             obj.fWeight += (igd.weight / 100) * igd.fatRatio;
-            obj.fHeat = obj.fWeight * 9;
+            obj.fCalories = obj.fWeight * 9;
             obj.cWeight += (igd.weight / 100) * igd.carbonRatio;
-            obj.cHeat = obj.cWeight * 4;
-            obj.totalHeat = obj.pHeat + obj.fHeat + obj.cHeat;
-            obj[`heat${cur.type}`] +=
+            obj.cCalories = obj.cWeight * 4;
+            obj.totalCalories = obj.pCalories + obj.fCalories + obj.cCalories;
+            obj[`calories${cur.type}`] +=
               (igd.weight / 100) * igd.proteinRatio * 4 +
               (igd.weight / 100) * igd.fatRatio * 9 +
               (igd.weight / 100) * igd.carbonRatio * 4;
@@ -532,17 +532,17 @@ const getters = {
           pWeight: 0,
           fWeight: 0,
           cWeight: 0,
-          pHeat: 0,
-          fHeat: 0,
-          cHeat: 0,
+          pCalories: 0,
+          fCalories: 0,
+          cCalories: 0,
           //
-          totalHeat: 0,
-          heat1: 0,
-          heat2: 0,
-          heat3: 0,
-          heat4: 0,
-          heat5: 0,
-          heat6: 0,
+          totalCalories: 0,
+          calories1: 0,
+          calories2: 0,
+          calories3: 0,
+          calories4: 0,
+          calories5: 0,
+          calories6: 0,
           //
           totalWeight: 0,
           weight1: 0,
@@ -554,7 +554,7 @@ const getters = {
         }
       )
     );
-    console.log(nutriData);
+    // console.log(nutriData);
     return nutriData;
   },
   verifyNotRecData: state => {
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue
deleted file mode 100644
index 6fdfab1c9..000000000
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <div :class="className" :style="{ height: height, width: width }" />
-</template>
-
-<script>
-import echarts from "echarts";
-import VueScrollTo from "vue-scrollto";
-require("@/utils/echarts/myShine");
-import resize from "@/views/dashboard/mixins/resize";
-import { createNamespacedHelpers } from "vuex";
-const { mapMutations } = createNamespacedHelpers("recipes");
-const animationDuration = 6000;
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: "chart",
-    },
-    width: {
-      type: String,
-      default: "100%",
-    },
-    height: {
-      type: String,
-      default: "300px",
-    },
-    data: {
-      type: Array,
-      default: [],
-    },
-    max: {
-      type: Number,
-      default: 0,
-    },
-  },
-  data() {
-    return {
-      chart: null,
-      nameDict: {
-        pHeat: "蛋白质",
-        fHeat: "脂肪",
-        cHeat: "碳水",
-      },
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return;
-    }
-    this.chart.dispose();
-    this.chart = null;
-  },
-  updated() {
-    // console.log("updated");
-  },
-  methods: {
-    ...mapMutations(["setCurrentDay"]),
-    initChart() {
-      this.chart = echarts.init(this.$el, "myShine");
-      this.chart.on("click", this.handleOnClick);
-      this.updateChart(this.data.length > 0 ? this.data : {});
-    },
-    updateChart(source) {
-      // console.log(this.max);
-      this.chart.clear();
-      this.chart.setOption({
-        title: {
-          text: "营养统计",
-        },
-        tooltip: {
-          trigger: "axis",
-          // appendToBody: true,
-          formatter: (params) => {
-            // console.log(params);
-            const [param] = params;
-            const { name } = param;
-            let totalHeat = 0;
-            const tooltips = params.reduce(
-              (arr, cur) => {
-                const { value, seriesName } = cur;
-                const nutriName = this.nameDict[seriesName];
-                totalHeat += value[seriesName];
-                const heatVal = value[seriesName].toFixed(1);
-                const weightVal = value[
-                  `${seriesName.substring(0, 1)}Weight`
-                ].toFixed(1);
-                arr.push(
-                  `${cur.marker} ${nutriName}：${weightVal}克（${heatVal}千卡）`
-                );
-                return arr;
-              },
-              [name]
-            );
-            tooltips[0] += ` - 共${totalHeat.toFixed(1)}千卡`;
-            return tooltips.join("</br>");
-          },
-        },
-        dataset: {
-          dimensions: [
-            "name",
-            "pWeight",
-            "pHeat",
-            "fWeight",
-            "fHeat",
-            "cWeight",
-            "cHeat",
-          ],
-          source,
-        },
-        grid: {
-          top: 50,
-          left: 10,
-          right: 50,
-          bottom: 10,
-          containLabel: true,
-        },
-        xAxis: {
-          type: "category",
-          // axisLabel: {
-          //   rotate: 45,
-          // },
-        },
-        yAxis: {
-          type: "value",
-          name: "热量/千卡",
-          nameTextStyle: {
-            color: "#262626",
-            fontSize: 12,
-          },
-        },
-        series: ["pHeat", "fHeat", "cHeat"].map((dim, idx) => ({
-          name: dim,
-          type: "bar",
-          barWidth: 24,
-          stack: "bar",
-          encode: {
-            y: dim,
-            x: 0,
-          },
-          markLine: {
-            data: [{ name: "BMR", yAxis: this.max ? this.max - 400 : 0 }],
-            symbol: "none",
-            lineStyle: {
-              color: "#d96969",
-            },
-          },
-          itemStyle: {
-            borderWidth: 2,
-            borderColor: "#fff",
-          },
-        })),
-      });
-    },
-    handleOnClick(params) {
-      // console.log(params);
-      const { dataIndex } = params;
-      this.setCurrentDay({ currentDay: dataIndex });
-      VueScrollTo.scrollTo(`#recipes${dataIndex}`, 500, {
-        container: "#recipes_content",
-      });
-    },
-  },
-  watch: {
-    data(newVal, oldVal) {
-      if (newVal) {
-        this.$nextTick(() => {
-          this.updateChart(newVal);
-        });
-      }
-    },
-  },
-};
-</script>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
new file mode 100644
index 000000000..00c9a7c7c
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
@@ -0,0 +1,276 @@
+<template>
+  <div ref="echart" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import echarts from "echarts";
+require("@/utils/echarts/myShine");
+import resize from "@/views/dashboard/mixins/resize";
+import { createNamespacedHelpers } from "vuex";
+const { mapMutations, mapState } = createNamespacedHelpers("recipes");
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "200px",
+    },
+    data: {
+      type: Array,
+      default: [],
+    },
+    subTitle: {
+      type: String,
+      default: "",
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  computed: {},
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.echart, "myShine");
+      if (this.data.length > 0) {
+        this.updateChart(this.data);
+      }
+    },
+    backToAll() {
+      this.resetCurrentDay({ currentDay: -1 });
+    },
+    getTooltipArr(params) {
+      console.log(params);
+      let tooltips;
+      const { name, marker, percent, value } = params;
+      switch (this.type) {
+        case "nutrition":
+          const weight = value[1] / (name === "脂肪" ? 9 : 4);
+          tooltips = [
+            `${marker} ${name}`,
+            `摄入量：${weight.toFixed(1)}克`,
+            `摄入热量：${value[1].toFixed(1)}千卡`,
+            `供能比：${percent}%`,
+          ];
+          break;
+        case "calories":
+          tooltips = [
+            `${marker} ${name}`,
+            `热量：${value[1].toFixed(1)}千卡`,
+            `占比：${percent}%`,
+          ];
+          break;
+        case "weight":
+          tooltips = [
+            `${marker} ${name}`,
+            `质量：${value[1].toFixed(1)}克`,
+            `占比：${percent}%`,
+          ];
+          break;
+      }
+      return tooltips.join("</br>");
+    },
+    updateChart(source) {
+      console.log(source);
+      const total = source.reduce((acc, cur) => acc + cur[1], 0);
+      this.chart.clear();
+      const option = {
+        title: {
+          text: this.title,
+          subtext: this.subTitle,
+        },
+        legend: {
+          left: 100,
+          itemWidth: 8,
+          itemHeight: 8,
+          pageIconSize: 10,
+          textStyle: {
+            fontSize: 10,
+          },
+        },
+        dataset: {
+          source,
+        },
+        tooltip: {
+          trigger: "item",
+          appendToBody: true,
+          formatter: this.getTooltipArr,
+        },
+        graphic: [
+          {
+            type: "group",
+            top: 60,
+            left: 10,
+            silent: true,
+            children: [
+              {
+                type: "text",
+                style: {
+                  text: this.type === "weight" ? "总质量" : "总热量约",
+                  fill: "#606266",
+                },
+              },
+              {
+                type: "text",
+                top: 18,
+                left: 8,
+                style: {
+                  text: `${total.toFixed(1)}${
+                    this.type === "weight" ? "克" : "千卡"
+                  }`,
+                  font: '14px "Microsoft YaHei", sans-serif',
+                },
+              },
+            ],
+          },
+          {
+            type: "group",
+            top: 36,
+            right: 10,
+            silent: true,
+            children: source.map((item, idx) => {
+              const data =
+                this.type == "nutrition"
+                  ? item[1] / (idx === 1 ? 9 : 4)
+                  : item[1];
+              return {
+                type: "text",
+                top: idx * 20,
+                right: 10,
+                style: {
+                  text: `${item[0]}：${data.toFixed(1)}${
+                    this.type === "calories" ? "千卡" : "克"
+                  }`,
+                  fill: "#606266",
+                },
+              };
+            }),
+          },
+        ],
+        series: [
+          {
+            type: "pie",
+            radius: [0, 60],
+            center: ["50%", "55%"],
+            // labelLine: {
+            //   length: 5,
+            //   length2: 5,
+            // },
+            label: {
+              show: true,
+              position: "inside",
+              color: "#fff",
+              fontSize: 12,
+              fontWeight: "bold",
+            },
+            itemStyle: {
+              borderWidth: 1,
+              borderColor: "#fff",
+            },
+          },
+        ],
+      };
+      // console.log(option);
+      this.chart.setOption(option);
+    },
+  },
+  watch: {
+    data(newVal, oldVal) {
+      if (newVal) {
+        this.$nextTick(() => {
+          this.updateChart(newVal);
+        });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/ :focus {
+  outline: 0;
+}
+
+.aspect_pie_chart_wrapper {
+  width: 100%;
+  display: flex;
+  position: relative;
+
+  & > div:nth-child(1) {
+    // width: 200px
+  }
+
+  .small_table {
+    .my_cell {
+      padding: 2px 0 !important;
+    }
+  }
+
+  .summary {
+    padding: 2px;
+    border-bottom: 1px solid #dfe6ec;
+    border-left: 1px solid #dfe6ec;
+    border-right: 1px solid #dfe6ec;
+
+    & > div {
+      padding: 3px;
+      text-align: center;
+    }
+  }
+
+  .see_all {
+    position: absolute;
+    bottom: 4px;
+    left: 24px;
+    padding: 0;
+  }
+
+  .icon_btns {
+    position: absolute;
+    right: 0;
+
+    em {
+      display: inline-block;
+      padding: 4px;
+      cursor: pointer;
+    }
+
+    .sel_icon {
+      color: #1890ff;
+    }
+  }
+
+  .table_zone {
+    margin-top: 26px;
+  }
+}
+</style>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
new file mode 100644
index 000000000..d072c16a1
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="daily_analyze_com_wrapper">
+    <pie-chart
+      title="营养统计"
+      :data="nutritionSource"
+      type="nutrition"
+      :subTitle="subTitle"
+    />
+    <pie-chart
+      title="热量统计"
+      :data="caloriesSource"
+      type="calories"
+      :subTitle="subTitle"
+    />
+    <pie-chart
+      title="质量统计"
+      :data="weightSource"
+      type="weight"
+      :subTitle="subTitle"
+    />
+    <el-button size="mini" type="text" @click="backToAll" class="see_all"
+      >查看全部</el-button
+    >
+  </div>
+</template>
+<script>
+import PieChart from "./PieChart";
+import { createNamespacedHelpers } from "vuex";
+const { mapGetters, mapMutations } = createNamespacedHelpers("recipes");
+export default {
+  name: "DailyAnalyzeCom",
+  data() {
+    return {
+      subTitle: "",
+    };
+  },
+  components: {
+    PieChart,
+  },
+  methods: {
+    backToAll() {
+      this.resetCurrentDay({ currentDay: -1 });
+    },
+    ...mapMutations(["resetCurrentDay"]),
+  },
+  computed: {
+    nutritionSource() {
+      const [data] = this.analyseData;
+      this.subTitle = data.name;
+      return [
+        ["蛋白质", data.pCalories],
+        ["脂肪", data.fCalories],
+        ["碳水", data.cCalories],
+      ];
+    },
+    caloriesSource() {
+      const [data] = this.analyseData;
+      const source = [
+        ["早餐", data.calories1],
+        ["午餐", data.calories3],
+        ["晚餐", data.calories5],
+      ];
+      if (data.calories2) {
+        source.push(["早加餐", data.calories2]);
+      }
+      if (data.calories4) {
+        source.push(["午加餐", data.calories4]);
+      }
+      if (data.calories6) {
+        source.push(["晚加餐", data.calories6]);
+      }
+      return source;
+    },
+    weightSource() {
+      const [data] = this.analyseData;
+      const source = [
+        ["早餐", data.weight1],
+        ["午餐", data.weight3],
+        ["晚餐", data.weight5],
+      ];
+      if (data.weight2) {
+        source.push(["早加餐", data.weight2]);
+      }
+      if (data.weight4) {
+        source.push(["午加餐", data.weight4]);
+      }
+      if (data.weight6) {
+        source.push(["晚加餐", data.weight6]);
+      }
+      return source;
+    },
+    ...mapGetters(["analyseData"]),
+  },
+};
+</script>
+<style lang="scss" scoped>
+.daily_analyze_com_wrapper {
+  position: relative;
+  & > div:not(:nth-child(1)) {
+    margin-top: 12px;
+  }
+
+  .see_all {
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+}
+</style>
+
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue
new file mode 100644
index 000000000..cc9489a3e
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue
@@ -0,0 +1,221 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import echarts from "echarts";
+require("@/utils/echarts/myShine");
+import resize from "@/views/dashboard/mixins/resize";
+const animationDuration = 6000;
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "180px",
+    },
+    data: {
+      type: Array,
+      default: [],
+    },
+    max: {
+      type: Number,
+      default: 0,
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  computed: {},
+  updated() {
+    // console.log("updated");
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, "myShine");
+      this.chart.on("click", this.handleOnClick);
+      if (this.data.length > 0) {
+        this.updateChart(this.data);
+      }
+    },
+    getTooltipArr(params) {
+      // console.log(params);
+      const [param] = params;
+      const { name } = param;
+      let tooltips;
+      let total = 0;
+      switch (this.type) {
+        case "nutrition":
+          tooltips = params.reduce(
+            (arr, cur) => {
+              const { value, seriesName, seriesIndex, marker } = cur;
+              const calories = value[seriesIndex + 1];
+              total += calories;
+              const weight = (
+                calories / (seriesName === "脂肪" ? 9 : 4)
+              ).toFixed(1);
+              arr.push(
+                `${marker} ${seriesName}：${weight}克（${calories.toFixed(
+                  1
+                )}千卡）`
+              );
+              return arr;
+            },
+            [name]
+          );
+          tooltips[0] += ` - 约${total.toFixed(1)}千卡`;
+          break;
+        case "calories":
+          tooltips = params.reduce(
+            (arr, cur) => {
+              const { value, seriesName, seriesIndex, marker } = cur;
+              const calories = value[seriesIndex + 1];
+              total += calories;
+              if (calories) {
+                arr.push(`${marker} ${seriesName}：${calories.toFixed(1)}千卡`);
+              }
+              return arr;
+            },
+            [name]
+          );
+          tooltips[0] += ` - 约${total.toFixed(1)}千卡`;
+          break;
+        case "weight":
+          tooltips = params.reduce(
+            (arr, cur) => {
+              const { value, seriesName, seriesIndex, marker } = cur;
+              const weight = value[seriesIndex + 1];
+              total += weight;
+              if (weight) {
+                arr.push(`${marker} ${seriesName}：${weight.toFixed(1)}克`);
+              }
+              return arr;
+            },
+            [name]
+          );
+          tooltips[0] += ` - 共${total.toFixed(1)}克`;
+          break;
+      }
+      return tooltips.join("</br>");
+    },
+    updateChart(source) {
+      // console.log(this.max);
+      // console.log(source);
+      this.chart.clear();
+      const option = {
+        title: {
+          text: this.title,
+        },
+        legend: {
+          // type: "scroll",
+          left: 100,
+          itemWidth: 8,
+          itemHeight: 8,
+          pageIconSize: 10,
+          textStyle: {
+            fontSize: 10,
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+          appendToBody: true,
+          formatter: this.getTooltipArr,
+        },
+        dataset: {
+          source,
+        },
+        grid: {
+          top: 50,
+          left: 10,
+          right: 50,
+          bottom: 10,
+          containLabel: true,
+        },
+        xAxis: {
+          type: "category",
+          // axisLabel: {
+          //   rotate: 45,
+          // },
+        },
+        yAxis: {
+          type: "value",
+          name: this.type === "weight" ? "质量/克" : "热量/千卡",
+          nameTextStyle: {
+            color: "#262626",
+            fontSize: 10,
+          },
+        },
+        series: source[0].slice(1).map((name, idx) => ({
+          name,
+          type: "bar",
+          barWidth: 24,
+          stack: "bar",
+          encode: {
+            y: idx + 1,
+            x: 0,
+          },
+          itemStyle: {
+            borderWidth: 2,
+            borderColor: "#fff",
+          },
+        })),
+      };
+      if (this.max) {
+        option.series[0].markLine = {
+          data: [{ name: "BMR", yAxis: this.max ? this.max - 400 : 0 }],
+          symbol: "none",
+          lineStyle: {
+            color: "#d96969",
+          },
+        };
+      }
+      this.chart.setOption(option);
+    },
+    handleOnClick(params) {
+      // console.log(params);
+      const { dataIndex } = params;
+      this.$emit("onClick", dataIndex);
+    },
+  },
+  watch: {
+    data(newVal, oldVal) {
+      if (newVal) {
+        this.$nextTick(() => {
+          this.updateChart(newVal);
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue
new file mode 100644
index 000000000..4b32c5999
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="weakly_analyze_com_wrapper">
+    <bar-chart
+      :data="nutritionSource"
+      :max="max"
+      title="营养统计"
+      type="nutrition"
+      @onClick="handleOnClick"
+    />
+    <bar-chart
+      :data="caloriesSource"
+      title="热量统计"
+      type="calories"
+      @onClick="handleOnClick"
+    />
+    <bar-chart
+      :data="weightSource"
+      title="质量统计"
+      type="weight"
+      @onClick="handleOnClick"
+    />
+  </div>
+</template>
+<script>
+import { createNamespacedHelpers } from "vuex";
+const { mapState, mapGetters, mapMutations } = createNamespacedHelpers(
+  "recipes"
+);
+import VueScrollTo from "vue-scrollto";
+import BarChart from "./BarChart";
+export default {
+  name: "WeaklyAnalyzeCom",
+  components: {
+    BarChart,
+  },
+  data() {
+    return {};
+  },
+  props: ["data"],
+  methods: {
+    handleOnClick(currentDay) {
+      this.setCurrentDay({ currentDay });
+      VueScrollTo.scrollTo(`#recipes${currentDay}`, 500, {
+        container: "#recipes_content",
+      });
+    },
+    ...mapMutations(["setCurrentDay"]),
+  },
+  computed: {
+    nutritionSource() {
+      return this.analyseData.reduce(
+        (arr, cur) => {
+          arr.push([cur.name, cur.pCalories, cur.fCalories, cur.cCalories]);
+          return arr;
+        },
+        [["日期", "蛋白质", "脂肪", "碳水"]]
+      );
+    },
+    caloriesSource() {
+      return this.analyseData.reduce(
+        (arr, cur) => {
+          arr.push([
+            cur.name,
+            cur.calories1,
+            cur.calories2,
+            cur.calories3,
+            cur.calories4,
+            cur.calories5,
+            cur.calories6,
+          ]);
+          return arr;
+        },
+        [["日期", "早餐", "早加餐", "午餐", "午加餐", "晚餐", "晚加餐"]]
+      );
+    },
+    weightSource() {
+      return this.analyseData.reduce(
+        (arr, cur) => {
+          arr.push([
+            cur.name,
+            cur.weight1,
+            cur.weight2,
+            cur.weight3,
+            cur.weight4,
+            cur.weight5,
+            cur.weight6,
+          ]);
+          return arr;
+        },
+        [["日期", "早餐", "早加餐", "午餐", "午加餐", "晚餐", "晚加餐"]]
+      );
+    },
+    max() {
+      const { basicBMR } = this.healthyData || {};
+      return basicBMR
+        ? parseFloat(basicBMR.substring(0, basicBMR.indexOf("千卡")))
+        : 0;
+    },
+    ...mapState(["healthyData"]),
+    ...mapGetters(["analyseData"]),
+  },
+};
+</script>
+<style lang="scss" scoped>
+.weakly_analyze_com_wrapper {
+  & > div:not(:nth-child(1)) {
+    margin-top: 12px;
+  }
+}
+</style>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
index 80f9ef9f2..a380e04f6 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
@@ -1,50 +1,46 @@
 <template>
   <div class="recipes_build_info_view_wrapper">
-    <div class="top" v-if="showChart">
-      <BarChart
-        v-if="analyseData.length > 1"
-        :data="analyseData"
-        height="160px"
-        width="100%"
-        :max="max"
-      />
-      <PieChart
-        v-if="analyseData.length === 1"
-        :data="analyseData"
-        height="160px"
-        width="100%"
-      />
-    </div>
-    <div
-      class="content"
-      :style="`height: calc(100vh - ${showChart ? 192 : 32}px);`"
-    >
-      <TemplateInfoView v-if="!!temId" :data="templateInfo" />
-      <HealthyView :data="healthyData" v-else-if="healthyDataType === 0" dev />
-      <BodySignView :data="healthyData" v-else dev />
-    </div>
+    <el-tabs v-model="activeName" @tab-click="handleOnTabClick">
+      <el-tab-pane label="食谱分析" name="0" v-if="showChart">
+        <div class="content">
+          <WeaklyAnalyzeCom v-if="analyseData.length > 1" />
+          <DailyAnalyzeCom v-else />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="模板信息" name="1" v-if="!!temId">
+        <div class="content">
+          <TemplateInfoView :data="templateInfo" />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="客户信息" name="2" v-else>
+        <div class="content">
+          <HealthyView :data="healthyData" v-if="healthyDataType === 0" dev />
+          <BodySignView :data="healthyData" v-else dev />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 <script>
 import { createNamespacedHelpers } from "vuex";
 const { mapActions, mapState, mapGetters } = createNamespacedHelpers("recipes");
-import BarChart from "./BarChart";
-import PieChart from "./PieChart";
 import TemplateInfoView from "./TemplateInfoView";
 import HealthyView from "@/components/HealthyView";
 import BodySignView from "@/components/BodySignView";
+import WeaklyAnalyzeCom from "./WeaklyAnalyzeCom";
+import DailyAnalyzeCom from "./DailyAnalyzeCom";
 export default {
   name: "InfoView",
   data() {
     const { temId } = this.$route.query;
-    return { temId };
+    return { temId, activeName: "0" };
   },
   components: {
-    BarChart,
-    PieChart,
     HealthyView,
     BodySignView,
     TemplateInfoView,
+    WeaklyAnalyzeCom,
+    DailyAnalyzeCom,
   },
   computed: {
     max() {
@@ -64,16 +60,18 @@ export default {
     ]),
     ...mapGetters(["analyseData"]),
   },
+  methods: {
+    handleOnTabClick(tab) {
+      this.activeName = tab.name;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
 .recipes_build_info_view_wrapper {
-  .top {
-    height: 160px;
-  }
-
   .content {
     overflow: auto;
+    height: calc(100vh - 88px);
   }
 }
 </style>

From 8328cbab3ae4c1e2c8568cc48e190ed98043b475 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Mar 2021 17:00:39 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E9=A1=B9=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/HealthyView/index.vue      | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/stdiet-ui/src/components/HealthyView/index.vue b/stdiet-ui/src/components/HealthyView/index.vue
index 298d9abac..a9003f686 100644
--- a/stdiet-ui/src/components/HealthyView/index.vue
+++ b/stdiet-ui/src/components/HealthyView/index.vue
@@ -105,6 +105,24 @@ export default {
       open: false,
       basicInfo,
       healthyInvestigate: [
+        {
+          title: "既往病史/用药史评估",
+          content: [
+            { title: "病史体征", value: "physicalSigns" },
+            { title: "湿气数据", value: "moistureDate" },
+            { title: "气血数据", value: "bloodData" },
+            { title: "家族疾病史", value: "familyIllnessHistory" },
+            { title: "手术史", value: "operationHistory" },
+            { title: "近期是否做过手术", value: "nearOperationFlag" },
+            { title: "手术恢复情况", value: "recoveryeSituation" },
+            { title: "是否长期服用药物", value: "longEatDrugFlag" },
+            { title: "长期服用的药物", value: "longEatDrugClassify" },
+            { title: "是否出现过过敏症状", value: "allergyFlag" },
+            { title: "过敏症状", value: "allergySituation" },
+            { title: "过敏源", value: "allergen" },
+            { title: "忌口过敏食物", value: "dishesIngredient" },
+          ],
+        },
         {
           title: "减脂经历评估",
           content: [
@@ -198,24 +216,7 @@ export default {
             { title: "熬夜频次", value: "stayupLateWeekNum" },
           ],
         },
-        {
-          title: "既往病史/用药史评估",
-          content: [
-            { title: "病史体征", value: "physicalSigns" },
-            { title: "湿气数据", value: "moistureDate" },
-            { title: "气血数据", value: "bloodData" },
-            { title: "家族疾病史", value: "familyIllnessHistory" },
-            { title: "手术史", value: "operationHistory" },
-            { title: "近期是否做过手术", value: "nearOperationFlag" },
-            { title: "手术恢复情况", value: "recoveryeSituation" },
-            { title: "是否长期服用药物", value: "longEatDrugFlag" },
-            { title: "长期服用的药物", value: "longEatDrugClassify" },
-            { title: "是否出现过过敏症状", value: "allergyFlag" },
-            { title: "过敏症状", value: "allergySituation" },
-            { title: "过敏源", value: "allergen" },
-            { title: "忌口过敏食物", value: "dishesIngredient" },
-          ],
-        },
+
         {
           title: "体检报告",
           content: [

From 6d912988ac8c21549303da473825bed75067687d Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Mar 2021 17:57:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A3=9F=E8=B0=B1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DailyAnalyzeCom/PieChart/index.vue        |   4 +-
 .../InfoView/DailyAnalyzeCom/index.vue        |   1 +
 .../recipesBuild/InfoView/PieChart/index.vue  | 421 ------------------
 .../InfoView/WeaklyAnalyzeCom/index.vue       |   4 +
 .../custom/recipesBuild/InfoView/index.vue    |  17 +-
 .../src/views/custom/recipesShow/utils.js     |   7 +-
 6 files changed, 21 insertions(+), 433 deletions(-)
 delete mode 100644 stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue

diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
index 00c9a7c7c..b85925331 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
@@ -70,7 +70,7 @@ export default {
       this.resetCurrentDay({ currentDay: -1 });
     },
     getTooltipArr(params) {
-      console.log(params);
+      // console.log(params);
       let tooltips;
       const { name, marker, percent, value } = params;
       switch (this.type) {
@@ -101,7 +101,7 @@ export default {
       return tooltips.join("</br>");
     },
     updateChart(source) {
-      console.log(source);
+      // console.log(source);
       const total = source.reduce((acc, cur) => acc + cur[1], 0);
       this.chart.clear();
       const option = {
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
index d072c16a1..ffe6d75e2 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
@@ -95,6 +95,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .daily_analyze_com_wrapper {
+  width: 100%;
   position: relative;
   & > div:not(:nth-child(1)) {
     margin-top: 12px;
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
deleted file mode 100644
index 32c634733..000000000
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
+++ /dev/null
@@ -1,421 +0,0 @@
-<template>
-  <div
-    :class="`aspect_pie_chart_wrapper ${className || ''}`"
-    :style="{ height: height, width: width }"
-  >
-    <div
-      ref="echart"
-      :style="{ height: height, width: !view ? '100px' : '100%' }"
-    />
-    <div class="icon_btns">
-      <el-tooltip effect="dark" content="营养分析" placement="top">
-        <em
-          :class="['iconfont', 'icon-03', { sel_icon: view === 0 }]"
-          @click="handleOnViewChange(0)"
-        />
-      </el-tooltip>
-      <el-tooltip effect="dark" content="热量分析" placement="top">
-        <em
-          :class="['iconfont', 'icon-fenxi', { sel_icon: view === 1 }]"
-          @click="handleOnViewChange(1)"
-        />
-      </el-tooltip>
-      <el-tooltip effect="dark" content="质量分析" placement="top">
-        <em
-          :class="[
-            'iconfont',
-            'icon-canshuiconyouhua-',
-            { sel_icon: view === 2 },
-          ]"
-          @click="handleOnViewChange(2)"
-        />
-      </el-tooltip>
-    </div>
-    <div v-if="view === 0" class="table_zone">
-      <el-table
-        :data="mData"
-        size="mini"
-        border
-        :cell-style="{ padding: '2px 0' }"
-        :header-cell-style="{ padding: '4px 0', height: 'unset' }"
-        class="small_table"
-      >
-        <el-table-column label="营养" prop="type" align="center" width="60" />
-        <el-table-column label="蛋白质" prop="p" align="center" width="65" />
-        <el-table-column label="脂肪" prop="f" align="center" width="65" />
-        <el-table-column label="碳水" prop="c" align="center" width="65" />
-      </el-table>
-      <div class="summary">
-        <div style="font-size: 12px; color: #606266">总热量约等于</div>
-        <div style="color: #515a6e; font-weight: bold">
-          {{ data[0] ? data[0].totalHeat.toFixed(1) : 0 }}千卡
-        </div>
-      </div>
-    </div>
-    <el-button size="mini" type="text" @click="backToAll" class="see_all"
-      >查看全部</el-button
-    >
-  </div>
-</template>
-
-<script>
-import echarts from "echarts";
-require("@/utils/echarts/myShine");
-import resize from "@/views/dashboard/mixins/resize";
-import TextInfo from "@/components/TextInfo";
-import { createNamespacedHelpers } from "vuex";
-const { mapMutations, mapState } = createNamespacedHelpers("recipes");
-
-export default {
-  mixins: [resize],
-  components: {
-    TextInfo,
-  },
-  props: {
-    className: {
-      type: String,
-      default: "chart",
-    },
-    width: {
-      type: String,
-      default: "100%",
-    },
-    height: {
-      type: String,
-      default: "300px",
-    },
-    data: {
-      type: Array,
-      default: [],
-    },
-  },
-  data() {
-    const nameDict = {
-      p: "蛋白质",
-      f: "脂肪",
-      c: "碳水",
-    };
-    const menuDict = {
-      1: "早餐",
-      2: "早加餐",
-      3: "午餐",
-      4: "午加餐",
-      5: "晚餐",
-      6: "晚加餐",
-    };
-    return {
-      chart: null,
-      nameDict,
-      menuDict,
-      typeDict: {
-        Weight: "摄入量",
-        Rate: "供能比",
-      },
-      view: 0,
-    };
-  },
-  computed: {
-    mData() {
-      const [data] = this.data;
-      if (!data) {
-        return [];
-      }
-      const mData = ["Weight", "Rate"].map((t, idx) => ({
-        type: this.typeDict[t],
-        ...["p", "f", "c"].reduce((obj, cur) => {
-          obj[cur] = idx
-            ? data.totalHeat === 0
-              ? 0
-              : `${((data[`${cur}Heat`] / data.totalHeat) * 100).toFixed(2)}%`
-            : `${data[`${cur}Weight`].toFixed(1)}克`;
-          return obj;
-        }, {}),
-      }));
-      // console.log(mData);
-      return mData;
-    },
-    curNameDict() {
-      switch (this.view) {
-        case 0:
-          return this.nameDict;
-        case 1:
-          return this.menuDict;
-        case 2:
-          return this.menuDict;
-      }
-    },
-    curTitle() {
-      switch (this.view) {
-        case 0:
-          return "营养分析";
-        case 1:
-          return "热量分析";
-        case 2:
-          return "质量分析";
-      }
-    },
-    curTotalText() {
-      switch (this.view) {
-        case 1:
-          return "总热量约";
-        case 2:
-          return "总质量";
-      }
-    },
-    curTotalName() {
-      switch (this.view) {
-        case 1:
-          return "totalHeat";
-        case 2:
-          return "totalWeight";
-      }
-    },
-    curUnit() {
-      switch (this.view) {
-        case 1:
-          return "千卡";
-        case 2:
-          return "克";
-      }
-    },
-    ...mapState(["recipesData"]),
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart();
-    });
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return;
-    }
-    this.chart.dispose();
-    this.chart = null;
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$refs.echart, "myShine");
-      this.updateChart(this.data[0] || {});
-    },
-    backToAll() {
-      this.resetCurrentDay({ currentDay: -1 });
-    },
-    getDataName(dim) {
-      switch (this.view) {
-        case 0:
-          return `${dim}Heat`;
-        case 1:
-          return `heat${dim}`;
-        case 2:
-          return `weight${dim}`;
-      }
-    },
-    updateChart(data) {
-      console.log(data);
-      this.chart.clear();
-      const option = {
-        title: {
-          text: this.curTitle,
-          subtext: data.name,
-        },
-        tooltip: {
-          position: "right",
-          trigger: "item",
-          // appendToBody: true,
-          formatter: (params) => {
-            const {
-              name,
-              marker,
-              percent,
-              data: { value, oriData, dim },
-            } = params;
-            return !this.view
-              ? [
-                  `${marker} ${name}`,
-                  `摄入量：${oriData[`${dim}Weight`].toFixed(1)}克`,
-                  `摄入热量：${value.toFixed(1)}千卡`,
-                  `供能比：${percent}%`,
-                ].join("</br>")
-              : this.view === 1
-              ? [
-                  `${marker} ${name}`,
-                  `热量：${data[`heat${dim}`].toFixed(1)}千卡`,
-                  `供能比：${percent}%`,
-                ].join("</br>")
-              : [
-                  `${marker} ${name}`,
-                  `质量：${data[`weight${dim}`].toFixed(1)}克`,
-                  `占比：${percent}%`,
-                ].join("</br>");
-          },
-        },
-        graphic: !this.view
-          ? []
-          : [
-              {
-                type: "group",
-                top: 60,
-                left: 10,
-                silent: true,
-                children: [
-                  {
-                    type: "text",
-                    style: {
-                      text: this.curTotalText,
-                      fill: "#606266",
-                    },
-                  },
-                  {
-                    type: "text",
-                    top: 18,
-                    left: 8,
-                    style: {
-                      text: `${
-                        data[`${this.curTotalName}`]
-                          ? data[`${this.curTotalName}`].toFixed(1)
-                          : 0
-                      } ${this.curUnit}`,
-                      font: '14px "Microsoft YaHei", sans-serif',
-                    },
-                  },
-                ],
-              },
-              {
-                type: "group",
-                top: 36,
-                right: 10,
-                silent: true,
-                children: Object.keys(this.curNameDict).reduce((arr, cur) => {
-                  const tarData = data[this.getDataName(cur)];
-                  if (tarData) {
-                    arr.push({
-                      type: "text",
-                      top: arr.length * 20,
-                      right: 10,
-                      style: {
-                        text: `${this.curNameDict[cur]}：${tarData.toFixed(1)}`,
-                        fill: "#606266",
-                      },
-                    });
-                  }
-                  return arr;
-                }, []),
-              },
-            ],
-        series: [
-          {
-            name: data.name,
-            type: "pie",
-            radius: [0, !this.view ? 40 : 60],
-            center: ["50%", "55%"],
-            data: Object.keys(this.curNameDict).reduce((arr, dim) => {
-              if (!this.view || data[`heat${dim}`]) {
-                arr.push({
-                  dim,
-                  value: data[this.getDataName(dim)],
-                  name: this.curNameDict[dim],
-                  oriData: data,
-                });
-              }
-              return arr;
-            }, []),
-            // labelLine: {
-            //   length: 5,
-            //   length2: 5,
-            // },
-            label: {
-              show: true,
-              position: "inside",
-              color: "#fff",
-              fontSize: !this.view ? 10 : 12,
-              fontWeight: "bold",
-            },
-            itemStyle: {
-              borderWidth: 1,
-              borderColor: "#fff",
-            },
-          },
-        ],
-      };
-      // console.log(option);
-      this.chart.setOption(option);
-    },
-    handleOnViewChange(view) {
-      this.view = view;
-      this.chart.resize({
-        width: !this.view ? 100 : 364,
-      });
-      this.updateChart(this.data[0] || {});
-    },
-    ...mapMutations(["resetCurrentDay"]),
-  },
-  watch: {
-    data(newVal, oldVal) {
-      if (newVal) {
-        this.$nextTick(() => {
-          this.updateChart(newVal[0]);
-        });
-      }
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-/deep/ :focus {
-  outline: 0;
-}
-
-.aspect_pie_chart_wrapper {
-  width: 100%;
-  display: flex;
-  position: relative;
-
-  & > div:nth-child(1) {
-    // width: 200px
-  }
-
-  .small_table {
-    .my_cell {
-      padding: 2px 0 !important;
-    }
-  }
-
-  .summary {
-    padding: 2px;
-    border-bottom: 1px solid #dfe6ec;
-    border-left: 1px solid #dfe6ec;
-    border-right: 1px solid #dfe6ec;
-
-    & > div {
-      padding: 3px;
-      text-align: center;
-    }
-  }
-
-  .see_all {
-    position: absolute;
-    bottom: 4px;
-    left: 24px;
-    padding: 0;
-  }
-
-  .icon_btns {
-    position: absolute;
-    right: 0;
-
-    em {
-      display: inline-block;
-      padding: 4px;
-      cursor: pointer;
-    }
-
-    .sel_icon {
-      color: #1890ff;
-    }
-  }
-
-  .table_zone {
-    margin-top: 26px;
-  }
-}
-</style>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue
index 4b32c5999..2a3dae557 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/index.vue
@@ -5,18 +5,21 @@
       :max="max"
       title="营养统计"
       type="nutrition"
+      width="364px"
       @onClick="handleOnClick"
     />
     <bar-chart
       :data="caloriesSource"
       title="热量统计"
       type="calories"
+      width="364px"
       @onClick="handleOnClick"
     />
     <bar-chart
       :data="weightSource"
       title="质量统计"
       type="weight"
+      width="364px"
       @onClick="handleOnClick"
     />
   </div>
@@ -103,6 +106,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .weakly_analyze_com_wrapper {
+  width: 100%;
   & > div:not(:nth-child(1)) {
     margin-top: 12px;
   }
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
index a380e04f6..e18a0633b 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="recipes_build_info_view_wrapper">
     <el-tabs v-model="activeName" @tab-click="handleOnTabClick">
-      <el-tab-pane label="食谱分析" name="0" v-if="showChart">
-        <div class="content">
-          <WeaklyAnalyzeCom v-if="analyseData.length > 1" />
-          <DailyAnalyzeCom v-else />
-        </div>
-      </el-tab-pane>
       <el-tab-pane label="模板信息" name="1" v-if="!!temId">
         <div class="content">
           <TemplateInfoView :data="templateInfo" />
@@ -18,6 +12,12 @@
           <BodySignView :data="healthyData" v-else dev />
         </div>
       </el-tab-pane>
+      <el-tab-pane label="食谱分析" name="0" v-if="showChart">
+        <div class="content">
+          <WeaklyAnalyzeCom v-if="analyseData.length > 1" />
+          <DailyAnalyzeCom v-else />
+        </div>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -33,7 +33,7 @@ export default {
   name: "InfoView",
   data() {
     const { temId } = this.$route.query;
-    return { temId, activeName: "0" };
+    return { temId, activeName: !!temId ? "1" : "2" };
   },
   components: {
     HealthyView,
@@ -68,6 +68,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/deep/ :focus {
+  outline: 0;
+}
 .recipes_build_info_view_wrapper {
   .content {
     overflow: auto;
diff --git a/stdiet-ui/src/views/custom/recipesShow/utils.js b/stdiet-ui/src/views/custom/recipesShow/utils.js
index 0d2dc6f37..b64e33ad0 100644
--- a/stdiet-ui/src/views/custom/recipesShow/utils.js
+++ b/stdiet-ui/src/views/custom/recipesShow/utils.js
@@ -1,12 +1,12 @@
 export function getProcessMenuData(menuData) {
-  // const igdPlanData = {};
-
+  // console.log(menuData)
   const menuList = menuData.reduce((arr, cur) => {
     if (
       cur.dishesId > -1 &&
       cur.name &&
       cur.igdList.length > 0 &&
-      cur.type !== "0"
+      cur.type !== "0" &&
+      cur.detail.length > 0
     ) {
       arr.push({
         id: cur.id,
@@ -42,5 +42,6 @@ export function getProcessMenuData(menuData) {
     }
     return arr;
   }, []);
+  // console.log(menuList);
   return menuList;
 }

From c536b20b63442eb28fe5c5ccf5b00046f56cb506 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Mar 2021 19:44:20 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4&?=
 =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/store/modules/recipes.js        | 52 ++++++++++---------
 .../RecipesView/RecipesCom/index.vue          |  3 +-
 .../custom/recipesShow/MenuDetail/index.vue   |  7 ++-
 .../src/views/custom/recipesShow/utils.js     |  3 +-
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index ba1e69807..94e4ed2d9 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -254,21 +254,28 @@ const actions = {
                       const tarDetail = cur.detail.find(
                         obj => obj.id === igdData.id
                       );
-                      if (tarDetail) {
-                        igdArr.push({
-                          id: igdData.id,
-                          name: igdData.name,
-                          carbonRatio: igdData.carbonRatio,
-                          fatRatio: igdData.fatRatio,
-                          proteinRatio: igdData.proteinRatio,
-                          cusUnit: tarDetail.cus_unit,
-                          cusWeight: tarDetail.cus_weight,
-                          weight: parseFloat(tarDetail.weight),
-                          notRec: igdData.notRec,
-                          rec: igdData.rec,
-                          type: igdData.type
-                        });
+                      if (tarDetail && tarDetail.weight === -1) {
+                        return igdArr;
                       }
+                      igdArr.push({
+                        id: igdData.id,
+                        name: igdData.name,
+                        carbonRatio: igdData.carbonRatio,
+                        fatRatio: igdData.fatRatio,
+                        proteinRatio: igdData.proteinRatio,
+                        cusUnit: tarDetail
+                          ? tarDetail.cus_unit
+                          : igdData.cusUnit,
+                        cusWeight: tarDetail
+                          ? tarDetail.cus_weight
+                          : igdData.cusWeight,
+                        weight: parseFloat(
+                          tarDetail ? tarDetail.weight : igdData.weight
+                        ),
+                        notRec: igdData.notRec,
+                        rec: igdData.rec,
+                        type: igdData.type
+                      });
                     }
                     return igdArr;
                   }, [])
@@ -400,17 +407,12 @@ const actions = {
           }));
         } else if (actionType === "delIgd") {
           // 删除某食材
-          params.detail = mTarDishes.igdList.reduce((arr, igd) => {
-            if (igd.id !== payload.igdId) {
-              arr.push({
-                id: igd.id,
-                weight: igd.weight,
-                cus_unit: igd.cusUnit,
-                cus_weight: igd.cusWeight
-              });
-            }
-            return arr;
-          }, []);
+          params.detail = mTarDishes.igdList.map(igd => ({
+            id: igd.id,
+            weight: igd.id === payload.igdId ? -1 : igd.weight,
+            cus_unit: igd.cusUnit,
+            cus_weight: igd.cusWeight
+          }));
         } else if (actionType === "unit" || actionType === "weight") {
           // 修改食材
           params.detail = mTarDishes.igdList.map(igd => {
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 359613a1b..361e47bb1 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -337,7 +337,8 @@ export default {
                 }
                 lastNameHit =
                   arr[arr.length - 1].name === cur.name &&
-                  arr[arr.length - 1].type === cur.type;
+                  arr[arr.length - 1].type === cur.type
+                  // arr[arr.length - 1].dishesId === cur.dishesId;
                 if (lastNameHit) {
                   let namePos = arr.length - 1;
                   for (let i = namePos; i >= 0; i--) {
diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
index 247fff2f0..c8e37e277 100644
--- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
@@ -15,7 +15,10 @@
       </div>
       <div v-for="mObj in obj.values" :key="mObj.id">
         <div class="dishes_item">
-          <div v-if="!mObj.methods && !mObj.remark" class="simple_dishes">
+          <div
+            v-if="!mObj.methods && !mObj.remark && !mObj.igdList"
+            class="simple_dishes"
+          >
             <span>{{ mObj.name }}</span>
             <span class="weight_style">
               <span style="margin-right: 20px">{{ mObj.cusStr }}</span>
@@ -87,7 +90,7 @@ export default {
         typeName: this.menuTypeDict[type],
         values: mData[type],
       }));
-      // console.log(mMenus);
+      console.log(mMenus);
       return mMenus;
     },
     ...mapState(["cusUnitDict", "cusWeightDict", "menuTypeDict"]),
diff --git a/stdiet-ui/src/views/custom/recipesShow/utils.js b/stdiet-ui/src/views/custom/recipesShow/utils.js
index b64e33ad0..2ded2c2b6 100644
--- a/stdiet-ui/src/views/custom/recipesShow/utils.js
+++ b/stdiet-ui/src/views/custom/recipesShow/utils.js
@@ -5,8 +5,7 @@ export function getProcessMenuData(menuData) {
       cur.dishesId > -1 &&
       cur.name &&
       cur.igdList.length > 0 &&
-      cur.type !== "0" &&
-      cur.detail.length > 0
+      cur.type !== "0"
     ) {
       arr.push({
         id: cur.id,

From 0e5eeac7d4a082debad150a9d2aee3f85beb5261 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 22 Mar 2021 19:52:08 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
index ffe6d75e2..7945362bf 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue
@@ -4,18 +4,22 @@
       title="营养统计"
       :data="nutritionSource"
       type="nutrition"
+      width="364px"
+
       :subTitle="subTitle"
     />
     <pie-chart
       title="热量统计"
       :data="caloriesSource"
       type="calories"
+      width="364px"
       :subTitle="subTitle"
     />
     <pie-chart
       title="质量统计"
       :data="weightSource"
       type="weight"
+      width="364px"
       :subTitle="subTitle"
     />
     <el-button size="mini" type="text" @click="backToAll" class="see_all"

From d91543ea5ef1eae12c5558baeba0ec670cd6a397 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 23 Mar 2021 10:01:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A5=BC=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InfoView/DailyAnalyzeCom/PieChart/index.vue           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
index b85925331..bf5d37a9b 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/PieChart/index.vue
@@ -130,7 +130,7 @@ export default {
           {
             type: "group",
             top: 60,
-            left: 10,
+            left: 8,
             silent: true,
             children: [
               {
@@ -156,7 +156,7 @@ export default {
           {
             type: "group",
             top: 36,
-            right: 10,
+            right: 0,
             silent: true,
             children: source.map((item, idx) => {
               const data =
@@ -170,7 +170,7 @@ export default {
                 style: {
                   text: `${item[0]}：${data.toFixed(1)}${
                     this.type === "calories" ? "千卡" : "克"
-                  }`,
+                  }${` (${((item[1] / total) * 100).toFixed(1)}%`})`,
                   fill: "#606266",
                 },
               };
@@ -181,7 +181,7 @@ export default {
           {
             type: "pie",
             radius: [0, 60],
-            center: ["50%", "55%"],
+            center: ["42%", "55%"],
             // labelLine: {
             //   length: 5,
             //   length2: 5,

From cdb93a17024f20144dd50a000dda34419e1643e7 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 23 Mar 2021 11:03:16 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A3=9F=E8=B0=B1?=
 =?UTF-8?q?=E5=B9=B6=E5=88=B6=E4=BD=9C=E5=AE=8C=E6=88=90=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=9B=B4=E6=8E=A5=E6=94=B9=E6=9C=AA=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
index 11e030171..feed15795 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
@@ -44,6 +44,7 @@
           placement="bottom"
           trigger="click"
           title="修改食谱状态"
+          v-if="!!recipesId"
           style="margin-right: 12px"
         >
           <div>
@@ -70,7 +71,6 @@
           <el-button
             slot="reference"
             size="mini"
-            v-if="!!recipesId"
             :type="getReviewType(reviewStatus)"
           >
             {{ getReviewStatusName(reviewStatus) }}