liuQiang 1 jaar geleden
bovenliggende
commit
f1e0a04e86
4 gewijzigde bestanden met toevoegingen van 101 en 21 verwijderingen
  1. 3 3
      src/components/historyList/index.vue
  2. 11 7
      src/views/department/MyFile.vue
  3. 76 4
      src/views/myfile/MyFile.vue
  4. 11 7
      src/views/publicment/MyFile.vue

+ 3 - 3
src/components/historyList/index.vue

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

+ 11 - 7
src/views/department/MyFile.vue

@@ -1218,14 +1218,18 @@ export default {
                 loadingPreview.value = false
             }
             if (row.name === '文字识别') {
-                router.push({
-                    path: '/identifyFont',
-                      query: {
-                        docId: copyRow.value.docId,
-                        fileId: copyRow.value.fileId,
-                        fileType: copyFileType.value
+                const itemData = {
+                        name: '文字识别',
+                        path: 'identifyFont',
+                        clickRowId: {
+                            docId: copyRow.value.docId,
+                            fileId: copyRow.value.fileId,
+                            fileType: copyFileType.value
+                        }
                     }
-                })
+                    sessionStorage.setItem('textData','')
+                    sessionStorage.setItem('showImg','')
+                    addFolderAdd(itemData)
             }
             if (row.name === '打开') {
                 loadingPreview.value = true

+ 76 - 4
src/views/myfile/MyFile.vue

@@ -490,7 +490,7 @@
     <!-- 图片预览 -->
     <!-- 历史版本 -->
     <historyList v-if="openForwardFile" :openFile="openForwardFile" :docId="clickRowId" :name="nameForm.name"
-        :copyRow="copyRow" @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data"
+        :copyRow="copyRow" @setHisData="setHisData" @close="openForwardFile = false" :fileUserTreeData="fileUserTreeData.data"
         @changeMsgClose="changeMsgClose" :historyTotal="historyTotal">
     </historyList>
     <!-- 历史版本 -->
@@ -520,6 +520,19 @@
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='3' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
     <TreeMenu v-show="showTreeMenu" :spaceType='3' @delCollect="delCollect" @collectFolder="collectFolder" :clickRow="clickRow" @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>
+    </el-dialog>
+    <!-- <iframe v-if="hisIfarmeData?.src" :src="hisIfarmeData.src" id="iframeHis" frameborder="1" width="1200px"
+     height="800px" class="iframeBox" ></iframe> -->
 </template>
 
 <script>
@@ -785,12 +798,59 @@ export default {
         const delMoreFolder = ref([])
         const inputTitle = ref()//验证框标题
         const isCode = ref(false)// 验证的类型
-        const isAsc = ref("asc");
+        const isAsc = ref("desc");
         const leftShowList = ref()
         const thisFirst = ref()
         const ListtreeData = ref()
         const searchFolderTree = ref()
         const showTreeMenu = ref(false)
+        const nowTime = ref(new Date().getTime())
+        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)=>{
+            nowTime.value = new Date().getTime()
+            hisIfarmeData.value = {
+                src:`${window.location.origin}/fileEdit?clickRowId=${data.docId}&canEdit=0&canCopy=0&history=1&fileId=${data.fileId}`,
+            }
+            showHis.value = true
+            const dom = document.getElementById('iframeHis')
+            if(dom){
+                dom.contentWindow.location.reload();
+            }
+            // console.log(21);
+            setTimeout(() => {
+                iframeSize()
+            }, 1000);
+            // 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 =
+            800 + "px";
+        inIframe.style.width = outIframe.style.width =
+            1200 + "px";
+        }
+        const closeHis = ()=>{
+            // hisIfarmeData.value = {}
+
+            showHis.value = false
+        }
         const changeSort = async () => {
             isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
             // refreshFile()
@@ -1285,6 +1345,8 @@ export default {
                             fileType: copyFileType.value
                         }
                     }
+                    sessionStorage.setItem('textData','')
+                    sessionStorage.setItem('showImg','')
                     addFolderAdd(itemData)
             }
             if (row.name === '打开') {
@@ -2857,7 +2919,12 @@ export default {
             delFolderDataFn,
             openFolderPath,
             delFolderMenu,
-            delFileFn
+            delFileFn,
+            hisIfarmeData,
+            setHisData,
+            closeHis,
+            nowTime,
+            showHis
         }
     },
     watch: {
@@ -2912,7 +2979,12 @@ p {
     justify-content: flex-start;
     overflow: hidden;
 }
-
+// .iframeBox{
+//     position: fixed;
+//     top: 10%;
+//     left: 20%;
+//     z-index: 500000;
+// }
 .settingBox {
     width: 25vw;
     height: 92vh;

+ 11 - 7
src/views/publicment/MyFile.vue

@@ -1199,14 +1199,18 @@ export default {
                 loadingPreview.value = false
             }
             if (row.name === '文字识别') {
-                router.push({
-                    path: '/identifyFont',
-                    query: {
-                        docId: copyRow.value.docId,
-                        fileId: copyFileId.value,
-                        fileType: copyFileType.value
+                const itemData = {
+                        name: '文字识别',
+                        path: 'identifyFont',
+                        clickRowId: {
+                            docId: copyRow.value.docId,
+                            fileId: copyRow.value.fileId,
+                            fileType: copyFileType.value
+                        }
                     }
-                })
+                    sessionStorage.setItem('textData','')
+                    sessionStorage.setItem('showImg','')
+                    addFolderAdd(itemData)
             }
             if (row.name === '打开') {
                 loadingPreview.value = true