diff --git a/src/components/custom-navigation-bar/index.vue b/src/components/custom-navigation-bar/index.vue index bcb3038..6e9a0ab 100644 --- a/src/components/custom-navigation-bar/index.vue +++ b/src/components/custom-navigation-bar/index.vue @@ -47,14 +47,14 @@ const accountType = computed(() => { // 判断当前选中的是否是登录账号 if (currentUserId === originalUserId) { - // 如果是登录账号,检查是否有父账号 - // parentList 包含登录账号本身,如果长度>1说明有其他可切换账号(父账号) + // 如果是登录账号,检查是否有主账号 + // parentList 包含登录账号本身,如果长度>1说明有其他可切换账号(主账号) const hasParent = parentList.value.length > 1 && parentList.value.some(item => item.userId !== originalUserId); return hasParent ? "(子账号)" : "(主账号)"; } else { - // 如果选中的是其他账号,那一定是父账号 - return "(父账号)"; + // 如果选中的是其他账号,那一定是主账号 + return "(主账号)"; } }); //然后计算出navBarHeight diff --git a/src/my/addController.vue b/src/my/addController.vue index 4cd5e6d..6bd5dee 100644 --- a/src/my/addController.vue +++ b/src/my/addController.vue @@ -544,17 +544,18 @@ function next() { state.msg = "请选择放置的设备"; return; } + console.log('pondId原始值:', params.pondId[0], '类型:', typeof params.pondId[0]); // 发起添加设备请求 const data = { serialNum: params.devNum, - pondId: params.pondId[0], + pondId: String(params.pondId[0]), // 转为字符串保持精度 salinityCompensation: waterType.value == 1 ? 0 : Number(salt.value), oxyWarnLower: Number(alarm.value), inputVoltage: Number(inputVoltage.value), listPutPondPartId: listPutPondPartId.value, isOxygenUsed:isHave.value==1?true:false }; - console.log('添加设备数据', data); + console.log('添加设备数据', data, 'pondId类型:', typeof data.pondId); addDeviceController(data).then((res) => { if (res.code == 200) { Taro.redirectTo({ diff --git a/src/my/addDevice.vue b/src/my/addDevice.vue index 9df27a6..8ffc503 100644 --- a/src/my/addDevice.vue +++ b/src/my/addDevice.vue @@ -108,7 +108,9 @@ const isLoading = ref(false) /**---------------method start-------------------- */ Taro.useDidShow(() => { 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 = "请输入设备号"; return; } + + // 传参前再次确保 pondId 为字符串 + const paramsToSend = { + ...params, + pondId: params.pondId.map(id => String(id)) + }; + console.log('准备传递的参数:', paramsToSend); + if (params.devType == 1) { isLoading.value = false Taro.navigateTo({ - url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=" + page, + url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page, }); } else { isLoading.value = false Taro.navigateTo({ url: - "/my/addController?params=" + JSON.stringify(params) + "&page=" + page, + "/my/addController?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page, }); } } diff --git a/src/my/deviceList.vue b/src/my/deviceList.vue index ac8ca7a..af45b1d 100644 --- a/src/my/deviceList.vue +++ b/src/my/deviceList.vue @@ -359,14 +359,22 @@ function submit() { state.msg = "请输入设备号"; return; } + + // 传参前确保 pondId 为字符串 + const paramsToSend = { + ...params, + pondId: params.pondId.map(id => String(id)) + }; + console.log('deviceList 准备传递的参数:', paramsToSend); + if (params.devType == 1) { Taro.navigateTo({ - url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=" + page, + url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=" + page, }); } else { Taro.navigateTo({ 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; if (pondId) { 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); } } }); diff --git a/src/pages/main/home.vue b/src/pages/main/home.vue index d9ac1a2..94aaf72 100644 --- a/src/pages/main/home.vue +++ b/src/pages/main/home.vue @@ -979,7 +979,9 @@ function pond1() { // 塘口模式2 function pond2() { 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; showTour.value = false; + + // 传参前确保 pondId 为字符串 + const paramsToSend = { + ...params, + pondId: params.pondId.map(id => String(id)) + }; + console.log('home 准备传递的参数:', paramsToSend); + if (params.devType == 1) { Taro.navigateTo({ - url: "/my/addDetector?params=" + JSON.stringify(params) + "&page=home", + url: "/my/addDetector?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=home", }); } else { Taro.navigateTo({ - url: "/my/addController?params=" + JSON.stringify(params) + "&page=home", + url: "/my/addController?params=" + encodeURIComponent(JSON.stringify(paramsToSend)) + "&page=home", }); } }