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

Merge branch 'liubiao-main'

Browse Source
This commit is contained in:
fengerli
2026-03-10 18:04:12 +08:00
parent 1c9c5ab639 ee50e38292
commit 9ddb412b7a
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -7,7 +7,7 @@ VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
# VITE_APP_BASE_API = 'http://139.224.253.23:8000' # VITE_APP_BASE_API = 'http://139.224.253.23:8000'
VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq' VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
#VITE_APP_BASE_API = 'http://192.168.110.57:8000' # VITE_APP_BASE_API = 'http://192.168.110.57:8000'
#代永飞接口 #代永飞接口
# VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' # VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'

2
src/views/controlCenter/controlPanel/index.vue
View File

@ -37,7 +37,7 @@
<el-collapse-item name="1"> <el-collapse-item name="1">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" class="queryFormRef"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="queryFormRef">
<el-form-item label="设备类型" prop="deviceType"> <el-form-item label="设备类型" prop="deviceType">
<el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable> <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
<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.deviceTypeId" /> :value="item.deviceTypeId" />
</el-select> </el-select>

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

@ -227,7 +227,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="设备类型" prop="deviceType"> <el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)" <el-select v-model="form.deviceType" placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)"
> clearable filterable>
<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>
@ -622,6 +622,7 @@ const handleAdd = async () => {
}; };
/** 修改按钮操作 */ /** 修改按钮操作 */
const handleUpdate = async (row?: deviceForm) => { const handleUpdate = async (row?: deviceForm) => {
debugger;
reset(); reset();
dialog.visible = true; dialog.visible = true;
dialog.title = '修改设备'; dialog.title = '修改设备';
@ -663,29 +664,29 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
showImeiField.value = false; showImeiField.value = false;
communicationModeInfo.value = null; communicationModeInfo.value = null;
// 编辑时如果有值，根据已有值确定显示哪个字段 // 编辑时如果有值，根据已有值确定显示哪个字段
if (form.value.id) { // if (form.value.id) {
console.log('zheshi me1 '); // console.log('zheshi me1 ');
// 1. 先判断：Mac 和 Imei 都有值（新增的关键分支） // // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== ''; // const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== ''; // const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
if (hasMac && hasImei) { // if (hasMac && hasImei) {
//两个都有值：显示两个字段 + 都加校验 // //两个都有值：显示两个字段 + 都加校验
showMacField.value = true; // showMacField.value = true;
showImeiField.value = true; // showImeiField.value = true;
console.log('两个字段都有值'); // console.log('两个字段都有值');
} else if (hasMac) { // } else if (hasMac) {
showMacField.value = true; // showMacField.value = true;
showImeiField.value = false; // showImeiField.value = false;
rules.value.deviceImei = []; // rules.value.deviceImei = [];
console.log('只有 Mac 有值'); // console.log('只有 Mac 有值');
} else if (hasImei) { // } else if (hasImei) {
showImeiField.value = true; // showImeiField.value = true;
showMacField.value = false; // showMacField.value = false;
rules.value.deviceMac = []; // rules.value.deviceMac = [];
console.log('只有 Imei 有值'); // console.log('只有 Imei 有值');
} // }
return; // return;
} // }
if (isProcessing) return; if (isProcessing) return;
isProcessing = true; isProcessing = true;
// 新增或编辑时没有值，根据设备类型获取通讯方式 // 新增或编辑时没有值，根据设备类型获取通讯方式