diff --git a/public/static/libs/mapbox/extend/RainsLayer.js b/public/static/libs/mapbox/extend/RainsLayer.js index 158a271..e988422 100644 --- a/public/static/libs/mapbox/extend/RainsLayer.js +++ b/public/static/libs/mapbox/extend/RainsLayer.js @@ -125,14 +125,17 @@ // this.init(); } - async init(images = []) { + async init(images = [],callback) { this.images = images.length?images:this.images; this.imagesFiles = []; + this.index = 0; if (this.bbox.length && this.images.length) { Object.keys(this.scales).forEach(key => plotInit(key, this.scales[key])); if (!this.canvas) this.canvas = createCanvas(0); this.imagesFiles = await Promise.all(this.images.map(url => urlToFile(url, _.last(_.split(url, '/'))))); this.callback && this.callback(this); + callback && callback(this); + setRainImage(this.imagesFiles[this.index], this.canvas, '1', this); } } diff --git a/public/static/libs/mapbox/extend/RainsLayer.js b/public/static/libs/mapbox/extend/RainsLayer.js index 158a271..e988422 100644 --- a/public/static/libs/mapbox/extend/RainsLayer.js +++ b/public/static/libs/mapbox/extend/RainsLayer.js @@ -125,14 +125,17 @@ // this.init(); } - async init(images = []) { + async init(images = [],callback) { this.images = images.length?images:this.images; this.imagesFiles = []; + this.index = 0; if (this.bbox.length && this.images.length) { Object.keys(this.scales).forEach(key => plotInit(key, this.scales[key])); if (!this.canvas) this.canvas = createCanvas(0); this.imagesFiles = await Promise.all(this.images.map(url => urlToFile(url, _.last(_.split(url, '/'))))); this.callback && this.callback(this); + callback && callback(this); + setRainImage(this.imagesFiles[this.index], this.canvas, '1', this); } } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 8a0483c..95bc1e3 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -270,7 +270,7 @@ dataLoad.value=true let parms = { time: huiguActiveTime.value }; reviewApi.rainMapDataBack(parms).then((res) => { - + if (res.code == 200) { hoursList.value = res.data; hoursList.value.activeIndex = 0; @@ -397,8 +397,9 @@ }); }); } - newfiberMap.RainsLayer.show() - newfiberMap.RainsLayer.init([res.data.weatherwarningFileurl.fileUrl]) + + // newfiberMap.RainsLayer.init([ 'https://server1.wh-nf.cn:9000/newfiber-donghugaoxin/2024/11/27/2024-07-02-4%E5%B0%8F%E6%97%B6-4_20241127201053A060.tif']) + newfiberMap.RainsLayer.init([res.data.weatherwarningFileurl.fileUrl],(self)=> self.show()) dataLoad.value=false debugger console.log("shangtu", res.data);