SKY-20221114TUK\Administrator 2 жил өмнө
parent
commit
2e6af70e06

+ 3 - 1
src/router/index.js

@@ -95,11 +95,13 @@ const whiteList = ['/login']
 
 
 // 路由加载前(全局路由前置守卫)
 // 路由加载前(全局路由前置守卫)
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
+	
 	console.log('store', store.roleId)
 	console.log('store', store.roleId)
 	NProgress.start();
 	NProgress.start();
 
 
 	// token存在的情况
 	// token存在的情况
-	if (store.roleId || to.path=="/login") {
+	// if (store.roleId || to.path=="/login") {
+		if (to.path=="/login") {
 		next();
 		next();
 		NProgress.done();
 		NProgress.done();
 	} else {
 	} else {

+ 4 - 5
src/utils/request.js

@@ -58,7 +58,6 @@ request.interceptors.request.use(
 // 响应拦截器
 // 响应拦截器
 request.interceptors.response.use(
 request.interceptors.response.use(
 	(response) => {
 	(response) => {
-		debugger;
 		if (response.status !== 200) {
 		if (response.status !== 200) {
 			return Promise.reject(new Error(response.statusText || 'Error'));
 			return Promise.reject(new Error(response.statusText || 'Error'));
 		}
 		}
@@ -69,7 +68,7 @@ request.interceptors.response.use(
 		if (res.success == true) {
 		if (res.success == true) {
 			return res;
 			return res;
 		}
 		}
-		debugger;
+		
 		// 错误提示
 		// 错误提示
 		ElMessage.error(res.message);
 		ElMessage.error(res.message);
 
 
@@ -78,11 +77,11 @@ request.interceptors.response.use(
 		// 	store.userStore?.setToken('')
 		// 	store.userStore?.setToken('')
 		// 	location.reload();
 		// 	location.reload();
 		// }
 		// }
-		debugger;
+
 		return Promise.reject(new Error(res.msg || 'Error'));
 		return Promise.reject(new Error(res.msg || 'Error'));
 	},
 	},
 	async (error) => {
 	async (error) => {
-		debugger;
+
 		NProgress.done();
 		NProgress.done();
 
 
 		if (error.response) {
 		if (error.response) {
@@ -91,7 +90,7 @@ request.interceptors.response.use(
 				config
 				config
 			} = error.response;
 			} = error.response;
 		}
 		}
-debugger;
+
 		return Promise.reject({
 		return Promise.reject({
 			message: error.message
 			message: error.message
 		});
 		});

+ 5 - 0
src/views/Login/Login.vue

@@ -134,14 +134,19 @@
 				// 	})
 				// 	})
 
 
 				// })
 				// })
+		         store.roleId=2
 				this.$router.replace({
 				this.$router.replace({
 					path: '/home'
 					path: '/home'
 				})
 				})
+				
+			
 				let userInfo = {
 				let userInfo = {
 					account: this.loginForm.username,
 					account: this.loginForm.username,
 					password: this.loginForm.password,
 					password: this.loginForm.password,
 					id: this.loginForm.id
 					id: this.loginForm.id
 				}
 				}
+				
+					console.log(" userInfo" , userInfo)
 				localStorage.setItem('person', JSON.stringify(userInfo))
 				localStorage.setItem('person', JSON.stringify(userInfo))
 
 
 				//登陆成功判断是否记住密码,设置本地存储账号信息,isRemeber存储是否记住密码状态
 				//登陆成功判断是否记住密码,设置本地存储账号信息,isRemeber存储是否记住密码状态

+ 2 - 0
src/views/Map3d/Map3DMain.vue

@@ -46,6 +46,8 @@
 	import printmap from './components/printmap.vue';
 	import printmap from './components/printmap.vue';
 	import dialogEdit from "./components/drawEdit.vue";
 	import dialogEdit from "./components/drawEdit.vue";
 	import queryResult from "./components/queryResult.vue";
 	import queryResult from "./components/queryResult.vue";
+	
+	
 	import ggsbtj from "./components/ggsbtj.vue";
 	import ggsbtj from "./components/ggsbtj.vue";
 	import ysltj from "./components/ysltj.vue";
 	import ysltj from "./components/ysltj.vue";
 	import sbyxjc from "./components/sbyxjc.vue";
 	import sbyxjc from "./components/sbyxjc.vue";

+ 3 - 0
src/views/Map3d/components/basicLayer.vue

@@ -185,6 +185,7 @@
 			 * 添加底图图集
 			 * 添加底图图集
 			 */
 			 */
 			addBaseLayer() {
 			addBaseLayer() {
+				debugger;
 				let _self = this
 				let _self = this
 
 
 				_self.$http.get('/getTableList', {
 				_self.$http.get('/getTableList', {
@@ -193,6 +194,7 @@
 					orderByField: '' //排序
 					orderByField: '' //排序
 				}).then(res => {
 				}).then(res => {
 					console.log('底图图集', res.data)
 					console.log('底图图集', res.data)
+					debugger;
 
 
 					res.data.forEach(item => {
 					res.data.forEach(item => {
 						let parameterset = item.parameterset;
 						let parameterset = item.parameterset;
@@ -277,6 +279,7 @@
 				sqlWhere: '"roleId"' + " = '" + roleId + "'",
 				sqlWhere: '"roleId"' + " = '" + roleId + "'",
 				orderByField: ''
 				orderByField: ''
 			}).then(res => {
 			}).then(res => {
+				debugger;
 				_self.roleName = '"atlasType"' + "= '底图'" +" and "+ '"roleId"' + " ='" + roleId + "'"
 				_self.roleName = '"atlasType"' + "= '底图'" +" and "+ '"roleId"' + " ='" + roleId + "'"
 				_self.addBaseLayer();
 				_self.addBaseLayer();
 			})
 			})