Compare commits

..

3 Commits

2 changed files with 20 additions and 10 deletions

View File

@ -116,7 +116,7 @@
<el-tooltip v-if="scope.row.id !== 1 && scope.row.deviceStatus == 1" content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip v-if="!scope.row.customerName && scope.row.deviceStatus == 1" content="删除" placement="top">
<el-tooltip v-if="!scope.row.customerName" content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.deviceStatus == 1 && !scope.row.customerName" content="分配" placement="top">
@ -164,21 +164,21 @@
</el-row>
<el-row v-if="showMacField">
<el-col :span="24">
<el-form-item label="设备MAC" prop="deviceMac">
<el-form-item label="设备MAC" prop="deviceMac" required>
<el-input v-model="form.deviceMac" placeholder="请输入设备MAC" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="showMacField">
<el-col :span="24">
<el-form-item label="蓝牙名称" prop="bluetoothName">
<el-form-item label="蓝牙名称" prop="bluetoothName" required>
<el-input v-model="form.bluetoothName" placeholder="请输入蓝牙名称" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="showImeiField">
<el-col :span="24">
<el-form-item label="设备IMEI" prop="deviceImei">
<el-form-item label="设备IMEI" prop="deviceImei" required>
<el-input v-model="form.deviceImei" placeholder="请输入设备IMEI" />
</el-form-item>
</el-col>
@ -275,9 +275,9 @@
</template>
</el-dialog>
<!-- IMEI 二维码弹窗 -->
<el-dialog v-model="qrCodeDialogVisible" title="设备IMEI二维码" width="420px" append-to-body>
<el-dialog v-model="qrCodeDialogVisible" title="设备IMEI二维码" width="20%" append-to-body>
<div style="text-align: center;">
<QRCodeVue3 :value="qrCodeValue" :size="200" />
<QRCodeVue3 :value="qrCodeValue" :size="100" />
<p style="margin-top: 10px;">{{ qrCodeValue }}</p>
</div>
<template #footer>
@ -358,6 +358,16 @@ const initData: PageData<deviceForm, deviceQuery> = {
deviceType: [
{ required: true, message: '请选择设备类型', trigger: 'blur' },
],
bluetoothName: [
{ required: true, message: '请输入蓝牙名称', trigger: 'blur' },
],
deviceMac: [
{ required: true, message: '请输入设备MAC', trigger: 'blur' },
],
deviceImei: [
{ required: true, message: '请输入设备IMEI', trigger: 'blur' },
],
}
};
const data = reactive<PageData<deviceForm, deviceQuery>>(initData);
@ -533,7 +543,6 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
showMacField.value = false;
showImeiField.value = false;
communicationModeInfo.value = null;
// 编辑时如果有值,根据已有值确定显示哪个字段
if (form.value.id) {
if (form.value.deviceMac) {
@ -549,7 +558,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
isProcessing = true;
// 新增或编辑时没有值,根据设备类型获取通讯方式
try {
userFormRef.value?.clearValidate(['deviceMac', 'deviceImei']);
userFormRef.value?.clearValidate(['deviceMac', 'deviceImei','bluetoothName']);
if (!deviceTypeId) {
return;
}
@ -565,6 +574,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
showMacField.value = false;
showImeiField.value = true;
form.value.deviceMac = ''; // 清空MAC
form.value.bluetoothName = '' // 清空蓝牙名称
}
}
} catch (error) {

View File

@ -55,9 +55,9 @@
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd />
</el-tab-pane>
<el-tab-pane label="第三方应用" name="thirdParty">
<!-- <el-tab-pane label="第三方应用" name="thirdParty">
<thirdParty :auths="state.auths" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="在线设备" name="onlineDevice">
<onlineDevice :devices="state.devices" />
</el-tab-pane>