dyf/dyf-vue-ui
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6170控制面板添加解除报警逻辑

Browse Source
This commit is contained in:
fengerli
2025-10-09 11:40:21 +08:00
parent 2dca6e3ff8
commit 8e552df724
12 changed files with 140 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/equipmentManagement/devices/index.vue
View File

@ -12,7 +12,7 @@
<el-form-item label="设备MAC" prop="deviceMac">
<el-input v-model="queryParams.deviceMac" placeholder="请输入设备MAC" clearable />
</el-form-item>
<el-form-item label="请输入设备IMEI" prop="deviceImei">
<el-form-item label="设备IMEI" prop="deviceImei">
<el-input v-model="queryParams.deviceImei" placeholder="请输入设备IMEI" clearable />
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
@ -27,6 +27,13 @@
<el-option label="失效" value="0" />
</el-select>
</el-form-item>
<el-form-item label="在线状态" prop="onlineStatus">
<el-select v-model="queryParams.onlineStatus" placeholder="在线状态" style="margin-left: 10px">
<el-option label="在线" value="1" />
<el-option label="离线" value="0" />
<el-option label="故障" value="2" />
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
@ -88,7 +95,7 @@
<el-popover placement="right" trigger="click">
<template #reference>
<img v-if="scope.row.devicePic" :src="scope.row.devicePic"
style="width: 40px; height: 40px; cursor: pointer; object-fit: contain"
style="width: 50px; height: 50px; cursor: pointer; object-fit: contain"
class="hover:opacity-80 transition-opacity" />
<img v-else src="@/assets/index/IMG.png" alt="" style="width: 40px; height: 40px;">
</template>
@ -107,10 +114,10 @@
</el-tag>
</template>
</el-table-column>
<el-table-column prop="onlineStatus" label="设备状态">
<el-table-column prop="onlineStatus" label="设备状态">
<template #default="scope">
<el-tag :type="scope.row.onlineStatus === 1 ? 'success' : 'info'">
{{ scope.row.onlineStatus === 1 ? '在线' : '离线' }}
{{ scope.row.onlineStatus === 1 ? '在线' : (scope.row.onlineStatus === 2 ? '故障' : '离线') }}
</el-tag>
</template>
</el-table-column>
@ -451,7 +458,8 @@ const initData: PageData<deviceForm, deviceQuery> = {
deviceMac: '',
deviceImei: '',
deviceType: '',
deviceStatus: ''
deviceStatus: '',
onlineStatus:''
},
rules: {
deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
@ -711,17 +719,17 @@ const httpRequestImg = (parm): Promise<any> => {
return Promise.resolve();
};
const beforeUpload = (file) => {
const isLt2M = file.size / 1024 / 1024 < 2;
//const isLt2M = file.size / 1024 / 1024 < 2;
const isJPG = file.type === 'image/jpeg' || file.type === 'image/png';
if (!isJPG) {
ElMessage.warning('请上传jpg、png格式，大小不超过2M的照片');
ElMessage.warning('请上传jpg、png格式');
return false;
}
if (!isLt2M) {
ElMessage.warning('大小不超过2M的照片片');
return false;
}
return isJPG && isLt2M;
// if (!isLt2M) {
// ElMessage.warning('大小不超过2M的照片片');
// return false;
// }
return isJPG;
};
// 文件上传状态改变时触发
const fileUploadChange = (files, fileList) => {
@ -922,16 +930,16 @@ const handleImportSuccess = (response: any) => {
if (response.code == 200) {
console.log('导入成功了么');
importResult.value.isShow = true;
if (response.data) {
console.log(response.data,'response.data');
console.log(response.data, 'response.data');
importResult.value.succeed = response.data.successCount;
importResult.value.errorSun = response.data.failureCount;
importResult.value.total = importResult.value.succeed + importResult.value.errorSun;
importResult.value.link = response.data.errorExcelUrl;
}
if (importUpload.value) {
if (importUpload.value) {
importUpload.value.clearFiles();
}
getList(); // 初始化列表数据