删除有关所属客户字段

This commit is contained in:
fengerli
2025-12-09 11:47:32 +08:00
parent 30079ec854
commit eb8e4e1c69
4 changed files with 37 additions and 29 deletions

View File

@ -6,6 +6,7 @@ export interface deviceQuery extends PageQuery {
deviceStatus: string; deviceStatus: string;
bluetoothName?: string; // 蓝牙名称查询字段 bluetoothName?: string; // 蓝牙名称查询字段
onlineStatus?: string; onlineStatus?: string;
bindingStatus?:string
} }
export interface deviceForm { export interface deviceForm {
@ -38,6 +39,7 @@ export interface deviceVO {
customerId?: string | number; customerId?: string | number;
typeName?: string; typeName?: string;
bluetoothName?: string; // 蓝牙名称字段 bluetoothName?: string; // 蓝牙名称字段
} }
export interface deviceTypeOption { export interface deviceTypeOption {

View File

@ -15,25 +15,31 @@
<el-form-item label="设备IMEI" prop="deviceImei"> <el-form-item label="设备IMEI" prop="deviceImei">
<el-input v-model="queryParams.deviceImei" placeholder="请输入设备IMEI" clearable /> <el-input v-model="queryParams.deviceImei" placeholder="请输入设备IMEI" clearable />
</el-form-item> </el-form-item>
<el-form-item label="设备类型" prop="deviceType"> <el-form-item label="设备类型" prop="deviceType" >
<el-select v-model="queryParams.deviceType" placeholder="设备类型"> <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable>
<el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName" <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="deviceStatus" v-hasPermi="['equipment:devices:allocate']"> <el-form-item label="设备状态" prop="deviceStatus" v-hasPermi="['equipment:devices:allocate']">
<el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px"> <el-select v-model="queryParams.deviceStatus" placeholder="设备状态" clearable>
<el-option label="正常" value="1" /> <el-option label="正常" value="1" />
<el-option label="失效" value="0" /> <el-option label="失效" value="0" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="在线状态" prop="onlineStatus"> <el-form-item label="在线状态" prop="onlineStatus">
<el-select v-model="queryParams.onlineStatus" placeholder="在线状态" style="margin-left: 10px"> <el-select v-model="queryParams.onlineStatus" placeholder="在线状态" clearable>
<el-option label="在线" value="1" /> <el-option label="在线" value="1" />
<el-option label="离线" value="0" /> <el-option label="离线" value="0" />
<el-option label="故障" value="2" /> <el-option label="故障" value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="绑定状态" prop="bindingStatus">
<el-select v-model="queryParams.bindingStatus" placeholder="绑定状态" clearable>
<el-option label="已绑定" value="1" />
<el-option label="未绑定" value="0" />
</el-select>
</el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
@ -459,7 +465,8 @@ const initData: PageData<deviceForm, deviceQuery> = {
deviceImei: '', deviceImei: '',
deviceType: '', deviceType: '',
deviceStatus: '', deviceStatus: '',
onlineStatus:'' onlineStatus: '',
bindingStatus:''
}, },
rules: { rules: {
deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }], deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
@ -909,7 +916,7 @@ const handleBatchImport = () => {
const downloadTemplate = () => { const downloadTemplate = () => {
// 这里可用 window.open 或 a 标签下载模板 // 这里可用 window.open 或 a 标签下载模板
const link = document.createElement('a'); const link = document.createElement('a');
link.href = 'https://fuyuanshen.com/fys/Equipmentimporttemplate/EquipmentImportTemplate.xlsx'; link.href = 'https://www.cnxhyc.com/jquan/Equipmentimporttemplate/EquipmentImportTemplate.xlsx';
link.download = '设备数据导入模板.xlsx'; // 可选:指定下载文件名 link.download = '设备数据导入模板.xlsx'; // 可选:指定下载文件名
link.style.display = 'none'; // 隐藏标签 link.style.display = 'none'; // 隐藏标签
document.body.appendChild(link); document.body.appendChild(link);
@ -917,11 +924,11 @@ const downloadTemplate = () => {
document.body.removeChild(link); // 移除标签 document.body.removeChild(link); // 移除标签
}; };
const beforeImportUpload = (file: any) => { const beforeImportUpload = (file: any) => {
const isLt5M = file.size / 1024 / 1024 < 5; // const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) { // if (!isLt5M) {
proxy?.$modal.msgError('上传文件大小不能超过 5MB!'); // proxy?.$modal.msgError('上传文件大小不能超过 5MB!');
} // }
return isLt5M; // return isLt5M;
}; };
//添加tokenf方法head_upload 直接返回 getBearerToken() //添加tokenf方法head_upload 直接返回 getBearerToken()
@ -930,10 +937,8 @@ const handleImportSuccess = (response: any) => {
if (response.code == 200) { if (response.code == 200) {
console.log('导入成功了么'); console.log('导入成功了么');
importResult.value.isShow = true; importResult.value.isShow = true;
if (response.data) { if (response.data) {
console.log(response.data, 'response.data'); console.log(response.data, 'response.data');
importResult.value.succeed = response.data.successCount; importResult.value.succeed = response.data.successCount;
importResult.value.errorSun = response.data.failureCount; importResult.value.errorSun = response.data.failureCount;
importResult.value.total = importResult.value.succeed + importResult.value.errorSun; importResult.value.total = importResult.value.succeed + importResult.value.errorSun;
@ -944,6 +949,9 @@ const handleImportSuccess = (response: any) => {
} }
getList(); // 初始化列表数据 getList(); // 初始化列表数据
} else { } else {
if (importUpload.value) {
importUpload.value.clearFiles();
}
proxy?.$modal.msgError(response.msg); proxy?.$modal.msgError(response.msg);
} }
}; };
@ -967,9 +975,7 @@ const handleBatchAssignConfirm = () => {
customerId: batchAssignCustomerId.value, // 目标客户ID customerId: batchAssignCustomerId.value, // 目标客户ID
deviceIds: selectedIds // 选中的设备ID数组 deviceIds: selectedIds // 选中的设备ID数组
}; };
api api.deviceAssignCustomer(data).then((res) => {
.deviceAssignCustomer(data)
.then((res) => {
if (res.code == 200) { if (res.code == 200) {
batchAssignDialogVisible.value = false; batchAssignDialogVisible.value = false;
getList(); getList();

View File

@ -161,7 +161,7 @@
</el-dialog> </el-dialog>
<!-- 选择设备的穿梭框 --> <!-- 选择设备的穿梭框 -->
<el-dialog v-model="Status.dialogDeviceVisible" title="选择设备" width="800" :draggable="true"> <el-dialog v-model="Status.dialogDeviceVisible" title="选择设备" width="630" :draggable="true">
<el-transfer :titles="['所有设备', '已选择设备']" v-model="transfer.value" :data="transfer.data" :filterable="true" /> <el-transfer :titles="['所有设备', '已选择设备']" v-model="transfer.value" :data="transfer.data" :filterable="true" />
<div class="center" style="margin-top: 10px"> <div class="center" style="margin-top: 10px">