修正了检测截图排序问题,增加了足底压力板有效性设置功能。

This commit is contained in:
root 2026-02-07 11:46:13 +08:00
parent e3e294694c
commit def6304bd9
3 changed files with 48 additions and 29 deletions

View File

@ -39,7 +39,7 @@ fourcc = MJPG
backend = directshow
[FEMTOBOLT]
enable = False
enable = True
algorithm_type = plt
color_resolution = 1080P
depth_mode = NFOV_2X2BINNED
@ -54,9 +54,9 @@ imu_enable = True
imu_use_mock = False
imu_ble_name = WT901BLE67
imu_mac_address = FA:E8:88:06:FE:F3
pressure_enable = False
pressure_enable = True
pressure_use_mock = False
pressure_port = COM5
pressure_port = COM3
pressure_baudrate = 115200
[REMOTE]

View File

@ -1366,10 +1366,8 @@ class AppServer:
for item in session_data['videos']:
item_copy = item.copy()
item_copy['type'] = 'video'
result_data.append(item_copy)
result_data.append(item_copy)
# 按时间戳排序
result_data.sort(key=lambda x: x.get('timestamp', ''), reverse=False)
return jsonify({
'success': True,

View File

@ -39,7 +39,7 @@
</div>
<div class="displayleft" style="width: 550px;
justify-content: flex-end;padding-right: 5px;">
<div class="icon-box" title="相机参数设置" @click="cameraUpdate">
<div class="icon-box" title="设备参数设置" @click="cameraUpdate">
<img src="@/assets/detection/settings.png" alt="" >
</div>
<div class="icon-box" title="查看档案" @click="routerClick">
@ -806,7 +806,7 @@
<div class="pop-up-mask" v-if="cameraDialogVisible">
<div class="pop-up-camera-container">
<div class="pop-up-camera-header">
<div>相机参数设置</div>
<div>设备参数设置</div>
<img src="@/assets/close.png" alt="" style="cursor: pointer;" @click="handleCameraCancel">
</div>
<div class="pop-up-camera-body">
@ -824,7 +824,7 @@
<el-checkbox v-model="cameraForm.femtobolt.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="pop-up-camera-display" style="padding-top: 30px;padding-bottom: 10px;">
<div class="pop-up-camera-display" style="padding-top: 20px;padding-bottom: 10px;">
<div class="pop-up-camera-line"></div>
<div class="pop-up-camera-title">足部相机</div>
</div>
@ -854,20 +854,9 @@
</el-radio-group>
<el-checkbox v-model="cameraForm.camera2.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="pop-up-camera-display" style="padding-top: 30px;padding-bottom: 00px;">
<div class="pop-up-camera-line"></div>
<div class="pop-up-camera-title">遥控器</div>
</div>
<div class="pop-up-camera-display" style="padding-top: 10px;">
<div class="pop-up-camera-name">串口号</div>
<el-select v-model="cameraForm.remote.port" placeholder="请选择" style="width: 434px;">
<el-option v-for="item in remotePortData" :label="item" :value="item" />
</el-select>
<el-checkbox v-model="cameraForm.remote.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="pop-up-camera-display" style="padding-top: 30px;padding-bottom: 00px;">
<div class="pop-up-camera-display" style="padding-top: 20px;padding-bottom: 00px;">
<div class="pop-up-camera-line"></div>
<div class="pop-up-camera-title">IMU设备</div>
</div>
@ -881,7 +870,30 @@
<el-checkbox v-model="cameraForm.imu.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="pop-up-camera-display" style="padding-top: 20px;padding-bottom: 0px;">
<div class="pop-up-camera-line"></div>
<div class="pop-up-camera-title">足底压力板</div>
</div>
<div class="pop-up-camera-display" style="padding-top: 10px;">
<div class="pop-up-camera-name">串口号</div>
<el-select v-model="cameraForm.pressure.port" placeholder="请选择" style="width: 434px;">
<el-option v-for="item in remotePortData" :label="item" :value="item" />
</el-select>
<el-checkbox v-model="cameraForm.pressure.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="pop-up-camera-display" style="padding-top: 20px;padding-bottom: 00px;">
<div class="pop-up-camera-line"></div>
<div class="pop-up-camera-title">遥控器</div>
</div>
<div class="pop-up-camera-display" style="padding-top: 10px;">
<div class="pop-up-camera-name">串口号</div>
<el-select v-model="cameraForm.remote.port" placeholder="请选择" style="width: 434px;">
<el-option v-for="item in remotePortData" :label="item" :value="item" />
</el-select>
<el-checkbox v-model="cameraForm.remote.enable" label="有效" size="large" style="width: 60px;margin-left:10px ;" />
</div>
<div class="form-actions-display">
<el-button @click="handleCameraCancel" class="formreturnCancel">退出</el-button>
<el-button type="primary" class="formsaveCancel"
@ -1115,6 +1127,10 @@ const cameraForm = ref({ // 相机参数
port: '', //
enable: false
},
pressure:{
port: '',
enable: false
},
})
const calculatedAge = ref(null)
@ -1357,8 +1373,13 @@ function cameraUpdate() { // 相机设置数据更新弹框
enable: false
},
remote:{
port: '', // IMU
}
port: '',
enable: false
},
pressure:{
port: '',
enable: false
}
}
//
getDevicesInit()
@ -2430,7 +2451,7 @@ const getDevicesInit = async () => {
if (response.ok) {
const result = await response.json()
if (result.success) {
console.log('相机参数加载成功:', result.data)
console.log('设备参数加载成功:', result.data)
cameraForm.value = result.data
cameraDialogVisible.value = true
// console.log(':', patientInfo.value)
@ -2441,8 +2462,8 @@ const getDevicesInit = async () => {
throw new Error(`HTTP ${response.status}: ${response.statusText}`)
}
} catch (error) {
console.error('加载相机参数失败:', error)
ElMessage.warning('加载相机参数失败,请检查网络连接')
console.error('加载设备参数失败:', error)
ElMessage.warning('加载设备参数失败,请检查网络连接')
}
}
@ -3362,7 +3383,7 @@ function viewClick(e){
}
.pop-up-camera-container{
width: 668px;
height:630px;
height:700px;
position: absolute;
top: 0;
right: 0;