diff --git a/projects/cdk/src/ingredient/add-dish-to-ingredient/add-dish-to-ingredient.component.ts b/projects/cdk/src/ingredient/add-dish-to-ingredient/add-dish-to-ingredient.component.ts
index b6fd8bb..0111e93 100644
--- a/projects/cdk/src/ingredient/add-dish-to-ingredient/add-dish-to-ingredient.component.ts
+++ b/projects/cdk/src/ingredient/add-dish-to-ingredient/add-dish-to-ingredient.component.ts
@@ -31,11 +31,12 @@ export class AddDishToIngredientComponent implements OnInit {
foods: FoodInDishInterface[] = [];
ngOnInit(): void {
- console.log("this.peopleGroups", this.peopleGroups);
+ // console.log("this.peopleGroups", this.peopleGroups);
}
onDishChange(dish: any) {
if (dish) {
+ this.dish = dish;
this.mark = dish.marks;
this.getFoodNameByKeys(dish.ingredient);
}
@@ -45,6 +46,7 @@ export class AddDishToIngredientComponent implements OnInit {
const keys = foods.map((i) => i.key);
this.api.getFoodList({ keys }).subscribe((res) => {
this.foods = res.body.map((i) => {
+ const value = this.dish?.ingredient?.find((f: any) => f["key"] === i.key)?.value ?? 0;
return {
foodName: i.name,
key: i.key,
@@ -52,7 +54,7 @@ export class AddDishToIngredientComponent implements OnInit {
groupValues: this.peopleGroups.map((p) => {
return {
peopleName: p,
- value: 0,
+ value,
};
}),
value: {},
diff --git a/projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html b/projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html
index 2e6c8a2..b020fa7 100644
--- a/projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html
+++ b/projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html
@@ -44,10 +44,7 @@
{{p}}
|
-
-
-
diff --git a/projects/cdk/src/services/api.service.ts b/projects/cdk/src/services/api.service.ts
index 39cebf7..12365dc 100644
--- a/projects/cdk/src/services/api.service.ts
+++ b/projects/cdk/src/services/api.service.ts
@@ -572,7 +572,12 @@ export class ApiService {
return this.http.get(`/api/menu/analysis/types?${params}`);
}
- getMenuDataVis() {
- return this.http.get(`/api/menu/dish`);
+ getCurrentDayDataVisList() {
+ return this.http.get(`/api/menu/display`);
+ }
+
+ getMenuDataVis(menuId: number) {
+ // return this.http.get(`/api/menu/dish`);
+ return this.http.get(`/api/menu/display?menuId=${menuId}`);
}
}
diff --git a/projects/cdk/src/types/index.ts b/projects/cdk/src/types/index.ts
index 692a70c..d7d4b73 100644
--- a/projects/cdk/src/types/index.ts
+++ b/projects/cdk/src/types/index.ts
@@ -6,6 +6,8 @@ export type DecText = number | string;
export type Augmented = O & AnyObject;
+export type Optional = Omit & Partial>;
+
export type NutrientInterface = {
key: string;
measurement: string;
diff --git a/projects/client/src/app/pages/data-vis/data-vis.component.html b/projects/client/src/app/pages/data-vis/data-vis.component.html
index a028e3e..a3b92ac 100644
--- a/projects/client/src/app/pages/data-vis/data-vis.component.html
+++ b/projects/client/src/app/pages/data-vis/data-vis.component.html
@@ -14,7 +14,12 @@
-
今日带量食谱
+
+ 今日带量食谱
+
+ 【{{currentMenu.name}}】
+
+
@@ -80,7 +85,7 @@
今日营养分析
-
+