Merge remote-tracking branch 'origin/一期' into 一期

# Conflicts:
#	src/views/remote-manage/remote-control.vue
This commit is contained in:
yy 2024-05-30 10:06:25 +08:00
commit 6a07153e46

View File

@ -9,8 +9,8 @@
@exception-event="vitalExcepEvent"></chart-line>
<chart-line ref="chartDom3" class="chart-line" :names="['SPO2', 'TEMP']"
@exception-event="vitalExcepEvent"></chart-line>
<chart-ecg ref="chartDom4" class="chart-ecg" :name="['CH1', 'CH2']"
@exception-event="vitalExcepEvent"></chart-ecg>
<!-- <chart-ecg ref="chartDom4" class="chart-ecg" :name="['CH1', 'CH2']"
@exception-event="vitalExcepEvent"></chart-ecg>-->
</div>
<div class="center-box">
@ -42,8 +42,8 @@
<!-- <el-option v-for="item in databaseOptions" :key="item.value" :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<el-button color="#C77000" style="width: 150px;" @click="viewPatientInfo">患者信息</el-button>
<el-button color="#C77000" style="width: 150px;">已连接</el-button>
<el-button color="#C77000" style="width: 200px;" @click="viewPatientInfo">患者信息</el-button>
<!-- <el-button color="#C77000" style="width: 150px;">已连接</el-button>-->
<!-- <el-button color="#C77000" >机器人运行正常</el-button>-->
</div>
<el-button color="#e0e0e0" @click="backRemote">
@ -106,12 +106,12 @@
<el-dropdown-item command="速度(ml/h)">速度(ml/h)</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template> -->
</el-dropdown>
</template> -->
</el-table-column>
<el-table-column prop="total" label="累计药量(ml)" width="100"/>
<el-table-column prop="state" label="工作状态" width="70" align="center"/>
<!-- <el-table-column label="特殊情况人为干预" align="center">
<el-table-column prop="state" label="工作状态" width="150" align="center"/>
<!-- <el-table-column label="特殊情况人为干预" align="center">
<template #default="scope">
<div class="table-btn-box">
<el-button size="small" color="#006080" @click="tableItemPlus(scope)">
@ -125,7 +125,7 @@
<Minus/>
</el-icon>
</el-button>
&lt;!&ndash; <el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
&lt;!&ndash; <el-button size="small" color="#006080" @click="tableItemConfirm(scope)"
:disabled="tableDataStore[scope.$index].speed === scope.row.speed">确定&ndash;&gt;-->
<!--<el-button size="small" color="#006080" @click="tableItemConfirm(scope, varTableData)">确定
</el-button>
@ -139,11 +139,11 @@
<!-- table2 -->
<div class="table-box">
<el-table :data="fixedTableData" height="100%" style="width: 100%">
<el-table-column type="index" label="序号" width="40" align="center"/>
<el-table-column type="index" label="序号" width="80" align="center"/>
<el-table-column prop="name" label="药物名称" align="center"/>
<el-table-column prop="speed" label="速度(ml/h)" width="100"/>
<el-table-column prop="total" label="累计药量(ml)" width="100"/>
<el-table-column prop="state" label="工作状态" width="70" align="center"/>
<el-table-column prop="state" label="工作状态" width="150" align="center"/>
<!-- <el-table-column label="特殊情况人为干预" align="center">
<template #default="scope">
<div class="table-btn-box">
@ -588,7 +588,7 @@ function startAI() {
.chart-line {
width: 100%;
height: calc(25% - 30px);
height: calc(33.3% - 30px);
margin-bottom: 20px;
background: #e8f5f8;
border-top-left-radius: 20px;
@ -596,7 +596,7 @@ function startAI() {
// overflow: hidden;
}
.chart-ecg {
/*.chart-ecg {
width: 100%;
height: calc(25% - 50px);
border-left: 1px solid #92b3c1;
@ -628,7 +628,7 @@ function startAI() {
border-top: 5px solid transparent;
}
}
}
}*/
.center-box {
width: calc(100% - 1500px);
@ -646,6 +646,7 @@ function startAI() {
position: relative;
// width: 400px;
// height: 650px;
margin-top: 80px;
width: 500px;
height: 812.5px;
min-height: 650px;
@ -766,6 +767,7 @@ function startAI() {
width: 200px;
height: 100%;
.unusual-title {
display: block;
width: 100%;
@ -858,6 +860,10 @@ function startAI() {
&.align-right {
text-align: right;
span {
background: $main-color;
}
}
span {
@ -868,7 +874,7 @@ function startAI() {
border-radius: 8px;
color: white;
letter-spacing: 1px;
background: $main-color;
background: #92b3c1;
text-align: left;
}
}
@ -944,5 +950,5 @@ function startAI() {
}
}
}
}
}
</style>