Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

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/"',
 
 }

src/views/login.vue

@@ -250,7 +250,7 @@ export default {
       checkPwdTip: "", //检测提示
       phoneCode: "", //手机验证码
       isRemember: false, //记住密码
-      isClient: false //是否是客户端
+      isClient: true //是否是客户端
     };
   },
   beforeRouteLeave(to, from, next) {

src/views/main_web/cloud.vue

@@ -413,7 +413,7 @@
         mapAddress:'北京天安门',
         showImage:false,
         imageUrl:'',
-        isClient:false, //是否是客户端
+        isClient:true, //是否是客户端
         //结束
         // end
       };

src/views/main_web/projnotice.vue

@@ -85,7 +85,7 @@
         showOffice: false, // 预览Office文件
         officeUrl: "", // PDF URL
         isShowDefault:false,
-        isClient: false,//是否是客户端
+        isClient: true,//是否是客户端
       };
     },
     mounted: function () {

src/views/main_web/workspace.vue

@@ -2131,7 +2131,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: false, // 是否是客户端
+      isClient: true, // 是否是客户端
 
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
@@ -2263,7 +2263,7 @@ export default {
      * 0:我的文件   1：工作文件
      */
     changeWorkdata(i) {
-      clearInterval(this.timer);
+      //clearInterval(this.timer);
       this.currentPageType = i;
       this.dbClickSelectedFolderGroupData = {}; //切换我的文件和工作文件 清空双击的文件分组对象
       if (this.currentPageType == 0) {
@@ -2921,11 +2921,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 => {
@@ -5265,12 +5275,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",
@@ -5886,6 +5902,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;
       }