From 4611558cffd6e77f47fff5594ce4228dbd72a1a0 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 25 Apr 2023 17:29:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 46 ++-- src/api/crawl/index.js | 19 +- src/utils/request.js | 2 +- .../components/searchCondition.vue | 217 ++++++++++-------- .../responseManagement/userResponse/index.vue | 10 +- 5 files changed, 156 insertions(+), 138 deletions(-) diff --git a/package-lock.json b/package-lock.json index bff5248..e30a322 100644 --- a/package-lock.json +++ b/package-lock.json @@ -342,11 +342,6 @@ "fastq": "^1.6.0" } }, - "@popperjs/core": { - "version": "npm:@sxzz/popperjs-es@2.11.7", - "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", - "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" - }, "@rollup/pluginutils": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", @@ -2005,7 +2000,7 @@ }, "clone": { "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==" }, "color-convert": { @@ -2202,7 +2197,7 @@ }, "deep-equal": { "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "requires": { "is-arguments": "^1.0.4", @@ -2215,7 +2210,7 @@ "dependencies": { "object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" } } @@ -2228,7 +2223,7 @@ }, "define-properties": { "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", "requires": { "has-property-descriptors": "^1.0.0", @@ -2237,7 +2232,7 @@ "dependencies": { "object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" } } @@ -2331,6 +2326,13 @@ "lodash-unified": "^1.0.2", "memoize-one": "^6.0.0", "normalize-wheel-es": "^1.2.0" + }, + "dependencies": { + "@popperjs/core": { + "version": "npm:@sxzz/popperjs-es@2.11.7", + "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", + "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" + } } }, "esbuild": { @@ -2538,12 +2540,12 @@ }, "eventemitter3": { "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" }, "extend": { "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "falafel": { @@ -2575,7 +2577,7 @@ }, "fast-diff": { "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" }, "fast-json-stable-stringify": { @@ -2688,7 +2690,7 @@ }, "functions-have-names": { "version": "1.2.3", - "resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" }, "geojson-equality": { @@ -2796,7 +2798,7 @@ }, "has-property-descriptors": { "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "requires": { "get-intrinsic": "^1.1.1" @@ -2809,7 +2811,7 @@ }, "has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "requires": { "has-symbols": "^1.0.2" @@ -2865,7 +2867,7 @@ }, "is-arguments": { "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "requires": { "call-bind": "^1.0.2", @@ -2891,7 +2893,7 @@ }, "is-date-object": { "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.0.5.tgz", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "requires": { "has-tostringtag": "^1.0.0" @@ -2935,7 +2937,7 @@ }, "is-regex": { "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "requires": { "call-bind": "^1.0.2", @@ -3176,7 +3178,7 @@ }, "object-is": { "version": "1.1.5", - "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "requires": { "call-bind": "^1.0.2", @@ -3247,7 +3249,7 @@ }, "parchment": { "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" }, "parent-module": { @@ -3394,7 +3396,7 @@ }, "quill": { "version": "1.3.7", - "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", "requires": { "clone": "^2.1.1", diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js index 08df2f7..a341df3 100644 --- a/src/api/crawl/index.js +++ b/src/api/crawl/index.js @@ -24,7 +24,7 @@ export const news = (disaster_id, keywords, page, isBaidu, id) => { }, }); }; -export const rs = (stime, etime, disaster_id, ranges, type = 1) => { +export const rs = (stime, etime, disaster_id, ranges, type = 1,id) => { let method = 'sentinel'; if (type == 1) { method = 'sentinel'; @@ -33,15 +33,22 @@ export const rs = (stime, etime, disaster_id, ranges, type = 1) => { } else { method = 'searchone'; } - + let data = { + stime, + etime, + disaster_id, + id, + } + if(type != 1 && type != 2){ + data['geo'] = ranges + }else{ + data['ranges']=ranges + } return request({ url: '/api/' + crawlModule + '/rs/' + method, method: 'post', data: { - stime, - etime, - disaster_id, - ranges, + }, }); }; diff --git a/src/utils/request.js b/src/utils/request.js index 1e18ec7..432d50e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,7 +4,7 @@ import qs from 'qs'; import { Session } from '/@/utils/storage'; // export const moduleName = 'zqq-biz-vordm'; -export const moduleName = 'biz-vordm'; +export const moduleName = 'yyhouc-biz-vordm'; export const crawlModule = "vordm-crawl"; // 配置新建一个 axios 实例 const service = axios.create({ diff --git a/src/views/dataService/remoteSensingData/components/searchCondition.vue b/src/views/dataService/remoteSensingData/components/searchCondition.vue index 406ad6e..74182d0 100644 --- a/src/views/dataService/remoteSensingData/components/searchCondition.vue +++ b/src/views/dataService/remoteSensingData/components/searchCondition.vue @@ -134,6 +134,7 @@ import Map from "/@/components/Map.vue"; import { ref, reactive, watch } from 'vue'; import { rs, submit } from '/@/api/crawl/index'; import { useUserInfo } from '/@/stores/userInfo'; +import { ElMessage } from "element-plus"; const userInfo = useUserInfo(); // 初始化数据 @@ -184,82 +185,82 @@ const state = reactive({ // } // ] }, - { - value: '国产系列卫星', - label: '国产系列卫星', - children: [ - { - value: 'GF - 1', - label: 'GF - 1', - }, - { - value: 'GF - 2', - label: 'GF - 2', - }, - { - value: 'GF - 3', - label: 'GF - 3', - }, - { - value: 'GF - 4', - label: 'GF - 4', - }, - { - value: 'GF - 6', - label: 'GF - 6', - }, - { - value: 'ZY - 3', - label: 'ZY - 3', - }, - { - value: 'ZY - 302', - label: 'ZY - 302', - }, - { - value: 'ZY - 02C', - label: 'ZY - 02C', - }, - ], - }, - { - value: '欧比特珠海一号系列卫星', - label: '欧比特珠海一号系列卫星', - children: [ - { - value: 'OVS - 2A', - label: 'OVS - 2A', - }, - { - value: 'OVS - 3A', - label: 'OVS - 3A', - }, - { - value: 'OVS - 1A', - label: 'OVS - 1A', - }, - { - value: 'OVS - 1B', - label: 'OVS - 1B', - }, - { - value: 'OHS - 2A', - label: 'OHS - 2A', - }, - { - value: 'OHS - 2B', - label: 'OHS - 2B', - }, - { - value: 'OHS - 2C', - label: 'OHS - 2C', - }, - { - value: 'OHS - 2D', - label: 'OHS - 2D', - }, - ], - } + // { + // value: '国产系列卫星', + // label: '国产系列卫星', + // children: [ + // { + // value: 'GF - 1', + // label: 'GF - 1', + // }, + // { + // value: 'GF - 2', + // label: 'GF - 2', + // }, + // { + // value: 'GF - 3', + // label: 'GF - 3', + // }, + // { + // value: 'GF - 4', + // label: 'GF - 4', + // }, + // { + // value: 'GF - 6', + // label: 'GF - 6', + // }, + // { + // value: 'ZY - 3', + // label: 'ZY - 3', + // }, + // { + // value: 'ZY - 302', + // label: 'ZY - 302', + // }, + // { + // value: 'ZY - 02C', + // label: 'ZY - 02C', + // }, + // ], + // }, + // { + // value: '欧比特珠海一号系列卫星', + // label: '欧比特珠海一号系列卫星', + // children: [ + // { + // value: 'OVS - 2A', + // label: 'OVS - 2A', + // }, + // { + // value: 'OVS - 3A', + // label: 'OVS - 3A', + // }, + // { + // value: 'OVS - 1A', + // label: 'OVS - 1A', + // }, + // { + // value: 'OVS - 1B', + // label: 'OVS - 1B', + // }, + // { + // value: 'OHS - 2A', + // label: 'OHS - 2A', + // }, + // { + // value: 'OHS - 2B', + // label: 'OHS - 2B', + // }, + // { + // value: 'OHS - 2C', + // label: 'OHS - 2C', + // }, + // { + // value: 'OHS - 2D', + // label: 'OHS - 2D', + // }, + // ], + // } ], shortcuts: [ { @@ -399,6 +400,20 @@ const editCoordinate = () => { // 开始爬虫 const startCrawl = () => { + if(!state.startTime){ + ElMessage.error("Please select the search start time") + return; + } + if(!state.endTime){ + ElMessage.error("Please select the search end time") + return; + } + if(state.coordinateList.length==0||!state.coordinateList[0].Lat||!state.coordinateList[0].Lng||!state.coordinateList[1].Lat ||!state.coordinateList[1].Lng){ + ElMessage.error("Please draw the area on the map") + return; + } + + var ranges = state.coordinateList[0].Lat + ' ' + state.coordinateList[0].Lng + ',' + state.coordinateList[1].Lat + ' ' + state.coordinateList[1].Lng var type = null if (state.satelliteSelected[0] == 'landsat') { @@ -413,36 +428,38 @@ const startCrawl = () => { var param = { "stime": state.startTime, "etime": state.endTime, - "disaster_id": state.selectID * 1, + "disaster_id": state.selectID, "ranges": ranges, "id": id } console.log(param); - submit( - { - type: type, - manageId: userInfo.userInfos.id, - status: 0, - disasterId: state.selectID, - id: (id ? id : null) - } - ).then(ret => { - if (ret == 1042) { - ElMessage.error("error") - } else { + // submit( + // { + // type: type, + // startDate:state.startTime, + // endDate:state.endTime, + // manageId: userInfo.userInfos.id, + // status: 0, + // disasterId: state.selectID, + // id: (id ? id : null) + // } + // ).then(ret => { + // if (ret == 1042) { + // ElMessage.error("error") + // } else { + + // rs(stime, etime, disaster_id, ranges, type = 1).then(res => { + // console.log(res); + // // getData(); + // ElMessage({ + // message: 'Success, Start crawling.', + // type: 'success', + // }) + // }) - rs(param).then(res => { - console.log(res); - // getData(); - ElMessage({ - message: 'Success, Start crawling.', - type: 'success', - }) - }) - - } - }) + // } + // }) } // 清空搜索条件 diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index 9539538..da035c6 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -190,15 +190,7 @@ style="height:35px;"> - <<<<<<< HEAD - - - ======= - - >>>>>>> zqq + Date: Wed, 26 Apr 2023 10:47:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 69f8071..b5ec45f 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -277,12 +277,12 @@ const initLineChart = (xData,data1, data2) => { symbol: 'circle', smooth: true, data: data2, - lineStyle: { color: '#44c05b' }, - itemStyle: { color: '#44c05b', borderColor: '#44c05b' }, + lineStyle: { color: 'rgba(145,204,117,1)' }, + itemStyle: { color: 'rgba(145,204,117,1)', borderColor: 'rgba(145,204,117,1)' }, areaStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: '#44c05b' }, - { offset: 1, color: '#44c05b' }, + { offset: 0, color: 'rgba(145,204,117,1)' }, + { offset: 1, color: 'rgba(145,204,117,0)' }, ]), }, } @@ -328,12 +328,12 @@ const initLineVandDChart = (xData,data1, data2) => { symbol: 'circle', smooth: true, data: data2, - lineStyle: { color: '#3d91e7' }, - itemStyle: { color: '#3d91e7', borderColor: '#3d91e7' }, + lineStyle: { color: 'rgba(84,112,198,1)' }, + itemStyle: { color: 'rgba(84,112,198,1)', borderColor: 'rgba(84,112,198,1)' }, areaStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: '#3d91e7' }, - { offset: 1, color: '#3d91e7' }, + { offset: 0, color: 'rgba(84,112,198,1)' }, + { offset: 1, color: 'rgba(84,112,198,0)' }, ]), }, },{ @@ -343,12 +343,12 @@ const initLineVandDChart = (xData,data1, data2) => { symbol: 'circle', smooth: true, data: data1, - lineStyle: { color: '#e78d3d' }, - itemStyle: { color: '#e78d3d', borderColor: '#e78d3d' }, + lineStyle: { color: 'rgba(250,200,88,1)' }, + itemStyle: { color: 'rgba(250,200,88,1)', borderColor: 'rgba(250,200,88,1)' }, areaStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: '#e78d3d' }, - { offset: 1, color: '#e78d3d' }, + { offset: 0, color: 'rgba(250,200,88,1)' }, + { offset: 1, color: 'rgba(250,200,88,0)' }, ]), }, } @@ -398,8 +398,8 @@ const initChiefChart = (xData,yData) => { barWidth: 30, itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: '#fe9a8bb3' }, - { offset: 1, color: '#fe9a8b03' }, + { offset: 0, color: 'rgba(238,102,102,1)' }, + { offset: 1, color: 'rgba(238,102,102,0)' }, ]), //柱状图圆角 borderRadius: [30, 30, 0, 0], @@ -451,8 +451,8 @@ const initAdministratorsChart = (xData,yData) => { yAxisIndex: 0, itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: 'rgba(108,80,243,0.3)' }, - { offset: 1, color: 'rgba(108,80,243,0)' }, + { offset: 0, color: 'rgba(115,192,222,1)' }, + { offset: 1, color: 'rgba(115,192,222,0)' }, ]), //柱状图圆角 borderRadius: [30, 30, 0, 0],