diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 091caa4..e6eb365 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -469,7 +469,7 @@ let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; - Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; + Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine; Getproperties.value.id = item.id; Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ''; diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 091caa4..e6eb365 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -469,7 +469,7 @@ let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; - Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; + Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine; Getproperties.value.id = item.id; Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ''; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue index 330184f..e392e78 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue @@ -126,7 +126,7 @@ listData.value = res.data; listData.value.map((e) => { let wellDepth = e.wellDepth || 2; - e.percentum = ((e.z / wellDepth) * 100).toFixed(2); + e.percentum = ((e.z / wellDepth) * 100).toFixed(2)<100?((e.z / wellDepth) * 100).toFixed(2):100; }); console.log("listData.value", listData.value); }