Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!88 添加备注，柱状图标线

Browse Source 
Merge pull request !88 from 德仔/develop
This commit is contained in:
德仔 2021-03-03 19:26:17 +08:00 committed by Gitee
commit 4880a16faa
10 changed files with 550 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
stdiet-ui/src/components/BodySignView/index.vue
View File

@ -1,7 +1,15 @@
<template>
<div>
<div class="body_sign_view_wrapper">
<div>
<h2>{{ this.data.name }}</h2>
<!-- <el-button
v-if="dev"
size="mini"
type="primary"
class="remark_btn"
@click="handleOnRemark"
>修改备注</el-button
> -->
<div class="msg-info" v-for="(info, idx) in basicInfo" :key="idx">
<text-info
v-for="con in info"
@ -12,20 +20,45 @@
/>
</div>
</div>
<!-- 备注弹窗 -->
<el-dialog title="修改备注" :visible.sync="open" width="480px">
<el-input
type="textarea"
v-model="data.remark"
rows="6"
placeholder="请输入备注信息"
maxlength="300"
show-word-limit
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="onClosed">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import TextInfo from "@/components/TextInfo";
import { updateHealthy } from "@/api/custom/healthy";
export default {
name: "BodySignView",
props: ["data"],
props: {
data: {
type: Object,
default: {},
},
dev: {
type: Boolean,
default: false,
},
},
components: {
"text-info": TextInfo,
},
data() {
return {
basicInfo: [
const basicInfo = [
[
{ title: "性别", value: "sex" },
{ title: "年龄", value: "age" },
@ -69,19 +102,54 @@ export default {
[{ title: "病史", value: "signStr" }],
[{ title: "忌口或过敏源", value: "dishesIngredientId" }],
[{ title: "方便沟通时间", value: "connectTime" }],
[{ title: "备注", value: "remark" }],
],
];
if (this.dev) {
basicInfo.splice(3, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
basicInfo.splice(4, 0, [
{ title: "不运动总热量", value: "notSportHeat" },
]);
basicInfo.splice(basicInfo.length, 0, [
{ title: "备注", value: "remark" },
]);
}
return {
basicInfo,
open: false,
};
},
methods: {
handleOnRemark() {
this.open = true;
},
onClosed() {
this.open = false;
},
submit() {
const { id, remark } = this.data;
updateHealthy({ id, remark }).then((res) => {
if (res.code === 200) {
this.$message.success("修改成功");
this.open = false;
}
});
},
},
};
</script>
<style rel="stylesheet/scss" lang="scss">
.msg-info {
<style lang="scss" scoped>
.body_sign_view_wrapper {
.remark_btn {
position: absolute;
top: 36px;
right: 16px;
}
.msg-info {
display: flex;
margin-bottom: 8px;
.text-info-extra {
margin-bottom: 2px;
}
}
}
</style>

84
stdiet-ui/src/components/HealthyView/index.vue
View File

@ -1,7 +1,15 @@
<template>
<div>
<div class="health_view_wrapper">
<div>
<h2>{{ this.data.name }}</h2>
<el-button
v-if="dev"
size="mini"
type="primary"
class="remark_btn"
@click="handleOnRemark"
>修改备注</el-button
>
<div class="msg-info" v-for="(info, idx) in basicInfo" :key="idx">
<text-info
v-for="con in info"
@ -28,20 +36,45 @@
</div>
</el-collapse-item>
</el-collapse>
<!-- 备注弹窗 -->
<el-dialog title="修改备注" :visible.sync="open" width="480px">
<el-input
type="textarea"
v-model="data.remark"
rows="6"
placeholder="请输入备注信息"
maxlength="300"
show-word-limit
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="onClosed">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import TextInfo from "@/components/TextInfo";
import { updateHealthy } from "@/api/custom/healthy";
export default {
name: "HealthyView",
props: ["data"],
props: {
data: {
type: Object,
default: {},
},
dev: {
type: Boolean,
default: false,
},
},
components: {
"text-info": TextInfo,
},
data() {
return {
basicInfo: [
const basicInfo = [
[
{ title: "调理项目", value: "conditioningProject" },
{ title: "电话", value: "phone" },
@ -55,8 +88,18 @@ export default {
{ title: "体重", value: "weight" },
],
[{ title: "地域", value: "position" }],
[{ title: "备注", value: "remark" }],
],
];
if (this.dev) {
basicInfo.splice(3, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
basicInfo.splice(4, 0, [
{ title: "不运动总热量", value: "notSportHeat" },
]);
basicInfo.splice(6, 0, [{ title: "备注", value: "remark" }]);
}
return {
open: false,
basicInfo,
healthyInvestigate: [
{
title: "减脂经历评估",
@ -180,15 +223,40 @@ export default {
],
};
},
methods: {
handleOnRemark() {
this.open = true;
},
onClosed() {
this.open = false;
},
submit() {
const { id, remark } = this.data;
updateHealthy({ id, remark }).then((res) => {
if (res.code === 200) {
this.$message.success("修改成功");
this.open = false;
}
});
},
},
};
</script>
<style rel="stylesheet/scss" lang="scss">
.msg-info {
<style lang="scss" scoped>
.health_view_wrapper {
.remark_btn {
position: absolute;
top: 36px;
right: 16px;
}
.msg-info {
display: flex;
margin-bottom: 8px;
.text-info-extra {
margin-bottom: 2px;
}
}
}
</style>

2
stdiet-ui/src/components/PhysicalSignsRemark/index.vue
View File

@ -4,7 +4,7 @@
<el-form-item label="" prop="remark" >
<el-input
type="textarea"
:rows="5"
:rows="6"
maxlength="300"
show-word-limit
placeholder="请输入备注"

8
stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue
View File

@ -14,7 +14,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['orderPause:pause:add']"
v-hasPermi="['recipes:pause:add']"
>新增</el-button
>
</el-col>
@ -24,7 +24,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['orderPause:pause:export']"
v-hasPermi="['recipes:pause:export']"
>导出</el-button
>
</el-col>
@ -96,7 +96,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['orderPause:pause:edit']"
v-hasPermi="['recipes:pause:edit']"
>修改</el-button
>
<el-button
@ -104,7 +104,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['orderPause:pause:remove']"
v-hasPermi="['recipes:pause:remove']"
>删除</el-button
>
</template>

10
stdiet-ui/src/utils/healthyData.js
View File

@ -471,6 +471,16 @@ const moduleObj = {
//健康信息处理，将数组转为字符串
export function dealHealthy(customerHealthy) {
customerHealthy.basicBMR = (
(10 * customerHealthy.weight) / 2 +
6.25 * customerHealthy.tall -
5 * customerHealthy.age -
customerHealthy.sex * 161
).toFixed(1);
customerHealthy.notSportHeat = (customerHealthy.basicBMR * 1.3).toFixed(1);
customerHealthy.basicBMR += "千卡";
customerHealthy.notSportHeat += "千卡";
needAttrName.forEach(name => {
if (customerHealthy.hasOwnProperty(name)) {
customerHealthy[name] = (String(customerHealthy[name]) || "")

58
stdiet-ui/src/views/custom/dishes/index.vue
View File

@ -247,17 +247,10 @@
:summary-method="getSummaries"
style="width: 100%"
>
<el-table-column prop="name" label="食材"></el-table-column>
<el-table-column label="通俗计量">
<el-table-column prop="name" label="食材" align="center" />
<el-table-column label="通俗计量" align="center">
<template slot-scope="scope">
<span class="cus-unit">
<!-- <el-input-number
v-model="scope.row.cusWeight"
size="mini"
controls-position="right"
step="0.5"
:min="0.5"
/> -->
<el-select size="mini" v-model="scope.row.cusWeight">
<el-option
v-for="dict in cusWeightOptions"
@ -277,7 +270,7 @@
</span>
</template>
</el-table-column>
<el-table-column prop="weight" label="重量(g)">
<el-table-column prop="weight" label="重量(g)" align="center">
<template slot-scope="scope">
<el-input-number
class="weight"
@ -286,15 +279,36 @@
controls-position="right"
@change="handleInputChange"
:min="0"
:step="50"
:step="5"
/>
</template>
</el-table-column>
<el-table-column prop="proteinRatio" label="蛋白质/100g">
</el-table-column>
<el-table-column prop="fatRatio" label="脂肪/100g">
</el-table-column>
<el-table-column prop="carbonRatio" label="碳水/100g">
<el-table-column
prop="proteinRatio"
label="蛋白质/100g"
align="center"
/>
<el-table-column
prop="fatRatio"
label="脂肪/100g"
align="center"
/>
<el-table-column
prop="carbonRatio"
label="碳水/100g"
align="center"
/>
<el-table-column label="热量" align="center">
<template slot-scope="scope">
{{
`${(
((scope.row.proteinRatio * scope.row.weight) / 100) *
4 +
((scope.row.fatRatio * scope.row.weight) / 100) * 9 +
((scope.row.carbonRatio * scope.row.weight) / 100) * 4
).toFixed(1)} kcal`
}}
</template>
</el-table-column>
</el-table>
</el-form-item>
@ -740,22 +754,26 @@ export default {
},
getSummaries(param) {
const { columns, data } = param;
console.log(data);
return columns.reduce(
(arr, cur, idx) => {
if (idx > 1) {
if (idx === 6) {
// 备注
return arr;
}
arr[6] = arr[3] * 4 + arr[4] * 9 + arr[5] * 4 + ' kcal';
} else {
arr[idx] = data.reduce((acc, dAcc) => {
if (idx === 2) {
return acc + parseFloat(dAcc.weight);
}
return parseFloat(
(acc + (dAcc[cur.property] * dAcc.weight) / 100).toFixed(1)
(
acc +
(dAcc[cur.property] * parseFloat(dAcc.weight)) / 100
).toFixed(1)
);
}, 0);
}
}
return arr;
},
["合计"]

47
stdiet-ui/src/views/custom/ingredient/index.vue
View File

@ -97,12 +97,10 @@
size="mini"
@click="handleQuery"
>搜索
</el-button
>
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置
</el-button
>
</el-button>
</el-form-item>
</el-form>
@ -179,6 +177,17 @@
align="center"
prop="carbonRatio"
/>
<el-table-column label="每百克热量(千卡)" align="center" width="120">
<template slot-scope="scope">
{{
(
scope.row.proteinRatio * 4 +
scope.row.fatRatio * 9 +
scope.row.carbonRatio * 4
).toFixed(1)
}}
</template>
</el-table-column>
<el-table-column
label="地域"
align="center"
@ -192,15 +201,15 @@
width="120"
>
<template slot-scope="scope">
<autohideinfo :data="string2Arr(scope.row.notRec)"/>
<autohideinfo :data="string2Arr(scope.row.notRec)" />
</template>
</el-table-column>
<el-table-column label="推荐人群" align="center" prop="rec" width="120">
<template slot-scope="scope">
<autohideinfo :data="string2Arr(scope.row.rec)"/>
<autohideinfo :data="string2Arr(scope.row.rec)" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="操作"
align="center"
@ -241,7 +250,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12">
<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">
@ -376,20 +385,20 @@
</template>
<script>
import {
import {
addIngredient,
delIngredient,
exportIngredient,
getIngredient,
listIngredient,
updateIngredient,
} from "@/api/custom/ingredient";
} from "@/api/custom/ingredient";
import AutoHideInfo from "@/components/AutoHideInfo";
import AutoHideInfo from "@/components/AutoHideInfo";
import {listPhysicalSigns} from "@/api/custom/physicalSigns";
import { listPhysicalSigns } from "@/api/custom/physicalSigns";
export default {
export default {
name: "Ingredient",
components: {
autohideinfo: AutoHideInfo,
@ -591,8 +600,7 @@
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {
});
.catch(function () {});
},
/** 导出按钮操作 */
handleExport() {
@ -608,12 +616,11 @@
.then((response) => {
this.download(response.msg);
})
.catch(function () {
});
.catch(function () {});
},
string2Arr(str) {
return str ? str.split(',') : []
}
return str ? str.split(",") : [];
},
};
},
};
</script>

14
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/BarChart.vue
View File

@ -30,6 +30,10 @@ export default {
type: Array,
default: [],
},
max: {
type: Number,
default: 0,
},
},
data() {
return {
@ -64,6 +68,7 @@ export default {
this.updateChart(this.data.length > 0 ? this.data : {});
},
updateChart(source) {
console.log(this.max);
this.chart.clear();
this.chart.setOption({
title: {
@ -112,7 +117,7 @@ export default {
grid: {
top: 55,
left: 20,
right: 20,
right: 50,
bottom: 10,
containLabel: true,
},
@ -135,6 +140,13 @@ export default {
y: dim,
x: 0,
},
markLine: {
data: [{ name: "BMR", yAxis: this.max - 400 }],
symbol: "none",
lineStyle: {
color: "red",
},
},
itemStyle: {
borderWidth: 2,
borderColor: "#fff",

12
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
View File

@ -58,6 +58,16 @@
:data="data"
height="170px"
width="500px"
:max="
healthyData.basicBMR
? parseFloat(
healthyData.basicBMR.substring(
0,
healthyData.basicBMR.indexOf('千卡')
)
)
: 0
"
/>
<PieChart
v-if="data.length === 1"
@ -89,7 +99,7 @@ export default {
},
props: ["collapse", "data"],
computed: {
...mapState(["recipesId", "reviewStatus"]),
...mapState(["recipesId", "reviewStatus", "healthyData"]),
},
methods: {
handleCollapseClick() {

4
stdiet-ui/src/views/custom/recipesBuild/index.vue
View File

@ -11,8 +11,8 @@
</div>
<div class="right" v-loading="healthDataLoading">
<TemplateInfoView v-if="!!temId" :data="templateInfo" />
<HealthyView :data="healthyData" v-else-if="healthyDataType === 0" />
<BodySignView :data="healthyData" v-else />
<HealthyView :data="healthyData" v-else-if="healthyDataType === 0" dev />
<BodySignView :data="healthyData" v-else dev />
</div>
</div>
</template>