fix: 修复多个字段校验，显示优化等bug

src/theme/element.scss

@@ -248,8 +248,12 @@
 	}
 }
 
-
-.el-tree-node__label{
+.el-tree-node__label,
+.custom-tree-node{
 	overflow: hidden;
 	text-overflow: ellipsis;
+}
+
+.el-popper {
+    max-width: 50vw;
 }

src/views/iot/device-tree/tree/component/edit.vue

@@ -40,8 +40,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="类型" prop="template">
-							<el-select v-model="ruleForm.template" filterable clearable placeholder="请选择类型" style="width: 100%;">
+						<el-form-item label="页面模板" prop="template">
+							<el-select v-model="ruleForm.template" filterable clearable placeholder="请选择页面模板" style="width: 100%;">
 								<el-option v-for="dict in tree_types" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
 							</el-select>
 						</el-form-item>
@@ -60,7 +60,6 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="设备所属区域" prop="area">
-
 							<el-cascader :options="orgData" :props="{ checkStrictly: true, emitPath: false, value: 'id', label: 'name' }" placeholder="请选择区域" clearable class="w100" v-model="ruleForm.area">
 								<template #default="{ node, data }">
 									<span>{{ data.name }}</span>
@@ -171,9 +170,7 @@ export default defineComponent({
 			treeData: [] as any[]
 		});
 
-		const { tree_types_2 } = proxy.useDict('tree_types_2');
-
-		const { tree_types, tree_category } = proxy.useDict('tree_types', 'tree_category');
+		const { tree_types_2, tree_types, tree_category } = proxy.useDict('tree_types_2', 'tree_types', 'tree_category');
 
 		// 打开弹窗
 		const openDialog = (type: string, row?: any) => {
@@ -209,7 +206,7 @@ export default defineComponent({
 		const getDetail = () => {
 			api.tree.detail({ infoId: state.ruleForm.id })
 				.then((res: any) => {
-					state.ruleForm = { ...res.data }
+					state.ruleForm = { ...res.data, area: Number(res.data.area) }
 				})
 		}
 		// 新增

src/views/iot/device-tree/tree/index.vue

@@ -6,7 +6,7 @@
           <el-scrollbar v-loading="treeLoading">
             <el-input :prefix-icon="search" v-model="searchVal" placeholder="请输入设备树名称" clearable size="default" style="width: 100%;" />
 
-            <el-button v-if="!treeLoading && !treeData.length" type="primary"  v-auth="'add'" class="mt-2" @click="operateCmd('add', {})" style="width: 100%">新建节点</el-button>
+            <el-button v-if="!treeLoading && !treeData.length" type="primary" v-auth="'add'" class="mt-2" @click="operateCmd('add', {})" style="width: 100%">新建节点</el-button>
             <el-tree ref="zlTreeSearchRef" v-if="!treeLoading" :data="treeData" :props="{
               children: 'children',
               label: 'name'
@@ -52,7 +52,7 @@
         </el-card>
       </el-col>
       <el-col :span="19">
-        <el-card shadow="hover">
+        <el-card shadow="hover" v-if="treeDetail.name">
           <el-tabs v-model="tabName" @tab-click="onTabClick">
             <el-tab-pane label="设备树信息" name="1">
               <table>
@@ -292,7 +292,7 @@ export default defineComponent({
         ElMessage.warning('请选择节点树')
         return
       }
-      
+
       if (!(new Date(ruleForm.value.endDate) >= new Date(ruleForm.value.startDate))) {
         ElMessage.warning('开始时间不能大于结束时间')
         return
@@ -326,6 +326,7 @@ export default defineComponent({
               api.tree.delete({ id: data.infoId }).then(() => {
                 ElMessage.success('删除成功');
                 state.searchVal = ''
+                state.treeDetail = {}
                 getTreeList();
               });
             })

src/views/iot/device/channel/index.vue

@@ -10,12 +10,12 @@
 	<div class="page">
 		<el-card shadow="hover">
 			<div class="search">
-				<el-form :model="params" :inline="true" ref="queryRef">
+				<el-form :model="params" :inline="true" ref="queryRef" @keyup.enter.native="getList(1)">
 					<el-form-item label="通道名称" prop="title">
-						<el-input v-model="params.title" placeholder="请输入通道名称" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.title" placeholder="请输入通道名称" clearablestyle="width: 240px" />
 					</el-form-item>
 					<el-form-item label="注册码" prop="number">
-						<el-input v-model="params.number" placeholder="请输入注册码" clearablestyle="width: 240px" @keyup.enter.native="getList(1)" />
+						<el-input v-model="params.number" placeholder="请输入注册码" clearablestyle="width: 240px" />
 					</el-form-item>
 					<el-form-item>
 						<el-button size="default" type="primary" class="ml10" @click="getList(1)">

src/views/iot/device/instance/component/subDevice.vue

@@ -533,7 +533,7 @@ export default defineComponent({
 
 		// 删除产品
 		const onRowDel = (key, type) => {
-			let msg = `此操作将永久删除该数据吗？，是否继续?`
+			let msg = `此操作将永久删除该数据，是否继续?`
 
 			if (key.length === 0) {
 				ElMessage.error('请选择要删除的数据。')

src/views/iot/device/instance/detail.vue

@@ -663,7 +663,7 @@ export default defineComponent({
 
     // 删除产品
     const onRowDel = (key, type) => {
-      let msg = `此操作将永久删除该数据吗？，是否继续?`;
+      let msg = `此操作将永久删除该数据，是否继续?`;
 
       if (key.length === 0) {
         ElMessage.error('请选择要删除的数据。');

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

@@ -6,7 +6,7 @@
 					<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-input v-model.trim="ruleForm.name" placeholder="请输入属性定义名称" />
 				</el-form-item>
 
 				<el-form-item label="数据类型" prop="type">

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

@@ -175,12 +175,12 @@ export default defineComponent({
 				...form
 			},
 			rules: {
-				name: [ { required: true, message: '产品名称不能为空', trigger: 'change' },
-        				{ max: 32, message: '产品名称不能超过32个字符', trigger: 'change' },
-						{ validator: validateNoSpace, message: '产品名称不能包含空格', trigger: 'change' }
-					],
+				name: [{ required: true, message: '产品名称不能为空', trigger: 'change' },
+				{ max: 32, message: '产品名称不能超过32个字符', trigger: 'change' },
+				{ validator: validateNoSpace, message: '产品名称不能包含空格', trigger: 'change' }
+				],
 				key: [{ required: true, message: '产品标识不能为空', trigger: 'change' },
-					{ validator: validateNoSpace, message: '产品标识不能包含空格', trigger: 'change' }],
+				{ validator: validateNoSpace, message: '产品标识不能包含空格', trigger: 'change' }],
 				messageProtocol: [{ required: true, message: '消息协议不能为空', trigger: 'change' }],
 				transportProtocol: [{ required: true, message: '接入方式不能为空', trigger: 'change' }],
 				categoryId: [{ required: true, message: '产品分类不能为空', trigger: 'change' }],

src/views/iot/device/product/detail.vue

@@ -359,7 +359,7 @@ export default defineComponent({
 
 		// 删除产品
 		const onRowDel = (key, type) => {
-			let msg = `此操作将永久删除该数据吗？是否继续?`;
+			let msg = `此操作将永久删除该数据，是否继续?`;
 
 			if (key.length === 0) {
 				ElMessage.error('请选择要删除的数据。');

src/views/iot/device/template/detail.vue

@@ -462,7 +462,7 @@ export default defineComponent({
 
 		// 删除产品
 		const onRowDel = (key, type) => {
-			let msg = `此操作将永久删除该数据吗？，是否继续?`;
+			let msg = `此操作将永久删除该数据，是否继续?`;
 
 			if (key.length === 0) {
 				ElMessage.error('请选择要删除的数据。');

src/views/iot/network/tunnel/create.vue

@@ -6,7 +6,7 @@
                     <el-collapse-item title="基本信息" name="1">
                         <div class="collapse-wrap">
                             <el-form style="width: 600px;margin: 0 auto;" :model="form" label-width="68px">
-                                <el-form-item label="名称">
+                                <el-form-item label="名称" prop="name">
                                     <el-input v-model="form.name" placeholder="请填写名称" />
                                 </el-form-item>
                                 <el-form-item label="类型">

src/views/iot/network/tunnel/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-card shadow="hover">
         <el-form :inline="true" label-width="68px">
-            <el-form-item label="通道名称">
+            <el-form-item label="通道名称"  @keyup.enter.native="searchData()">
                 <el-input size="default" style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>
             </el-input>
             </el-form-item>

src/views/system/application/index.vue

@@ -1,8 +1,8 @@
 <template>
 	<el-card shadow="hover">
 		<div class="search">
-			<el-form :inline="true" ref="queryRef">
-				<el-form-item label="应用名称：" prop="name" @submit.prevent>
+			<el-form :model="params" :inline="true" ref="queryRef">
+				<el-form-item label="应用名称：" prop="keyWord" @submit.prevent>
 					<el-input v-model="params.keyWord" placeholder="请输入应用名称" clearable size="default" style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				<el-form-item>
@@ -70,7 +70,7 @@ getList()
 const resetQuery = (formEl: any) => {
 	if (!formEl) return;
 	formEl.resetFields();
-	getList();
+	getList(1);
 };
 const initTableData = () => {
 	user.dept.getList({ status: 1 }).then((res: any) => {

src/views/system/assess/component/editAttr.vue

@@ -6,7 +6,7 @@
 					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" />
 				</el-form-item>
 				<el-form-item label="属性定义名称" prop="name">
-					<el-input v-model="ruleForm.name" placeholder="请输入属性定义名称" />
+					<el-input v-model.trim="ruleForm.name" placeholder="请输入属性定义名称" />
 				</el-form-item>
 
 				<el-form-item label="数据类型" prop="type">

src/views/system/assess/component/editPro.vue

@@ -41,10 +41,10 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="传输协议" prop="transportProtocol">
+        <el-form-item label="接入方式" prop="transportProtocol">
 
 
-          <el-select v-model="ruleForm.transportProtocol" placeholder="请选择传输协议">
+          <el-select v-model="ruleForm.transportProtocol" placeholder="请选择接入方式">
             <el-option v-for="item in tranData" :key="item.key" :label="item.name" :value="item.key" />
           </el-select>
         </el-form-item>
@@ -132,7 +132,7 @@ export default defineComponent({
         parentId: [{ required: true, message: '产品分类不能为空', trigger: 'blur' }],
         deptId: [{ required: true, message: '所属组织不能为空', trigger: 'blur' }],
         messageProtocol: [{ required: true, message: '消息协议不能为空', trigger: 'blur' }],
-        transportProtocol: [{ required: true, message: '传输协议不能为空', trigger: 'blur' }],
+        transportProtocol: [{ required: true, message: '接入方式不能为空', trigger: 'blur' }],
         deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
       }
     });

src/views/system/assess/totalIndex/index.vue

@@ -131,7 +131,7 @@ export default defineComponent({
     };
     // 删除
     const onRowDel = (row: TableDataRow) => {
-      ElMessageBox.confirm(`此操作将永久删除账户：“${row.title}”，是否继续?`, '提示', {
+      ElMessageBox.confirm(`此操作将永久删除指数：“${row.title}”，是否继续?`, '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',

src/views/system/manage/user/index.vue

@@ -5,7 +5,12 @@
 				<el-card shadow="hover">
 					<el-scrollbar>
 						<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入组织名称" clearable size="default" style="width: 100%;" />
-						<el-tree ref="treeRef" class="filter-tree mt-4" :data="deptData" :props="deptProps" default-expand-all :filter-node-method="deptFilterNode" @node-click="handleNodeClick" />
+						<el-tree ref="treeRef" class="filter-tree mt-4" :data="deptData" :props="deptProps" default-expand-all :filter-node-method="deptFilterNode" @node-click="handleNodeClick">
+							<template #default="{ node, data }">
+								<div class="custom-tree-node" :title="node.label">
+									{{ node.label }}
+								</div>
+							</template></el-tree>
 					</el-scrollbar>
 				</el-card>
 			</el-col>