Merge remote-tracking branch 'origin/master'

王震

2023-09-13 a15fb376f2a52a36be5ce2f1eeaf252a509dfcb7

 src/components/view/equipmentmaintain.vue

@@ -245,7 +245,6 @@
                placeholder="请输入搜索内容" 
                size="small" clearable ></el-input>
                    <el-tree :data="list" ref="tree" 
                    style="height: 500px;overflow-y: auto;"
                    :props="{children: 'children',label: 'name'}" highlight-current node-key="name" default-expand-all
                         
                        @node-click="handleNodeClick"
@@ -707,6 +706,7 @@
      height: calc(100% - 20px);
      border-right: 3px solid rgb(245, 247, 251);
      padding: 16px;
      overflow-y: auto;
   }

   .thing .left .custom-tree-node span {