From ec7a2945407a2123aa20ffd8a0624162a5093e68 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 15:10:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/disasterInfo/index.js | 56 ++-- .../responseManagement/userResponse/index.vue | 259 ++++++++---------- 2 files changed, 152 insertions(+), 163 deletions(-) diff --git a/src/api/disasterInfo/index.js b/src/api/disasterInfo/index.js index f7ed885..c10ab83 100644 --- a/src/api/disasterInfo/index.js +++ b/src/api/disasterInfo/index.js @@ -1,19 +1,19 @@ import request from '/@/utils/request'; -import {moduleName} from '/@/utils/request'; +import { moduleName } from '/@/utils/request'; export function getList(params) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/list', + url: '/api/' + moduleName + '/ui/disasterInfo/list', method: 'get', params, }); } -export function getPage(current,size,params) { +export function getPage(current, size, params) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/list', + url: '/api/' + moduleName + '/ui/disasterInfo/list', method: 'get', - params:{ + params: { current, size, ...params @@ -21,17 +21,17 @@ export function getPage(current,size,params) { }); } -export function updateDisasterManage(data){ +export function updateDisasterManage(data) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/updateBatch', + url: '/api/' + moduleName + '/ui/disasterInfo/updateBatch', method: 'put', data: data, }); } -export function removeManage(data){ +export function removeManage(data) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/removeManage', + url: '/api/' + moduleName + '/ui/disasterInfo/removeManage', method: 'put', data: data, }); @@ -41,7 +41,7 @@ export function removeManage(data){ //review export function review(data) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/review', + url: '/api/' + moduleName + '/ui/disasterInfo/review', method: 'post', data: data, }); @@ -50,28 +50,38 @@ export function review(data) { /** * 首页 dashborad */ -export function statistics(){ +export function statistics() { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/statistics', + url: '/api/' + moduleName + '/ui/disasterInfo/statistics', method: 'get' }); } -export const getUserList = (name,current,size) => { +export const getUserList = (name, current, size) => { return request({ - url: '/api/yyhouc-system-manager/user/list', - method: 'get', - params: { - name, - current, - size - } - }); + url: '/api/yyhouc-system-manager/user/list', + method: 'get', + params: { + name, + current, + size + } + }); } export function submit(data) { return request({ - url: '/api/'+moduleName+'/ui/disasterInfo/submit', + url: '/api/' + moduleName + '/ui/disasterInfo/submit', method: 'post', data, }); -} \ No newline at end of file +} + +export function responseEndedDisasterInfo(id) { + return request({ + url: '/api/' + moduleName + '/ui/disasterInfo/responseEndedDisasterInfo', + method: 'get', + params: { + id + } + }); +} diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index d1fb61b..cde529d 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -1,41 +1,42 @@ --> - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - Point - Area - Edit - Clear + Point + Area + Edit + Clear - + Latitude： - + + Longitude： - + - + - + - + @@ -193,7 +154,7 @@ import en from 'element-plus/dist/locale/en.mjs' import { reactive, onMounted, ref, nextTick, watchEffect, defineAsyncComponent } from 'vue'; import { ElMessageBox, ElMessage } from 'element-plus'; -import { getList, review } from '/@/api/disasterInfo/index'; +import { getList, review, responseEndedDisasterInfo } from '/@/api/disasterInfo/index'; import { getDictionary } from '/@/api/system/dictbiz'; import { useVariableStore } from '/@/stores/index.ts' //引入地图 @@ -223,6 +184,23 @@ const MapPage = defineAsyncComponent({ const onAllocation = (row) => { select.value.openDialog(row) }; + + +const responseEnded = (row) => { + ElMessageBox.confirm(`Confirm completion of response?`, 'Prompt', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', + type: 'warning', + }) + .then(() => { + responseEndedDisasterInfo(row.id).then((da) => { + ElMessage.success('Operation successful'); + }) + }) + .catch(() => { }); +}; + + const dateFormat = (date) => { return useDateFormat(date, 'YYYY-MM-DD').value; } @@ -406,26 +384,27 @@ const getValue = (key) => { }; From dbcc24580d1aecce3a064e0e17df0f8652f7202c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com> Date: Mon, 24 Apr 2023 15:19:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataService/multimediaData/index.vue | 2 +- src/views/responseManagement/userResponse/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index e87ec7d..4bc323b 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -13,7 +13,7 @@ {{ getValue(scope.row.disasterType) }} - + - + @@ -75,7 +75,7 @@ {{ getValue(scope.row.disasterType) }} - + From d7d0092fcfcb089a133457ce6c2636a77126453c Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 15:36:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/responseManagement/userResponse/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index cde529d..33e2af6 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -89,11 +89,12 @@ - + @@ -234,7 +235,7 @@ const getTableData = () => { if (state.selectName === 'first') { state.tableData.param.respondStatus = 0; } else { - state.tableData.param.respondStatus = 2; + state.tableData.param.respondStatus = 3; } getList(state.tableData.param).then((res) => { state.tableData.data = res.records; From 1e71ff9577f5fad920bd095ce115c21a8abde28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com> Date: Mon, 24 Apr 2023 15:46:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/navBars/breadcrumb/user.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index bedef9a..d50fa35 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -53,19 +53,19 @@ :hide-timeout="50" trigger="click" @command="onLanguageChange"> -
+ + + - + -->
From ba83f4e478c7c271eac7589f2872a79ac5133d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com> Date: Mon, 24 Apr 2023 17:29:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Map.vue | 262 +++++------- .../responseManagement/userResponse/index.vue | 388 ++++++++---------- 2 files changed, 280 insertions(+), 370 deletions(-) diff --git a/src/components/Map.vue b/src/components/Map.vue index b22f2fd..6c4740c 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -2,27 +2,25 @@
- - - \ No newline at end of file + diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index d473e3b..a8c324b 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -1,46 +1,45 @@ - From 97f9ceec6911af888b8b45d62a21d61e6b58312e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com> Date: Mon, 24 Apr 2023 17:30:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/responseManagement/userResponse/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index a8c324b..c44ee4d 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -99,7 +99,7 @@