Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

2021-03-17 18:37:00 +08:00
parent b78a68c807 65b6505ef0
commit 75d11bb9e3
12 changed files with 454 additions and 148 deletions
--- a/stdiet-ui/public/index.html
+++ b/stdiet-ui/public/index.html
@ -6,6 +6,7 @@
    <meta name="renderer" content="webkit">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2343184_8rlvxcc41j5.css">
    <title><%= webpackConfig.name %></title>
 	  <style>
    html,
--- a/stdiet-ui/src/components/FileUpload/index.vue
+++ b/stdiet-ui/src/components/FileUpload/index.vue
@ -0,0 +1,60 @@
+<template>
+    <el-upload
+      ref="ElUpload"
+      v-bind="$props"
+    >
+      <slot></slot>
+    </el-upload>
+</template>
+<script>
+export default {
+  name: 'formUpload',
+  componentName: 'formUpload',
+  props: [
+    'value', 'action', 'headers', 'multiple', 'data', 'show-file-list', 'name', 'with-credentials', 'drag',
+    'accept', 'on-preview', 'on-remove', 'on-success', 'on-error', 'on-progress', 'on-change',
+    'before-upload', 'before-remove', 'list-type', 'auto-upload', 'file-list', 'http-request',
+    'disabled', 'limit', 'on-exceed',
+  ],
+  data() {
+    return {
+      currentValue: this.value,
+    };
+  },
+  watch: {
+    // eslint-disable-next-line
+    value(val, oldValue) {
+      this.setCurrentValue(val);
+    },
+    // eslint-disable-next-line
+    fileList(val, oldValue) {
+      this.setCurrentValue(val);
+    },
+  },
+  methods: {
+    clearFiles() {
+      this.$refs.ElUpload.clearFiles();
+    },
+    abort(file) {
+      this.$refs.ElUpload.abort(file);
+    },
+    dispatch(componentName, eventName, params) {
+      let parent = this.$parent || this.$root;
+      let name = parent.$options.componentName;
+      while (parent && (!name || name !== componentName)) {
+        parent = parent.$parent;
+        if (parent) {
+          name = parent.$options.componentName;
+        }
+      }
+      if (parent) {
+        parent.$emit(...[eventName].concat(params));
+      }
+    },
+    setCurrentValue(value) {
+      this.currentValue = value;
+      this.dispatch('ElFormItem', 'el.form.change',  [].concat(value));
+    },
+  },
+};
+</script>
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@ -517,6 +517,10 @@ const getters = {
            obj.fHeat = obj.fWeight * 9;
            obj.cWeight += (igd.weight / 100) * igd.carbonRatio;
            obj.cHeat = obj.cWeight * 4;
+            obj[`heat${cur.type}`] +=
+              (igd.weight / 100) * igd.proteinRatio * 4 +
+              (igd.weight / 100) * igd.fatRatio * 9 +
+              (igd.weight / 100) * igd.carbonRatio * 4;
          });
          return obj;
        },
@ -527,7 +531,13 @@ const getters = {
          cWeight: 0,
          pHeat: 0,
          fHeat: 0,
-          cHeat: 0
+          cHeat: 0,
+          heat1: 0,
+          heat2: 0,
+          heat3: 0,
+          heat4: 0,
+          heat5: 0,
+          heat6: 0,
        }
      )
    );
--- a/stdiet-ui/src/views/custom/ingredient/index.vue
+++ b/stdiet-ui/src/views/custom/ingredient/index.vue
@ -245,55 +245,17 @@
    />

    <!-- 添加或修改食材对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="620px" append-to-body>
-      <el-row :gutter="15">
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+      <el-row :gutter="8" style="height: 620px; overflow: auto">
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="12">
+          <el-col :span="8">
            <el-form-item label="食材名称" prop="name" label-width="90px">
-              <el-input v-model="form.name" placeholder="请输入食材名称" />
+              <el-input v-model="form.name" placeholder="请输入名称" />
            </el-form-item>
          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="蛋白质比例"
-              prop="proteinRatio"
-              label-width="90px"
-            >
-              <el-input
-                v-model="form.proteinRatio"
-                placeholder="请输入蛋白质比例"
-                style="width: 150px"
-              />
-              /100g
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="脂肪比例" prop="fatRatio" label-width="90px">
-              <el-input
-                v-model="form.fatRatio"
-                placeholder="请输入脂肪比例"
-                style="width: 150px"
-              />
-              /100g
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="碳水比例"
-              prop="carbonRatio"
-              label-width="90px"
-            >
-              <el-input
-                v-model="form.carbonRatio"
-                placeholder="请输入碳水比例"
-                style="width: 150px"
-              />
-              /100g
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="食材类别" prop="type" label-width="90px">
-              <el-select v-model="form.type" placeholder="请选择食材类别">
+          <el-col :span="8">
+            <el-form-item label="食材类别" prop="type" label-width="100px">
+              <el-select v-model="form.type" placeholder="请选择类别">
                <el-option
                  v-for="dict in typeOptions"
                  :key="dict.dictValue"
@ -303,8 +265,8 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="12">
-            <el-form-item label="地域" prop="area" label-width="90px">
+          <el-col :span="8">
+            <el-form-item label="地域" prop="area" label-width="100px">
              <el-select v-model="form.area" placeholder="请选择地域">
                <el-option
                  v-for="dict in areaOptions"
@ -315,8 +277,35 @@
              </el-select>
            </el-form-item>
          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="蛋白质/100g"
+              prop="proteinRatio"
+              label-width="100px"
+            >
+              <el-input
+                v-model="form.proteinRatio"
+                placeholder="蛋白质比例"
+                width="80px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="脂肪/100g" prop="fatRatio" label-width="90px">
+              <el-input v-model="form.fatRatio" placeholder="脂肪比例" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="碳水/100g"
+              prop="carbonRatio"
+              label-width="90px"
+            >
+              <el-input v-model="form.carbonRatio" placeholder="碳水比例" />
+            </el-form-item>
+          </el-col>
          <el-col :span="12">
-            <el-form-item label="忌口人群" label-width="90px">
+            <el-form-item label="忌口人群" label-width="76px">
              <el-select
                v-model="form.notRecIds"
                multiple
@ -333,7 +322,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="推荐人群" label-width="90px">
+            <el-form-item label="推荐人群" label-width="76px">
              <el-select
                v-model="form.recIds"
                multiple
@ -349,9 +338,34 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
+            <el-form-item label="食材图片" prop="imgList">
+              <el-upload
+                drag
+                :auto-upload="true"
+                :headers="{ Authorization: 'Bearer ' + token }"
+                :limit="5"
+                :multiple="true"
+                :file-list="form.imgList"
+                :action="actionUrl"
+                accept="image/jpeg,image/png"
+                :on-success="handleOnUploadSuccess"
+                :on-exceed="handleOnUploadExceed"
+                :on-remove="handleOnUploadRemove"
+                list-type="picture"
+              >
+                <em class="el-icon-upload" />
+                <div class="el-upload__text">
+                  将文件拖到此处，或<em>点击上传</em>
+                  <div style="font-size: 12px; color: #8c8c8c">最多可上传5个文件，且每个文件不超过10M</div>
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
            <el-form-item label="审核状态" prop="reviewStatus">
              <el-select
+                style="position: absolute"
                v-model="form.reviewStatus"
                placeholder="请选择审核状态"
                clearable
@ -366,8 +380,19 @@
            </el-form-item>
          </el-col>
          <el-col :span="24">
-            <el-form-item label="备注" prop="remark" label-width="90px">
+            <el-form-item label="介绍" prop="info">
              <el-input
+                :rows="5"
+                v-model="form.info"
+                type="textarea"
+                placeholder="请输入内容"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                :rows="3"
                v-model="form.remark"
                type="textarea"
                placeholder="请输入内容"
@ -395,6 +420,8 @@ import {
 } from "@/api/custom/ingredient";

 import AutoHideInfo from "@/components/AutoHideInfo";
+import FileUpload from "@/components/FileUpload";
+import { getToken } from "@/utils/auth";

 import { listPhysicalSigns } from "@/api/custom/physicalSigns";

@ -402,11 +429,14 @@ export default {
  name: "Ingredient",
  components: {
    autohideinfo: AutoHideInfo,
+    FileUpload,
  },
  data() {
    return {
      // 遮罩层
      loading: true,
+      //
+      actionUrl: process.env.VUE_APP_BASE_API + "/custom/fileUpload/ingredient",
      // 选中数组
      ids: [],
      // 非单个禁用
@ -431,6 +461,8 @@ export default {
      areaOptions: [],
      //
      physicalSignsOptions: [],
+      //
+      token: getToken(),
      // 查询参数
      queryParams: {
        pageNum: 1,
@ -506,6 +538,7 @@ export default {
        createTime: null,
        updateBy: null,
        updateTime: null,
+        imgList: [],
      };
      this.resetForm("form");
    },
@ -621,6 +654,34 @@ export default {
    string2Arr(str) {
      return str ? str.split(",") : [];
    },
+    handleOnUploadSuccess(res, file, fileList) {
+      this.form.imgList = fileList.map((data) => {
+        const { name, url, response } = data;
+        if (response) {
+          return { url: response.fileUrl, name: response.fileName };
+        }
+        return { url, name };
+      });
+      // console.log({
+      //   res,
+      //   file,
+      //   fileList,
+      //   form: this.form,
+      // });
+    },
+    handleOnUploadRemove(file, fileList) {
+      this.form.imgList = fileList.map(({ url, name }) => ({
+        url,
+        name,
+      }));
+      // console.log({ file, fileList, form: this.form });
+    },
+    handleOnUploadExceed(files, fileList) {
+      this.$message({
+        message: "最多可上传5张图片",
+        type: "warning",
+      });
+    },
  },
 };
 </script>
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
@ -3,8 +3,25 @@
    :class="`aspect_pie_chart_wrapper ${className || ''}`"
    :style="{ height: height, width: width }"
  >
-    <div ref="echart" :style="{ height: height, width: '100px' }" />
-    <div>
+    <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>
+    </div>
+    <div v-if="view === 0" class="table_zone">
      <el-table
        :data="mData"
        size="mini"
@ -24,15 +41,10 @@
          {{ totalHeat.toFixed(1) }}千卡
        </div>
      </div>
-      <div
-        style="text-align: right; margin-top: 4px"
-        v-if="recipesData.length > 1"
-      >
-        <el-button size="mini" type="text" @click="backToAll"
-          >查看全部</el-button
-        >
-      </div>
    </div>
+    <el-button size="mini" type="text" @click="backToAll" class="see_all"
+      >查看全部</el-button
+    >
  </div>
 </template>

@ -76,10 +88,19 @@ export default {
        f: "脂肪",
        c: "碳水",
      },
+      menuDict: {
+        1: "早餐",
+        2: "早加餐",
+        3: "午餐",
+        4: "午加餐",
+        5: "晚餐",
+        6: "晚加餐",
+      },
      typeDict: {
        Weight: "摄入量",
        Rate: "供能比",
      },
+      view: 0,
    };
  },
  computed: {
@ -119,16 +140,17 @@ export default {
  methods: {
    initChart() {
      this.chart = echarts.init(this.$refs.echart, "myShine");
-      this.updateChart(this.data.length > 0 ? this.data[0] : {});
+      this.updateChart(this.data[0] || {});
    },
    backToAll() {
      this.resetCurrentDay({ currentDay: -1 });
    },
    updateChart(data) {
+      // console.log(data);
      this.chart.clear();
-      this.chart.setOption({
+      const option = {
        title: {
-          text: "营养分析",
+          text: !this.view ? "营养分析" : "热量分析",
          subtext: data.name,
        },
        tooltip: {
@ -142,26 +164,90 @@ export default {
              percent,
              data: { value, oriData, dim },
            } = params;
-            return [
-              `${marker} ${name}`,
-              `摄入量：${oriData[`${dim}Weight`].toFixed(1)}克`,
-              `摄入热量：${value.toFixed(1)}千卡`,
-              `供能比：${percent}%`,
-            ].join("</br>");
+            return !this.view
+              ? [
+                  `${marker} ${name}`,
+                  `摄入量：${oriData[`${dim}Weight`].toFixed(1)}克`,
+                  `摄入热量：${value.toFixed(1)}千卡`,
+                  `供能比：${percent}%`,
+                ].join("</br>")
+              : [
+                  `${marker} ${name}`,
+                  `热量：${data[`heat${dim}`].toFixed(1)}千卡`,
+                  `供能比：${percent}%`,
+                ].join("</br>");
          },
        },
+        graphic:
+          this.view === 1
+            ? [
+                {
+                  type: "group",
+                  top: 60,
+                  left: 10,
+                  silent: true,
+                  children: [
+                    {
+                      type: "text",
+                      style: {
+                        text: "总热量约",
+                        fill: "#606266",
+                      },
+                    },
+                    {
+                      type: "text",
+                      top: 18,
+                      left: 8,
+                      style: {
+                        text: `${this.totalHeat.toFixed(1)}千卡`,
+                        font: '14px "Microsoft YaHei", sans-serif',
+                      },
+                    },
+                  ],
+                },
+                {
+                  type: "group",
+                  top: 36,
+                  right: 10,
+                  silent: true,
+                  children: Object.keys(this.menuDict).reduce((arr, cur) => {
+                    const tarData = data[`heat${cur}`];
+                    if (tarData) {
+                      arr.push({
+                        type: "text",
+                        top: arr.length * 20,
+                        right: 10,
+                        style: {
+                          text: `${this.menuDict[cur]}：${tarData.toFixed(1)}`,
+                          fill: "#606266",
+                        },
+                      });
+                    }
+                    return arr;
+                  }, []),
+                },
+              ]
+            : [],
        series: [
          {
            name: data.name,
            type: "pie",
-            radius: [0, 40],
+            radius: [0, !this.view ? 40 : 60],
            center: ["50%", "55%"],
-            data: ["p", "f", "c"].map((dim) => ({
-              dim,
-              value: data[`${dim}Heat`],
-              name: this.nameDict[dim],
-              oriData: data,
-            })),
+            data: (!this.view
+              ? Object.keys(this.nameDict)
+              : Object.keys(this.menuDict)
+            ).reduce((arr, dim) => {
+              if (!this.view || data[`heat${dim}`]) {
+                arr.push({
+                  dim,
+                  value: !this.view ? data[`${dim}Heat`] : data[`heat${dim}`],
+                  name: (!this.view ? this.nameDict : this.menuDict)[dim],
+                  oriData: data,
+                });
+              }
+              return arr;
+            }, []),
            // labelLine: {
            //   length: 5,
            //   length2: 5,
@ -170,7 +256,7 @@ export default {
              show: true,
              position: "inside",
              color: "#fff",
-              fontSize: 10,
+              fontSize: !this.view ? 10 : 12,
              fontWeight: "bold",
            },
            itemStyle: {
@ -179,7 +265,16 @@ export default {
            },
          },
        ],
+      };
+      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"]),
  },
@ -195,21 +290,24 @@ export default {
 };
 </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
  }

-  // & > div:nth-child(2) {
  .small_table {
    .my_cell {
      padding: 2px 0 !important;
    }
  }
-  // }

  .summary {
    padding: 2px;
@ -222,5 +320,31 @@ export default {
      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>
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@ -49,14 +49,7 @@
      </el-table-column>
      <el-table-column label="菜品" prop="name" align="center">
        <template slot="header">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="点击添加菜品"
-            placement="top"
-          >
-            <div class="pointer_style" @click="handleOnAdd">菜品</div>
-          </el-tooltip>
+          <div class="pointer_style" @click="handleOnAdd">菜品</div>
        </template>
        <template slot-scope="scope">
          <el-popover placement="right" trigger="hover" :title="scope.row.name">
--- a/stdiet-ui/src/views/custom/recipesShow/utils.js
+++ b/stdiet-ui/src/views/custom/recipesShow/utils.js
@ -14,6 +14,7 @@ export function getProcessMenuData(menuData) {
        name: cur.name,
        menuId: cur.menuId,
        methods: cur.methods,
+        remark: cur.remark,
        type: cur.type,
        isMain: cur.isMain,
        igdList: cur.igdList.reduce((igdArr, igdData) => {