gaibug

index.html

@@ -9,8 +9,8 @@
 		<link rel="icon" href="/favicon.ico">
 		<title>聚合智慧文档管理系统</title>
 		<!--引入onlyoffice组件-->
-		 <!-- <script type="text/javascript" src="https://192.168.1.99:19443/web-apps/apps/api/documents/api.js" charset="utf-8" async></script> -->
-		<script type="text/javascript" src="http://http://8.142.173.95:19531/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		 <script type="text/javascript" src="https://192.168.101.99:19443/web-apps/apps/api/documents/api.js" charset="utf-8" async></script>
+		<!-- <script type="text/javascript" src="http://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.188.88: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>

src/components/ListShow/ListShow.vue

@@ -50,7 +50,7 @@
     <div class="table_box">
       <el-table
         :data="tableData"
-        style="width: 100%; height: calc(88vh - 48px)"
+        style="width: 100%; height: calc(93vh - 48px)"
         ref="container"
         @row-contextmenu="rightClick"
         @selection-change="SelectionChange"

src/layout/NewIndex.vue

@@ -21,7 +21,6 @@
 
 <script setup>
 import { onMounted, ref, provide, onUnmounted } from "vue";
-import bus from "@/utils/bus.js";
 import TopMenu from "@/layout/components/TopMenu/TopMenu.vue";
 import DefaultPage from "@/layout/components/DefaultPage/DefaultPage.vue";
 import { layer } from "@layui/layer-vue";
@@ -238,10 +237,6 @@ onMounted(() => {
       path: `${path1}/${path2}${path3 ? "/" + path3 : ""}`,
     };
   }
-  // 绑定事件总线
-  bus.on("test", (data, num) => {
-    console.log("data", data);
-  });
   window.$setOpenTab = (itemData) => {
     openMaxmin(itemData.name, itemData.path);
   };
@@ -250,7 +245,6 @@ onMounted(() => {
   };
 });
 onUnmounted(() => {
-  bus.off("test");
   clearInterval();
 });
 const changeSearch = async (val, text) => {

src/layout/components/DefaultPage/DefaultPage.vue

@@ -36,9 +36,10 @@
           type="text"
           class="search_input"
           v-model="searchText"
+          @keyup.enter="searchBtn"
           placeholder="请输入关键字"
         />
-        <div class="searchBtn" @click="searchBtn" @keyup.enter="searchBtn">
+        <div class="searchBtn" @click="searchBtn">
           <img src="@/assets/images/newIndex/search.png" alt="" />
           <span>全域瞬搜</span>
         </div>
@@ -259,6 +260,7 @@ const isSearch = ref(props.showSearch);
 const searchText = ref(); // 搜索内容
 const hightData = ref([]); // 高级搜索数据
 const allData = ref([]); // 全域搜索数据
+const canSearch = ref(true)
 
 const emit = defineEmits(["openMaxmin", "changeSearch"]);
 const props = defineProps({
@@ -286,6 +288,14 @@ const props = defineProps({
 //搜索事件
 const searchBtn = () => {
   // console.log("searchText", searchText.value);
+    if(!canSearch.value){
+      return
+    }else{
+      canSearch.value = false
+      setTimeout(() => {
+        canSearch.value = true
+      }, 3000);
+    }
   if (!searchText.value) {
     ElMessage({
       message: "请输入关键字",
@@ -299,12 +309,25 @@ bus.emit('test',1,1)
 // 获取数据
 const getList = async () => {
   const resN = await listRecent({ isFolder: "N" });
+  console.log('resN',resN);
   if (resN.code === 200) {
-    var arr = [];
-    resN.rows.map(async (item) => {
-      const detail = await getInfo(item.relaId);
-      tableFileData.value.push(detail.data);
-    });
+    tableFileData.value.length = resN.rows.length;
+    for (let index = 0; index < resN.rows.length; index++) {
+       getInfo(resN.rows[index].relaId).then(async(res) => {
+        //  tableFileData.value.push(res.data);
+         tableFileData.value.splice(index,1,res.data);
+         index++
+      })
+    }
+    // console.log('tableFileData',tableFileData.value);
+    // 将tableFileData里的数据按照createTime排序
+    // tableFileData.value = tableFileData.value.sort((a, b) => {
+    //   return new Date(b.createTime) - new Date(a.createTime);
+    // });
+    // resN.rows.map(async (item) => {
+    //   const detail = await getInfo(item.relaId);
+    //   tableFileData.value.push(detail.data);
+    // });
   }
 };
 // 打开最近文件

src/views/collect/index.vue

@@ -100,7 +100,7 @@
           <el-table
             :data="folderArr"
             style="width: 100%"
-            height="37vh"
+            height="41vh"
             :scrollbar-always-on="true"
             @row-contextmenu="fileRightTable"
             @row-click="folderClick"
@@ -146,7 +146,7 @@
           <el-table
             :data="fileArr"
             style="width: 100%"
-            height="42vh"
+            height="46vh"
             :scrollbar-always-on="true"
             @row-contextmenu="fileRightTable"
             @row-click="clickFile"
@@ -208,7 +208,7 @@
             <span class="collapseItem_title">文件夹</span>
           </template>
           <!-- 平铺 -->
-          <el-scrollbar style="height: 39vh">
+          <el-scrollbar style="height: 43vh">
             <div class="tile_box">
               <div
                 class="file_box"
@@ -241,7 +241,7 @@
             <span class="collapseItem_title">文件</span>
           </template>
           <!-- 平铺 -->
-          <el-scrollbar style="height: 40vh">
+          <el-scrollbar style="height: 44vh">
             <div class="tile_box">
               <div
                 class="file_box"
@@ -869,7 +869,7 @@ const setIcon = (fileType) => {
   height: 100%;
   background-color: #fff;
   border-radius: 4px;
-  height: 88vh;
+  height: 96vh;
   .topPath {
     width: 100%;
     height: 24px;

src/views/department/MyFile.vue

@@ -14,7 +14,7 @@
                 </div>
                 <!-- 方块点击盒子 -->
                 <div
-                    style="height: 75vh;overflow-y: auto;">
+                    style="height: 83vh;overflow-y: auto;">
                     <div class="searchBox">
                         <div v-if="leftShowList === 2" style="width:100%">
                             <el-input v-model="searchFire" @keyup.enter="fileBlur" @input="fileBlur" class="searchFire" size="large"
@@ -2917,7 +2917,7 @@ p {
 
 .bigBox {
     width: 100%;
-    height: 88vh;
+    height: 100vh;
     display: flex;
     justify-content: flex-start;
     overflow: hidden;
@@ -2925,7 +2925,7 @@ p {
 
 .settingBox {
     width: 25vw;
-    height: 92vh;
+    height: 100vh;
     // border: 1px solid black;
     border-radius: 4px;
     /* margin: 5px 5px; */
@@ -3017,7 +3017,7 @@ p {
 
 .mesBox {
     width: 75vw;
-    height: 88vh;
+    height: 96vh;
     border-radius: 4px;
     background-color: white;
 }

src/views/myfile/MyFile.vue

@@ -14,7 +14,7 @@
                     </div>
                 </div>
                 <!-- 方块点击盒子 -->
-                <div style="height: 75vh;overflow-y: auto;">
+                <div style="height: 83vh;overflow-y: auto;">
                     <div class="searchBox">
                         <div v-if="leftShowList === 2" style="width:100%">
                             <el-input v-model="searchFire" @keyup.enter="fileBlur" @input="fileBlur" class="searchFire" size="large"
@@ -630,7 +630,6 @@ import { getConfigKey } from "@/api/system/config.js"
 import TreeMenu from '@/components/TreeMenu/TreeMenu.vue'
 import addFileDrop from '@/components/addFileDrop/addFileDrop.vue'
 import addFileTempList from '@/components/addFileTempList/addFileTempList.vue'
-import bus from "@/utils/bus.js";
 
 export default {
     directives: {
@@ -2775,7 +2774,9 @@ export default {
             }
         });
         onMounted(() => {
-            console.log('window',window);
+            window.$refreshFile = () => {
+                refreshFile()
+            }
             // if(!thisFolder.value){
             const hasMsg = localStorage.getItem('leftShowList')
             if (route.query.clickRowId) {
@@ -3161,7 +3162,6 @@ export default {
             historyDocId,
             historyFileId,
             noHis,
-            bus,
             hasThisTab
         }
     },
@@ -3215,7 +3215,7 @@ p {
 
 .bigBox {
     width: 100%;
-    height: 88vh;
+    height: 100vh;
     display: flex;
     justify-content: flex-start;
     overflow: hidden;
@@ -3236,7 +3236,7 @@ p {
 // }
 .settingBox {
     width: 25vw;
-    height: 92vh;
+    height: 100vh;
     // border: 1px solid black;
     border-radius: 4px;
     /* margin: 5px 5px; */
@@ -3333,7 +3333,7 @@ p {
 
 .mesBox {
     width: 75vw;
-    height: 88vh;
+    height: 96vh;
     border-radius: 4px;
     background-color: white;
 }

src/views/myjoin/MyJoin.vue

@@ -8,7 +8,7 @@
                         <!-- <el-button @click="newFileAdd">新建文件</el-button> -->
                     </div>
                     <div>
-                        <el-table @row-contextmenu="handleRowClick" height="calc(88vh - 40px - 15px)" :data="myPack" style="width: 100%;cursor: pointer;" @row-click="rowJoinClickFN">
+                        <el-table @row-contextmenu="handleRowClick" height="calc(100vh - 40px - 15px)" :data="myPack" style="width: 100%;cursor: pointer;" @row-click="rowJoinClickFN">
                             <!-- <el-table-column type="selection" width="55" /> -->
                             <el-table-column label="名称" width="280">
                                 <template #default="scope">
@@ -354,7 +354,7 @@ export default {
 @import "@/assets/styles/my-common.scss";
 .bigBox {
     width: 100%;
-    height: 88vh;
+    height: 100vh;
     margin: 0 auto;
     background-color: white;
 }

src/views/publicment/MyFile.vue

@@ -14,7 +14,7 @@
                 </div>
                 <!-- 方块点击盒子 -->
                 <div
-                    style="height: 75vh;overflow-y: auto;">
+                    style="height: 83vh;overflow-y: auto;">
                     <div class="searchBox">
                         <div v-if="leftShowList === 2" style="width:100%">
                             <el-input v-model="searchFire" @keyup.enter="fileBlur" @input="fileBlur" class="searchFire" size="large"
@@ -2900,7 +2900,7 @@ p {
 
 .bigBox {
     width: 100%;
-    height: 88vh;
+    height: 100vh;
     display: flex;
     justify-content: flex-start;
     overflow: hidden;
@@ -2908,7 +2908,7 @@ p {
 
 .settingBox {
     width: 25vw;
-    height: 92vh;
+    height: 100vh;
     // border: 1px solid black;
     border-radius: 4px;
     /* margin: 5px 5px; */
@@ -3002,7 +3002,7 @@ p {
 
 .mesBox {
     width: 75vw;
-    height: 88vh;
+    height: 96vh;
     border-radius: 4px;
     background-color: white;
 }

vite.config.js

@@ -41,11 +41,11 @@ export default defineConfig(({
 				'/dev-api': {
 					// target: 'http://192.168.1.12:8080/',
 					// target: 'http://192.168.1.88:8080/',
-					// target: 'http://192.168.1.99:8080/',
+					target: 'http://192.168.101.99:8080/',
 					// target: 'http://192.168.1.11:8080/',
 					// target: 'http://localhost:8080/',
 					// target:'http://192.168.1.28:8080/',
-					target:'http://8.142.173.95:19527',
+					// target:'http://8.142.173.95:19527',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/dev-api/, '')
 				},
@@ -53,8 +53,8 @@ export default defineConfig(({
 				'/websocket': {
 					// target:'ws://localhost:8080/websocket',
 					// target:'ws://192.168.1.12:8080/websocket',
-					// target:'ws://192.168.1.99:8080/websocket',
-					target:'ws://8.142.173.95:19527/websocket',
+					target:'ws://192.168.101.99:8080/websocket',
+					// target:'ws://8.142.173.95:19527/websocket',
 					// target:'ws://192.168.1.11:8080/websocket',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/websocket/, '')