diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js index da4ed955..77462762 100644 --- a/src/views/main_web/workspace/service.js +++ b/src/views/main_web/workspace/service.js @@ -43,6 +43,10 @@ export async function createSubFolder(folderGroupData) { * 添加历史文件 */ export async function AddArchMilesStone(fileInfo){ + fileInfo=firstCharToUpperCase(fileInfo); + delete fileInfo.IsShowFile; + //fileInfo=JSON.stringify(fileInfo) + //console.log(fileInfo); const res = await fetchApi('file/AddArchMilesStone', fileInfo); return wrapErrorHint(res); } \ No newline at end of file diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue index 10aca46d..76818af8 100644 --- a/src/views/main_web/workspace/workspace.vue +++ b/src/views/main_web/workspace/workspace.vue @@ -288,18 +288,18 @@ - {{ item.folderGroupName }} + {{ item.folderName }} @@ -340,7 +340,7 @@ @@ -380,7 +380,7 @@ @@ -3086,7 +3086,6 @@ export default { this.dbClickSelectedFolderGroupData != null && JSON.stringify(this.dbClickSelectedFolderGroupData) != "{}" ) { - console.log("我要更新当前文件夹啦"); this.intoFoldergroup(this.dbClickSelectedFolderGroupData); } else { this.listFiles(); @@ -5296,6 +5295,7 @@ export default { this.isCreating = true; file.ModifyUserId=sessionStorage.userId; file.ModifyTime=new Date(); + //file.milestone=1; const Res = await services.AddArchMilesStone(file); if(Res.Code !=-1){ this.refreshPages(); @@ -5307,14 +5307,6 @@ export default { duration: 2500, }); this.isCreating = false; - }else{ - this.$notify({ - title: "温馨提示", - message: Res.Msg, - type: "error", - offset: 100, - duration: 5000, - }); } }, // createMilestone: function (file) { @@ -6552,14 +6544,6 @@ export default { offset: 100, duration: 2500, }); - } else { - this.$notify({ - title: "温馨提示", - message: "创建失败", - type: "error", - offset: 100, - duration: 5000, - }); } this.dialogNewFolderGroup = false; @@ -6646,23 +6630,22 @@ export default { listOtherFiles: folderResInfo.workFile, listOtherFolderGroups: null, } + console.log("res"); + console.log(res) if (this.currentPageType == 0) { - // 加载我的文件 this.myFilesList = this.folderFileList.listMyFiles; - // 加载我的文件夹 zxm+ this.myListFolderGroups = this.folderFileList.listFolderGroups; - this.folderGroupBreads =this.folderFileList.folderGroupBreads; + this.folderGroupBreads =this.folderFileList.listFolderGroups.concat([]); + this.folderGroupBreads.unshift(foldergroup); } else { - // 加载工作文件 this.myFilesList = this.folderFileList.listOtherFiles; - // 加载工作文件分组 zxm+ this.myListFolderGroups = this.folderFileList.listOtherFolderGroups; - this.folderGroupBreads =this.folderFileList.folderGroupBreads; + this.folderGroupBreads =null; } clearInterval(this.timer); this.timer = setInterval(() => { this.intoFoldergroup(foldergroup); - }, 8 * 1000); + }, 3 * 1000); }, // intoFoldergroup: function (foldergroup) {