From d10797d26d9cc7ac656bc4268ac019e83facddf3 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Fri, 6 Nov 2020 14:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=87=E4=BB=B6=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E7=82=B9=E5=87=BB=E4=BA=86=E6=89=8D=E8=83=BD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projSetting/projSetting.vue               |  2 +-
 src/views/main_web/workspace/workspace.vue    | 38 ++++++++++---------
 vue.config.js                                 |  2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/views/components_web/projSetting/projSetting.vue b/src/views/components_web/projSetting/projSetting.vue
index ac6c32d0..e01c5a95 100644
--- a/src/views/components_web/projSetting/projSetting.vue
+++ b/src/views/components_web/projSetting/projSetting.vue
@@ -193,7 +193,7 @@
                       >
                         <span>编辑</span>
                       </file-uploader>
-                      <span class="faceBtn" v-show="isShowSaveAllBtn" @click="setSystemCover">使用随机封面</span>
+                      <span class="faceBtn" v-show="isShowSaveAllBtn" @click="setSystemCoverRandom">使用随机封面</span>
                     </div>
                   </div>
                 </div>
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 219e3d35..2cb6ea7b 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -545,7 +545,7 @@
                           </div>
 
                           <div
-                            v-if="file.status == 0"
+                            v-if="file.status == 1"
                             class="yijianxietong isonselect_defual"
                           >
                             <i
@@ -573,7 +573,7 @@
                             <i
                               class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
                               title="点击暂停协同"
-                              @click="setFileStatus(file, 0, '更新为工作中', 1)"
+                              @click="setFileStatus(file, 1, '更新为工作中', 1)"
                             ></i>
                           </div>
                           <div
@@ -839,7 +839,7 @@
                           <span
                             v-if="
                               nowFolderName == '公共文件夹' &&
-                              file.createUserID == userId
+                              file.createUserId == userId
                             "
                             class="yiyunwenjian_infodesc"
                             >由我创建</span
@@ -847,7 +847,7 @@
                           <span
                             v-if="
                               nowFolderName == '公共文件夹' &&
-                              file.createUserID != userId
+                              file.createUserId != userId
                             "
                             class="yiyunwenjian_infodesc"
                             >{{ file.cnName }}创建</span
@@ -860,7 +860,7 @@
                           <span
                             v-if="
                               nowFolderName != '公共文件夹' &&
-                              file.createUserID != userId
+                              file.createUserId != userId
                             "
                             class="yiyunwenjian_infodesc"
                             >{{ file.cnName }}创建</span
@@ -3845,14 +3845,16 @@ export default {
       if(isCommonFolder) {
         this.loadCommitedComFiles();
       } 
-      // else {
-      //   if (this.curactive == 0) {
-      //     this.listCollaborationFiles();
-      //   } else if (this.curactive == 1) {
-      //     this.myPublicFilesList=[];
-      //     this.loadListCommonFiles();
-      //   }
-      // }
+      else {
+        if (this.curactive == 0) {
+          // this.listCollaborationFiles();
+          this.fileindex = 0;
+        } else if (this.curactive == 1) {
+          this.fileindex = 1;
+          // this.myPublicFilesList=[];
+          // this.loadListCommonFiles();
+        }
+      }
       this.refreshFileStatus();
       // debugger;
       // if (currentFolder.folderName == "公共文件夹") {
@@ -6371,11 +6373,11 @@ export default {
     workTab(num) {
       this.curactive = num;
       this.fileindex = num;
-      if (num == 0) {
-        this.listCollaborationFiles();
-      } else if (num == 1) {
-        this.loadListCommonFiles();
-      }
+      // if (num == 0) {
+      //   this.listCollaborationFiles();
+      // } else if (num == 1) {
+      //   this.loadListCommonFiles();
+      // }
     },
     /**
      * 协作文件展开
diff --git a/vue.config.js b/vue.config.js
index da86159d..c1c95259 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.156:8089',
+          target:'http://10.240.32.197:8089',
 
           changeOrigin: true,
           secure: false,