diff --git a/.env.local b/.env.local index a3752946..c22b406f 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.74:48080' +VITE_BASE_URL='http://192.168.0.172:48080' # VITE_BASE_URL='http://192.168.0.189:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 diff --git a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue index c99936d2..16d96d21 100644 --- a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue +++ b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue @@ -229,10 +229,10 @@ const open = (item, list) => { console.log(item) form.value = item form.value.layersNumber = item.dataList.length || '' - form.value.deviceId = item.deviceId || item.dataObj.id || '' + form.value.deviceId = item?.deviceId || item?.dataObj?.id || '' form.value.positionMapId = props.positionMapId equipmentList.value = list - if (item.dataObj.deviceType) { + if (item?.dataObj?.deviceType) { deviceInfo.value.deviceType = item.dataObj.deviceType || '' getDeviceList() } else { diff --git a/src/views/mapPage/realTimeMap/components-tool/map-scale-tool.vue b/src/views/mapPage/realTimeMap/components-tool/map-scale-tool.vue index c2cc6eb6..e76b9242 100644 --- a/src/views/mapPage/realTimeMap/components-tool/map-scale-tool.vue +++ b/src/views/mapPage/realTimeMap/components-tool/map-scale-tool.vue @@ -2,7 +2,12 @@ - + + - - - -
- -
- - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +