历史记录

src/views/department/MyFile.vue

@@ -456,9 +456,9 @@
     </div>
     <!-- 图片预览 -->
     <!-- 历史版本 -->
-    <historyList v-if="openForwardFile"  :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
-        @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data" @changeMsgClose="changeMsgClose"
-        :historyTotal="historyTotal">
+    <historyList v-if="openForwardFile" :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name"
+        :copyRow="copyRow" @setHisData="setHisData" @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data"
+        @changeMsgClose="changeMsgClose" :historyTotal="historyTotal">
     </historyList>
     <!-- 历史版本 -->
     <!-- 二次密码验证 -->
@@ -484,10 +484,23 @@
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='2' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
     <TreeMenu v-show="showTreeMenu" :spaceType='2' @delCollect="delCollect" @collectFolder="collectFolder" :noEdit="noEdit" :clickRow="clickRow" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
+    <!-- 查看历史记录的iframe -->
+      <el-dialog
+        v-model="showHis"
+        title="历史记录"
+        width="1250px"
+        :close-delay='200'
+        :before-close="closeHis"
+    >
+     <iframe :key="nowTime" :src="hisIfarmeData.src" :name="nowTime" id="iframeHis" frameborder="0" width="1200px"
+     height="800px" class="iframeBox" ></iframe>
+     <!-- <PreHistory v-if="showHis" style="width:1200px;" :historyDocId="historyDocId" :historyFileId="historyFileId"></PreHistory> -->
+    </el-dialog>
 </template>
 
 <script>
 import { ref, toRaw, onMounted,onActivated ,inject,watch} from 'vue'
+import PreHistory from "@/components/PreHistory/PreHistory.vue"
 import myfile from '../../api/myfile/myfile'
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
@@ -778,6 +791,52 @@ export default {
         const showTreeMenu = ref(false)
         const noEdit = ref(false)//树形节点 右键是否可编辑
         const collectId = ref()
+        const showHis = ref(false)
+        const hisIfarmeData = ref({
+            // src: `${window.location.origin}/fileEdit?clickRowId=7567&canEdit=0&canCopy=0&history=0&fileId=0`,
+        })
+        const setHisData = (data)=>{
+            hisIfarmeData.value = {
+                // src:`${window.location.origin}/fileEdit?clickRowId=${data.docId}&canEdit=0&canCopy=0&history=1&fileId=${data.fileId}`,
+                src:`${window.location.origin}/preHistory?clickRowId=${data.docId}&fileId=${data.fileId}`,
+            }
+            showHis.value = true
+            const dom = document.getElementById('iframeHis')
+            if(dom){
+                dom.contentWindow.location.reload();
+            }
+            // console.log(21);
+            setTimeout(() => {
+                iframeSize()
+            }, 200);
+            // console.log('data',data);
+        }
+        // 控制iframe大小
+        const iframeSize = () => {
+        // console.log('执行ifSize',par);
+        const outIframe = document.getElementById("iframeHis");
+        const inIframe =
+            outIframe.contentDocument.getElementsByTagName("iframe")[0];
+        if(inIframe==null){
+            // console.log('没有inF');
+            setTimeout(() => {
+            // console.log('==============');
+            iframeSize()
+            }, 200);
+            return
+        }
+        // console.log('outIframe', outIframe);
+        // console.error(outIframe.parentElement);
+        inIframe.style.height = outIframe.style.height =
+        outIframe.parentElement.offsetHeight - 40 + "px";
+         inIframe.style.width = outIframe.style.width =
+        outIframe.parentElement.offsetWidth  - 80+ "px";
+        }
+        const closeHis = ()=>{
+            // hisIfarmeData.value = {}
+
+            showHis.value = false
+        }
         const changeSort = async () => {
            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc")
         //    refreshFile()
@@ -2737,7 +2796,11 @@ export default {
             delFolderMenu,
             noEdit,
             delFileFn,
-            collectId
+            collectId,
+            setHisData,
+            showHis,
+            closeHis,
+            hisIfarmeData
         }
     },
     watch: {
@@ -2761,7 +2824,8 @@ export default {
         MoveTo,
         LeftList,
         ListShow,
-        TreeMenu
+        TreeMenu,
+        PreHistory
     },
 }
 

src/views/myfile/MyFile.vue

@@ -542,9 +542,9 @@
         :close-delay='200'
         :before-close="closeHis"
     >
-     <!-- <iframe :key="nowTime" :src="hisIfarmeData.src" :name="nowTime" id="iframeHis" frameborder="0" width="1200px"
-     height="800px" class="iframeBox" ></iframe> -->
-     <PreHistory v-if="showHis" :historyDocId="historyDocId" :historyFileId="historyFileId"></PreHistory>
+     <iframe :key="nowTime" :src="hisIfarmeData.src" :name="nowTime" id="iframeHis" frameborder="0" width="1200px"
+     height="800px" class="iframeBox" ></iframe>
+     <!-- <PreHistory v-if="showHis" style="width:1200px;" :historyDocId="historyDocId" :historyFileId="historyFileId"></PreHistory> -->
     </el-dialog>
     <!-- 查看模板的iframe -->
       <el-dialog
@@ -867,14 +867,14 @@ export default {
                 src:`${window.location.origin}/preHistory?clickRowId=${data.docId}&fileId=${data.fileId}`,
             }
             showHis.value = true
-            // const dom = document.getElementById('iframeHis')
-            // if(dom){
-            //     dom.contentWindow.location.reload();
-            // }
-            // // console.log(21);
-            // setTimeout(() => {
-            //     iframeSize()
-            // }, 200);
+            const dom = document.getElementById('iframeHis')
+            if(dom){
+                dom.contentWindow.location.reload();
+            }
+            // console.log(21);
+            setTimeout(() => {
+                iframeSize()
+            }, 200);
             // console.log('data',data);
         }
         // 控制iframe大小

src/views/publicment/MyFile.vue

@@ -449,9 +449,9 @@
     </div>
     <!-- 图片预览 -->
     <!-- 历史版本 -->
-    <historyList v-if="openForwardFile"  :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name" :copyRow="copyRow"
-        @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data" @changeMsgClose="changeMsgClose"
-        :historyTotal="historyTotal">
+    <historyList v-if="openForwardFile" :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name"
+        :copyRow="copyRow" @setHisData="setHisData" @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data"
+        @changeMsgClose="changeMsgClose" :historyTotal="historyTotal">
     </historyList>
     <!-- 历史版本 -->
     <!-- 二次密码验证 -->
@@ -477,10 +477,23 @@
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='1' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
      <TreeMenu v-show="showTreeMenu" :spaceType='1' @delCollect="delCollect" @collectFolder="collectFolder" :clickRow="clickRow" :noEdit="noEdit" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
+     <!-- 查看历史记录的iframe -->
+      <el-dialog
+        v-model="showHis"
+        title="历史记录"
+        width="1250px"
+        :close-delay='200'
+        :before-close="closeHis"
+    >
+     <iframe :key="nowTime" :src="hisIfarmeData.src" :name="nowTime" id="iframeHis" frameborder="0" width="1200px"
+     height="800px" class="iframeBox" ></iframe>
+     <!-- <PreHistory v-if="showHis" style="width:1200px;" :historyDocId="historyDocId" :historyFileId="historyFileId"></PreHistory> -->
+    </el-dialog>
 </template>
 
 <script>
 import { ref, toRaw, onMounted ,onActivated,watch} from 'vue'
+import PreHistory from "@/components/PreHistory/PreHistory.vue"
 import myfile from '../../api/myfile/myfile'
 import {documentation}from "@/api/biz/actor.js"
 import { delFavorite } from '@/api/biz/favorite.js'
@@ -774,6 +787,52 @@ export default {
         const showTreeMenu = ref(false)
         const noEdit = ref(false)//树形节点 右键是否可编辑
         const collectId = ref()
+        const showHis = ref(false)
+        const hisIfarmeData = ref({
+            // src: `${window.location.origin}/fileEdit?clickRowId=7567&canEdit=0&canCopy=0&history=0&fileId=0`,
+        })
+        const setHisData = (data)=>{
+            hisIfarmeData.value = {
+                // src:`${window.location.origin}/fileEdit?clickRowId=${data.docId}&canEdit=0&canCopy=0&history=1&fileId=${data.fileId}`,
+                src:`${window.location.origin}/preHistory?clickRowId=${data.docId}&fileId=${data.fileId}`,
+            }
+            showHis.value = true
+            const dom = document.getElementById('iframeHis')
+            if(dom){
+                dom.contentWindow.location.reload();
+            }
+            // console.log(21);
+            setTimeout(() => {
+                iframeSize()
+            }, 200);
+            // console.log('data',data);
+        }
+        // 控制iframe大小
+        const iframeSize = () => {
+        // console.log('执行ifSize',par);
+        const outIframe = document.getElementById("iframeHis");
+        const inIframe =
+            outIframe.contentDocument.getElementsByTagName("iframe")[0];
+        if(inIframe==null){
+            // console.log('没有inF');
+            setTimeout(() => {
+            // console.log('==============');
+            iframeSize()
+            }, 200);
+            return
+        }
+        // console.log('outIframe', outIframe);
+        // console.error(outIframe.parentElement);
+        inIframe.style.height = outIframe.style.height =
+        outIframe.parentElement.offsetHeight - 40 + "px";
+         inIframe.style.width = outIframe.style.width =
+        outIframe.parentElement.offsetWidth  - 80+ "px";
+        }
+        const closeHis = ()=>{
+            // hisIfarmeData.value = {}
+
+            showHis.value = false
+        }
         const changeSort = async () => {
            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc")
         //    refreshFile()
@@ -2721,7 +2780,11 @@ export default {
             delFolderMenu,
             noEdit,
             delFileFn,
-            collectId
+            collectId,
+            setHisData,
+            showHis,
+            closeHis,
+            hisIfarmeData
         }
     },
     watch: {
@@ -2745,7 +2808,8 @@ export default {
         MoveTo,
         LeftList,
         ListShow,
-        TreeMenu
+        TreeMenu,
+        PreHistory
     },
 }