From d75984ed3afefa072d99cb7d67e54e3c89f4b613 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 26 Mar 2021 18:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A3=9F=E8=B0=B1=E5=A4=87?=
=?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../recipesBuild/RecipesView/RecipesHeaderCom/index.vue | 2 +-
stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
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 b9a91c467..46d51c089 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
@@ -229,7 +229,7 @@ export default {
}
recipesDom.style.overflow = "visible";
html2canvans(recipesDom, {
- scale: 2,
+ scale: 1.5,
height: recipesDom.scrollHeight,
}).then((canvas) => {
const { name } = this.healthyData;
diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
index 7d3f35f54..1103db21a 100644
--- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
@@ -83,7 +83,11 @@ export default {
obj[cur.type] = [];
}
let tarMenu = cur;
- if (!tarMenu.methods && tarMenu.igdList.length === 1) {
+ if (
+ !tarMenu.methods &&
+ !tarMenu.remark &&
+ tarMenu.igdList.length === 1
+ ) {
tarMenu = tarMenu.igdList[0];
tarMenu.cusStr = `${this.cusWeightDict[tarMenu.cusWeight] || ""}${
this.cusUnitDict[tarMenu.cusUnit] || ""