文档管理弹框优化

@@ -63,7 +63,7 @@ export default {
 
 
 
 
         let hideElDialog = () =>{
         let hideElDialog = () =>{
-            emit('hidedialog');
+            emit('hidedialog',false);
         }
         }
 
 
         let okFunc = () =>{
         let okFunc = () =>{

@@ -17,13 +17,13 @@
                                 {{node.label }}
                                 {{node.label }}
                             </div>
                             </div>
                             <div  v-if="isAdmin()" :style="{'width':isAdmin()?'60px':'0px'}">
                             <div  v-if="isAdmin()" :style="{'width':isAdmin()?'60px':'0px'}">
-                                <a @click="editType(data)" 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>
                                 <a @click="showFolder(true,false,node) " style="margin-right: 10px;">
                                 <a @click="showFolder(true,false,node) " style="margin-right: 10px;">
                                     <i class="el-icon-plus"></i>
                                     <i class="el-icon-plus"></i>
                                 </a>
                                 </a>
-                                <a @click="deleteDocument(data.id,'folder')">
+                                <a @click="deleteDocument(data.id,'folder')"  v-if="!data.root">
                                     <i class="el-icon-delete"></i>
                                     <i class="el-icon-delete"></i>
                                 </a>
                                 </a>
                             </div>
                             </div>
@@ -129,7 +129,7 @@
         </el-col>
         </el-col>
     </el-row>
     </el-row>
 
 
-    <cm-dialog :title="addDialogTitle" width="500px" :showDialogVisible="addDialogVisible" :showFooter="false">
+    <cm-dialog :title="addDialogTitle" width="500px" :showDialogVisible="addDialogVisible" @hidedialog="showFolder" :showFooter="false">
         <template v-slot>
         <template v-slot>
             <el-form
             <el-form
                     label-width="120px"
                     label-width="120px"

@@ -238,11 +238,16 @@ export default {
                     // // 加载第一个节点数据
                     // // 加载第一个节点数据
                     // getPage(first.id);
                     // getPage(first.id);
 
 
+
                     let root = {
                     let root = {
                         id: '0',
                         id: '0',
                         name: '文档管理',
                         name: '文档管理',
+                        root:'root',
                         children: res.data
                         children: res.data
                     }
                     }
+                    if(props.isRecycle){
+                        root.name = '文档回收站';
+                    }
 
 
                     defaultExpandedKeys.value = [root.id];
                     defaultExpandedKeys.value = [root.id];
                     addHistoryNode(root);
                     addHistoryNode(root);
@@ -448,12 +453,12 @@ export default {
             sort: 100
             sort: 100
         });
         });
         let showFolder = (flg, isUser,node) => {
         let showFolder = (flg, isUser,node) => {
+            addDialogVisible.value = flg;
             let title="";
             let title="";
             if(node){
             if(node){
                 currentNodeData.value = node.data;
                 currentNodeData.value = node.data;
                 title =`修改树节点“${currentNodeData.value.name}“子文件夹`;
                 title =`修改树节点“${currentNodeData.value.name}“子文件夹`;
             }
             }
-
             docForm.value = {
             docForm.value = {
                 id:'',
                 id:'',
                 name: '',
                 name: '',
@@ -461,10 +466,11 @@ export default {
                 type: '',
                 type: '',
                 sort: 100
                 sort: 100
             };
             };
-            isUserFolder.value = isUser;
-            addDialogVisible.value = flg;
+            if(isUser != undefined){
+                isUserFolder.value = isUser;
+            }
 
 
-            if (addDialogVisible.value) {
+            if (addDialogVisible.value != undefined) {
                 title = `新建自定义文件夹`;
                 title = `新建自定义文件夹`;
             }
             }
             addDialogTitle.value = title
             addDialogTitle.value = title

 <div>
 <div>
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
-          {{textString}}
+          {{textString}}1111
     </span>
     </span>
 
 
-    <cm-dialog title="收藏" width="500px" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
+    <cm-dialog title="机房布局" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
         <template v-slot>
         <template v-slot>
-            <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
+           <div style="overflow: auto">
+               <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
+           </div>
         </template>
         </template>
     </cm-dialog>
     </cm-dialog>
 
 

 <div>
 <div>
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
     <span class="el-dropdown-link" @click="showMachineRoomDialog(true)" >
-          {{textString}}
+          {{textString}}2222
     </span>
     </span>
 
 
-    <cm-dialog title="收藏" width="500px" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
+    <cm-dialog title="机柜" :showFooter="false" :showDialogVisible="dialogFlg" @hidedialog="showMachineRoomDialog">
         <template v-slot>
         <template v-slot>
-            <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
+            <machineRoomDetail v-if="isDetailShow" :detailData="detailData" :machineData="machineData"></machineRoomDetail>
         </template>
         </template>
     </cm-dialog>
     </cm-dialog>
 
 

@@ -2,8 +2,8 @@ export default {
     name: 'machineRoomDetailComponents',
     name: 'machineRoomDetailComponents',
     template: '',
     template: '',
     components: {
     components: {
-        'GetMachineRoom': Vue.defineAsyncComponent(
-            () => myImport('views/commonComponents/getMachineRoom/index')
+        'machineRoomDetail': Vue.defineAsyncComponent(
+            () => myImport('views/commonComponents/machineRoomDetail/index')
         ),
         ),
     },
     },
     props: {
     props: {