Browse Source

fix: bug修复

master
guoapeng 2 days ago
parent
commit
02ca13fad8
  1. 25
      src/pages/Index/History.vue
  2. 5
      src/pages/Index/Index.vue
  3. 4
      src/pages/Index/Regular/Running.vue
  4. 17
      src/pages/Index/debug.vue
  5. 2
      src/store/modules/device.ts

25
src/pages/Index/History.vue

@ -15,9 +15,12 @@
header-cell-class-name="table-header"
row-class-name="table-row"
>
<el-table-column type="selection"></el-table-column>
<el-table-column prop="id" label="记录ID" width="65"></el-table-column>
<el-table-column prop="creatDate" label="日期" width="100">
<el-table-column type="selection" header-align="center"
align="center"></el-table-column>
<el-table-column prop="id" label="记录ID" width="65" header-align="center"
align="center"></el-table-column>
<el-table-column prop="creatDate" label="日期" width="100" header-align="center"
align="center">
<template #default="scope">
<div>
{{ formatDate(scope.row.creatDate)[0] }}
@ -27,7 +30,8 @@
</div>
</template>
</el-table-column>
<el-table-column prop="sampleId" label="患者ID" width="180">
<el-table-column prop="sampleId" label="患者ID" width="180" header-align="center"
align="center">
<template #default="scope">
<div>
{{ scope.row.sampleId }}
@ -40,15 +44,18 @@
</div>
</template>
</el-table-column>
<el-table-column prop="sampleBloodType" label="样本类型" width="100">
<el-table-column prop="sampleBloodType" label="样本类型" width="100" header-align="center"
align="center">
<template #default="scope">
{{
settingTubeStore.bloodTypeKeyMap[scope.row.sampleBloodType].name
}}
</template>
</el-table-column>
<el-table-column prop="lotId" label="批次"></el-table-column>
<el-table-column prop="results" label="结果" width="150px">
<el-table-column prop="lotId" label="批次" header-align="center"
align="center"></el-table-column>
<el-table-column prop="results" label="结果" width="150px" header-align="center"
align="center">
<template #default="scope">
<div
v-for="(r, idx) in scope.row.results"
@ -131,7 +138,7 @@
<p class="userid">样本ID{{ rowData && rowData.sampleId }}</p>
<p class="userid">患者ID{{ rowData && rowData.sampleUserid }}</p>
<p class="userid">样本条码{{ rowData && rowData.sampleBarcode }}</p>
<p class="userid">条码ID{{ rowData && rowData.sampleBarcode }}</p>
<p class="userid">记录ID{{ rowData && rowData.id }}</p>
<p class="projName">项目名称{{ rowData && rowData.projName }}</p>
@ -645,7 +652,7 @@ watchEffect(() => {
.history-result {
//height: 3rem;
display: flex;
align-items: center;
align-items: center;justify-content: center;
}
:deep(.table-header) {
height: 60px;

5
src/pages/Index/Index.vue

@ -1142,12 +1142,11 @@ async function startInit() {
await pollingInitState()
// ID
const res = await getIdCardInfo()
console.log(res)
if (!res) {
if (!res.success) {
return
}
consumableStore.setIdCardInserted(true)
consumableStore.setIdCardInfo(res)
consumableStore.setIdCardInfo(res.data)
// //id
// idCardInserted.value = true
// //v-html

4
src/pages/Index/Regular/Running.vue

@ -123,7 +123,7 @@
<div class="tube_info"><div class="tube-label">状态</div><div>{{emergencyStateDesc[emergencyInfo.state]}}</div></div>
<div class="tube_info"><div class="tube-label">样本ID</div><div>{{emergencyInfo.sampleId}}</div></div>
<div class="tube_info"><div class="tube-label">患者ID</div><div>{{emergencyInfo.userid}}</div></div>
<div class="tube_info"><div class="tube-label">形码: </div><div>{{emergencyInfo.sampleBarcode}}</div></div>
<div class="tube_info"><div class="tube-label">码ID</div><div>{{emergencyInfo.sampleBarcode}}</div></div>
</div>
<div v-else>无项目</div>
</template>
@ -155,7 +155,7 @@
</div></div>
<div class="tube_info"><div class="tube-label">样本ID</div><div>{{tube.sampleId}}</div></div>
<div class="tube_info"><div class="tube-label">患者ID</div><div>{{tube.userid}}</div></div>
<div class="tube_info"><div class="tube-label">形码: </div><div>{{tube.sampleBarcode}}</div></div>
<div class="tube_info"><div class="tube-label">码ID</div><div>{{tube.sampleBarcode}}</div></div>
</div>
<div v-else>无项目</div>
</template>

17
src/pages/Index/debug.vue

@ -149,12 +149,12 @@ const ok = async () => {
if (currentType.value === 'incubateBoxTemperature') {
const res= await correctIncubatorBoxTemperature({nowActualTemperature: Number(currentTemperature.value)})
if (res.success) {
eMessage.success('提交成功')
eMessage.success('设置成功')
}
} else if (currentType.value === 'pboxTemperature') {
const res = await correctPlateBoxTemperature({nowActualTemperature: Number(currentTemperature.value)})
if (res.success) {
eMessage.success('提交成功')
eMessage.success('设置成功')
}
}
}
@ -213,21 +213,22 @@ const ok = async () => {
<span>控温测试</span>
<div>
<span>孵育盘</span>
<span>{{deviceStore.sensorState?.incubateBoxTemperature.toFixed(1)}}</span>
<span>{{deviceStore.sensorState?.preciseIncubateBoxTemperature.toFixed(1)}}</span>
<span></span>
<span>&nbsp;&nbsp;&nbsp;</span>
<span>板夹仓</span>
<span>{{deviceStore.sensorState?.pboxTemperature.toFixed(1)}}</span>
<span>{{deviceStore.sensorState?.precisePboxTemperature.toFixed(1)}}</span>
<span></span>
</div></div>
<div class="content1">
<el-button type="primary" size="large" @click="() => {
dialogVisible = true;
currentTemperature = deviceStore.sensorState?.incubateBoxTemperature.toFixed(1)
currentTemperature = deviceStore.sensorState?.preciseIncubateBoxTemperature.toFixed(1)
currentType = 'incubateBoxTemperature'
}">校准孵育盘温度</el-button>
<el-button type="primary" size="large" @click="() => {
dialogVisible = true;
currentTemperature = deviceStore.sensorState?.pboxTemperature.toFixed(1)
currentTemperature = deviceStore.sensorState?.precisePboxTemperature.toFixed(1)
currentType = 'pboxTemperature'
}">校准板夹仓温度</el-button>
</div>
@ -283,11 +284,11 @@ const ok = async () => {
box-sizing: border-box;
width: 100%;
background: #fff;
padding: 20px;
padding: 20px 20px 0 20px;
border-radius: 10px;
.content1 {
display: flex;
padding: 10px;
padding: 20px;
align-items: center;
.el-select {
margin: 0 20px;

2
src/store/modules/device.ts

@ -33,6 +33,8 @@ export const useDeviceStore = defineStore('device', () => {
const sensorState = ref<Record<string, any>>({
pboxTemperature: 20,
precisePboxTemperature: 20,
preciseIncubateBoxTemperature: 20,
incubateBoxTemperature: 20,
wasteBinFullFlag: false,
})

Loading…
Cancel
Save