liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	.env.development
This commit is contained in:
daiyongfei
2025-09-03 16:04:55 +08:00
parent df3da71c59 2da26d5f47
commit 4749cdce3c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/controlCenter/controlPanel/components/map.vue
View File

@ -11,7 +11,7 @@
<div class="device_item" v-for="(device, index) in effectiveDeviceList" :key="device.id"> <div class="device_item" v-for="(device, index) in effectiveDeviceList" :key="device.id">
<el-checkbox :value="device.id" :model-value="checkedDeviceIds.includes(device.id)" <el-checkbox :value="device.id" :model-value="checkedDeviceIds.includes(device.id)"
@update:model-value="(checked: boolean) => handleCheckboxChange(checked, device.id)" @update:model-value="(checked: boolean) => handleCheckboxChange(checked, device.id)"
class="device_checkbox" :hidden="isSingleDevice"></el-checkbox> class="device_checkbox" :hidden="isSingleDevice" :disabled="device.onlineStatus==0"></el-checkbox>
<div class="device_page"> <div class="device_page">
<div class="device_info"> <div class="device_info">
@ -101,7 +101,7 @@ const initMap = async () => {
// 创建地图实例（确保容器DOM已渲染） // 创建地图实例（确保容器DOM已渲染）
mapInstance = new AMap.Map(mapRef.value, { mapInstance = new AMap.Map(mapRef.value, {
center: getCenterCoord(), center: getCenterCoord(),
zoom: isSingleDevice.value ? 5 : 5, zoom: isSingleDevice.value ? 8 : 8,
resizeEnable: true resizeEnable: true
}); });

8
src/views/controlCenter/historyjectory/trackplayback.vue
View File

@ -216,10 +216,10 @@ const handlePlayPause = (group: any) => {
return isNaN(lng) || isNaN(lat) ? null : [lng, lat] as [number, number]; return isNaN(lng) || isNaN(lat) ? null : [lng, lat] as [number, number];
}).filter((point: any) => point !== null); // 过滤无效点 }).filter((point: any) => point !== null); // 过滤无效点
if (validTrackPoints.length < 2) { // if (validTrackPoints.length < 2) {
ElMessage.warning('有效轨迹点不足2个，无法播放'); // ElMessage.warning('有效轨迹点不足2个，无法播放');
return; // return;
} // }
// 3. 重置播放状态并赋值轨迹数据 // 3. 重置播放状态并赋值轨迹数据
resetPlayState(); resetPlayState();

4
src/views/equipmentAlarmRecord/index.vue
View File

@ -44,10 +44,10 @@
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker> :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="报警状态" prop="treatmentState"> <el-form-item label="处理状态" prop="treatmentState">
<el-select v-model="queryParams.treatmentState"> <el-select v-model="queryParams.treatmentState">
<el-option value="0" label="已处理"></el-option> <el-option value="0" label="已处理"></el-option>
<el-option value="1" label="未处理"></el-option> <el-option value="1" label="待处理"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>