From 490aac5af2d37827c96c4313d2e0fb20e78407e9 Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Fri, 7 Apr 2023 11:07:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?zqq:=E6=B7=BB=E5=8A=A0=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/route.js | 167 ++++++++++++++++-- .../systemManagement/administrator/index.vue | 5 + .../systemManagement/dictionary/index.vue | 10 ++ src/views/systemManagement/index.vue | 0 4 files changed, 170 insertions(+), 12 deletions(-) create mode 100644 src/views/systemManagement/administrator/index.vue create mode 100644 src/views/systemManagement/dictionary/index.vue create mode 100644 src/views/systemManagement/index.vue diff --git a/src/router/route.js b/src/router/route.js index 9f1fdb5..e591ed3 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -41,7 +41,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'iconfont icon-shouye', - zh:"控制台" + zh: '控制台', }, }, { @@ -58,7 +58,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin'], // icon: 'iconfont icon-xitongshezhi', - zh:"响应管理" + zh: '响应管理', }, children: [ { @@ -74,7 +74,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin'], // icon: 'iconfont icon-caidan', - zh:"用户响应管理" + zh: '用户响应管理', }, }, { @@ -90,7 +90,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin'], // icon: 'ele-ColdDrink', - zh:"管理员管理" + zh: '管理员管理', }, }, { @@ -106,7 +106,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'iconfont icon-icon-', - zh:"数据上传管理" + zh: '数据上传管理', }, }, ], @@ -125,7 +125,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'iconfont icon-xitongshezhi', - zh:"数据服务" + zh: '数据服务', }, children: [ { @@ -141,7 +141,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'iconfont icon-caidan', - zh:"多媒体数据" + zh: '多媒体数据', }, }, { @@ -157,7 +157,7 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'ele-ColdDrink', - zh:"遥感数据" + zh: '遥感数据', }, }, { @@ -173,11 +173,154 @@ export const dynamicRoutes = [ isIframe: false, roles: ['admin', 'chief'], // icon: 'ele-ColdDrink', - zh:"其他数据服务" + zh: '其他数据服务', }, }, ], }, + { + path: '/systemManagement', + name: 'systemManagement', + component: () => import('/@/views/systemManagement/administrator/index.vue'), + redirect: '/systemManagement/administrator', + meta: { + title: 'System management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + // icon: 'iconfont icon-xitongshezhi', + zh: '系统管理', + }, + children: [ + { + path: '/systemManagement/administrator', + name: 'administratorManagement', + component: () => import('/@/views/systemManagement/administrator/index.vue'), + meta: { + title: 'Administrator management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + // icon: 'iconfont icon-caidan', + zh: '普通管理员管理', + }, + }, + { + path: '/systemManagement/dictionary', + name: 'dictionaryManagement', + component: () => import('/@/views/systemManagement/dictionary/index.vue'), + meta: { + title: 'Dictionary management', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + // icon: 'ele-ColdDrink', + zh: '字典管理', + }, + }, + ], + }, + // path: '/system', + // name: 'system', + // component: () => import('/@/layout/routerView/parent.vue'), + // redirect: '/system/menu', + // meta: { + // title: '系统设置', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'iconfont icon-xitongshezhi', + // }, + // 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/dic', + // name: 'systemDic', + // component: () => import('/@/views/system/dic/index.vue'), + // meta: { + // title: '字典管理', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin'], + // icon: 'ele-SetUp', + // }, + // }, + // ], + // }, // { // path: '/dataUploadAndRetrieval', // name: 'dataUploadAndRetrieval', @@ -335,7 +478,7 @@ export const notFoundAndNoPower = [ meta: { title: '页面找不到', isHide: true, - zh:"页面找不到" + zh: '页面找不到', }, }, { @@ -345,7 +488,7 @@ export const notFoundAndNoPower = [ meta: { title: '页面无权限', isHide: true, - zh:"页面无权限" + zh: '页面无权限', }, }, ]; @@ -363,7 +506,7 @@ export const staticRoutes = [ component: () => import('/@/views/login/index.vue'), meta: { title: '登录', - zh:"登录" + zh: '登录', }, }, ]; diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue new file mode 100644 index 0000000..5db23de --- /dev/null +++ b/src/views/systemManagement/administrator/index.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/src/views/systemManagement/dictionary/index.vue b/src/views/systemManagement/dictionary/index.vue new file mode 100644 index 0000000..c61817c --- /dev/null +++ b/src/views/systemManagement/dictionary/index.vue @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/src/views/systemManagement/index.vue b/src/views/systemManagement/index.vue new file mode 100644 index 0000000..e69de29 From 7b895c067194ee507b5c2721cd8c573788df0306 Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Sat, 8 Apr 2023 16:46:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?zqq:=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/remoteSensingSourceData/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/remoteSensingSourceData/index.js b/src/api/remoteSensingSourceData/index.js index 0aed30f..aa1884d 100644 --- a/src/api/remoteSensingSourceData/index.js +++ b/src/api/remoteSensingSourceData/index.js @@ -1,10 +1,10 @@ import request from '/@/utils/request'; -const moduleName = 'zqq-biz-vordm'; +const moduleName = 'biz-vordm'; export const getRemoteSensingSourceData = (param) => { return request({ - url: '/api/' + moduleName + '/ui/remoteSensingSourceData', + url: '/api/' + moduleName + '/ui/remoteSensing/SourceData', method: 'get', params: param, }); @@ -12,7 +12,7 @@ export const getRemoteSensingSourceData = (param) => { export const getSelectionCondition = (param) => { return request({ - url: '/api/' + moduleName + '/ui/selectCondition', + url: '/api/' + moduleName + '/ui/disasterInfo/select-condition', method: 'get', params: param, }); From 7a8d6919b906df677429fb6109e2a64731d8434f Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Tue, 11 Apr 2023 09:42:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?zqq:=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/remoteSensingSourceData/index.js | 5 ++--- src/utils/request.js | 2 ++ .../remoteSensingData/components/retrievalCondition.vue | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api/remoteSensingSourceData/index.js b/src/api/remoteSensingSourceData/index.js index aa1884d..1c905ea 100644 --- a/src/api/remoteSensingSourceData/index.js +++ b/src/api/remoteSensingSourceData/index.js @@ -1,6 +1,5 @@ import request from '/@/utils/request'; - -const moduleName = 'biz-vordm'; +import { moduleName } from '/@/utils/request'; export const getRemoteSensingSourceData = (param) => { return request({ @@ -12,7 +11,7 @@ export const getRemoteSensingSourceData = (param) => { export const getSelectionCondition = (param) => { return request({ - url: '/api/' + moduleName + '/ui/disasterInfo/select-condition', + url: '/api/' + moduleName + '/ui/disasterInfo/selectCondition', method: 'get', params: param, }); diff --git a/src/utils/request.js b/src/utils/request.js index c34ade0..2ebf7fe 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,6 +3,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import qs from 'qs'; import { Session } from '/@/utils/storage'; +export const moduleName = 'zqq-biz-vordm'; + // 配置新建一个 axios 实例 const service = axios.create({ //baseURL: import.meta.env.VITE_API_URL, diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue index cfc4285..f2f6d62 100644 --- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue +++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue @@ -208,6 +208,7 @@ const searchDisasterType = () => { "disasterDate": state.value_disasterDate, "name": "disaster_type" } + if (state.options_disasterType) { getSelectionCondition(selectType).then( (res) => {