From 40fd907fcdbbc8ecd1499cc5d2cba99898ed0e71 Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Tue, 11 Apr 2023 22:34:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?zqq:=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{index.js => remoteSensingSourceData.js} | 0 src/layout/navBars/breadcrumb/user.vue | 58 +++---- src/router/route.js | 154 +++++++++--------- src/stores/themeConfig.js | 4 +- .../components/retrievalCondition.vue | 6 +- .../chief}/index.vue | 0 6 files changed, 112 insertions(+), 110 deletions(-) rename src/api/remoteSensingSourceData/{index.js => remoteSensingSourceData.js} (100%) rename src/views/{responseManagement/administrator => systemManagement/chief}/index.vue (100%) diff --git a/src/api/remoteSensingSourceData/index.js b/src/api/remoteSensingSourceData/remoteSensingSourceData.js similarity index 100% rename from src/api/remoteSensingSourceData/index.js rename to src/api/remoteSensingSourceData/remoteSensingSourceData.js diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 3a36db5..857379f 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -49,29 +49,31 @@ - -
- -
- -
+ +
+ +
+ +
- + @@ -94,7 +96,7 @@ - + @@ -115,16 +117,16 @@ import other from '/@/utils/other'; // 引入组件 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue')); const Search = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/search.vue')); -const useTranslateStore=useTranslate() +const useTranslateStore = useTranslate() const onLanguageChange = (lang) => { - if(lang=="en"){ - state.disabledI18n="en" - useTranslateStore.translate_control=0 - } - else{ - state.disabledI18n="zh-cn" - useTranslateStore.translate_control=1 - } + if (lang == "en") { + state.disabledI18n = "en" + useTranslateStore.translate_control = 0 + } + else { + state.disabledI18n = "zh-cn" + useTranslateStore.translate_control = 1 + } }; // 定义变量内容 const router = useRouter(); @@ -138,7 +140,7 @@ const state = reactive({ isScreenfull: false, disabledSize: 'large', setIntervalId: null, - disabledI18n:"en", + disabledI18n: "en", }); // 设置分割样式 diff --git a/src/router/route.js b/src/router/route.js index a02d202..04e032f 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/index.vue'), - meta: { - title: 'Administrator management', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - roles: ['admin'], - // icon: 'ele-ColdDrink', - zh: '管理员管理', - }, - }, { path: '/responseManagement/dataUpload', name: 'data-upload-management', @@ -211,6 +195,22 @@ export const dynamicRoutes = [ zh: '普通管理员管理', }, }, + { + path: '/systemManagement/chief', + name: 'chiefManagement', + component: () => import('/@/views/systemManagement/chief/index.vue'), + meta: { + title: 'Chief Administrator management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + // icon: 'ele-ColdDrink', + zh: '主要管理员管理', + }, + }, { path: '/systemManagement/dictionary', name: 'dictionaryManagement', @@ -383,69 +383,69 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin'], // icon: 'iconfont icon-xitongshezhi', - zh:"系统设置" + zh: '系统设置', }, children: [ - // { - // path: '/system/menu', - // name: 'systemMenu', - // component: () => import('/@/views/system/menu/index.vue'), - // meta: { - // title: '菜单管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'iconfont icon-caidan', - // }, - // }, - // { - // path: '/system/role', - // name: 'systemRole', - // component: () => import('/@/views/system/role/index.vue'), - // meta: { - // title: '角色管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'ele-ColdDrink', - // }, - // }, - // { - // path: '/system/user', - // name: 'systemUser', - // component: () => import('/@/views/system/user/index.vue'), - // meta: { - // title: '用户管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'iconfont icon-icon-', - // }, - // }, - // { - // path: '/system/dept', - // name: 'systemDept', - // component: () => import('/@/views/system/dept/index.vue'), - // meta: { - // title: '部门管理', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin'], - // icon: 'ele-OfficeBuilding', - // }, - // }, + // { + // path: '/system/menu', + // name: 'systemMenu', + // component: () => import('/@/views/system/menu/index.vue'), + // meta: { + // title: '菜单管理', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'iconfont icon-caidan', + // }, + // }, + // { + // path: '/system/role', + // name: 'systemRole', + // component: () => import('/@/views/system/role/index.vue'), + // meta: { + // title: '角色管理', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'ele-ColdDrink', + // }, + // }, + // { + // path: '/system/user', + // name: 'systemUser', + // component: () => import('/@/views/system/user/index.vue'), + // meta: { + // title: '用户管理', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'iconfont icon-icon-', + // }, + // }, + // { + // path: '/system/dept', + // name: 'systemDept', + // component: () => import('/@/views/system/dept/index.vue'), + // meta: { + // title: '部门管理', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'ele-OfficeBuilding', + // }, + // }, { path: '/system/dic', name: 'systemDic', diff --git a/src/stores/themeConfig.js b/src/stores/themeConfig.js index 7778706..60d5833 100644 --- a/src/stores/themeConfig.js +++ b/src/stores/themeConfig.js @@ -147,8 +147,8 @@ export const useThemeConfig = defineStore('themeConfig', { globalViceTitle: 'vueNextAdmin', // 网站副标题(登录页顶部文字) globalViceTitleMsg: '专注、免费、开源、维护、解疑', - // 默认初始语言,可选值"",默认 zh-cn - globalI18n: 'zh-cn', + // 默认初始语言,可选值"",默认 en + globalI18n: 'en', // 默认全局组件大小,可选值"",默认 'large' globalComponentSize: 'large', }, diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue index f2f6d62..d221d06 100644 --- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue +++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue @@ -136,7 +136,7 @@ diff --git a/src/router/route.js b/src/router/route.js index 68bda89..1912bfc 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -80,7 +80,7 @@ export const dynamicRoutes = [ { path: '/responseManagement/administrator', name: 'administrator-management', - component: () => import('/@/views/responseManagement/administrator/index.vue'), + component: () => import('/@/views/responseManagement/administrator/addAdministrator.vue'), meta: { title: 'Administrator management', isLink: '', diff --git a/src/stores/index.ts b/src/stores/index.ts new file mode 100644 index 0000000..3ff43e0 --- /dev/null +++ b/src/stores/index.ts @@ -0,0 +1,80 @@ +import { defineStore } from "pinia"; +import { Names } from "./store_name"; + +export const useVariableStore = defineStore(Names.TEST, { + state: () => { + return { + OtherdataTag:1, + RemotesensingTag: 1, + remoteSensingDataTable: [ + { + ID: 1, + Satellite_type:"Sentinel-2_Sentinel-2A", + Production_date:"2023-02-10 12:10:25", + Product_resolution: "10", + Cloud_coverage:'15.5191', + Central_longitude_and_latitude:'(96.6408,122.1683)', + Thumbnail:"../assets/home/1.jpg", + Download_link:"../assets/detail/list_download_icon.png", + Data_source:"", + Data_upload_agency:"" + }, + { + ID: 2, + Satellite_type:"Sentinel-2_Sentinel-2B", + Production_date:"2023-02-10 12:10:23", + Product_resolution: "10", + Cloud_coverage:'15.5256', + Central_longitude_and_latitude:'(96.6408,122.1683)', + Thumbnail:"../assets/home/5.jpg", + Download_link:'../assets/detail/list_download_icon.png', + Data_source:"", + Data_upload_agency:"" + }, + { + ID: 3, + Satellite_type:"Landsat-8", + Production_date:"2023-02-10 12:01:34", + Product_resolution: "6", + Cloud_coverage:'13.5345', + Central_longitude_and_latitude:'(96.6408,122.1683)', + Thumbnail:"../assets/home/3.jpg", + Download_link:'../assets/detail/list_download_icon.png', + Data_source:"", + Data_upload_agency:"" + } + // { + // ID: 1, + // Satellite_type:"Sentinel-2_Sentinel-2A", + // Production_date:"2023-02-10 12:10:25", + // Product_resolution(m):"10", + // Cloud_coverage(%):'15.5191', + // Central_longitude_and_latitude:'(96.6408,122.1683)', + // Thumbnail:"@/assets/home/1.jpg", + // Download_link:'', + // Data_source:"", + // Data_upload_agency:"" + // } + ], + layerGroupPoint:null, + layerGroupPoly:null, + polygoncontrol:null, + toolData:{ + records:null, + total:null, + current:null, + size:null, + pages:null, + }, + } + }, + + getters: { + + }, + + actions: { + + } + + }) \ No newline at end of file diff --git a/src/stores/store_name.ts b/src/stores/store_name.ts new file mode 100644 index 0000000..f45d2f1 --- /dev/null +++ b/src/stores/store_name.ts @@ -0,0 +1,4 @@ +export const enum Names { + TEST = "TEST" + } + \ No newline at end of file diff --git a/src/views/responseManagement/administrator/component/addAdministrator.vue b/src/views/responseManagement/administrator/addAdministrator.vue similarity index 100% rename from src/views/responseManagement/administrator/component/addAdministrator.vue rename to src/views/responseManagement/administrator/addAdministrator.vue From c8c3e40c54b6ebc1bd651c887bd3ee7530983287 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Wed, 12 Apr 2023 17:09:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9A=82=E5=AD=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8A=A0=E5=85=A5=E5=9C=B0=E5=9B=BE=E4=B8=8E?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../responseManagement/userResponse/index.vue | 72 ++++++++++++------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index b4604db..f537fef 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -2,7 +2,7 @@
- + @@ -57,7 +57,7 @@ :total="state.tableData.total"> - + @@ -113,7 +113,22 @@
- + + + +
@@ -122,6 +137,9 @@ import { defineAsyncComponent, reactive, onMounted, ref } from 'vue'; import { ElMessageBox, ElMessage} from 'element-plus'; import {getList ,review } from '/@/api/disasterInfo/index'; import { getDictionary } from '/@/api/system/dictbiz'; +//引入地图 +import Map from '/@/components/Map.vue'; + const activeName = ref('first'); @@ -129,12 +147,11 @@ const handleClick = (tab ,event) => { state.selectName=tab.props.name; getTableData(); }; -// 引入组件 -const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialog.vue')); // 定义变量内容 const roleDialogRef = ref(); const state = reactive({ + dialogVisible: false, tableData: { data: [], total: 0, @@ -171,28 +188,29 @@ const onHandleSizeChange = (val) => { }; const onOpenEditRole = (type, row) => { //使用英语提示用户是否进行审核 - ElMessageBox.confirm('Are you sure you want to review this data ?', 'Tips', { - confirmButtonText: 'OK', - cancelButtonText: 'Cancel', - type: 'warning', - }) - .then(() => { - //审核通过 - review(row.id).then(() => { - ElMessage({ - type: 'success', - message: 'Review success!', - }); - getTableData(); - }); - }) - .catch(() => { - //审核不通过 - ElMessage({ - type: 'info', - message: 'Review failed!', - }); - }); + // ElMessageBox.confirm('Are you sure you want to review this data ?', 'Tips', { + // confirmButtonText: 'OK', + // cancelButtonText: 'Cancel', + // type: 'warning', + // }) + // .then(() => { + // //审核通过 + // review(row.id,state.tableData.loading).then(() => { + // ElMessage({ + // type: 'success', + // message: 'Review success!', + // }); + // getTableData(); + // }); + // }) + // .catch(() => { + // //审核不通过 + // ElMessage({ + // type: 'info', + // message: 'Review failed!', + // }); + // }); + state.dialogVisible = true; }; // 分页改变 From 6a09af20c44c8370139049ee8728671d8776e2c2 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Thu, 13 Apr 2023 14:03:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0tool=20contact=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=88=97=E8=A1=A8=E3=80=82=E5=AE=8C=E6=88=90callforhe?= =?UTF-8?q?lp=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 8 + package.json | 4 +- src/api/contact/index.js | 39 +++++ src/api/disasterInfo/index.js | 4 +- src/api/tool/index.js | 39 +++++ src/router/route.js | 32 ++++ .../contact/component/add.vue | 99 ++++++++++++ .../responseManagement/contact/index.vue | 140 ++++++++++++++++ .../responseManagement/tool/component/add.vue | 153 ++++++++++++++++++ src/views/responseManagement/tool/index.vue | 142 ++++++++++++++++ .../responseManagement/userResponse/index.vue | 96 +++++++---- 11 files changed, 719 insertions(+), 37 deletions(-) create mode 100644 src/api/contact/index.js create mode 100644 src/api/tool/index.js create mode 100644 src/views/responseManagement/contact/component/add.vue create mode 100644 src/views/responseManagement/contact/index.vue create mode 100644 src/views/responseManagement/tool/component/add.vue create mode 100644 src/views/responseManagement/tool/index.vue diff --git a/package-lock.json b/package-lock.json index 073494d..c62f0ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1543,6 +1543,14 @@ "resolved": "https://registry.npmjs.org/leaflet-draw/-/leaflet-draw-1.0.4.tgz", "integrity": "sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ==" }, + "leaflet-imageoverlay-rotated": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/leaflet-imageoverlay-rotated/-/leaflet-imageoverlay-rotated-0.2.1.tgz", + "integrity": "sha512-8MsrIuW/aXI0EjDXgJSJJ67nqVNQJsP/glmND9g6yc6t+zQgdPUbTRHC65jSs/IBwzwyhggnDgDuydalcEX+ew==", + "requires": { + "leaflet": "^1.0.0" + } + }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", diff --git a/package.json b/package.json index b5b7881..37ea273 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "js-cookie": "^3.0.1", "js-md5": "^0.7.3", "leaflet": "^1.9.3", - "leaflet-draw": "^1.0.4", - "leaflet-imageoverlay-rotated": "^0.2.1", + "leaflet-draw": "^1.0.4", + "leaflet-imageoverlay-rotated": "^0.2.1", "mitt": "^3.0.0", "nprogress": "^0.2.0", "pinia": "^2.0.33", diff --git a/src/api/contact/index.js b/src/api/contact/index.js new file mode 100644 index 0000000..19751fd --- /dev/null +++ b/src/api/contact/index.js @@ -0,0 +1,39 @@ +import request from '/@/utils/request'; +import {moduleName} from '/@/utils/request'; +export const getList = (current, size, param) => { + return request({ + url: '/api/'+moduleName+'/ui/contact/list', + method: 'get', + params: { + current, + size, + param, + }, + }); +} +export const submit = (row) => { + return request({ + url: '/api/'+moduleName+'/ui/contact/submit', + method: 'post', + data: row + }) +} +export const remove = (ids) => { + return request({ + url: '/api/'+moduleName+'/ui/contact/remove', + method: 'post', + data: { + ids, + } + }) +} + +export const detail = (id) => { + return request({ + url: '/api/'+moduleName+'/ui/contact/data', + method: 'get', + params: { + id + } + }) +} diff --git a/src/api/disasterInfo/index.js b/src/api/disasterInfo/index.js index bee51f0..f7da8f9 100644 --- a/src/api/disasterInfo/index.js +++ b/src/api/disasterInfo/index.js @@ -9,10 +9,10 @@ export function getList(params) { }); } //review -export function review(id) { +export function review(data) { return request({ url: '/api/'+moduleName+'/ui/disasterInfo/review', method: 'post', - params: { id }, + data: data, }); } \ No newline at end of file diff --git a/src/api/tool/index.js b/src/api/tool/index.js new file mode 100644 index 0000000..c1b08db --- /dev/null +++ b/src/api/tool/index.js @@ -0,0 +1,39 @@ +import request from '/@/utils/request'; +import {moduleName} from '/@/utils/request'; +export const getList = (current, size, param) => { + return request({ + url: '/api/'+moduleName+'/ui/tool/list', + method: 'get', + params: { + current, + size, + param, + }, + }); +} +export const submit = (row) => { + return request({ + url: '/api/'+moduleName+'/ui/tool/submit', + method: 'post', + data: row + }) +} +export const remove = (ids) => { + return request({ + url: '/api/'+moduleName+'/ui/tool/remove', + method: 'post', + data: { + ids, + } + }) +} + +export const detail = (id) => { + return request({ + url: '/api/'+moduleName+'/ui/tool/data', + method: 'get', + params: { + id + } + }) +} diff --git a/src/router/route.js b/src/router/route.js index 1912bfc..9ea09e0 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -109,6 +109,38 @@ export const dynamicRoutes = [ zh: '数据上传管理', }, }, + { + path: '/responseManagement/tool', + name: 'tool-management', + component: () => import('/@/views/responseManagement/tool/index.vue'), + meta: { + title: 'Tool Management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'chief'], + icon: 'iconfont icon-icon-', + zh: 'tool管理', + }, + }, + { + path: '/responseManagement/contact', + name: 'contact-management', + component: () => import('/@/views/responseManagement/contact/index.vue'), + meta: { + title: 'Contact Management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'chief'], + icon: 'iconfont icon-icon-', + zh: 'tool管理', + }, + }, ], }, { diff --git a/src/views/responseManagement/contact/component/add.vue b/src/views/responseManagement/contact/component/add.vue new file mode 100644 index 0000000..deda69f --- /dev/null +++ b/src/views/responseManagement/contact/component/add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/responseManagement/contact/index.vue b/src/views/responseManagement/contact/index.vue new file mode 100644 index 0000000..c01d29a --- /dev/null +++ b/src/views/responseManagement/contact/index.vue @@ -0,0 +1,140 @@ + + + diff --git a/src/views/responseManagement/tool/component/add.vue b/src/views/responseManagement/tool/component/add.vue new file mode 100644 index 0000000..9481c05 --- /dev/null +++ b/src/views/responseManagement/tool/component/add.vue @@ -0,0 +1,153 @@ + + + diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue new file mode 100644 index 0000000..fcfb848 --- /dev/null +++ b/src/views/responseManagement/tool/index.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index f537fef..e3b9f44 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -17,11 +17,17 @@ - + + + @@ -74,7 +80,12 @@ - + + + @@ -115,16 +126,28 @@ - + + + + + @@ -133,21 +156,24 @@