Merge branch 'main' of http://192.168.1.22:3000/zcy/canneng-admin

# Conflicts:
#	src/views/govern/device/planData/index.vue

src/views/govern/device/planData/components/schemeTree.vue

@@ -27,7 +27,6 @@
                         size="18"
                         class="fold ml10 menu-collapse"
                         style="cursor: pointer"
-                        v-if="true"
                     />
                 </div>
                 <el-tree
@@ -42,7 +41,6 @@
                     ref="treRef"
                     @node-click="clickNode"
                     :expand-on-click-node="false"
-               
                 >
                     <template #default="{ node, data }">
                         <span class="custom-tree-node">
@@ -211,7 +209,7 @@ const del = (node: Node, data: any) => {
         type: 'warning'
     })
         .then(() => {
-            delRecord({ id: data.id }).then(res => {
+            delRecord({ id: data.id }).then((res: any) => {
                 if (res.code == 'A0000') {
                     ElMessage.success('删除成功')
                     getTreeList()
@@ -231,6 +229,9 @@ const clickNode = (e: anyObj) => {
     e.children ? (planId.value = e.id) : (planId.value = e.pid)
     emit('nodeChange', e)
 }
+const setCheckedNode = (e: anyObj) => {
+    treRef.value.setCurrentKey(e)
+}
 watch(
     () => planData.value,
     (val, oldVal) => {
@@ -249,7 +250,7 @@ watch(
         deep: true
     }
 )
-defineExpose({ treeRef, getPlanData, getTreeList })
+defineExpose({ treeRef, getPlanData, getTreeList, setCheckedNode })
 </script>
 <style lang="scss" scoped>
 .cn-tree {
@@ -294,13 +295,13 @@ defineExpose({ treeRef, getPlanData, getTreeList })
         display: flex;
         align-items: center;
     }
-    .left{
-        span{
+    .left {
+        span {
             margin-left: 2px;
         }
     }
-    .right{
-        a{
+    .right {
+        a {
             margin-left: 2px;
         }
     }