hebing

index.html

@@ -9,8 +9,8 @@
 		<link rel="icon" href="/favicon.ico">
 		<title>聚合智慧文档管理系统</title>
 		<!--引入onlyoffice组件-->
-		<!-- <script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
-		<script type="text/javascript" src="http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		<script type="text/javascript" src="http://192.168.1.28:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		<!-- <script type="text/javascript" src="http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
 		<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 		<style>
 			html,

src/api/myfile/myfile.js

@@ -89,9 +89,10 @@ function fileChangeName(data) {
     })
 }
 // 文件下载
+let time = Date.now()
 function fileDown(data){
     return request({
-        url:`/biz/info/download/${data}`,
+        url:`/biz/info/download/${data}?time=${time}`,
 		timeout: 10*60*1000,//配置超时时间
         responseType: 'blob',
         headers:{

src/layout/indexCommon.vue

@@ -361,6 +361,14 @@ const toSearch = async () => {
   const res = await flieSearch(query);
   console.log("res", res);
   if (res) {
+    const itemData = {
+      label:'全局搜索',
+      path:'/search',
+      data:{
+          searchData: JSON.stringify(res),
+          searchText: searchText.value,
+        }
+    }
     // console.log("res", res);
     // console.log("router", route.path);
     if (route.path != "/search") {
@@ -538,7 +546,7 @@ const clickTab = (item) => {
     } else {
       editableTabsValue.value = url
       router.push({
-        path: item,
+        path: item+'?dirId='+item,
       });
     }
   }, 0);
@@ -593,7 +601,7 @@ const filePaneClick = (item) => {
   //   console.log("editableTabsValue", editableTabsValue.value);
 };
 // 创建文件的标签
-const addFileTab = (data) => {
+const addFileTab = (data,bool) => {
   console.log("fileTabdata", data);
   console.log();
   const thisData = JSON.parse(JSON.stringify(toRaw(data)));
@@ -625,7 +633,7 @@ const addFileTab = (data) => {
     if (!par.src) {
       if (thisData.docId) {
         // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
-        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
+        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}`;
         par.name = data.fileName;
         par.docId = data.docId
         par.show = true
@@ -643,20 +651,6 @@ const addFileTab = (data) => {
   });
   iFrameData.value = arr;
   isAlive.value = false;
-  //  const outIframe = document.getElementById("iframe" + par.id);
-  // const inIframe =
-  //   outIframe.contentDocument.getElementsByTagName("iframe")[0];
-  // setTimeout(() => {
-  //   console.log('outIframe',outIframe.parentElement);
-  //   console.error(outIframe.parentElement);
-  //   inIframe.style.height = outIframe.style.height =
-  //     outIframe.parentElement.offsetHeight + "px";
-  //   inIframe.style.width = outIframe.style.width =
-  //     outIframe.parentElement.offsetWidth + "px";
-
-  //   // console.log('dom',outIframe.parentElement.offsetWidth);
-  //   // console.log('inIframe',inIframe);
-  // }, 500);
   console.log("addFileTab", arr);
 };
 //创建tab标签事件
@@ -689,6 +683,9 @@ const addFolderAdd = (data) => {
     //需要jSON去转 否则页面无变化 离谱得很
     editableTabs.value = JSON.parse(JSON.stringify(editableTabs.value));
   }
+  editableTabsValue.value = data.path
+  toFileData.value = data
+  clickTab(data)
   console.log("editableTabs", toRaw(editableTabs.value));
 };
 provide("addTab", addTab);

src/views/biz/recent/index.vue

@@ -462,7 +462,7 @@ async function chooseSet(row, index, num) {
       spacePath.value = "/department";
     }
     const addData = {
-      path: spacePath.value,
+      path: spacePath.value + dirData.data.dirId,
       name: dirData.data.dirName,
       row: toRaw(dirData.data),
     };
@@ -479,7 +479,7 @@ async function chooseSet(row, index, num) {
     if (filePreview) {
       loadingPreview.value = false;
       // addTab(clickRow.value);
-      addFileTab(clickRow.value);
+      addFileTab(clickRow.value,0);
       onlyView.value = true;
       // editOnline.value = false
       cliCC.value = false;

src/views/department/MyFile.vue

@@ -835,7 +835,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value);
+                    addFileTab(clickRow.value,1);
                     onlyView.value = false
                     // editOnline.value = false
                     cliCC.value = false
@@ -862,7 +862,7 @@ export default {
                 if (filePreview) {
                     loadingPreview.value = false
                     // addTab(clickRow.value);
-                    addFileTab(clickRow.value)
+                    addFileTab(clickRow.value,0)
                     onlyView.value = true
                     // editOnline.value = false
                     cliCC.value = false

src/views/myfile/MyFile.vue

@@ -4,14 +4,8 @@
             <div  class="settingBox" @click="mouseClick">
                 <!-- 设置盒子顶部搜索 -->
                 <div class="topSearch">
-                    <!-- <div style="position: relative;">
-                        <el-input v-model="searchFire" class="searchFire" size="large" placeholder="搜索文件"
-                            style="width: 15rem;" />
-                        <el-icon style="color: gray;display: inline-block;position: absolute;top: 8px;right: 5px;">
-                            <Search />
-                        </el-icon>
-                    </div> -->
-                    <div class="">{{spaceName}}</div>
+                    
+                    <div class="spaceName">{{spaceName}}</div>
                     <div>
                         <el-icon style="font-size: 24px;" @click="createNewMenu(0)">
                             <Plus />
@@ -21,9 +15,16 @@
                 </div>
                 <!-- 方块点击盒子 -->
                 <div
-                    style="display: flex;justify-content: flex-start;align-items: flex-start;flex-wrap: wrap;height: 75vh;align-content: flex-start;overflow-y: auto;">
+                    style="height: 75vh;overflow-y: auto;">
+                    <div class="searchBox">
+                        <el-input v-model="searchFire" class="searchFire" size="large" placeholder="搜索文件" />
+                        <el-icon class="SearchIcon">
+                            <Search />
+                        </el-icon>
+                    </div>
                     <!-- v-for盒子 -->
-                    <template v-for="(item, index) in fileMenu"  :key="index">
+                    <div style="display: flex;justify-content: flex-start;align-items: flex-start;flex-wrap: wrap;align-content: flex-start;overflow-y: auto;">
+                        <template v-for="(item, index) in fileMenu"  :key="index">
                         <div class="setBox" @click="changeFile(item, index)">
                             <el-dropdown trigger="click" class="selectChe">
                                 <span class="el-dropdown-link">
@@ -52,6 +53,8 @@
                           </div>
                         </div>
                     </template>
+                    </div>
+                    
                 </div>
                 <div class="expansion">
                     <div class="top_box">
@@ -912,7 +915,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value);
+                    addFileTab(clickRow.value,1);
                     onlyView.value = false
                     // editOnline.value = false
                     cliCC.value = false
@@ -954,7 +957,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value);
+                    addFileTab(clickRow.value,0);
                     //    const addData = {
                     //     path:"/fileEdit" + clickRow.value.docId,
                     //     name:clickRow.value.fileName,
@@ -1578,6 +1581,8 @@ export default {
                 try{
                     let data = JSON.parse(event.target.result)
                 }catch(err){
+                    const time = Date.now()
+                    console.log('time',time);
                     const link = document.createElement('a');  // 创建a标签
                     let blob = new Blob([res]);     
                     link.style.display = 'none';
@@ -1602,7 +1607,7 @@ export default {
             // 添加监听，点击其他地方关闭文件夹右键菜单
             window.addEventListener("click", closeRMenu, true);
             window.addEventListener("click", mouseClick, true);
-            // console.log('onMounted');
+            console.log('onMounted');
         })
         // 组件显示
         onActivated(()=>{
@@ -1875,15 +1880,29 @@ p {
     height: 48px;
     background-color: #EBEFF6;
     display: flex;
-    justify-content: space-around;
+    justify-content: space-between;
     align-items: center;
+    padding-left: 16px;
+    padding-right: 16px;
 }
 
 .searchFire {
-    width: 248px;
+    width: 100%;
     height: 32px;
 }
+.searchBox{
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    padding: 8px 16px;
+    .SearchIcon{
+        color: gray;
+        position: absolute;
+        right: 5%;
+        top: 35%;
 
+    }
+}
 .setBox {
     width: 88px;
     height: 112px;

src/views/myfile/components/FileEdit.vue

@@ -71,7 +71,7 @@ export default {
       if (docId && !props.historyPrew) {     
         getInfo(docId).then((response) => {
           const obj = response.data;
-          obj.isEdit = isEdit;
+          obj.isEdit = isEdit == 1?true:false;
           newObj.value = obj;
           option.value.isEdit = obj.isEdit;
           option.value.url = `${window.location.origin}${
@@ -113,19 +113,22 @@ export default {
       }
     }
     /** 修改按钮操作 */
-    function edit() {
-      oo(docId, true);
+    function edit(docId,canEdit) {
+      oo(docId,canEdit);
     }
     onMounted(() => {
       let route = useRoute(); 
+      let canEdit = false
       console.log('route',route.query);
       if(route.query.clickRowId){
           docId = route.query.clickRowId
           // copyRow = JSON.parse(route.query.copyRow)
       }
+        console.log('route.query.canEdit',route.query.canEdit);
+        canEdit = route.query.canEdit
       console.log(docId, "doc");
       console.log(copyRow, "row");
-      edit();
+      edit(docId,canEdit);
       // let row = JSON.parse(newObj.value)
       // console.log(row, '852');
     });

src/views/publicment/MyFile.vue

@@ -838,7 +838,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    addFileTab(clickRow.value);
+                    addFileTab(clickRow.value,1);
                     onlyView.value = false
                     // editOnline.value = false
                     cliCC.value = false
@@ -864,7 +864,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                    loadingPreview.value = false
-                    addFileTab(clickRow.value);
+                    addFileTab(clickRow.value,0);
                     onlyView.value = true
                     cliCC.value = false
                 } else {