Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin

src/api/remoteSensingSourceData/index.js

@@ -1,10 +1,9 @@
 import request from '/@/utils/request';
-
+import { moduleName } from '/@/utils/request';
-const moduleName = 'zqq-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 +11,7 @@ export const getRemoteSensingSourceData = (param) => {
 
 export const getSelectionCondition = (param) => {
 	return request({
-		url: '/api/' + moduleName + '/ui/selectCondition',
+		url: '/api/' + moduleName + '/ui/disasterInfo/selectCondition',
 		method: 'get',
 		params: param,
 	});

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',
@@ -336,7 +479,7 @@ export const notFoundAndNoPower = [
 		meta: {
 			title: '页面找不到',
 			isHide: true,
-			zh:"页面找不到"
+			zh: '页面找不到',
 		},
 	},
 	{
@@ -346,7 +489,7 @@ export const notFoundAndNoPower = [
 		meta: {
 			title: '页面无权限',
 			isHide: true,
-			zh:"页面无权限"
+			zh: '页面无权限',
 		},
 	},
 ];
@@ -364,7 +507,7 @@ export const staticRoutes = [
 		component: () => import('/@/views/login/index.vue'),
 		meta: {
 			title: '登录',
-			zh:"登录"
+			zh: '登录',
 		},
 	},
 ];

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,

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) => {

src/views/systemManagement/administrator/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <h3>普通管理员注册审核管理</h3>
+  </div>
+</template>

src/views/systemManagement/dictionary/index.vue

@@ -0,0 +1,10 @@
+<template>
+  <div>
+    <h3>
+      <ul>字典管理
+        <li>disaster type</li>
+        <li>...</li>
+      </ul>
+    </h3>
+  </div>
+</template>