From 76d3f26717ced0c158c6e4be579cc503e8c6945c Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Mon, 22 May 2023 18:14:50 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=88=AC=E8=99=AB?= =?UTF-8?q?=E8=B0=83=E7=94=A8422=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/dataService/multimediaData/component/boot.vue | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index ec0f205..fbe375a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,7 +3,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import qs from 'qs'; import { Session } from '/@/utils/storage'; -export const moduleName = 'biz-vordm'; +export const moduleName = 'yyhouc-biz-vordm'; export const crawlModule = 'vordm-crawl'; export const twitterModule = "vordm-twitter"; const service = axios.create({ diff --git a/src/views/dataService/multimediaData/component/boot.vue b/src/views/dataService/multimediaData/component/boot.vue index ac50b4e..ecf57fe 100644 --- a/src/views/dataService/multimediaData/component/boot.vue +++ b/src/views/dataService/multimediaData/component/boot.vue @@ -160,7 +160,7 @@ + + \ No newline at end of file From 7d10269a9a5fd5f85a5915235ab8c6880e6586e8 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Wed, 24 May 2023 18:41:30 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 ++++++++++ src/api/disasterInfo/index.js | 7 +++ src/api/news/index.js | 7 +++ .../remoteSensingSourceData.js | 9 +++- src/api/response/dataUpload.js | 9 +++- src/directive/authDirective.js | 7 +++ .../dataService/multimediaData/index.vue | 37 +++++++++++++--- .../components/retrievalCondition.vue | 42 +++++++++++++++--- .../responseManagement/dataUpload/index.vue | 22 +++++++++- .../responseManagement/userResponse/index.vue | 44 +++++++++++++++---- 10 files changed, 184 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index e30a322..5155afe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3007,6 +3007,14 @@ "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz", "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==" }, + "leaflet-control-geocoder": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/leaflet-control-geocoder/-/leaflet-control-geocoder-2.4.0.tgz", + "integrity": "sha512-b2QlxuFd40uIDbnoUI3U9fzfnB4yKUYlmsXjquJ2d2YjoJqnyVYcIJeErAVv3kPvX3nI0gzvBq1XHMgSVFrGkQ==", + "requires": { + "open-location-code": "^1.0.0" + } + }, "leaflet-draw": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz", @@ -3020,6 +3028,14 @@ "leaflet": "^1.0.0" } }, + "leaflet-search": { + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/leaflet-search/-/leaflet-search-2.9.6.tgz", + "integrity": "sha512-ZzZEnjcYmVEXfYq5r2adt47voAtycJlZ3YDjWJXjJuUCWW99sj6IqB5qjNrBC5JALBmSnkOlfSHCaj3jbO1CGg==", + "requires": { + "leaflet": "*" + } + }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -3199,6 +3215,12 @@ "wrappy": "1" } }, + "open-location-code": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/open-location-code/-/open-location-code-1.0.3.tgz", + "integrity": "sha512-DBm14BSn40Ee241n80zIFXIT6+y8Tb0I+jTdosLJ8Sidvr2qONvymwqymVbHV2nS+1gkDZ5eTNpnOIVV0Kn2fw==", + "optional": true + }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", diff --git a/src/api/disasterInfo/index.js b/src/api/disasterInfo/index.js index 30b2450..4a6afc1 100644 --- a/src/api/disasterInfo/index.js +++ b/src/api/disasterInfo/index.js @@ -88,3 +88,10 @@ export function responseEndedDisasterInfo(id) { } }); } +export function deleteByIds(ids) { + return request({ + url: '/api/' + moduleName + '/ui/disasterInfo/deleteByIds', + method: 'delete', + data: ids + }); +} diff --git a/src/api/news/index.js b/src/api/news/index.js index ee02d89..d88b152 100644 --- a/src/api/news/index.js +++ b/src/api/news/index.js @@ -32,3 +32,10 @@ export const importTemplate = (data) => { data: data }) } +export const remove = (ids,type) => { + return request({ + url: '/api/'+moduleName+'/ui/'+(type?'news':'socialMedia')+'/deleteByIds', + method: 'delete', + data: ids + }) +} diff --git a/src/api/remoteSensingSourceData/remoteSensingSourceData.js b/src/api/remoteSensingSourceData/remoteSensingSourceData.js index da88526..231d040 100644 --- a/src/api/remoteSensingSourceData/remoteSensingSourceData.js +++ b/src/api/remoteSensingSourceData/remoteSensingSourceData.js @@ -45,4 +45,11 @@ export const importTemplate = (data) => { method: 'post', data: data }); -}; \ No newline at end of file +}; +export const removeList = (ids) => { + return request({ + url: '/api/' + moduleName + '/ui/remoteSensing/remove', + method: 'delte', + data: ids, + }); +} \ No newline at end of file diff --git a/src/api/response/dataUpload.js b/src/api/response/dataUpload.js index 19d1b8c..a50fdd9 100644 --- a/src/api/response/dataUpload.js +++ b/src/api/response/dataUpload.js @@ -50,4 +50,11 @@ export const auditData = (data) => { method: 'post', data: data }); -}; \ No newline at end of file +}; +export const remove = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/dataUpload/remove', + method: 'delete', + data: data + }); +} \ No newline at end of file diff --git a/src/directive/authDirective.js b/src/directive/authDirective.js index b1b2cb1..0013142 100644 --- a/src/directive/authDirective.js +++ b/src/directive/authDirective.js @@ -15,6 +15,13 @@ export function authDirective(app) { if (!stores.userInfos.authBtnList.some((v) => v === binding.value)) el.parentNode.removeChild(el); }, }); + app.directive('auth-role', { + mounted(el, binding) { + const stores = useUserInfo(); + console.log('指令验证',stores.userInfos); + if (!stores.userInfos.roles.some((v) => v === binding.value)) el.parentNode.removeChild(el); + }, + }); // 多个权限验证,满足一个则显示(v-auths="[xxx,xxx]") app.directive('auths', { mounted(el, binding) { diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index bbc16eb..7fb4a62 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -57,6 +57,12 @@ Upload + + + + + Delete + -