diff --git a/package.json b/package.json index 2d40205..ed60945 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "leaflet-control-geocoder": "^2.4.0", "leaflet-draw": "^1.0.4", "leaflet-imageoverlay-rotated": "^0.2.1", + "leaflet-search": "^2.9.6", "mitt": "^3.0.0", "nprogress": "^0.2.0", "pinia": "^2.0.33", diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js index 4fde0b5..16fb445 100644 --- a/src/api/crawl/index.js +++ b/src/api/crawl/index.js @@ -1,4 +1,4 @@ -import request, { crawlModule, moduleName } from '/@/utils/request'; +import request, { crawlModule, moduleName,twitterModule } from '/@/utils/request'; export const geoserve = (vordm_id, link, disaster_id, name) => { return request({ @@ -24,6 +24,15 @@ export const news = (disaster_id, keywords, page, isBaidu, id) => { }, }); }; +export const twitter = (disaster_id, keys,stime,etime) => { + return request({ + url: '/api/' + twitterModule + 'socialmedia/twitter', + method: 'post', + data: { + disaster_id, keys,stime,etime + }, + }); +}; export const rs = (stime, etime, disaster_id, ranges, type = 1,id) => { let method = 'sentinel'; if (type == 1) { @@ -50,6 +59,22 @@ export const rs = (stime, etime, disaster_id, ranges, type = 1,id) => { data: data, }); }; +export const rs2 = (disaster_id ,arr,stime,etime) => { + let data = { + stime, + etime, + disaster_id, + arr + } + return request({ + url: '/api1/' + crawlModule + '/RS', + method: 'post', + data: data, + }); +}; + + + export const submit = (row) => { return request({ url: '/api/' + moduleName + '/ui/crawlInfo/submit', diff --git a/src/components/Map.vue b/src/components/Map.vue index 550c20f..7c9c422 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -49,13 +49,13 @@ onMounted(() => { featureLayerG_area = L.layerGroup().addTo(homeMap) featureLayerG_point = L.layerGroup().addTo(homeMap) - // 'http://t0.tianditu.com/img_c/wmts?layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=' - // const CIA_C = "http://t0.tianditu.com/cia_c/wmts?layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk="; - // const nameLayer = L.tileLayer(CIA_C + TK_KEY, { - // maxZoom: 20, - // tileSize: 256, - // zoomOffset: 1 - // }).addTo(homeMap); + 'http://t0.tianditu.com/img_c/wmts?layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk=' + const CIA_C = "http://t0.tianditu.com/cia_c/wmts?layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}&tk="; + const nameLayer = L.tileLayer(CIA_C + TK_KEY, { + maxZoom: 20, + tileSize: 256, + zoomOffset: 1 + }).addTo(homeMap); // 创建Geocoding控件 const geocoder = L.Control.geocoder({ diff --git a/src/utils/request.js b/src/utils/request.js index 30b981e..ec0f205 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,6 +5,7 @@ import { Session } from '/@/utils/storage'; export const moduleName = 'biz-vordm'; export const crawlModule = 'vordm-crawl'; +export const twitterModule = "vordm-twitter"; const service = axios.create({ //baseURL: import.meta.env.VITE_API_URL, timeout: 50000, diff --git a/src/views/dataService/multimediaData/component/boot.vue b/src/views/dataService/multimediaData/component/boot.vue index b94498c..556d682 100644 --- a/src/views/dataService/multimediaData/component/boot.vue +++ b/src/views/dataService/multimediaData/component/boot.vue @@ -43,8 +43,7 @@ - {{ - state.baiduOption.runTitle }} + {{state.baiduOption.runTitle }} @@ -73,7 +72,7 @@ + color="#131313" v-if="state.bingOption.buttonIs && state.bing.status == 1"> @@ -89,10 +88,68 @@ - {{ state.bingOption.runTitle - }} + {{ state.bingOption.runTitle}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ state.twitterOption.runTitle}} + + + + +