diff --git a/src/api/data/otherData.js b/src/api/data/otherData.js new file mode 100644 index 0000000..6e6c838 --- /dev/null +++ b/src/api/data/otherData.js @@ -0,0 +1,84 @@ +import request, {moduleName} from '/@/utils/request'; + + +/** + * 查询上传数据对应的灾害分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getDisasterPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/otherData/queryDisasterPage', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 查询上传数据分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getOtherDataPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/otherData/pages', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 上传基础数据 + * @param data + * @returns {Promise>} + */ +export const uploadData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/otherData/upload', + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data: data + }); +}; + +/** + * 新增管理员 + * @param data + * @returns {Promise>} + */ +export const auditData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/otherData/audit', + method: 'post', + data: data + }); +}; + +/** + * 删除 + * @param id + * @returns {Promise>} + */ +export const deleteData = (id) => { + return request({ + url: '/api/' + moduleName + '/ui/otherData/remove', + method: 'delete', + params:{ + id + } + }); +}; \ No newline at end of file diff --git a/src/api/data/pictureInfo.js b/src/api/data/pictureInfo.js new file mode 100644 index 0000000..da6be7c --- /dev/null +++ b/src/api/data/pictureInfo.js @@ -0,0 +1,74 @@ +import request, {moduleName} from '/@/utils/request'; + + +/** + * 查询上传数据对应的灾害分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getDisasterPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/queryDisasterPage', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 根据灾害id查询图片数据 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getPicturePage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/pictureInfo/page', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 上传基础数据 + * @param data + * @returns {Promise>} + */ +export const uploadData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/pictureInfo/upload', + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data: data + }); +}; + + +/** + * 根据灾害id查询图片数据 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const delPicture = (id) => { + return request({ + url: '/api/' + moduleName + '/ui/pictureInfo/remove', + method: 'delete', + params: { + id + } + }); +}; \ No newline at end of file diff --git a/src/api/data/visualData.js b/src/api/data/visualData.js new file mode 100644 index 0000000..0bbdf77 --- /dev/null +++ b/src/api/data/visualData.js @@ -0,0 +1,104 @@ +import request, {moduleName} from '/@/utils/request'; + + +/** + * 查询上传数据对应的灾害分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getDisasterPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/queryDisasterPage', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 根据灾害id查询词云分页 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getWordClouds = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/wordCloudPage', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 根据灾害id查询热点分页 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getHotspot = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/hotspotPages', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 上传基础数据 + * @param data + * @returns {Promise>} + */ +export const uploadData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/upload', + method: 'post', + data: data + }); +}; + +/** + * 新增管理员 + * @param data + * @returns {Promise>} + */ +export const auditData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/audit', + method: 'post', + data: data + }); +}; + + +/** + * 根据灾害id查询图片数据 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const delData = (id,type) => { + return request({ + url: '/api/' + moduleName + '/ui/visualData/remove', + method: 'delete', + params: { + id, + type + } + }); +}; \ No newline at end of file diff --git a/src/api/response/adminManager.js b/src/api/response/adminManager.js index 55427cd..7a86f5d 100644 --- a/src/api/response/adminManager.js +++ b/src/api/response/adminManager.js @@ -9,7 +9,7 @@ import request, {moduleName} from '/@/utils/request'; */ export const getAdminManagerPage = (current,size,params) => { return request({ - url: '/api/' + moduleName + '/adminManager/pages', + url: '/api/' + moduleName + '/ui/adminManager/pages', method: 'get', params: { current, @@ -26,7 +26,7 @@ export const getAdminManagerPage = (current,size,params) => { */ export const auditData = (data) => { return request({ - url: '/api/' + moduleName + '/adminManager/audit', + url: '/api/' + moduleName + '/ui/adminManager/audit', method: 'post', data: data }); @@ -35,7 +35,7 @@ export const auditData = (data) => { export const remove = (ids) => { return request({ - url: '/api/' + moduleName + '/administrator/delete', + url: '/api/' + moduleName + '/ui/administrator/delete', method: 'delete', params: { ids, diff --git a/src/api/response/administrator.js b/src/api/response/administrator.js index 378bd26..7233002 100644 --- a/src/api/response/administrator.js +++ b/src/api/response/administrator.js @@ -9,7 +9,7 @@ import request, {moduleName} from '/@/utils/request'; */ export const getAdminPage = (current,size,params) => { return request({ - url: '/api/' + moduleName + '/administrator/pages', + url: '/api/' + moduleName + '/ui/administrator/pages', method: 'get', params: { current, @@ -26,7 +26,7 @@ export const getAdminPage = (current,size,params) => { */ export const addAdmin = (data) => { return request({ - url: '/api/' + moduleName + '/administrator/add', + url: '/api/' + moduleName + '/ui/administrator/add', method: 'post', data: data }); @@ -35,7 +35,7 @@ export const addAdmin = (data) => { export const remove = (ids) => { return request({ - url: '/api/' + moduleName + '/administrator/delete', + url: '/api/' + moduleName + '/ui/administrator/delete', method: 'delete', params: { ids, diff --git a/src/api/response/dataUpload.js b/src/api/response/dataUpload.js new file mode 100644 index 0000000..19d1b8c --- /dev/null +++ b/src/api/response/dataUpload.js @@ -0,0 +1,53 @@ +import request, {moduleName} from '/@/utils/request'; + + +/** + * 查询上传数据对应的灾害分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getDisasterPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/dataUpload/queryDisasterPage', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 查询上传数据分页列表 + * @param current + * @param size + * @param params + * @returns {Promise>} + */ +export const getDataUploadPage = (current,size,params) => { + return request({ + url: '/api/' + moduleName + '/ui/dataUpload/pages', + method: 'get', + params: { + current, + size, + ...params + } + }); +}; + +/** + * 新增管理员 + * @param data + * @returns {Promise>} + */ +export const auditData = (data) => { + return request({ + url: '/api/' + moduleName + '/ui/dataUpload/audit', + method: 'post', + data: data + }); +}; \ No newline at end of file diff --git a/src/api/tool/index.js b/src/api/tool/index.js index c1b08db..9b8dd2d 100644 --- a/src/api/tool/index.js +++ b/src/api/tool/index.js @@ -1,14 +1,17 @@ import request from '/@/utils/request'; import {moduleName} from '/@/utils/request'; export const getList = (current, size, param) => { + let params = { + current, + size, + }; + if(param){ + params = Object.assign(params, param); + } return request({ url: '/api/'+moduleName+'/ui/tool/list', method: 'get', - params: { - current, - size, - param, - }, + params: params, }); } export const submit = (row) => { @@ -37,3 +40,10 @@ export const detail = (id) => { } }) } +export const review = (data) => { + return request({ + url: '/api/'+moduleName+'/ui/tool/review', + method: 'post', + data:data + }) +} \ No newline at end of file diff --git a/src/components/form/index.vue b/src/components/form/index.vue new file mode 100644 index 0000000..c0547b1 --- /dev/null +++ b/src/components/form/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/router/route.js b/src/router/route.js index 9ea09e0..5f7c748 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -77,22 +77,6 @@ export const dynamicRoutes = [ zh: '用户响应管理', }, }, - { - path: '/responseManagement/administrator', - name: 'administrator-management', - component: () => import('/@/views/responseManagement/administrator/addAdministrator.vue'), - meta: { - title: 'Administrator management', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - roles: ['admin', 'chief'], - icon: 'ele-ColdDrink', - zh: '管理员管理', - }, - }, { path: '/responseManagement/dataUpload', name: 'data-upload-management', @@ -208,6 +192,38 @@ export const dynamicRoutes = [ zh: '其他数据服务', }, }, + { + path: '/dataService/visualData', + name: 'visualData', + component: () => import('/@/views/dataService/visualData/index.vue'), + meta: { + title: 'visual data service', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'chief'], + icon: 'ele-ColdDrink', + zh: '其他数据服务', + }, + }, + { + path: '/dataService/pictureInfo', + name: 'pictureInfo', + component: () => import('/@/views/dataService/pictureInfo/index.vue'), + meta: { + title: 'picture info service', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'chief'], + icon: 'ele-ColdDrink', + zh: '其他数据服务', + }, + }, ], }, { @@ -227,6 +243,22 @@ export const dynamicRoutes = [ zh: '系统管理', }, children: [ + { + path: '/systemManagement/chief/administrator', + name: 'chief-administrator-management', + component: () => import('/@/views/systemManagement/chiefAdministrator/index.vue'), + meta: { + title: 'Chief Administrator management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'chief'], + icon: 'ele-ColdDrink', + zh: '管理员管理', + }, + }, { path: '/systemManagement/administrator', name: 'administratorManagement', diff --git a/src/views/dataService/otherData/component/upload.vue b/src/views/dataService/otherData/component/upload.vue new file mode 100644 index 0000000..34dc48c --- /dev/null +++ b/src/views/dataService/otherData/component/upload.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue index 0443ea4..8112ab1 100644 --- a/src/views/dataService/otherData/index.vue +++ b/src/views/dataService/otherData/index.vue @@ -1,191 +1,142 @@ - + diff --git a/src/views/dataService/pictureInfo/component/upload.vue b/src/views/dataService/pictureInfo/component/upload.vue new file mode 100644 index 0000000..e7b7f4b --- /dev/null +++ b/src/views/dataService/pictureInfo/component/upload.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue new file mode 100644 index 0000000..256004e --- /dev/null +++ b/src/views/dataService/pictureInfo/index.vue @@ -0,0 +1,283 @@ + + + + diff --git a/src/views/dataService/visualData/component/hotspotForm.vue b/src/views/dataService/visualData/component/hotspotForm.vue new file mode 100644 index 0000000..78e4b11 --- /dev/null +++ b/src/views/dataService/visualData/component/hotspotForm.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataService/visualData/component/wordCloudForm.vue b/src/views/dataService/visualData/component/wordCloudForm.vue new file mode 100644 index 0000000..35b33d5 --- /dev/null +++ b/src/views/dataService/visualData/component/wordCloudForm.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue new file mode 100644 index 0000000..ad5d532 --- /dev/null +++ b/src/views/dataService/visualData/index.vue @@ -0,0 +1,348 @@ + + + + diff --git a/src/views/responseManagement/dataUpload/component/audit.vue b/src/views/responseManagement/dataUpload/component/audit.vue new file mode 100644 index 0000000..7fb7f00 --- /dev/null +++ b/src/views/responseManagement/dataUpload/component/audit.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/src/views/responseManagement/dataUpload/index.vue b/src/views/responseManagement/dataUpload/index.vue index 92b35bb..292b704 100644 --- a/src/views/responseManagement/dataUpload/index.vue +++ b/src/views/responseManagement/dataUpload/index.vue @@ -1,82 +1,94 @@ diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue index fcfb848..79ebda1 100644 --- a/src/views/responseManagement/tool/index.vue +++ b/src/views/responseManagement/tool/index.vue @@ -1,142 +1,173 @@ diff --git a/src/views/systemManagement/administrator/component/audit.vue b/src/views/systemManagement/administrator/component/audit.vue index 9d7ff89..18fdf15 100644 --- a/src/views/systemManagement/administrator/component/audit.vue +++ b/src/views/systemManagement/administrator/component/audit.vue @@ -23,6 +23,7 @@ import {addAdmin} from '/@/api/response/administrator.js'; import {auditData} from '/@/api/response/adminManager.js'; import {ElMessage} from "element-plus"; const adminAddFormRef = ref(); +const emit = defineEmits(['callback']); const state = reactive({ isShowDialog: false, isLoading:false, diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue index 2b92f44..7f3ad17 100644 --- a/src/views/systemManagement/administrator/index.vue +++ b/src/views/systemManagement/administrator/index.vue @@ -122,7 +122,6 @@ const auditManager = (row) => { const getTableData = () => { state.tableData.loading = true; getAdminManagerPage(state.tableData.param.pageNum,state.tableData.param.pageSize,{"managerName":state.searchName}).then(res=>{ - console.log("分页数据",res); state.tableData.data = res.records; state.tableData.total = res.total; }) diff --git a/src/views/responseManagement/administrator/addAdministrator.vue b/src/views/systemManagement/chiefAdministrator/component/addAdministrator.vue similarity index 72% rename from src/views/responseManagement/administrator/addAdministrator.vue rename to src/views/systemManagement/chiefAdministrator/component/addAdministrator.vue index 9284c36..c7e5a97 100644 --- a/src/views/responseManagement/administrator/addAdministrator.vue +++ b/src/views/systemManagement/chiefAdministrator/component/addAdministrator.vue @@ -14,7 +14,7 @@ - +