From c93f0c9f668ec2e4536a81e1ebf6e9736faa4b26 Mon Sep 17 00:00:00 2001 From: zxm Date: Wed, 8 Jul 2020 13:26:00 +0800 Subject: [PATCH 1/2] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.修改协作文件刷新bug --- src/views/main_web/workspace.vue | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index 22ed9392..aaf34a4d 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2246,7 +2246,7 @@ export default { * 0:我的文件 1：工作文件 */ changeWorkdata(i) { - clearInterval(this.timer); + //clearInterval(this.timer); this.currentPageType = i; this.dbClickSelectedFolderGroupData = {}; //切换我的文件和工作文件 清空双击的文件分组对象 if (this.currentPageType == 0) { @@ -2904,11 +2904,21 @@ export default { ) }) .then(response => { - thisApp.folderFileList = response.data; - thisApp.myFilesList = thisApp.folderFileList.listAllFiles; - // 加载我的文件夹 zxm+ - thisApp.myListFolderGroups = - thisApp.folderFileList.listFolderGroups; + // thisApp.folderFileList = response.data; + // thisApp.myFilesList = thisApp.folderFileList.listAllFiles; + // // 加载我的文件夹 zxm+ + // thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups; + if (this.currentPageType == 0) { + // 加载我的文件 + this.myFilesList = this.folderFileList.listMyFiles; + //zxm+ 加载我的文件夹组 + this.myListFolderGroups = this.folderFileList.listFolderGroups; + } else { + // 加载工作文件 + this.myFilesList = this.folderFileList.listOtherFiles; + //zxm+ 加载工作文件夹组 + this.myListFolderGroups = this.folderFileList.listOtherFolderGroups; + } thisApp.loadCommitedComFiles(); }) .catch(error => { @@ -5867,6 +5877,7 @@ export default { var thisApp = this; var sourceData = evt.draggedContext.element; var targetData = evt.relatedContext.element; + console.log(targetData.folderGroupID) if (targetData.folderGroupID == "myFile" || targetData.folderGroupID == "myComFile") { targetData.folderID = this.nowFolder.folderID; } From 3e6c36a250f28a0e32cf1a27b18439a1ac24be5b Mon Sep 17 00:00:00 2001 From: xzx Date: Wed, 8 Jul 2020 16:24:28 +0800 Subject: [PATCH 2/2] [VersionBeta] V.1.0.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Adds] 1.创建云文件、样板文件增加分组参数：foldergroupId --- config/prod.env.js | 2 +- src/views/login.vue | 2 +- src/views/main_web/cloud.vue | 2 +- src/views/main_web/projnotice.vue | 2 +- src/views/main_web/workspace.vue | 10 ++++++++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/prod.env.js b/config/prod.env.js index 4c55351c..61ec9f09 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -9,6 +9,6 @@ module.exports = { // OFFICE_WEB: '"https://office.tszcloud.com"' - API_HOST:'"http://192.168.5.25:9003/api/"', + API_HOST:'"http://192.168.5.32:9003/api/"', } diff --git a/src/views/login.vue b/src/views/login.vue index 41118314..bbee1e1a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -250,7 +250,7 @@ export default { checkPwdTip: "", //检测提示 phoneCode: "", //手机验证码 isRemember: false, //记住密码 - isClient: false //是否是客户端 + isClient: true //是否是客户端 }; }, beforeRouteLeave(to, from, next) { diff --git a/src/views/main_web/cloud.vue b/src/views/main_web/cloud.vue index 404904fd..567419e1 100644 --- a/src/views/main_web/cloud.vue +++ b/src/views/main_web/cloud.vue @@ -413,7 +413,7 @@ mapAddress:'北京天安门', showImage:false, imageUrl:'', - isClient:false, //是否是客户端 + isClient:true, //是否是客户端 //结束 // end }; diff --git a/src/views/main_web/projnotice.vue b/src/views/main_web/projnotice.vue index d8a8103b..b2fc1d64 100644 --- a/src/views/main_web/projnotice.vue +++ b/src/views/main_web/projnotice.vue @@ -85,7 +85,7 @@ showOffice: false, // 预览Office文件 officeUrl: "", // PDF URL isShowDefault:false, - isClient: false,//是否是客户端 + isClient: true,//是否是客户端 }; }, mounted: function () { diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue index fe5bf783..b3eb47c7 100644 --- a/src/views/main_web/workspace.vue +++ b/src/views/main_web/workspace.vue @@ -2130,7 +2130,7 @@ export default { dialogNewSuperMapVisible: false, newSuperMap: { showName: "", description: "" }, mapAddress: "北京天安门", - isClient: false, // 是否是客户端 + isClient: true, // 是否是客户端 /**新建文件分组 start*/ dialogNewFolderGroup: false, //新建文件分组组弹窗 @@ -5261,12 +5261,18 @@ export default { fileId = this.currentTempFile.nodeFileID; } var folderId = this.listUserFolders[this.nowFolderIndex].folderID; + var foldergroupId=""; + if(this.dbClickSelectedFolderGroupData != null && JSON.stringify(this.dbClickSelectedFolderGroupData) != "{}") + { + foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID; + } var param = { fileName: this.createCloudFileName, folderId: folderId, fileId: fileId, userId: sessionStorage.userId, - companyId: sessionStorage.companyId + companyId: sessionStorage.companyId, + folderGroupID:foldergroupId }; this.$axios({ method: "post",