拉取代码合并冲突

src/views/components_web/distWork/distWork.vue

@@ -1647,7 +1647,7 @@ function mergeFolderList(plainFolderList, userHash) {
     const folder = firstCharToLowerCase(upperFolder);
     hash[folder.id] = folder;
     folder.listChildren = [];
-    folder.listUser = folder.oldGeneralId.split(',').filter(a => a).map(id => userHash[id]);
+  folder.listUser = folder.oldGeneralId.split(',').filter(a => a).map(id => userHash[id]);
     folder.manageUser = (folder.oldManager === '0' ? '' : folder.oldManager).split(',').filter(a => a).map(id => userHash[id]);
     const parentFolderId = folder.superId;
     // headList.push(folder);

src/views/main_web/workspace/service.js

@@ -45,6 +45,7 @@ export async function createSubFolder(folderGroupData) {
 export async function AddArchMilesStone(fileInfo){
   fileInfo=firstCharToUpperCase(fileInfo);
   delete fileInfo.IsShowFile;
+
   const res = await fetchApi('file/AddArchMilesStone', fileInfo);
   return wrapErrorHint(res);
 }

src/views/main_web/workspace/workspace.vue

@@ -445,7 +445,7 @@
                   id="draggleFiles"
                   class="list-group"
                   :list="myFilesList"
-                  group="group" 
+                  group="group"
                   :move="draggableMove"
                   @end="draggableEnd"
                 >
@@ -912,7 +912,7 @@
                     class="yiyun_wenjian_list lisy-group-item"
                     v-for="foldergroup in myListFolderGroups"
                     :key="foldergroup.id"
-                    @dblclick="intoFoldergroup(foldergroup),getfolderGroupBreads(foldergroup)"
+                   @dblclick="intoFoldergroup(foldergroup),getfolderGroupBreads(foldergroup)"
                   >
                     <div
                       class="defultImage-mid foldernew-mid"
@@ -6651,13 +6651,14 @@ export default {
     /**
      * 双击文件获取面包屑
      */
-    getfolderGroupBreads(foldergroup){
+      getfolderGroupBreads(foldergroup){
       this.folderGroupBreads.push(foldergroup);
     },
     /**
      * 双击文件夹组名称 进入文件夹
      */
     async intoFoldergroup(foldergroup){
+    
       this.dbClickSelectedFolderGroupData=foldergroup;
       this.isShowWorkt=false;
       this.isShowBread=true;
@@ -6676,9 +6677,13 @@ export default {
         listOtherFiles: folderResInfo.workFile,
         listOtherFolderGroups: null,
       }
+      console.log("res");
+      console.log(res)
       if (this.currentPageType == 0) {
         this.myFilesList = this.folderFileList.listMyFiles;
         this.myListFolderGroups = this.folderFileList.listFolderGroups;
+        this.folderGroupBreads =this.folderFileList.listFolderGroups.concat([]);
+        this.folderGroupBreads.unshift(foldergroup);
       } else {
         this.myFilesList = this.folderFileList.listOtherFiles;
         this.myListFolderGroups = this.folderFileList.listOtherFolderGroups;
@@ -6686,8 +6691,9 @@ export default {
       }
         clearInterval(this.timer);
         this.timer = setInterval(() => {
-           this.intoFoldergroup(foldergroup);
-         }, 3 * 1000);
+          this.intoFoldergroup(foldergroup);
+        }, 3 * 1000);
+      
     },
     // intoFoldergroup: function (foldergroup) {
     //   // console.log('intoFoldergroup: ', foldergroup);
@@ -6750,7 +6756,7 @@ export default {
       var thisApp = this;
       clearInterval(thisApp.timer);
       if (isBreadFirstNode) {
-        thisApp.folderGroupBreads = [];
+      thisApp.folderGroupBreads = [];
         thisApp.isShowWorkt = true;
         thisApp.isShowBread = false;
         thisApp.dbClickSelectedFolderGroupData = {};
@@ -6767,7 +6773,7 @@ export default {
         thisApp.intoFoldergroup(obj);
         // thisApp.timer = setInterval(() => {
         //   thisApp.intoFoldergroup(obj);
-        // }, 3 * 1000);
+        // }, 3 * 1000);    
       }
     },
     /**
@@ -7138,7 +7144,6 @@ export default {
     outWorkSpace(data) {
       this.hideWorklinkPage();
     },
-
   },
   destroyed: function () {
     window.removeEventListener("scroll", this.onscroll);
@@ -7160,7 +7165,6 @@ export default {
     draggable: draggable,
     AppHeader,
   },
-
 };
 </script>
 <style>

vue.config.js

@@ -24,6 +24,7 @@ module.exports = {
           NODE_ENV: '"development"',
           API_HOST: '"/api/"',
           // API_HOST: '"http://47.104.91.134:9000/api/"',
+ 
         }
       }),
     ],
@@ -32,6 +33,7 @@ module.exports = {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
           target:'http://10.240.33.159:8089',
+
           changeOrigin: true,
           secure: false,
         },