diff --git a/stdiet-ui/src/components/HealthyView/index.vue b/stdiet-ui/src/components/HealthyView/index.vue index a9003f686..674ffe218 100644 --- a/stdiet-ui/src/components/HealthyView/index.vue +++ b/stdiet-ui/src/components/HealthyView/index.vue @@ -29,10 +29,21 @@ >
+
+ {{ con.title }}: + 查看 +
@@ -52,6 +63,17 @@ 取 消 + + + +
+ +
+
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index b03de5894..075bcbf80 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -1,245 +1,258 @@ - - + + + + + + - - - - + :data="scope.row.guidanceValue" + :maxLength="100" + /> + +
+
+
+

+ {{ titleArray[index + 1] }} +

+ + + + + + + + + + + + + + + + +
+
+
+ + +
+ +
+ +
+ 健康评估表链接 + +
+
- - -
- -
- -
- 健康评估表链接 - -
+
+ +
-
-
- - + -
- - - - - + > + + + - + + +
+ +
+
+ - diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue index b8547591e..fd39f40f6 100644 --- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue +++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue @@ -175,7 +175,7 @@ export default { }, methods: { showDrawer(data) { - console.log(data); + // console.log(data); this.data = data; if (!this.data) { return; @@ -288,7 +288,7 @@ export default { this.reset(); }, handleOnDelete(data) { - console.log(data); + // console.log(data); this.$confirm("此操作将删除对计划的食谱, 是否继续?", "提示", { confirmButtonText: "确定", diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js index a0c1a9816..137424066 100644 --- a/stdiet-ui/src/utils/healthyData.js +++ b/stdiet-ui/src/utils/healthyData.js @@ -609,6 +609,12 @@ export function dealHealthy(customerHealthy) { ? `,${customerHealthy.otherOperationHistory}` : ""; } + if (customerHealthy.hasOwnProperty("medicalReport")) { + const urls = customerHealthy.medicalReport.split(","); + customerHealthy.medicalReport_one = urls[0]; + customerHealthy.medicalReport_two = urls[1]; + customerHealthy.medicalReport_three = urls[2]; + } if (customerHealthy.hasOwnProperty("defecationNum")) { customerHealthy.defecationNum += "次/天"; } diff --git a/stdiet-ui/src/views/custom/ingredient/index.vue b/stdiet-ui/src/views/custom/ingredient/index.vue index 038315fdb..39448ba95 100644 --- a/stdiet-ui/src/views/custom/ingredient/index.vue +++ b/stdiet-ui/src/views/custom/ingredient/index.vue @@ -732,7 +732,7 @@ export default { }); }, handleOnUploadPreview(file) { - console.log(file); + // console.log(file); this.previewTitle = file.name; this.previewVisible = true; this.previewUrl = file.url; 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 bf5d37a9b..10de59f15 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 @@ -113,9 +113,8 @@ export default { left: 100, itemWidth: 8, itemHeight: 8, - pageIconSize: 10, textStyle: { - fontSize: 10, + fontSize: 12, }, }, dataset: { 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 index cc9489a3e..c393cfcc9 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/WeaklyAnalyzeCom/BarChart/index.vue @@ -144,7 +144,7 @@ export default { itemHeight: 8, pageIconSize: 10, textStyle: { - fontSize: 10, + fontSize: 12, }, }, tooltip: { @@ -173,7 +173,7 @@ export default { name: this.type === "weight" ? "质量/克" : "热量/千卡", nameTextStyle: { color: "#262626", - fontSize: 10, + fontSize: 12, }, }, series: source[0].slice(1).map((name, idx) => ({ diff --git a/stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue index aab65ef1f..d9af0b218 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue @@ -50,7 +50,7 @@ export default { this.activeName = tab.name; }, handleOnDayClick(data) { - console.log(data); + // console.log(data); const { id, numDay } = data; if (this.selectedIgd !== id) { this.selectedIgd = id; diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue index c8e37e277..726dfd36d 100644 --- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue +++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue @@ -90,7 +90,7 @@ export default { typeName: this.menuTypeDict[type], values: mData[type], })); - console.log(mMenus); + // console.log(mMenus); return mMenus; }, ...mapState(["cusUnitDict", "cusWeightDict", "menuTypeDict"]),