Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

@@ -2,7 +2,6 @@
     <el-row :gutter="5">
     <el-row :gutter="5">
         <el-col :span="layout.left">
         <el-col :span="layout.left">
             <div style="border-radius: 3px;background-color: white"
             <div style="border-radius: 3px;background-color: white"
-                 onmouseout="$('.tree-tools').hide();"
                  :style="{'height':height+'px','max-height':height + 'px','overflow':'auto'}">
                  :style="{'height':height+'px','max-height':height + 'px','overflow':'auto'}">
                 <div v-if="showTitle" style="text-align: left;padding-left: 10px;padding-top: 3px;font-weight: bold">
                 <div v-if="showTitle" style="text-align: left;padding-left: 10px;padding-top: 3px;font-weight: bold">
                     <slot name="title">
                     <slot name="title">
@@ -10,18 +9,14 @@
                     </slot>
                     </slot>
                 </div>
                 </div>
                 <!---->
                 <!---->
-                <el-tree ref="tree" style="padding:6px;width: 600px" :props="props" :data="treeData" node-key="id"
+                <el-tree ref="tree" style="padding:6px;" :props="props" :data="treeData" node-key="id"
                          :expand-on-click-node="false" :expand-on-click-node="true" :default-expanded-keys="defaultExpandedKeys">
                          :expand-on-click-node="false" :expand-on-click-node="true" :default-expanded-keys="defaultExpandedKeys">
                     <template #default="{ node, data }">
                     <template #default="{ node, data }">
-                        <div style="display: flex;flex-direction: row;width: 100%;">
-                            <div :style="{'width':isAdmin() ? 'calc(100% - 85px)':'100%','max-width':isAdmin() ? 'calc(100% - 85px)':'100%'}"
-                                 onmouseover="$('.tree-tools').hide();$(this).next().show()"
-                                 style="overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="nodeClick(node, data)" :title="node.label">
+                        <div style="display: flex;flex-direction: row;flex: 1;overflow: hidden">
+                            <div style="overflow: hidden;text-overflow: ellipsis;text-align: left;flex:1" @click="nodeClick(node, data)" :title="node.label">
                                 {{node.label }}
                                 {{node.label }}
                             </div>
                             </div>
-                            <div  onmouseout="$(this).hide()"
-                                  class="tree-tools"
-                                  v-if="isAdmin()" :style="{'width':isAdmin()?'80px':'0px','position': 'fixed','left': '200px','display':'none','background':'#F2F6FC'}">
+                            <div  v-if="isAdmin()" :style="{'width':isAdmin()?'70px':'0px'}">
                                 <a @click="editType(data)" v-if="!data.root" style="margin-right: 10px;">
                                 <a @click="editType(data)" v-if="!data.root" style="margin-right: 10px;">
                                     <i class="el-icon-edit"></i>
                                     <i class="el-icon-edit"></i>
                                 </a>
                                 </a>

 <cm-document :isView="true"
 <cm-document :isView="true"
              :viewTypeId="docType"
              :viewTypeId="docType"
-             :fileIds="[docType]"
              :viewTypeName="docTypeName"
              :viewTypeName="docTypeName"
              :types="[docType,'user']"
              :types="[docType,'user']"
              :checkAuth="false"
              :checkAuth="false"