修改首页重定向的地址，从后台配置中获取首页的地址并在登录之后和刷新页面时进行修改

src/layout/navBars/tagsView/tagsView.vue

@@ -487,7 +487,7 @@ export default defineComponent({
 			// 监听布局配置开启 TagsView 共用，为了演示还原默认值
 			proxy.mittBus.on('openShareTagsView', () => {
 				if (getThemeConfig.value.isShareTagsView) {
-					router.push('/home');
+					router.push('/');
 					state.tagsViewList = [];
 					state.tagsViewRoutesList.map((v: any) => {
 						if (v.meta?.isAffix && !v.meta?.isHide) {

src/router/index.ts

@@ -167,6 +167,11 @@ export async function setAddRoute() {
 		const routeName: any = route.name;
 		if (!router.hasRoute(routeName)) router.addRoute(route);
 	});
+
+	// 修改首页重定向的地址，从后台配置中获取首页的地址并在登录之后和刷新页面时进行修改
+	const sysinfo = JSON.parse(localStorage.sysinfo || '{}');
+	const homePage = router.getRoutes().find((item) => item.path === '/');
+	homePage && sysinfo.systemHomePageRoute && (homePage.redirect = sysinfo.systemHomePageRoute);
 }
 
 /**
@@ -230,7 +235,7 @@ router.beforeEach(async (to, from, next) => {
 			resetRoute();
 			NProgress.done();
 		} else if (token && to.path === '/login') {
-			next('/home');
+			next('/');
 			NProgress.done();
 		} else {
 			if (store.state.routesList.routesList.length === 0) {

src/views/iot/configuration/screen/tools.vue

@@ -1,18 +0,0 @@
-<template>
-  <div class="page-wrapper page-full">
-    <iframe class="iframe" :src="src" frameborder="0"></iframe>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Session } from '/@/utils/storage';
-const src = 'http://home.yanglizhi.cn:10003/?token=' + encodeURIComponent(Session.get('token'))
-</script>
-
-<style scoped lang="scss">
-  .iframe{
-    width: 100%;
-    height: 100%;
-    background: #fff;
-  }
-</style>

src/views/iot/configuration/tools.vue

@@ -1,18 +0,0 @@
-<template>
-  <div class="page-wrapper page-full">
-    <iframe class="iframe" :src="src" frameborder="0"></iframe>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Session } from '/@/utils/storage';
-const src = 'http://home.yanglizhi.cn:10001/?token=' + encodeURIComponent(Session.get('token'))
-</script>
-
-<style scoped lang="scss">
-  .iframe{
-    width: 100%;
-    height: 100%;
-    background: #fff;
-  }
-</style>

src/views/iot/iotmanager/dashboard.vue

@@ -410,7 +410,7 @@ export default defineComponent({
 					// "num": 43, //该级别日志数量
 					// "ratio": 100 //该级别日志数量占比(百分比)
 				state.pieChartLegend = [];
-				alarmLevel.map((item: any) => {
+				alarmLevel && alarmLevel.map((item: any) => {
 					state.pieChartLegend.push(item.name)
 					state.pieChartData.push(item.ratio)
 				})
@@ -432,7 +432,7 @@ export default defineComponent({
 		};
 		// 告警信息-更多信息
 		const toMore = () => {
-			router.push({ path: '/alarm/log'});
+			router.push({ path: '/monitor/notice'});
 		};
 		// 页面加载时
 		onMounted(() => {

src/views/login/component/account.vue

@@ -1,50 +1,68 @@
 <template>
-  <el-form ref="loginForm" size="large" class="login-content-form" :model="ruleForm" :rules="formRules">
-    <el-form-item class="login-animation1" prop="userName">
-      <el-input type="text" :placeholder="$t('message.account.accountPlaceholder1')" v-model="ruleForm.userName" clearable autocomplete="off">
-        <template #prefix>
-          <el-icon class="el-input__icon">
-            <ele-User />
-          </el-icon>
-        </template>
-      </el-input>
-    </el-form-item>
-    <el-form-item class="login-animation2" prop="password">
-      <el-input :type="isShowPassword ? 'text' : 'password'" :placeholder="$t('message.account.accountPlaceholder2')" v-model="ruleForm.password" autocomplete="off" @keyup.enter="onSignIn">
-        <template #prefix>
-          <el-icon class="el-input__icon">
-            <ele-Unlock />
-          </el-icon>
-        </template>
-        <template #suffix>
-          <i class="iconfont el-input__icon login-content-password" :class="isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'" @click="isShowPassword = !isShowPassword">
-          </i>
-        </template>
-      </el-input>
-    </el-form-item>
-    <el-form-item class="login-animation3" prop="captcha">
-      <el-col :span="15">
-        <el-input type="text" maxlength="4" :placeholder="$t('message.account.accountPlaceholder3')" v-model="ruleForm.captcha" clearable autocomplete="off" @keyup.enter="onSignIn">
-          <template #prefix>
-            <el-icon class="el-input__icon">
-              <ele-Position />
-            </el-icon>
-          </template>
-        </el-input>
-      </el-col>
-      <el-col :span="1"></el-col>
-      <el-col :span="8">
-        <div class="login-content-code">
-          <img class="login-content-code-img" @click="getCaptcha" width="130" height="38" :src="captchaSrc" style="cursor: pointer" />
-        </div>
-      </el-col>
-    </el-form-item>
-    <el-form-item class="login-animation4">
-      <el-button type="primary" class="login-content-submit" @click="onSignIn" :loading="loading.signIn">
-        <span>{{ $t('message.account.accountBtnText') }}</span>
-      </el-button>
-    </el-form-item>
-  </el-form>
+	<el-form ref="loginForm" size="large" class="login-content-form" :model="ruleForm" :rules="formRules">
+		<el-form-item class="login-animation1" prop="userName">
+			<el-input type="text" :placeholder="$t('message.account.accountPlaceholder1')" v-model="ruleForm.userName" clearable autocomplete="off">
+				<template #prefix>
+					<el-icon class="el-input__icon">
+						<ele-User />
+					</el-icon>
+				</template>
+			</el-input>
+		</el-form-item>
+		<el-form-item class="login-animation2" prop="password">
+			<el-input
+				:type="isShowPassword ? 'text' : 'password'"
+				:placeholder="$t('message.account.accountPlaceholder2')"
+				v-model="ruleForm.password"
+				autocomplete="off"
+				@keyup.enter="onSignIn"
+			>
+				<template #prefix>
+					<el-icon class="el-input__icon">
+						<ele-Unlock />
+					</el-icon>
+				</template>
+				<template #suffix>
+					<i
+						class="iconfont el-input__icon login-content-password"
+						:class="isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'"
+						@click="isShowPassword = !isShowPassword"
+					>
+					</i>
+				</template>
+			</el-input>
+		</el-form-item>
+		<el-form-item class="login-animation3" prop="captcha">
+			<el-col :span="15">
+				<el-input
+					type="text"
+					maxlength="4"
+					:placeholder="$t('message.account.accountPlaceholder3')"
+					v-model="ruleForm.captcha"
+					clearable
+					autocomplete="off"
+					@keyup.enter="onSignIn"
+				>
+					<template #prefix>
+						<el-icon class="el-input__icon">
+							<ele-Position />
+						</el-icon>
+					</template>
+				</el-input>
+			</el-col>
+			<el-col :span="1"></el-col>
+			<el-col :span="8">
+				<div class="login-content-code">
+					<img class="login-content-code-img" @click="getCaptcha" width="130" height="38" :src="captchaSrc" style="cursor: pointer" />
+				</div>
+			</el-col>
+		</el-form-item>
+		<el-form-item class="login-animation4">
+			<el-button type="primary" class="login-content-submit" @click="onSignIn" :loading="loading.signIn">
+				<span>{{ $t('message.account.accountBtnText') }}</span>
+			</el-button>
+		</el-form-item>
+	</el-form>
 </template>
 
 <script lang="ts">
@@ -59,126 +77,130 @@ import { Session } from '/@/utils/storage';
 import { formatAxis } from '/@/utils/formatTime';
 import api from '/@/api/system';
 export default defineComponent({
-  name: 'loginAccount',
-  setup() {
-    const { t } = useI18n();
-    const store = useStore();
-    const route = useRoute();
-    const router = useRouter();
-    const { proxy } = getCurrentInstance() as any;
-    const state = reactive({
-      isShowPassword: false,
-      ruleForm: {
-        userName: 'demo',
-        password: 'demo123456',
-        captcha: '',
-        VerifyKey: '',
-      },
-      formRules: {
-        userName: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
-        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
-        captcha: [{ required: true, trigger: 'blur', message: '验证码不能为空' }],
-      },
-      loading: {
-        signIn: false,
-      },
-      captchaSrc: '',
-    });
-    onMounted(() => {
-      getCaptcha();
-    });
-    // 时间获取
-    const currentTime = computed(() => {
-      return formatAxis(new Date());
-    });
+	name: 'loginAccount',
+	setup() {
+		const { t } = useI18n();
+		const store = useStore();
+		const route = useRoute();
+		const router = useRouter();
+		const { proxy } = getCurrentInstance() as any;
+		const state = reactive({
+			isShowPassword: false,
+			ruleForm: {
+				userName: 'demo',
+				password: 'demo123456',
+				captcha: '',
+				VerifyKey: '',
+			},
+			formRules: {
+				userName: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
+				password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
+				captcha: [{ required: true, trigger: 'blur', message: '验证码不能为空' }],
+			},
+			loading: {
+				signIn: false,
+			},
+			captchaSrc: '',
+		});
+		onMounted(() => {
+			getCaptcha();
+		});
+		// 时间获取
+		const currentTime = computed(() => {
+			return formatAxis(new Date());
+		});
 
-    const getCaptcha = () => {
-      api.login.captcha().then((res: any) => {
-        state.captchaSrc = res.img;
-        state.ruleForm.VerifyKey = res.key;
-      });
-    };
+		const getCaptcha = () => {
+			api.login.captcha().then((res: any) => {
+				state.captchaSrc = res.img;
+				state.ruleForm.VerifyKey = res.key;
+			});
+		};
 
-    // 登录
-    const onSignIn = () => {
-      // 验证表单
-      proxy.$refs.loginForm
-        .validate((valid: boolean) => {
-          if (valid) {
-            state.loading.signIn = true;
-            api.login
-              .login(state.ruleForm)
-              .then(async (res: any) => {
-                const userInfos = res.userInfo;
-                userInfos.avatar = proxy.getUpFileUrl(userInfos.avatar);
-                // 存储 token 到浏览器缓存
-                Session.set('token', res.token);
-                localStorage.setItem('token', res.token);
-                // 存储用户信息到浏览器缓存
-                Session.set('userInfo', userInfos);
-                await store.dispatch('userInfos/setUserInfos', userInfos);
+		// 登录
+		const onSignIn = () => {
+			// 验证表单
+			proxy.$refs.loginForm
+				.validate((valid: boolean) => {
+					if (valid) {
+						state.loading.signIn = true;
+						api.login
+							.login(state.ruleForm)
+							.then(async (res: any) => {
+								const userInfos = res.userInfo;
+								userInfos.avatar = proxy.getUpFileUrl(userInfos.avatar);
+								// 存储 token 到浏览器缓存
+								Session.set('token', res.token);
+								localStorage.setItem('token', res.token);
+								// 存储用户信息到浏览器缓存
+								Session.set('userInfo', userInfos);
+								await store.dispatch('userInfos/setUserInfos', userInfos);
 
-                currentUser();
-              })
-              .catch(() => {
-                state.loading.signIn = false;
-                getCaptcha();
-              });
-          }
-        })
-        .catch(() => { });
-    };
-    // 获取登录用户信息
-    const currentUser = async () => {
-      api.login.currentUser().then(async (res: any) => {
-        localStorage.setItem('userId', res.Info.id)
-        // 设置用户菜单
-        Session.set('userMenu', res.Data || []);
-        store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);
-        if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
-          // 前端控制路由，2、请注意执行顺序
-          await initFrontEndControlRoutes();
-          signInSuccess();
-        } else {
-          // 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-          // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-          await initBackEndControlRoutes();
-          // 执行完 initBackEndControlRoutes，再执行 signInSuccess
-          signInSuccess();
-        }
-      });
-      // // 设置按钮权限
-      // Session.set('permissions', res.data.permissions);
-      // // 1、请注意执行顺序(存储用户信息到vuex)
-      // await store.dispatch('userInfos/setPermissions', res.data.permissions);
-    };
-    // 登录成功后的跳转
-    const signInSuccess = () => {
-      // 初始化登录成功时间问候语
-      let currentTimeInfo = currentTime.value;
-      // 登录成功，跳到转首页
-      // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-      // 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
-      if (route.query?.redirect) {
-        router.push({
-          path: route.query?.redirect as string,
-          query: route.query.params ? (Object.keys(route.query?.params as string).length > 0 ? JSON.parse(route.query?.params as string) : '') : '',
-        });
-      } else {
-        router.push('/');
-      }
-      // 登录成功提示
-      // 关闭 loading
-      state.loading.signIn = false;
-      const signInText = t('message.signInText');
-      ElMessage.success(`${currentTimeInfo}，${signInText}`);
-    };
-    return {
-      onSignIn,
-      getCaptcha,
-      ...toRefs(state),
-    };
-  },
+								currentUser();
+							})
+							.catch(() => {
+								state.loading.signIn = false;
+								getCaptcha();
+							});
+					}
+				})
+				.catch(() => {});
+		};
+		// 获取登录用户信息
+		const currentUser = async () => {
+			api.login.currentUser().then(async (res: any) => {
+				localStorage.setItem('userId', res.Info.id);
+				// 设置用户菜单
+				Session.set('userMenu', res.Data || []);
+				store.dispatch('requestOldRoutes/setBackEndControlRoutes', res || []);
+				if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
+					// 前端控制路由，2、请注意执行顺序
+					await initFrontEndControlRoutes();
+					signInSuccess();
+				} else {
+					// 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+					// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+					await initBackEndControlRoutes();
+					// 执行完 initBackEndControlRoutes，再执行 signInSuccess
+					signInSuccess();
+				}
+			});
+			// // 设置按钮权限
+			// Session.set('permissions', res.data.permissions);
+			// // 1、请注意执行顺序(存储用户信息到vuex)
+			// await store.dispatch('userInfos/setPermissions', res.data.permissions);
+		};
+		// 登录成功后的跳转
+		const signInSuccess = () => {
+			// 修改首页重定向的地址，从后台配置中获取首页的地址并在登录之后和刷新页面时进行修改
+			const sysinfo = JSON.parse(localStorage.sysinfo || '{}');
+			const homePage = router.getRoutes().find((item) => item.path === '/');
+			homePage && (homePage.redirect = sysinfo.systemHomePageRoute);
+			// 初始化登录成功时间问候语
+			let currentTimeInfo = currentTime.value;
+			// 登录成功，跳到转首页
+			// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+			// 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
+			if (route.query?.redirect) {
+				router.push({
+					path: route.query?.redirect as string,
+					query: route.query.params ? (Object.keys(route.query?.params as string).length > 0 ? JSON.parse(route.query?.params as string) : '') : '',
+				});
+			} else {
+				router.push('/');
+			}
+			// 登录成功提示
+			// 关闭 loading
+			state.loading.signIn = false;
+			const signInText = t('message.signInText');
+			ElMessage.success(`${currentTimeInfo}，${signInText}`);
+		};
+		return {
+			onSignIn,
+			getCaptcha,
+			...toRefs(state),
+		};
+	},
 });
 </script>
 

src/views/login/index.vue

@@ -86,7 +86,7 @@ export default defineComponent({
 			},
 		};
 	},
-	created() {
+	mounted() {
 		this.sysinfo = JSON.parse(localStorage.sysinfo || '{}');
 	},
 	setup() {