From 44bbe4036fab551645d45eca9aa3836a6f9ba0ae Mon Sep 17 00:00:00 2001 From: glj Date: Wed, 26 Apr 2023 14:19:41 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/crawl/index.js | 22 + src/utils/request.js | 1 + src/views/dataService/otherData/index.vue | 538 ++++++++++++--------- src/views/dataService/visualData/index.vue | 26 +- 4 files changed, 360 insertions(+), 227 deletions(-) diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js index 4347860..effd42e 100644 --- a/src/api/crawl/index.js +++ b/src/api/crawl/index.js @@ -71,3 +71,25 @@ export const getList = (current, size, param) => { params: params, }); }; + +//geoserver发布基础地理数据 +export const pushing = (data) => { + return request({ + url: '/api/' + crawlModule + '/geoserve/pushing', + method: 'post', + data: data + }); +}; + +//wordcloud服务 +export const landsat = (disaster_id,number,id) => { + return request({ + url: '/api/' + crawlModule + '/rs/landsat', + method: 'get', + params:{ + disaster_id, + number, + id + } + }); +}; \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 16cc0da..6a1826d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,6 +5,7 @@ import { Session } from '/@/utils/storage'; // export const moduleName = 'zqq-biz-vordm'; export const moduleName = 'biz-vordm'; +export const crawlModule = 'vordm-crawl'; const service = axios.create({ //baseURL: import.meta.env.VITE_API_URL, timeout: 50000, diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue index a2069dc..c4a9229 100644 --- a/src/views/dataService/otherData/index.vue +++ b/src/views/dataService/otherData/index.vue @@ -1,280 +1,368 @@ - - diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue index eafd692..e87802f 100644 --- a/src/views/dataService/visualData/index.vue +++ b/src/views/dataService/visualData/index.vue @@ -18,7 +18,10 @@ search --> - + + Generate + + @@ -32,7 +35,7 @@ - + @@ -53,7 +56,7 @@ :total="state.tableData.total"> - + @@ -105,6 +108,8 @@ const editWordCloudsRef = ref(); import { defineAsyncComponent, reactive, onMounted, ref } from 'vue'; import { ElMessageBox, ElMessage } from 'element-plus'; import disasterTable from "/@/components/table/DisasterTable.vue"; +import { ta } from 'element-plus/es/locale'; +import { landsat } from '/@/api/crawl/index.js' // 引入组件 const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialog.vue')); const auditRef = ref(); @@ -112,6 +117,7 @@ const uploadRef = ref(); // 定义变量内容 const roleDialogRef = ref(); const state = reactive({ + nameNew:false, multipleWord: [], multipleHotspot: [], tabVal: 'first', @@ -145,7 +151,13 @@ const handleSelectionChange = (val) => { const handleSelectionHotspotChange = (val) => { state.multipleHotspot = val } + const handleClick = (tab) => { + if (tab=="second") { + state.nameNew = true; + }else{ + state.nameNew = false; + } state.tabVal = tab; state.tableData = { data: [], @@ -236,6 +248,14 @@ const uploadData = () => { } state.tabVal == 'first' ? wordCloudsRef.value.openDialog(state.disasterId) : hotspotRef.value.openDialog(state.disasterId); }; +//获取图文信息 +const generateData =()=>{ + landsat(state.disasterId,10,).then(da=>{ + console.log(da); + + }) +} + // 打开修改热点弹窗 const editHotspot = (row) => { editHotspotRef.value.openDialog(row);