Merge branch 'ASTRA-78' into 'master'

WIP Поправил данные стора Термометрии

See merge request andrusyakka/urban-couscous!366
This commit is contained in:
Aleksey Demin
2023-05-16 07:57:23 +00:00
2 changed files with 13 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
medical-form-wrapper(:title="data.title", :is-edit="isEdit", :open-edit="openEdit", :cancel="cancelEdit") medical-form-wrapper(:title="data.title", :is-edit="isEdit", :open-edit="openEdit", :cancel="cancelEdit")
.thermometry-wrapper.grid.gap-x-20.gap-y-5 .thermometry-wrapper.grid.gap-x-20.gap-y-5
.flex.flex-col.gap-y-4.items-start(v-if="isEdit" v-for="(thermometry, key) in thermometryData") .flex.flex-col.gap-y-4.items-start(v-if="isEdit" v-for="(thermometry, key) in protocol[data.key]")
span.font-semibold.text-smm {{ data.config.temperature[key].title }} span.font-semibold.text-smm {{ data.config.temperature[key].title }}
base-input.w-full( base-input.w-full(
v-model="thermometry.temperature", v-model="thermometry.temperature",
@@ -28,7 +28,7 @@
v-model="thermometry.result" v-model="thermometry.result"
:val="result.value" :val="result.value"
:label="result.value" :label="result.value"
size="30px" size="40px"
dense dense
checked-icon="check_box" checked-icon="check_box"
unchecked-icon="check_box_outline_blank" unchecked-icon="check_box_outline_blank"
@@ -36,7 +36,7 @@
.alert-icon.flex.justify-center.items-center.rounded.w-6.h-6(v-if="result.colorWarning") .alert-icon.flex.justify-center.items-center.rounded.w-6.h-6(v-if="result.colorWarning")
q-icon(size="13px" name="warning_amber") q-icon(size="13px" name="warning_amber")
.flex.flex-col.gap-y-2.items-start(v-else) .flex.flex-col.gap-y-2.items-start(v-else)
.flex.gap-x-1.h-8(v-for="(thermometry, key) in thermometryData") .flex.gap-x-1.h-8(v-for="(thermometry, key) in protocol[data.key]")
.flex.h-full.w-20.justify-center.items-center.gap-x-1.rounded( .flex.h-full.w-20.justify-center.items-center.gap-x-1.rounded(
:style="{'background-color': data.config.temperature[key].bg, 'color': data.config.temperature[key].color}" :style="{'background-color': data.config.temperature[key].bg, 'color': data.config.temperature[key].color}"
) )
@@ -69,7 +69,7 @@ export default {
}, },
computed: { computed: {
...mapState({ ...mapState({
thermometryData: (state) => state.medical.protocolThermometry, protocol: (state) => state.medical.protocolData,
}), }),
}, },
methods: { methods: {

View File

@@ -130,8 +130,7 @@ const state = () => ({
bite: "distal bite", bite: "distal bite",
hygieneIndex: 2, hygieneIndex: 2,
KPUIndex: 3, KPUIndex: 3,
}, thermometry: {
protocolThermometry: {
cold: { cold: {
temperature: 22, temperature: 22,
result: "Нет реакции", result: "Нет реакции",
@@ -141,6 +140,7 @@ const state = () => ({
result: "Повышенная чувствительность", result: "Повышенная чувствительность",
}, },
}, },
},
}); });
const getters = { const getters = {