Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

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/device/product/component/editEvent copy.vue

@@ -0,0 +1,539 @@
+<template>
+	<div class="system-edit-dic-container">
+		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+				<el-form-item label="事件定义标识" prop="key">
+					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
+				</el-form-item>
+				<el-form-item label="事件定义名称" prop="name">
+					<el-input v-model="ruleForm.name" placeholder="请输入事件定义名称" />
+				</el-form-item>
+
+				<el-form-item label="事件级别" prop="level">
+					<el-radio-group v-model="ruleForm.level">
+						<el-radio :label="0">普通</el-radio>
+						<el-radio :label="1">警告</el-radio>
+						<el-radio :label="2">紧急</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item label="输出参数" prop="maxLength">
+					<div v-for="(item, index) in inputsdata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称：</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index, 'fun')">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson('fun')">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item label="输出参数" prop="type">
+					<el-select v-model="valueType.type" placeholder="请选择数据类型" @change="seletChange">
+						<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+							<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
+						</el-option-group>
+					</el-select>
+				</el-form-item>
+
+				<!--根据数据类型输出不同表单-->
+
+				<el-form-item label="精度" prop="decimals" v-if="type == 'float' || type == 'double'">
+					<el-input v-model="valueType.decimals" placeholder="请输入精度" />
+				</el-form-item>
+
+				<el-form-item label="单位" prop="unit" v-if="type == 'int' || type == 'long' || type == 'float' || type == 'double'">
+					<el-input v-model="valueType.unit" placeholder="请输入单位" />
+				</el-form-item>
+
+				<el-form-item label="最大长度" prop="maxLength" v-if="type == 'string'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
+				</el-form-item>
+
+				<el-form-item label="时间格式" prop="maxLength" v-if="type == 'date'">
+					<el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
+				</el-form-item>
+
+				<el-form-item label="布尔值" prop="trueText" v-if="type == 'boolean'">
+					<div class="input-box">
+						<el-input v-model="valueType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.trueValue" placeholder="请输入布尔值" value="true" />
+					</div>
+
+					<div class="input-box">
+						<el-input v-model="valueType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+						<el-input v-model="valueType.falseValue" placeholder="请输入布尔值" value="false" />
+					</div>
+				</el-form-item>
+
+				<el-form-item label="枚举项" prop="maxLength" v-if="type == 'enum'">
+					<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+						<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+							><el-icon><Right /></el-icon
+						></span>
+						<el-input v-model="item.value" placeholder="请输入枚举文本" />
+						<div class="input-option">
+							<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+							<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+						</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item label="JSON对象" prop="maxLength" v-if="type == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称：</div>
+							<div style="width: 60%">{{ item.name }}</div>
+							<div class="jsonoption">
+								<!-- <el-link type="primary">编辑</el-link> -->
+								<el-link type="primary" @click="deljson(index)">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+				<div v-if="type == 'array'">
+					<el-form-item label="元素类型" prop="types">
+						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
+							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
+								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="item.type == 'array'" />
+							</el-option-group>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="精度" prop="decimals" v-if="types == 'float' || types == 'double'">
+						<el-input v-model="elementType.decimals" placeholder="请输入精度" />
+					</el-form-item>
+
+					<el-form-item label="单位" prop="unit" v-if="types == 'int' || types == 'long' || types == 'float' || types == 'double'">
+						<el-input v-model="elementType.unit" placeholder="请输入单位" />
+					</el-form-item>
+
+					<el-form-item label="最大长度" prop="maxLength" v-if="types == 'string'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入最大长度" />
+					</el-form-item>
+
+					<el-form-item label="时间格式" prop="maxLength" v-if="types == 'date'">
+						<el-input v-model="elementType.maxLength" placeholder="请输入时间格式" />
+					</el-form-item>
+
+					<el-form-item label="布尔值" prop="maxLength" v-if="types == 'boolean'">
+						<div class="input-box">
+							<el-input v-model="elementType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.trueValue" placeholder="请输入布尔值" value="true" />
+						</div>
+
+						<div class="input-box">
+							<el-input v-model="elementType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
+							<el-input v-model="elementType.falseValue" placeholder="请输入布尔值" value="false" />
+						</div>
+					</el-form-item>
+
+					<el-form-item label="枚举项" prop="maxLength" v-if="types == 'enum'">
+						<div class="input-box" v-for="(item, index) in enumdata" :key="index">
+							<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
+								><el-icon><Right /></el-icon
+							></span>
+							<el-input v-model="item.value" placeholder="请输入枚举文本" />
+							<div class="input-option">
+								<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
+								<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
+							</div>
+						</div>
+					</el-form-item>
+				</div>
+
+				<el-form-item label="JSON对象" prop="maxLength" v-if="types == 'object'">
+					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+						<div class="jsonlist">
+							<div>参数名称：</div>
+							<div style="width: 60%">{{ item.data.name }}</div>
+							<div class="jsonoption">
+								<el-link type="primary">编辑</el-link>
+								<el-link type="primary">删除</el-link>
+							</div>
+						</div>
+					</div>
+
+					<div style="display: block; width: 100%">
+						<div class="input-options" @click="addJson">
+							<el-icon><Plus /></el-icon>
+							<div>添加参数</div>
+						</div>
+					</div>
+				</el-form-item>
+
+				<!--根据数据类型输出不同表单-->
+
+				<el-form-item label="事件定义描述	" prop="desc">
+					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入事件定义描述"></el-input>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+		<EditOption ref="editOptionRef" @typeList="getOptionData" />
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
+import api from '/@/api/device';
+import uploadVue from '/@/components/upload/index.vue';
+import { Plus, Minus, Right } from '@element-plus/icons-vue';
+import EditOption from './editOption.vue';
+
+import { ElMessage, UploadProps } from 'element-plus';
+
+interface RuleFormState {
+	id: number;
+	productId: number;
+	key: string;
+	level: number;
+	name: string;
+	dictType: string;
+	valueType: Object;
+	status: number;
+	desc: string;
+}
+interface DicState {
+	isShowDialog: boolean;
+	ruleForm: RuleFormState;
+	typeData: RuleFormState[];
+	rules: {};
+}
+
+export default defineComponent({
+	name: 'deviceEditPro',
+	components: { Plus, Minus, Right, EditOption },
+	setup(prop, { emit }) {
+		const formRef = ref<HTMLElement | null>(null);
+		const editOptionRef = ref();
+		const state = reactive<DicState>({
+			isShowDialog: false,
+			typeData: [], //
+			type: '',
+			types: '',
+			productId: 0,
+			valueType: {
+				type: '',
+				maxLength: '',
+				trueText: '是',
+				trueValue: 'true',
+				falseText: '否',
+				falseValue: 'false',
+			},
+			elementType: {
+				type: '',
+				maxLength: '',
+			},
+			enumdata: [
+				{
+					text: '',
+					value: '',
+				},
+			],
+
+			jsondata: [],
+			inputsdata: [],
+			ruleForm: {
+				id: 0,
+				productId: 0,
+				level: 0,
+				name: '',
+				key: '',
+				status: 1,
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
+				desc: '',
+			},
+			rules: {
+				name: [{ required: true, message: '事件定义名称不能为空', trigger: 'blur' }],
+				key: [{ required: true, message: '事件定义标识不能为空', trigger: 'blur' }],
+				level: [{ required: true, message: '请选择事件级别', trigger: 'blur' }],
+				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],
+			},
+		});
+
+		// 打开弹窗
+		const openDialog = (row: RuleFormState | null, productId: number | null) => {
+			resetForm();
+			api.product.getDataType({ status: -1 }).then((res: any) => {
+				const datat = Object.values(res.dataType);
+				datat.forEach((item, index) => {
+					if (index == 0) {
+						datat[index]['label'] = '基础类型';
+						datat[index]['options'] = item;
+					} else {
+						datat[index]['label'] = '扩展类型';
+						datat[index]['options'] = item;
+					}
+				});
+				console.log(row);
+				console.log(productId);
+				state.typeData = datat || [];
+			});
+			state.ruleForm = row;
+			if (row.valueType) {
+				state.ruleForm = row;
+
+				state.productId = productId;
+				state.valueType = row.valueType;
+				state.ruleForm.valueType.type = row.valueType.type;
+				state.ruleForm.type = row.valueType.type;
+				state.type = row.valueType.type;
+				state.ruleForm.accessMode = row.accessMode;
+				if (row.valueType.elementType) {
+					state.elementType = row.valueType.elementType;
+					state.types = row.valueType.elementType.type;
+				}
+
+				if (row.type == 'enum') {
+					state.enumdata = row.valueType.elements;
+				}
+
+				if (row.type == 'object') {
+					state.jsondata = row.valueType.properties;
+				}
+
+				if (row.type == 'array' && state.types == 'enum') {
+					state.enumdata = row.valueType.elementType.elements;
+				}
+				if (row.type == 'array' && state.types == 'object') {
+					state.jsondata = row.valueType.elementType.properties;
+				}
+			}
+			state.isShowDialog = true;
+		};
+		const resetForm = () => {
+			state.ruleForm = {
+				name: '',
+				key: '',
+				accessMode: '0',
+				status: 1,
+				valueType: {
+					type: '',
+					maxLength: '',
+				},
+
+				desc: '',
+			};
+			state.type = '';
+			state.types = '';
+			state.valueType = {};
+			state.elementType = {};
+			state.jsondata = [];
+			state.enumdata = [
+				{
+					text: '',
+					value: '',
+				},
+			];
+		};
+
+		const seletChange = (val) => {
+			state.type = val;
+			state.ruleForm.type = val;
+
+			console.log(val);
+		};
+		const seletChanges = (val) => {
+			console.log(val);
+			state.types = val;
+			console.log(val);
+		};
+
+		const addEnum = () => {
+			state.enumdata.push({
+				text: '',
+				value: '',
+			});
+		};
+		const delEnum = (index) => {
+			state.enumdata.splice(index, 1);
+		};
+
+		const deljson = (index) => {
+			state.jsondata.splice(index, 1);
+		};
+
+		const addJson = () => {
+			editOptionRef.value.openDialog({ product_id: 0, id: 0 });
+		};
+		const getOptionData = (data) => {
+			state.jsondata.push(data);
+
+			console.log(state.jsondata);
+		};
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		// 新增
+		const onSubmit = () => {
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.id !== 0) {
+						//修改
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+							//如果是选中数组，并选择了枚举
+							if (state.types == 'enum') {
+								state.valueType.elementType = {
+									elements: state.enumdata,
+									type: 'enum',
+								};
+							}
+							//如果是选中数组，并选择了object
+							if (state.types == 'object') {
+								state.valueType.elementType = {
+									properties: state.jsondata,
+									type: 'object',
+								};
+							}
+						}
+
+						console.log(state.valueType);
+
+						state.ruleForm.valueType = state.valueType;
+						state.ruleForm.productId = state.productId;
+						api.model.eventedit(state.ruleForm).then(() => {
+							ElMessage.success('事件定义类型修改成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					} else {
+						//添加
+						if (state.type == 'enum') {
+							state.valueType.elements = state.enumdata;
+						}
+
+						if (state.type == 'object') {
+							state.valueType.properties = state.jsondata;
+						}
+
+						if (state.type == 'array') {
+							state.valueType.elementType = state.elementType;
+							//如果是选中数组，并选择了枚举
+							if (state.types == 'enum') {
+								state.valueType.elementType = {
+									elements: state.enumdata,
+									type: 'enum',
+								};
+							}
+							//如果是选中数组，并选择了object
+							if (state.types == 'object') {
+								state.valueType.elementType = {
+									properties: state.jsondata,
+									type: 'object',
+								};
+							}
+						}
+
+						state.ruleForm.valueType = state.valueType;
+						api.model.eventadd(state.ruleForm).then(() => {
+							ElMessage.success('事件定义类型添加成功');
+							closeDialog(); // 关闭弹窗
+							emit('typeList');
+						});
+					}
+				}
+			});
+		};
+
+		return {
+			editOptionRef,
+			getOptionData,
+			openDialog,
+			deljson,
+			addEnum,
+			delEnum,
+			addJson,
+			seletChange,
+			seletChanges,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			formRef,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+<style>
+.input-box {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin-top: 10px;
+}
+.input-option {
+	line-height: 30px;
+	padding-top: 5px;
+	width: 140px;
+}
+.input-option i {
+	margin: 0px 5px;
+	border: 1px solid #c3c3c3;
+	font-size: 16px;
+}
+.input-options {
+	display: flex;
+	align-items: center;
+	color: #409eff;
+	cursor: pointer;
+}
+.jslist {
+	width: 100%;
+	border: 1px solid #e8e8e8;
+	padding: 10px;
+	margin-bottom: 10px;
+}
+.jsonlist {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.jsonoption {
+}
+.jsonoption a {
+	margin: 0px 10px;
+}
+</style>

src/views/iot/device/product/component/editEvent.vue

@@ -3,167 +3,40 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="事件定义标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id!== 0 ?true : false"/>
+					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 				</el-form-item>
 				<el-form-item label="事件定义名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入事件定义名称" />
 				</el-form-item>
 
-                <el-form-item label="事件级别" prop="level">
-					<el-radio-group v-model="ruleForm.level" >
+				<el-form-item label="事件级别" prop="level">
+					<el-radio-group v-model="ruleForm.level">
 						<el-radio :label="0">普通</el-radio>
-
 						<el-radio :label="1">警告</el-radio>
 						<el-radio :label="2">紧急</el-radio>
 					</el-radio-group>
 				</el-form-item>
 
-				<el-form-item label="输出参数" prop="type" >
-					<el-select v-model="valueType.type" placeholder="请选择数据类型" @change="seletChange">
-						<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
-							<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
-						</el-option-group>
-					</el-select>
-				</el-form-item>
-
-				<!--根据数据类型输出不同表单-->
-
-				<el-form-item label="精度" prop="decimals" v-if="type == 'float' || type == 'double'">
-					<el-input v-model="valueType.decimals" placeholder="请输入精度" />
-				</el-form-item>
-
-				<el-form-item label="单位" prop="unit" v-if="type == 'int' || type == 'long' || type == 'float' || type == 'double'">
-					<el-input v-model="valueType.unit" placeholder="请输入单位" />
-				</el-form-item>
-
-				<el-form-item label="最大长度" prop="maxLength" v-if="type == 'string'">
-					<el-input v-model="valueType.maxLength" placeholder="请输入最大长度" />
-				</el-form-item>
-
-				<el-form-item label="时间格式" prop="maxLength" v-if="type == 'date'">
-					<el-input v-model="valueType.maxLength" placeholder="请输入时间格式" />
-				</el-form-item>
-
-				<el-form-item label="布尔值" prop="trueText" v-if="type == 'boolean'">
-					<div class="input-box">
-						<el-input v-model="valueType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
-						<el-input v-model="valueType.trueValue" placeholder="请输入布尔值" value="true" />
-					</div>
-
-					<div class="input-box">
-						<el-input v-model="valueType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
-						<el-input v-model="valueType.falseValue" placeholder="请输入布尔值" value="false" />
-					</div>
-				</el-form-item>
-
-				<el-form-item label="枚举项" prop="maxLength" v-if="type == 'enum'">
-					<div class="input-box" v-for="(item, index) in enumdata" :key="index">
-						<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
-							><el-icon><Right /></el-icon
-						></span>
-						<el-input v-model="item.value" placeholder="请输入枚举文本" />
-						<div class="input-option">
-							<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
-							<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
-						</div>
-					</div>
-				</el-form-item>
-
-				<el-form-item label="JSON对象" prop="maxLength" v-if="type == 'object'">
-					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
+				<el-form-item label="输出参数" prop="maxLength">
+					<div v-for="(item, index) in outputsdata" :key="index" class="jslist">
 						<div class="jsonlist">
 							<div>参数名称：</div>
 							<div style="width: 60%">{{ item.name }}</div>
 							<div class="jsonoption">
 								<!-- <el-link type="primary">编辑</el-link> -->
-								<el-link type="primary" @click="deljson(index)">删除</el-link>
-							</div>
-						</div>
-					</div>
-
-					<div style="display: block; width: 100%">
-						<div class="input-options" @click="addJson">
-							<el-icon><Plus /></el-icon>
-							<div>添加参数</div>
-						</div>
-					</div>
-				</el-form-item>
-
-				<div v-if="type == 'array'">
-					<el-form-item label="元素类型" prop="types">
-						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
-							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
-								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="item.type == 'array'" />
-							</el-option-group>
-						</el-select>
-					</el-form-item>
-
-					<el-form-item label="精度" prop="decimals" v-if="types == 'float' || types == 'double'">
-						<el-input v-model="elementType.decimals" placeholder="请输入精度" />
-					</el-form-item>
-
-					<el-form-item label="单位" prop="unit" v-if="types == 'int' || types == 'long' || types == 'float' || types == 'double'">
-						<el-input v-model="elementType.unit" placeholder="请输入单位" />
-					</el-form-item>
-
-					<el-form-item label="最大长度" prop="maxLength" v-if="types == 'string'">
-						<el-input v-model="elementType.maxLength" placeholder="请输入最大长度" />
-					</el-form-item>
-
-					<el-form-item label="时间格式" prop="maxLength" v-if="types == 'date'">
-						<el-input v-model="elementType.maxLength" placeholder="请输入时间格式" />
-					</el-form-item>
-
-					<el-form-item label="布尔值" prop="maxLength" v-if="types == 'boolean'">
-						<div class="input-box">
-							<el-input v-model="elementType.trueText" placeholder="请输入布尔值" value="是" /><span style="margin: 0px 10px">~</span>
-							<el-input v-model="elementType.trueValue" placeholder="请输入布尔值" value="true" />
-						</div>
-
-						<div class="input-box">
-							<el-input v-model="elementType.falseText" placeholder="请输入布尔值" value="否" /> <span style="margin: 0px 10px">~</span>
-							<el-input v-model="elementType.falseValue" placeholder="请输入布尔值" value="false" />
-						</div>
-					</el-form-item>
-
-					<el-form-item label="枚举项" prop="maxLength" v-if="types == 'enum'">
-						<div class="input-box" v-for="(item, index) in enumdata" :key="index">
-							<el-input v-model="item.text" placeholder="请输入枚举值" /><span style="margin: 0px 10px"
-								><el-icon><Right /></el-icon
-							></span>
-							<el-input v-model="item.value" placeholder="请输入枚举文本" />
-							<div class="input-option">
-								<el-icon @click="addEnum" v-if="index == 0"><Plus /></el-icon>
-								<el-icon @click="delEnum(index)" v-if="index != 0"><Minus /></el-icon>
-							</div>
-						</div>
-					</el-form-item>
-				</div>
-
-				
-				<el-form-item label="JSON对象" prop="maxLength" v-if="types == 'object'">
-					<div v-for="(item, index) in jsondata" :key="index" class="jslist">
-						<div class="jsonlist">
-							<div>参数名称：</div>
-							<div style="width: 60%">{{ item.data.name }}</div>
-							<div class="jsonoption">
-								<el-link type="primary">编辑</el-link>
-								<el-link type="primary">删除</el-link>
+								<el-link type="primary" @click="deljson(index, 'fun')">删除</el-link>
 							</div>
 						</div>
 					</div>
 
 					<div style="display: block; width: 100%">
-						<div class="input-options" @click="addJson">
+						<div class="input-options" @click="addJson('fun')">
 							<el-icon><Plus /></el-icon>
 							<div>添加参数</div>
 						</div>
 					</div>
 				</el-form-item>
 
-				<!--根据数据类型输出不同表单-->
-
-			
 				<el-form-item label="事件定义描述	" prop="desc">
 					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入事件定义描述"></el-input>
 				</el-form-item>
@@ -194,7 +67,8 @@ interface RuleFormState {
 	level: number;
 	name: string;
 	dictType: string;
-	valueType: Object;
+	inputs: Object;
+	outputs: Object [];
 	status: number;
 	desc: string;
 }
@@ -216,15 +90,7 @@ export default defineComponent({
 			typeData: [], //
 			type: '',
 			types: '',
-			productId:0,
-			valueType: {
-				type: '',
-				maxLength: '',
-				trueText:'是',
-				trueValue:'true',
-				falseText:'否',
-				falseValue:'false',
-			},
+			productId: 0,
 			elementType: {
 				type: '',
 				maxLength: '',
@@ -237,32 +103,24 @@ export default defineComponent({
 			],
 
 			jsondata: [],
+			outputsdata: [],
 
 			ruleForm: {
-				id:0,
-				productId:0,
-                level:0,
+				productId: 0,
 				name: '',
 				key: '',
-				status: 1,
-				valueType: {
-					type: '',
-					maxLength: '',
-				},
-
+				outputs: [],
 				desc: '',
 			},
 			rules: {
 				name: [{ required: true, message: '事件定义名称不能为空', trigger: 'blur' }],
 				key: [{ required: true, message: '事件定义标识不能为空', trigger: 'blur' }],
-				level: [{ required: true, message: '请选择事件级别', trigger: 'blur' }],
 				type: [{ required: true, message: '请选择数据类型', trigger: 'blur' }],
-				
 			},
 		});
 
 		// 打开弹窗
-		const openDialog = (row: RuleFormState | null,productId:number | null) => {
+		const openDialog = (row: RuleFormState | null, productId: number | null) => {
 			resetForm();
 
 			api.product.getDataType({ status: -1 }).then((res: any) => {
@@ -276,39 +134,16 @@ export default defineComponent({
 						datat[index]['options'] = item;
 					}
 				});
-				console.log(row);
-				console.log(productId);
+				// console.log(datat);
 				state.typeData = datat || [];
 			});
+
+			// console.log(row);
 			state.ruleForm = row;
-			if (row.valueType) {	
+			if (row.outputs) {
 				state.ruleForm = row;
-
-				state.productId=productId;
-				state.valueType = row.valueType;
-				state.ruleForm.valueType.type = row.valueType.type;
-				state.ruleForm.type = row.valueType.type;
-				state.type = row.valueType.type ;
-				state.ruleForm.accessMode=row.accessMode
-				if(row.valueType.elementType){
-					state.elementType=row.valueType.elementType;
-					state.types = row.valueType.elementType.type;
-				}
-
-				if (row.type == 'enum') {
-							state.enumdata = row.valueType.elements;;
-				}
-
-				if (row.type == 'object') {
-					state.jsondata = row.valueType.properties;
-				}
-
-				if(row.type == 'array' && state.types=='enum'){
-					state.enumdata=row.valueType.elementType.elements
-				}
-				if(row.type == 'array' && state.types=='object'){
-					state.jsondata=row.valueType.elementType.properties
-				}
+				state.productId = productId;
+				state.outputsdata = row.outputs;
 			}
 			state.isShowDialog = true;
 		};
@@ -316,37 +151,21 @@ export default defineComponent({
 			state.ruleForm = {
 				name: '',
 				key: '',
-				accessMode: '0',
 				status: 1,
-				valueType: {
-					type: '',
-					maxLength: '',
-				},
-
 				desc: '',
 			};
-				state.type="";
-			state.types="";
-			state.valueType = {};
-			state.elementType={};
-			state.jsondata = [];
-			state.enumdata = [{
-					text: '',
-					value: '',
-				},];
+			state.type = '';
+			state.types = '';
+			state.outputsdata = [];
+			state.elementType = [];
 		};
 
 		const seletChange = (val) => {
 			state.type = val;
 			state.ruleForm.type = val;
-		
-			
-			console.log(val);
 		};
 		const seletChanges = (val) => {
-			console.log(val);
 			state.types = val;
-			console.log(val);
 		};
 
 		const addEnum = () => {
@@ -359,17 +178,23 @@ export default defineComponent({
 			state.enumdata.splice(index, 1);
 		};
 
-		const deljson = (index) => {
-			state.jsondata.splice(index, 1);
-		}
-
-		const addJson = () => {
-			editOptionRef.value.openDialog({ product_id: 0, id: 0 });
+		const deljson = (index, type) => {
+			if (type == 'fun') {
+				state.outputsdata.splice(index, 1);
+			} else {
+				state.jsondata.splice(index, 1);
+			}
 		};
-		const getOptionData = (data) => {
-			state.jsondata.push(data);
 
-			console.log(state.jsondata);
+		const addJson = (type) => {
+			editOptionRef.value.openDialog({ product_id: 0, id: 0, type_data: type });
+		};
+		const getOptionData = (data, type_data) => {
+			if (type_data == 'fun') {
+				state.outputsdata.push(data);
+			} else {
+				state.jsondata.push(data);
+			}
 		};
 		// 关闭弹窗
 		const closeDialog = () => {
@@ -385,78 +210,21 @@ export default defineComponent({
 			if (!formWrap) return;
 			formWrap.validate((valid: boolean) => {
 				if (valid) {
-					if (state.ruleForm.id !== 0) {
-						//修改
-						if (state.type == 'enum') {
-							state.valueType.elements = state.enumdata;
-						}
-
-						if (state.type == 'object') {
-							state.valueType.properties = state.jsondata;
-						}
-
-						if (state.type == 'array') {
-							state.valueType.elementType = state.elementType;
-							//如果是选中数组，并选择了枚举
-							if(state.types=='enum'){
-								state.valueType.elementType = {
-									elements: state.enumdata,
-									type: 'enum'
-								}
-							}
-							//如果是选中数组，并选择了object
-							if(state.types=='object'){
-								state.valueType.elementType = {
-									properties: state.jsondata,
-									type: 'object'
-								}
-							}
-						}
+					state.ruleForm.outputs = state.outputsdata;
 
-						console.log(state.valueType);
+					const theApi = state.ruleForm.id !== 0 ? api.model.eventedit : api.model.eventadd;
 
-						state.ruleForm.valueType = state.valueType;
-						state.ruleForm.productId = state.productId
-						api.model.eventedit(state.ruleForm).then(() => {
-							ElMessage.success('事件定义类型修改成功');
-							closeDialog(); // 关闭弹窗
-							emit('typeList');
-						});
-					} else {
-						//添加
-						if (state.type == 'enum') {
-							state.valueType.elements = state.enumdata;
-						}
-
-						if (state.type == 'object') {
-							state.valueType.properties = state.jsondata;
-						}
+					if (state.ruleForm.id !== 0) {
+						state.ruleForm.productId = state.productId;
+					}
 
-						if (state.type == 'array') {
-							state.valueType.elementType = state.elementType;
-							//如果是选中数组，并选择了枚举
-							if(state.types=='enum'){
-								state.valueType.elementType = {
-									elements: state.enumdata,
-									type: 'enum'
-								}
-							}
-							//如果是选中数组，并选择了object
-							if(state.types=='object'){
-								state.valueType.elementType = {
-									properties: state.jsondata,
-									type: 'object'
-								}
-							}
-						}
+					console.log(JSON.parse(JSON.stringify(state.ruleForm)));
 
-						state.ruleForm.valueType = state.valueType;
-						api.model.eventadd(state.ruleForm).then(() => {
-							ElMessage.success('事件定义类型添加成功');
-							closeDialog(); // 关闭弹窗
-							emit('typeList');
-						});
-					}
+					theApi(state.ruleForm).then(() => {
+						ElMessage.success('事件定义类型操作成功');
+						closeDialog(); // 关闭弹窗
+						emit('typeList');
+					});
 				}
 			});
 		};

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