历史版本和首页

src/components/FileTreeChoice/index.vue

@@ -2,7 +2,7 @@
   <el-dialog v-model="isOpen" append-to-body width="700">
     <template #header>
       <div class="my-header">
-        <div class="title">选择文件</div>
+        <div class="title">{{docId?'历史版本列表':'选择文件'}}</div>
       </div>
     </template>
     <div class="main-cont">
@@ -18,8 +18,9 @@
           <template #default="{ node }">
             <span style="display: flex;align-items: center;">
               <img :src="fileImg" alt="" style="width: 20px;height: 20px;margin-right: 5px;"/>
+              {{ node.label }}
               <!-- 放置图片 -->
-              <span>{{ node.label }}</span>
+              <span>{{ docId?node.createTime:node.label}}</span>
               <!-- 显示节点标签 -->
             </span>
           </template>
@@ -54,6 +55,11 @@ const props = defineProps({
     type: Object,
     default: () => {},
   },
+  //我的文件历史版本传递的参数
+  docId:{
+    type:String,
+    default: '',
+  }
 });
 const defaultProps = {
   children: "children",
@@ -81,7 +87,9 @@ const handleNodeClick = (data) => {
 //确定按钮
   const emit = defineEmits(["fileChangeMsg"]);
 const confirm = () => {
-  const {disabled,label}=toRefs(clickData.value)
+  const {disabled}=toRefs(clickData.value)
+  if(!clickData.value.id){
+  return ElMessage({ message: '请选择文件', type: 'error' })}
   if(disabled.value){
     return ElMessage({ message: '当前选中为目录,请重新选择文件', type: 'error' })
   }

src/components/forwordTree/index.vue

@@ -169,7 +169,6 @@ const sureDir = async () => {
     ElMessage({ message: "该目录名字已存在,请重新创建", type: "error" });
     return
   }
-  console.log('selectedNode', selectedNode)
   const dirRes = await builtDir({
     dirName: dirName.value,
     spaceId: props.spaceId,

src/store/modules/websocket.js

@@ -75,10 +75,10 @@ const useWebsoctStore = defineStore('websoct', {
       }, 2000);
     },
     sendHeartbeat() {
-      if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-        // 发送心跳消息，可以是一个特定的字符串，表示心跳消息
-        this.socket.send("heartbeat");
-      }
+      // if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+      //   // 发送心跳消息，可以是一个特定的字符串，表示心跳消息
+      //   this.socket.send("heartbeat");
+      // }
     },
     handleMessage(event) {
         console.log('event', event)

src/views/liveChat/index.vue

@@ -503,7 +503,7 @@ onMounted(() => {
           </el-main>
           <!-- 底部 -->
           <el-footer height="112px" class="right-footer">
-            <!-- 发送文件 -->
+            <!-- 发送消息文件 -->
             <img
               :src="sendFile"
               class="send-info-file"
@@ -533,6 +533,7 @@ onMounted(() => {
       </div>
     </div>
   </div>
+  <!-- 发送消息按钮选择的文件 -->
   <forwordTree
     :openForwardFile="openForwardFile"
     :docId="docId"

src/views/myfile/MyFile.vue

@@ -432,6 +432,15 @@
         </div>
     </div>
     <!-- 图片预览 -->
+    <!-- 历史版本 -->
+    <FileTreeChoice
+    :openFile="openForwardFile"
+    :docId="clickRowId.toString()"
+    @close="openForwardFile = false"
+    :fileUserTreeData="fileUserTreeData.data"
+    @forwardChangeMsg="forwardChangeMsg"
+  ></FileTreeChoice>
+  <!-- 历史版本 -->
 </template>
 
 <script>
@@ -454,6 +463,9 @@ import squre from '../../assets/images/squre.png'
 import { ElMessage } from 'element-plus'
 import ImgPreview from '@/components/ImgPreview/ImgPreview.vue'
 import { preview } from "@/api/common/common.js";
+import FileTreeChoice from "@/components/FileTreeChoice/index.vue"; //选择文件发送的列表，历史版本
+import { listVersion } from "@/api/biz/version";
+import useUserStore from "@/store/modules/user";
 import { useRouter, useRoute } from "vue-router";
 export default {
     setup() {
@@ -504,6 +516,8 @@ export default {
         let needBag = ref("")
         let copyOrMove = ref(0)//0代表复制，1代表移动
         let sortNum = ref(0)
+        const openForwardFile=ref(false)   //历史版本展示
+        const fileUserTreeData = reactive({ data: {} });
         let boserForm = ref({
             spaceId: "",//空间id
             dirName: "",
@@ -857,6 +871,10 @@ export default {
                 const res = await preview(copyFileId.value)
                 previewData.value = URL.createObjectURL(res)
                 // console.log('res',res);
+            }else if(row.name ==="历史版本"){
+                const resHistory=await listVersion({docId:clickRowId.value})
+                fileUserTreeData.data = resHistory.rows;
+                openForwardFile.value=true
             }
         }
         function chooseSet1() {
@@ -1192,6 +1210,12 @@ export default {
             fileTrees.value = data
 
         }
+        //历史版本
+        // 点击转存
+        const forwardTreeData = reactive({ data: {} });
+        function forwardChangeMsg(val){
+
+        }
         onMounted(() => {
             getAllTop()
             getAllUser()
@@ -1312,7 +1336,11 @@ export default {
             copyOrMove,
             impDirId,
             impNum,
-            impSpaceId
+            impSpaceId,
+            openForwardFile,//历史版本
+            forwardTreeData,
+            forwardChangeMsg,
+            fileUserTreeData
         }
 
     },
@@ -1323,6 +1351,7 @@ export default {
         FileEdit,
         ImgPreview,
         FileTree,
+        FileTreeChoice
     },
 }
 

src/views/transFile/index.vue

@@ -32,9 +32,9 @@ export default {
   <script setup>
 import { ref } from "vue";
 import axios from "axios";
-import useUserStore from "@/store/modules/user";
 import { getToken } from "@/utils/auth";
 import { ElUpload, ElButton, ElProgress } from "element-plus";
+import useUserStore from "@/store/modules/user";
 const useUserStoreId = useUserStore();
 const uploadFileUrl = ref(
   import.meta.env.VITE_APP_BASE_API + "/biz/info/uploadFiles"