diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index e1c864f..57453d4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,7 +487,7 @@ 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.id = item.id || item.relationId; //item.relationId监测告警的普通id + Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = @@ -532,7 +532,7 @@ Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber; - Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id + Getproperties.value.id =item.relationId || item.id; //item.relationId监测告警的普通id Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index e1c864f..57453d4 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -487,7 +487,7 @@ 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.id = item.id || item.relationId; //item.relationId监测告警的普通id + Getproperties.value.id = item.relationId||item.id; //item.relationId监测告警的普通id Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = @@ -532,7 +532,7 @@ Getproperties.value.dataCode = item.dataCode; Getproperties.value.wellcode = item.wellCode || item.dataName || item.startPointNumber; - Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id + Getproperties.value.id =item.relationId || item.id; //item.relationId监测告警的普通id Getproperties.value.dataId = item.dataId || ""; Getproperties.value.stType = item.stType; Getproperties.value.geometry = diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index ddfbea9..f5a6749 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -303,6 +303,7 @@ self.hide(); dataLoad.value=false; console.log('8888888888888888',dataLoad.value); + newfiberMap.map.easeTo(newfiberMap.config_.params.init) } )); newfiberMap.RainsLayer.init(rainPicture.value);