From 7f3c4b8f9b5d10d59aa0f98d8e2c9dba9a9b7c15 Mon Sep 17 00:00:00 2001
From: revive <1664535558@qq.com>
Date: Thu, 5 Nov 2020 11:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projSetting/projSetting.vue               | 10 +-
 src/views/main_web/workspace/workspace.vue    | 98 ++++++++++---------
 vue.config.js                                 |  2 +-
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/views/components_web/projSetting/projSetting.vue b/src/views/components_web/projSetting/projSetting.vue
index a0ece103..ac6c32d0 100644
--- a/src/views/components_web/projSetting/projSetting.vue
+++ b/src/views/components_web/projSetting/projSetting.vue
@@ -722,7 +722,6 @@ import { wrapOssProtocol} from "@/services/oss";
           ImgUrl:this.nowProject.ShowImgUrl,
           Projprops: CustomProps,
         };  
-        console.log(updateData)
         const res=await prjService.EditProject(updateData); 
         this.projInfo(this.currentProjId);
         var thisApp = this;
@@ -734,9 +733,9 @@ import { wrapOssProtocol} from "@/services/oss";
             offset: 30,
             duration: 2500
           });
-          setTimeout(()=> {
-            thisApp.$emit("editSuccess");
-          },2000)
+          // setTimeout(()=> {
+          //   thisApp.$emit("editSuccess");
+          // },2000)
         } else {
           this.$notify({
             title: "温馨提示",
@@ -746,9 +745,8 @@ import { wrapOssProtocol} from "@/services/oss";
             duration: 5000
           });
         }
-
         this.isShowSaveAllBtn = false;
-        this.isShowInfoEdit = true;
+        this.isShowInfoEdit = false;
         this.isShowEditProjBtn = true;            
       },
       // saveProjectInfo: function () {
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 7701fd5a..9123aa3c 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -3848,8 +3848,6 @@ export default {
       const data = await services.fetchFolderFileList(currentFolder.id, userId, commonFolderId);
       if(!data) return;
       const folderResInfo = data;
-      console.log(111)
-      console.log(data);
       const folderFileList = this.folderFileList = {
         listAllFiles:null,
         listBreadFolderGroups: null,
@@ -4195,11 +4193,11 @@ export default {
     /**
      * 获取历史文件过滤
      */
-    getMilstoneFile(archName){
+    getMilstoneFile(file){
       var files=this.folderFileList.listMyFiles.concat([]);
       files.push(...this.folderFileList.listOtherFiles);
-      return files.filter(file=>{
-        return(file.archName===archName && file.milestone===2)
+      return files.filter(item=>{
+        return item.archName==file.archName&&item.id!=file.id;
       })
     },
     /**
@@ -5312,7 +5310,8 @@ export default {
       }
       this.currentMilestone=file;
       this.dialogFileHistory = true;
-      this.listMilestones=this.getMilstoneFile(file.archName);
+      //返回与该文件同名的所有文件并把自己过滤掉
+      this.listMilestones=this.getMilstoneFile(file);
       this.currentArchID = file.archID;
     },
     /**
@@ -5484,49 +5483,52 @@ export default {
     /**
      * 设置历史文件
      */
-    setMilestones: function () {
-      if (this.currentMileArchID == this.currentMilestone.id) {
-        this.dialogFileHistory = false;
-        return;
-      }
-      var thisApp = this;
-      this.$axios({
-        method: "get",
-        url: encodeURI(
-          process.env.API_HOST +
-            "archives/milestone/set/" +
-            this.currentArchID +
-            "/" +
-            this.currentMileArchID +
-            "/" +
-            sessionStorage.userId
-        ),
-      })
-        .then((response) => {
-          if (response.data.state == 1) {
-            this.$notify({
-              title: "恭喜您",
-              message: response.data.message,
-              type: "success",
-              offset: 100,
-              duration: 5000,
-            });
-            thisApp.dialogFileHistory = false;
-            thisApp.refreshPages();
-          } else {
-            this.$notify({
-              title: "温馨提示",
-              message: response.data.message,
-              type: "error",
-              offset: 100,
-              duration: 5000,
-            });
-          }
-        })
-        .catch((error) => {
-          console.log(error);
-        });
+    setMilestones(){
+
     },
+    // setMilestones: function () {
+    //   if (this.currentMileArchID == this.currentMilestone.id) {
+    //     this.dialogFileHistory = false;
+    //     return;
+    //   }
+    //   var thisApp = this;
+    //   this.$axios({
+    //     method: "get",
+    //     url: encodeURI(
+    //       process.env.API_HOST +
+    //         "archives/milestone/set/" +
+    //         this.currentArchID +
+    //         "/" +
+    //         this.currentMileArchID +
+    //         "/" +
+    //         sessionStorage.userId
+    //     ),
+    //   })
+    //     .then((response) => {
+    //       if (response.data.state == 1) {
+    //         this.$notify({
+    //           title: "恭喜您",
+    //           message: response.data.message,
+    //           type: "success",
+    //           offset: 100,
+    //           duration: 5000,
+    //         });
+    //         thisApp.dialogFileHistory = false;
+    //         thisApp.refreshPages();
+    //       } else {
+    //         this.$notify({
+    //           title: "温馨提示",
+    //           message: response.data.message,
+    //           type: "error",
+    //           offset: 100,
+    //           duration: 5000,
+    //         });
+    //       }
+    //     })
+    //     .catch((error) => {
+    //       console.log(error);
+    //     });
+    // },
     /**
      * 右键复制文件
      */
diff --git a/vue.config.js b/vue.config.js
index fe5ee114..da86159d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,7 +32,7 @@ module.exports = {
       proxy: {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
-          target:'http://10.240.32.127:8089',
+          target:'http://10.240.32.156:8089',
 
           changeOrigin: true,
           secure: false,