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 1/2] =?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 2/2] =?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,