diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ef5ac50..d092982 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -163,7 +163,7 @@
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch((error) => {
-            this.$message.error(error)
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ef5ac50..d092982 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -163,7 +163,7 @@
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch((error) => {
-            this.$message.error(error)
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index fc4414d..0f53be8 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -4,10 +4,10 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-form-item class="selectForm-container-item" prop="resourceName">
-          <el-input v-model.trim="listQuery.resourceName" placeholder="菜单名称" clearable/>
+          <el-input v-model.trim="listQuery.resourceName" placeholder="资源名称" clearable/>
         </el-form-item>
         <el-form-item class="selectForm-container-item" prop="resourceUrl">
-          <el-input v-model="listQuery.resourceUrl" placeholder="菜单路径" clearable/>
+          <el-input v-model="listQuery.resourceUrl" placeholder="资源路径" clearable/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <el-button v-if="hasPerm('/resource/add')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
@@ -143,7 +143,7 @@
         if (value.id === des.id) {
           console.log('findit')
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ef5ac50..d092982 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -163,7 +163,7 @@
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch((error) => {
-            this.$message.error(error)
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index fc4414d..0f53be8 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -4,10 +4,10 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-form-item class="selectForm-container-item" prop="resourceName">
-          <el-input v-model.trim="listQuery.resourceName" placeholder="菜单名称" clearable/>
+          <el-input v-model.trim="listQuery.resourceName" placeholder="资源名称" clearable/>
         </el-form-item>
         <el-form-item class="selectForm-container-item" prop="resourceUrl">
-          <el-input v-model="listQuery.resourceUrl" placeholder="菜单路径" clearable/>
+          <el-input v-model="listQuery.resourceUrl" placeholder="资源路径" clearable/>
         </el-form-item>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <el-button v-if="hasPerm('/resource/add')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="add">新增</el-button>
@@ -143,7 +143,7 @@
         if (value.id === des.id) {
           console.log('findit')
           list.splice(index, 1)
-          return
+
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/system/role/functionPerm.vue b/src/views/system/role/functionPerm.vue
index cdc85b5..d52e6cb 100644
--- a/src/views/system/role/functionPerm.vue
+++ b/src/views/system/role/functionPerm.vue
@@ -10,7 +10,9 @@
         :default-checked-keys="defaultChecked"
         check-strictly
         show-checkbox
-        node-key="id"/>
+        node-key="id"
+        @check="changeSelect"
+      />
     </el-scrollbar>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">保存</el-button>
@@ -80,7 +82,77 @@
           this.dialogFormVisible = false
         }
       })
+    },
+    changeSelect(node, treeState) {
+      const checked = treeState.checkedKeys.findIndex(v => v === node.id) === -1?false:true
+      // 若有子节点，将子节点都选中或不选中
+      this.checkChildState(node, checked, treeState)
+      // if (node.children && node.children.length > 0) {
+      //   node.children.forEach((item) => {
+      //     // 获取节点选中情况
+      //     // 若被选中,checkedKeys中添加子节点id,否则移除子节点id
+      //     if (checked !== -1) {
+      //       const index = treeState.checkedKeys.findIndex(v => v === item.id)
+      //       if (index === -1) {
+      //         treeState.checkedKeys.push(item.id)
+      //       }
+      //     } else {
+      //       const index = treeState.checkedKeys.findIndex(v => v === item.id)
+      //       if (index !== -1) {
+      //         treeState.checkedKeys.splice(index, 1)
+      //       }
+      //     }
+      //   })
+      // }
+      // 如果有父节点，选中父节点
+      if (node.pid !== '0' && checked) {
+        treeState.checkedKeys.push(node.pid)
+      }
+      // else if (node.pid !== '0' && !checked) {
+      //   const index = treeState.checkedKeys.findIndex(v => v === node.pid)
+      //   if (index !== -1) {
+      //     treeState.checkedKeys.splice(index, 1)
+      //   }
+      // }
+      this.$refs.tree.setCheckedKeys(treeState.checkedKeys)
+    },
+    // 检查子节点状态，状态若有变更则更新
+    checkChildState(node, checked, treeState) {
+      if (checked) {
+        const index = treeState.checkedKeys.findIndex(v => v === node.id)
+        if (index === -1) {
+          treeState.checkedKeys.push(node.id)
+        }
+      } else {
+        const index = treeState.checkedKeys.findIndex(v => v === node.id)
+        if (index !== -1) {
+          treeState.checkedKeys.splice(index, 1)
+        }
+      }
+      this.$refs.tree.setCheckedKeys(treeState.checkedKeys)
+
+      if (node.children && node.children.length > 0) {
+        node.children.forEach((item) => {
+          this.checkChildState(item, checked, treeState)
+        })
+      }
+    },
+    // 检查父节点状态，状态若有变更则更新
+    checkParentState(pid, checked, treeState) {
+      if (pid !== '0' && checked) {
+        const index = treeState.checkedKeys.findIndex(v => v === pid)
+        if (index === -1) {
+          treeState.checkedKeys.push(pid)
+        }
+      } else if (pid !== '0' && checked) {
+        const index = treeState.checkedKeys.findIndex(v => v === pid)
+        if (index !== -1) {
+          treeState.checkedKeys.splice(index, 1)
+        }
+      }
+      this.$refs.tree.setCheckedKeys(treeState.checkedKeys)
     }
+
   }
 }
 </script>