fix: 测试问题修复,新增塘口添加设备失败。

This commit is contained in:
tianyongbao
2026-01-21 14:41:20 +08:00
parent 978ba766b3
commit c47806f840
5 changed files with 46 additions and 15 deletions

View File

@@ -47,14 +47,14 @@ const accountType = computed(() => {
// 判断当前选中的是否是登录账号 // 判断当前选中的是否是登录账号
if (currentUserId === originalUserId) { if (currentUserId === originalUserId) {
// 如果是登录账号,检查是否有账号 // 如果是登录账号,检查是否有账号
// parentList 包含登录账号本身,如果长度>1说明有其他可切换账号账号) // parentList 包含登录账号本身,如果长度>1说明有其他可切换账号账号)
const hasParent = parentList.value.length > 1 && const hasParent = parentList.value.length > 1 &&
parentList.value.some(item => item.userId !== originalUserId); parentList.value.some(item => item.userId !== originalUserId);
return hasParent ? "(子账号)" : "(主账号)"; return hasParent ? "(子账号)" : "(主账号)";
} else { } else {
// 如果选中的是其他账号,那一定是账号 // 如果选中的是其他账号,那一定是账号
return "账号)"; return "账号)";
} }
}); });
//然后计算出navBarHeight //然后计算出navBarHeight

View File

@@ -544,17 +544,18 @@ function next() {
state.msg = "请选择放置的设备"; state.msg = "请选择放置的设备";
return; return;
} }
console.log('pondId原始值:', params.pondId[0], '类型:', typeof params.pondId[0]);
// 发起添加设备请求 // 发起添加设备请求
const data = { const data = {
serialNum: params.devNum, serialNum: params.devNum,
pondId: params.pondId[0], pondId: String(params.pondId[0]), // 转为字符串保持精度
salinityCompensation: waterType.value == 1 ? 0 : Number(salt.value), salinityCompensation: waterType.value == 1 ? 0 : Number(salt.value),
oxyWarnLower: Number(alarm.value), oxyWarnLower: Number(alarm.value),
inputVoltage: Number(inputVoltage.value), inputVoltage: Number(inputVoltage.value),
listPutPondPartId: listPutPondPartId.value, listPutPondPartId: listPutPondPartId.value,
isOxygenUsed:isHave.value==1?true:false isOxygenUsed:isHave.value==1?true:false
}; };
console.log('添加设备数据', data); console.log('添加设备数据', data, 'pondId类型:', typeof data.pondId);
addDeviceController(data).then((res) => { addDeviceController(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
Taro.redirectTo({ Taro.redirectTo({

View File

@@ -108,7 +108,9 @@ const isLoading = ref(false)
/**---------------method start-------------------- */ /**---------------method start-------------------- */
Taro.useDidShow(() => { Taro.useDidShow(() => {
if (pondId) { if (pondId) {
params.pondId = [pondId]; // 将 pondId 转为字符串保持精度
params.pondId = [String(pondId)];
console.log('addDevice 接收到的 pondId:', pondId, '转换后:', params.pondId);
} }
}); });
// 进入不同设备添加页面 // 进入不同设备添加页面
@@ -123,16 +125,24 @@ function submit() {
state.msg = "请输入设备号"; state.msg = "请输入设备号";
return; return;
} }
// 传参前再次确保 pondId 为字符串
const paramsToSend = {
...params,
pondId: params.pondId.map(id => String(id))
};
console.log('准备传递的参数:', paramsToSend);
if (params.devType == 1) { if (params.devType == 1) {
isLoading.value = false isLoading.value = false
Taro.navigateTo({ Taro.navigateTo({
url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=" + page, url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page,
}); });
} else { } else {
isLoading.value = false isLoading.value = false
Taro.navigateTo({ Taro.navigateTo({
url: url:
"/my/addController?params=" + JSON.stringify(params) + "&page=" + page, "/my/addController?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page,
}); });
} }
} }

View File

@@ -359,14 +359,22 @@ function submit() {
state.msg = "请输入设备号"; state.msg = "请输入设备号";
return; return;
} }
// 传参前确保 pondId 为字符串
const paramsToSend = {
...params,
pondId: params.pondId.map(id => String(id))
};
console.log('deviceList 准备传递的参数:', paramsToSend);
if (params.devType == 1) { if (params.devType == 1) {
Taro.navigateTo({ Taro.navigateTo({
url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=" + page, url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page,
}); });
} else { } else {
Taro.navigateTo({ Taro.navigateTo({
url: url:
"/my/addController?params=" + JSON.stringify(params) + "&page=" + page, "/my/addController?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page,
}); });
} }
} }
@@ -377,7 +385,9 @@ function getPondList() {
pondList.value = res.data; pondList.value = res.data;
if (pondId) { if (pondId) {
params.pondName = res.data.find((r) => r.id == pondId)?.["pondName"]; params.pondName = res.data.find((r) => r.id == pondId)?.["pondName"];
params.pondId = [pondId]; // 将 pondId 转为字符串保持精度
params.pondId = [String(pondId)];
console.log('deviceList 接收到的 pondId:', pondId, '转换后:', params.pondId);
} }
} }
}); });

View File

@@ -979,7 +979,9 @@ function pond1() {
// 塘口模式2 // 塘口模式2
function pond2() { function pond2() {
if (selPond.value) { if (selPond.value) {
params.pondId = [Number(selPond.value)]; // 保持字符串格式避免精度丢失
params.pondId = [String(selPond.value)];
console.log('pond2 设置 pondId:', params.pondId);
} }
} }
// 新建塘口 // 新建塘口
@@ -1182,13 +1184,21 @@ function submit() {
} }
alertShow.value = false; alertShow.value = false;
showTour.value = false; showTour.value = false;
// 传参前确保 pondId 为字符串
const paramsToSend = {
...params,
pondId: params.pondId.map(id => String(id))
};
console.log('home 准备传递的参数:', paramsToSend);
if (params.devType == 1) { if (params.devType == 1) {
Taro.navigateTo({ Taro.navigateTo({
url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=home", url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=home",
}); });
} else { } else {
Taro.navigateTo({ Taro.navigateTo({
url: "/my/addController?params=" + JSON.stringify(params) + "&page=home", url: "/my/addController?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=home",
}); });
} }
} }