diff --git a/public/home/1.png b/public/home/1.png new file mode 100644 index 0000000..509e4c4 Binary files /dev/null and b/public/home/1.png differ diff --git a/public/home/2.png b/public/home/2.png new file mode 100644 index 0000000..bf33b78 Binary files /dev/null and b/public/home/2.png differ diff --git a/public/home/3.png b/public/home/3.png new file mode 100644 index 0000000..7fd527a Binary files /dev/null and b/public/home/3.png differ diff --git a/public/home/4.png b/public/home/4.png new file mode 100644 index 0000000..6923452 Binary files /dev/null and b/public/home/4.png differ diff --git a/public/home/新建 文本文档.txt b/public/home/新建 文本文档.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js index a341df3..4347860 100644 --- a/src/api/crawl/index.js +++ b/src/api/crawl/index.js @@ -47,9 +47,7 @@ export const rs = (stime, etime, disaster_id, ranges, type = 1,id) => { return request({ url: '/api/' + crawlModule + '/rs/' + method, method: 'post', - data: { - - }, + data: data, }); }; export const submit = (row) => { diff --git a/src/api/disasterInfo/index.js b/src/api/disasterInfo/index.js index f7ed885..30b2450 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,15 +50,19 @@ export function review(data) { /** * 首页 dashborad */ -export function statistics(){ + +export function statistics(param){ return request({ url: '/api/'+moduleName+'/ui/disasterInfo/statistics', - method: 'get' - }); + method: 'get', + params:{ + year:param + } + }) } -export const getUserList = (name,current,size) => { +export const getUserList = (name, current, size) => { return request({ - url: '/api/yyhouc-system-manager/user/list', + url: '/api/system-manager/user/list', method: 'get', params: { name, @@ -67,11 +71,20 @@ export const getUserList = (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/components/Map.vue b/src/components/Map.vue index 3c6c5d8..0751013 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -2,11 +2,11 @@
- - - \ No newline at end of file + diff --git a/src/components/form/index.vue b/src/components/form/index.vue deleted file mode 100644 index c0547b1..0000000 --- a/src/components/form/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/table/DisasterTable.vue b/src/components/table/DisasterTable.vue new file mode 100644 index 0000000..17e5fd7 --- /dev/null +++ b/src/components/table/DisasterTable.vue @@ -0,0 +1,120 @@ + + + + + + \ No newline at end of file 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"> -
+ + + - + -->
diff --git a/src/layout/navMenu/vertical.vue b/src/layout/navMenu/vertical.vue index 113f0b8..8b8b3d1 100644 --- a/src/layout/navMenu/vertical.vue +++ b/src/layout/navMenu/vertical.vue @@ -12,7 +12,7 @@ @@ -20,7 +20,7 @@