gaibug

index.html

@@ -10,8 +10,9 @@
 		<title>聚合智慧文档管理系统</title>
 		<!--引入onlyoffice组件-->
 		<!-- <script type="text/javascript" src="https://doc.jujutong.cloud:19443/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://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="https://192.168.1.28:19443/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/components/historyList/index.vue

@@ -138,10 +138,10 @@ const clickIndex = ref("");
 const emit = defineEmits(["changeMsgClose"]);
 //点击预览
 const previewFileClick =async (item) => {
-  // console.log('preitem',item);
+  console.log('preitem',item);
   const res =await getInfo(item.docId)
   // console.log('res',res);
-  addFileTab(res.data,0,0,1);
+  addFileTab(res.data,0,0,1,item.fileId);
   // emit("changeMsgClose", true, item);
   isOpen.value = false;
 };

src/layout/indexCommon.vue

@@ -114,10 +114,10 @@
             </router-view>
           </div>
           <div v-show="!isAlive" style="width: 100%">
-            <div v-for="item in iFrameData" :key="item.id">
+            <div v-for="item in iFrameData" :id="item.src" :key="item.src">
               <div style="width: 100%" v-show="item.show">
                 <iframe :src="item.src" frameborder="0" :id="`iframe${item.id}`" :name="`iframe${item.id}`" width="100%"
-                  height="800px" class="iframeBox" v-show="item.show"></iframe>
+                  height="800px" class="iframeBox" ></iframe>
               </div>
             </div>
           </div>
@@ -643,7 +643,7 @@ const filePaneClick = (item) => {
   //   console.log("editableTabsValue", editableTabsValue.value);
 };
 // 创建文件的标签
-const addFileTab = (data, bool,copy,history) => {
+const addFileTab = (data, bool,copy,history,fileId) => {
   // console.log("addFileTab", data);
   history = history?history:0
   const thisData = JSON.parse(JSON.stringify(toRaw(data)));
@@ -655,7 +655,7 @@ const addFileTab = (data, bool,copy,history) => {
     // 已存在打开当前的并且改变编辑状态
     const thisPane = toRaw(hasThis)
     // 如果编辑状态改变了 先删除旧的 再新建
-    if(thisPane.src != `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}` ){
+    if(thisPane.src != `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${fileId}` ){
       // console.log('buyiyang',`${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}`);
       const arr = oldIFrameData.map((par) => {
           if (par.id === thisPane.id) {
@@ -670,7 +670,7 @@ const addFileTab = (data, bool,copy,history) => {
         if (!par.src) {
           if (thisData.docId) {
             // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
-            par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`;
+            par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${fileId}`;
             par.name = data.fileName;
             par.docId = data.docId
             par.show = true
@@ -692,7 +692,7 @@ const addFileTab = (data, bool,copy,history) => {
     // console.log('hasThis',thisPane);
     const arr = oldIFrameData.map((par) => {
       if (par.id == thisPane.id) {
-        `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`
+        `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${fileId}`
         par.show = true
         editableTabsValue.value = par.id// 标签跳转
         setTimeout(() => {
@@ -712,7 +712,7 @@ const addFileTab = (data, bool,copy,history) => {
     if (!par.src) {
       if (thisData.docId) {
         // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
-        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${thisData.fileId}`;
+        par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}&canEdit=${bool}&canCopy=${copy}&history=${history}&fileId=${fileId}`;
         par.name = data.fileName;
         par.docId = data.docId
         par.show = true

src/views/collect/index.vue

@@ -2,7 +2,6 @@
   <div class="container" v-if="!showPreview">
     <div class="statistics">
       <div class="left_box">
-        <div class="dataNum">共查询到个相关结果</div>
       </div>
       <div class="right_box">
         <img
@@ -34,39 +33,6 @@
     <!-- 标签 -->
     <div class="tags">
       <!-- TODO 标签可以拖动位置 -->
-      <!-- 
-      <el-tabs v-if="false" v-model="clickCollect" class="demo-tabs tabSign">
-        <el-tab-pane label="常用" name="first"></el-tab-pane>
-        <el-tab-pane label="默认" name="second"></el-tab-pane>
-        <draggable
-          :list="toRaw(tabList)"
-          ghost-class="ghost"
-          chosen-class="chosenClass"
-          animation="300"
-        >
-          <template #item="{ element }">
-            <el-tab-pane>
-              <template #label>
-                <div
-                  v-if="isChangeTabName !== element.labelId"
-                  @click.right="tabClick($event, element)"
-                >
-                  {{ element.labelName }}
-                </div>
-                <div v-else>
-                  <el-input
-                    v-model="changeTabName"
-                    size="mini"
-                    @blur="reTabName"
-                    maxlength="32"
-                    :autofocus="true"
-                  ></el-input>
-                </div>
-              </template>
-            </el-tab-pane>
-          </template>
-        </draggable>
-      </el-tabs> -->
 
       <el-tabs
         v-model="clickCollect"
@@ -626,7 +592,7 @@ const setIcon = (fileType) => {
   .statistics {
     width: 100%;
     height: 40px;
-    background-color: #d9e0f0;
+    background-color: #fff;
     padding-left: 16px;
     display: flex;
     justify-content: space-between;

src/views/department/MyFile.vue

@@ -681,6 +681,11 @@ export default {
         // 获取文件夹，中栏，文件
         function getAllTop() {
             documents.getTop(2).then(res => {
+                console.log('getAllTopres',res);
+                if(!res){
+                    console.log('nores');
+                    return
+                }
                 let userMe = [res]
                 impDirId.value = userMe[0].dirId//固定
                 impSpaceId.value = userMe[0].spaceId//固定
@@ -731,7 +736,7 @@ export default {
             }
         }
         function getSpaceList() {
-            myfile.fileType(3).then(res => {
+            myfile.fileType(2).then(res => {
                 useSpace.value = res.data.usedCap
                 allSpace.value = res.data.spaceCap
             })

src/views/myfile/MyFile.vue

@@ -701,6 +701,10 @@ export default {
         // 获取文件夹，中栏，文件
         function getAllTop() {
             documents.getTop(3).then(res => {
+                if(!res){
+                    console.log('nores');
+                    return
+                }
                 let userMe;
                 userMe = [res];
                 impDirId.value = userMe[0].dirId//固定

src/views/myfile/components/FileEdit.vue

@@ -95,7 +95,7 @@ export default {
           };
         });
       } else if (fileId && history == '1') {
-        // console.log('history',history);
+        console.log('history',history);
             getInfo(docId).then((response) => {
           const obj = response.data;
           obj.isEdit = false;
@@ -105,7 +105,8 @@ export default {
           option.value.isCopy = obj.isCopy;
            option.value.url = `${window.location.origin}${
           import.meta.env.VITE_APP_BASE_API
-        }/api/history/${obj.fileId}`;
+        }/api/history/${fileId}`;
+        console.log('url = ',option.value.url);
         //  option.value.url = `http://8.142.173.95:19527/api/history/${fileId}`;
           //  console.log('option.value.url',option.value.url);
           option.value.title = obj.fileName;
@@ -155,7 +156,8 @@ export default {
           // copyRow = JSON.parse(route.query.copyRow)
       }
       if(route.query.fileId){
-          fileId = route.query.fileId
+        fileId = route.query.fileId
+        console.log('fileId',fileId);
           // copyRow = JSON.parse(route.query.copyRow)
       }
         // console.log('route.query.canEdit',route.query.canEdit);

src/views/myjoin/MyJoin.vue

@@ -10,7 +10,7 @@
                         </div>
                         <div>
                             <el-table :data="myEjoy" style="width: 100%;cursor: pointer;" @row-click="rowClickFN">
-                                <el-table-column type="selection" width="55" />
+                                <!-- <el-table-column type="selection" width="55" /> -->
                                 <el-table-column label="名称" width="200">
                                     <template #default="scope">
                                         <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="juzhong">
@@ -37,7 +37,7 @@
                     </el-tab-pane>
                     <el-tab-pane label="我参与的" name="second">
                         <el-table :data="myPack" style="width: 100%;cursor: pointer;" @row-click="rowClickFN">
-                            <el-table-column type="selection" width="55" />
+                            <!-- <el-table-column type="selection" width="55" /> -->
                             <el-table-column label="名称" width="200">
                                 <template #default="scope">
                                     <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="juzhong">

src/views/publicment/MyFile.vue

@@ -732,7 +732,7 @@ export default {
             })
         }
         function getSpaceList() {
-            myfile.fileType(3).then(res => {
+            myfile.fileType(1).then(res => {
                 useSpace.value = res.data.usedCap
                 allSpace.value = res.data.spaceCap
             })

src/views/publicment/components/createTasnsfer.vue

@@ -129,11 +129,11 @@ function allTreeChange(e) {
 }
 // 获取用户树
 function getAllUser() {
-  userTree.getMentUserTree({}).then((res) => {
+  userTree.getUserTree({}).then((res) => {
     console.log("userTree", res);
     allTreeData.value = [res];
     console.log('open', open.value);
-    userTree.getMentUserTree({}).then((res) => {
+    userTree.getUserTree({}).then((res) => {
       allTreeData.value = [res];
       // 递归函数来获取所有节点的 id
       function getAllNodeIds(nodes) {