From 7783b57a2744bd6209dcfbd4a9d96e16a8bd5eb8 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Wed, 28 Oct 2020 14:08:13 +0800
Subject: [PATCH 1/2] system update

---
 main.js                                    |  21 ++-
 src/services/system.js                     |  38 +++---
 src/views/login/index.vue                  |   2 +-
 src/views/main_web/workspace/workspace.vue |  74 +++++------
 vue.config.js                              |   7 +-
 yarn.lock                                  | 147 +--------------------
 6 files changed, 87 insertions(+), 202 deletions(-)

diff --git a/main.js b/main.js
index e676d366..95889c10 100644
--- a/main.js
+++ b/main.js
@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, protocol } = require('electron')
+const { app, BrowserWindow, protocol, ipcMain, dialog } = require('electron')
 const { request } = require('http')
 const path = require('path')
 const url = require('url')
@@ -62,3 +62,22 @@ app.on('window-all-closed', function () {
 
 // In this file you can include the rest of your app's specific main process
 // code. You can also put them in separate files and require them here.
+
+// 监听必要的自定义事件
+/**
+ * 项目中的文件上传
+ */
+ipcMain.handle('project-upload-file', async (event, args) => {
+  const res = await dialog.showOpenDialog({
+    properties: ['openFile'],
+  });
+  return res;
+  // dialog.showOpenDialog({
+  //   properties: ['openFile'],
+  // }).then((files) => {
+    
+  //   if(files){
+  //     event.sender.send('project-selected-upload-file', files);
+  //   }
+  // })
+});
\ No newline at end of file
diff --git a/src/services/system.js b/src/services/system.js
index 222a32d2..766bc69c 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -19,12 +19,9 @@ const safeSocket = f => (...args) => socket && f(...args);
 
 const system = {
   isClient,
-  init: () => {
-
-  },
-  test: safeCall(() => {
+  init: safeCall(() => {
     console.log('客户端 electron API 检测:', global.electron);
-    system.initalSocket();
+    system.initialSocket();
   }),
   
   initialSocket: () => {
@@ -65,9 +62,18 @@ const system = {
    * issue:
    *  + 浏览器的文件上传不会带有本地的文件路径，本地服务是否可以唤起一个选择文件的弹窗?
    */
-  uploadFile: safeCall(() => {
-    const { ipcRender } = global.electron;
-    ipcRender.send('project-upload-file', { value: 'custom-var-test' });
+  uploadFile: safeCall(async () => {
+    const { ipcRenderer } = global.electron;
+    const res = await ipcRenderer.invoke('project-upload-file', { value: 'custom-var-test' });
+    console.log('ipcRenderer project-selected-upload-file: ', res);
+    // todo 调用socket上传文件到节点服务
+    // ipcRenderer.send('project-upload-file', { value: 'custom-var-test' });
+    // ipcRenderer.once('project-selected-upload-file', (event, path) => {
+    //   console.log('ipcRenderer project-selected-upload-file:', event, path);
+    //   debugger;
+    //   // todo 取出文件的本地路径, 及当前项目相关的数据通过socket，发送给本机服务
+    //   // 
+    // });
   }),
   /**
    * 系统打开文件
@@ -80,14 +86,14 @@ const system = {
    * 初始化ipcRender
    */
   initialClient: safeCall(() => {
-    const { ipcRender } = global.electron;
-    // 项目中的文件上传事件监听
-    ipcRender.on('project-selected-upload-file', (event, path) => {
-      console.log('ipcRender project-selected-upload-file:', event, path);
-      debugger;
-      // todo 取出文件的本地路径, 及当前项目相关的数据通过socket，发送给本机服务
-      // 
-    });
+    // const { ipcRenderer } = global.electron;
+    // // 项目中的文件上传事件监听
+    // ipcRenderer.on('project-selected-upload-file', (event, path) => {
+    //   console.log('ipcRenderer project-selected-upload-file:', event, path);
+    //   debugger;
+    //   // todo 取出文件的本地路径, 及当前项目相关的数据通过socket，发送给本机服务
+    //   // 
+    // });
   }),
 }
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ab73d2d3..3981bf8b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -262,7 +262,7 @@ export default {
   },
   created: function () {
     sessionStorage.login = "";
-    system.test();
+    system.init();
   },
   mounted: function () {
     this.loadRemember();
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index de551527..7650a6ef 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -2162,7 +2162,7 @@
     ></div>
     <div class="newfiledialog" v-show="isShowNewFiledialog == true">
       <div class="dragareaBox">
-        <div class="dragarea_top uploadBtn" v-if="!isClient">
+        <!-- <div class="dragarea_top uploadBtn" v-if="!isClient">
           <img src="static\img\upload.png" alt class="uploadBtnImg" />
           <span class="dragarea_area" @click="showNewFiledialog">
             <file-Uploader
@@ -2181,7 +2181,7 @@
               class="addUpfile2 dragbox"
             ></file-Uploader>
           </span>
-        </div>
+        </div> -->
         <div
           class="dragarea_top uploadBtn"
           v-if="isClient"
@@ -2715,7 +2715,7 @@ import ProjSetting from "@/views/components_web/projSetting/projSetting";
 import FileShare from "@/views/components_web/share_setting/fileshare";
 import draggable from "vuedraggable";
 import vuetify from "vuetify";
-import back from '@/services/system';
+import system from '@/services/system';
 import * as services from './service';
 import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
 
@@ -2935,7 +2935,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: back.isClient, // 是否是客户端
+      isClient: system.isClient, // 是否是客户端
       dialogNewFolderGroup: false, //新建文件分组组弹窗
       folderGroupData: {
         folderGroupID: "",
@@ -3034,7 +3034,7 @@ export default {
       this.$emit("showOption", true);
     },
     // downLoadStatus: function () {
-    //   var data = back.getProgress();
+    //   var data = system.getProgress();
     // },
     listenBottomHeight() {
       let oDivH = document.getElementById("bottomBox").offsetHeight;
@@ -3271,7 +3271,7 @@ export default {
      */
     showNewFiledialog: function () {
       this.isShowNewFiledialog = true;
-      this.loadlistApp();
+      // this.loadlistApp();
       this.loadListFiles();
       this.loadListTempFiles();
     },
@@ -3383,7 +3383,7 @@ export default {
                 // 启动客户端判断
                 thisApp.setFile = file;
                 thisApp.setState = state;
-                back.getFileStatus(file.archID, sessionStorage.userId);
+                system.getFileStatus(file.archID, sessionStorage.userId);
                 return;
               }
               file.status = state;
@@ -3503,7 +3503,7 @@ export default {
                 // 启动客户端判断
                 thisApp.setFile = file;
                 thisApp.setState = state;
-                back.getFileStatus(file.archID, sessionStorage.userId);
+                system.getFileStatus(file.archID, sessionStorage.userId);
                 return;
               }
               file.status = state;
@@ -4094,7 +4094,7 @@ export default {
     openNativeFolder(file) {
       var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
       var filename = file.archName + "." + file.extension;
-      back.openCollFolder(sessionStorage.projName, folderName, filename);
+      system.openCollFolder(sessionStorage.projName, folderName, filename);
     },
     // sayHello: function (file) {
     //   this.$notify({
@@ -4114,7 +4114,7 @@ export default {
         var filename = file.archName + "." + file.extension;
         var folderID = file.folderID;
         var type = "open";
-        back.openFile(archid, filename, folderID, type);
+        system.openFile(archid, filename, folderID, type);
       } else {
         this.openOffice(file);
       }
@@ -4174,7 +4174,7 @@ export default {
                   })
                   .then(function (response) {
                     if (response.data.state == 1) {
-                      back.openFile(archid, filename, folderID, type);
+                      system.openFile(archid, filename, folderID, type);
                       thisApp.refreshPages();
                     } else {
                       thisApp.$notify({
@@ -4191,7 +4191,7 @@ export default {
                   });
               } else {
                 if (sessionStorage.userId == file.modifyUserID) {
-                  back.openFile(archid, filename, folderID, type);
+                  system.openFile(archid, filename, folderID, type);
                 } else {
                   thisApp.$notify({
                     title: "温馨提示",
@@ -4297,7 +4297,7 @@ export default {
                   })
                   .then(function (response) {
                     if (response.data.state == 1) {
-                      back.openFile(archid, filename, folderID, type);
+                      system.openFile(archid, filename, folderID, type);
                       thisApp.refreshPages();
                     } else {
                       thisApp.$notify({
@@ -4314,7 +4314,7 @@ export default {
                   });
               } else {
                 if (sessionStorage.userId == file.modifyUserID) {
-                  back.openFile(archid, filename, folderID, type);
+                  system.openFile(archid, filename, folderID, type);
                 } else {
                   thisApp.$notify({
                     title: "温馨提示",
@@ -4386,7 +4386,7 @@ export default {
           var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
           var projID = file.projID;
           var type = "open";
-          back.openFile(
+          system.openFile(
             archid,
             filename,
             folderID,
@@ -4440,7 +4440,7 @@ export default {
           var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
           var projID = file.projID;
           var type = "openselect";
-          back.openFile(
+          system.openFile(
             archid,
             filename,
             folderID,
@@ -4579,7 +4579,7 @@ export default {
                 thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
               var projID = file.projID;
               if (type == 1) {
-                back.downloadFile(
+                system.downloadFile(
                   archid,
                   filename,
                   folderID,
@@ -4590,7 +4590,7 @@ export default {
               } else {
                 const folderName =
                   thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
-                back.downloadFile(
+                system.downloadFile(
                   archid,
                   filename,
                   folderID,
@@ -4627,21 +4627,21 @@ export default {
      * 客户端上传文件
      */
     clientUpload() {
-      if (this.isClient) {
-        this.isShowNewFiledialog = false;
-        var foldergroupId = "";
-        if (
-          this.dbClickSelectedFolderGroupData != null &&
-          JSON.stringify(this.dbClickSelectedFolderGroupData) != "{}"
-        ) {
-          foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID;
-        }
-        back.uploadFile(
-          this.listUserFolders[this.nowFolderIndex].folderID,
-          sessionStorage.userId,
-          foldergroupId
-        );
-      }
+      if(!this.isClient) return;
+      // this.isShowNewFiledialog = false;
+      // var foldergroupId = "";
+      // if (
+      //   this.dbClickSelectedFolderGroupData != null &&
+      //   JSON.stringify(this.dbClickSelectedFolderGroupData) != "{}"
+      // ) {
+      //   foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID;
+      // }
+      // system.uploadFile(
+      //   this.listUserFolders[this.nowFolderIndex].folderID,
+      //   sessionStorage.userId,
+      //   foldergroupId
+      // );
+      system.uploadFile();
     },
     /**
      * 重命名我的文件
@@ -4678,7 +4678,7 @@ export default {
                   var newFileName = file.archName + "." + file.extension;
                   // 客户端重命名文件
                   // 1.strFileId：文件ID；2.strNewFileName：新文件名；3.strUserId：用户ID
-                  back.renameFile(
+                  system.renameFile(
                     file.archID,
                     newFileName,
                     sessionStorage.userId
@@ -5423,7 +5423,7 @@ export default {
             if (thisApp.isClient) {
               // 客户复制文件
               // 1.strFileId：文件ID；2.strNewFileName：新文件名；3.strUserId：用户ID；4.strFolderId：目的文件夹ID
-              back.copyFile(
+              system.copyFile(
                 file.archID,
                 newFileName,
                 sessionStorage.userId,
@@ -5530,7 +5530,7 @@ export default {
                 if (thisApp.classif == "copy") {
                   // 客户复制文件
                   // 1.strFileId：文件ID；2.strNewFileName：新文件名；3.strUserId：用户ID；4.strFolderId：目的文件夹ID;5:strNewFileID:新文件ID
-                  back.copyFile(
+                  system.copyFile(
                     thisApp.BtnRightFile.archID,
                     newFileName,
                     sessionStorage.userId,
@@ -5540,7 +5540,7 @@ export default {
                 } else {
                   // 客户端移动文件
                   // 1.strFileId：文件ID；2.strNewFileName：新文件名；3.strUserId：用户ID；4.strFolderId：目的文件夹ID
-                  back.moveFile(
+                  system.moveFile(
                     nowFile.archID,
                     newFileName,
                     sessionStorage.userId,
diff --git a/vue.config.js b/vue.config.js
index 0311060c..c4c219d9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,6 +23,8 @@ module.exports = {
         'process.env': {
           NODE_ENV: '"development"',
           API_HOST: '"/api/"',
+          // API_HOST: '"http://47.104.91.134:9000/api/"',
+          IS_CLIENT: false,
         }
       }),
     ],
@@ -30,14 +32,15 @@ module.exports = {
       proxy: {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
-          target:'http://10.240.32.182:8089',
+          // target:'http://10.240.32.182:8089',
+          target:'http://10.240.32.245:8089',
 
           changeOrigin: true,
           secure: false,
         },
         '/api': {
           target: 'http://47.104.91.134:8080',
-          // target: 'http://10.240.32.236:8080',
+          // target: 'http://10.240.32.245:8080',
           changeOrigin: true,
           secure: false,
         }
diff --git a/yarn.lock b/yarn.lock
index 470ce179..c137ee05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1599,11 +1599,6 @@ address@>=0.0.1, address@^1.0.0, address@^1.1.2:
   resolved "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.npm.taobao.org/after/download/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
 agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npm.taobao.org/agent-base/download/agent-base-4.3.0.tgz?cache=0&sync_timestamp=1593732670803&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fagent-base%2Fdownload%2Fagent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -1919,11 +1914,6 @@ array-unique@^0.3.2:
   resolved "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=
-
 asar@^3.0.0:
   version "3.0.3"
   resolved "https://registry.npm.taobao.org/asar/download/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
@@ -2117,21 +2107,11 @@ babel-runtime@6.x:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npm.taobao.org/backo2/download/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
-
 base64-js@^1.0.2, base64-js@^1.2.3:
   version "1.3.1"
   resolved "https://registry.npm.taobao.org/base64-js/download/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
@@ -2204,11 +2184,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.npm.taobao.org/blob/download/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM=
-
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -3000,21 +2975,11 @@ compare-version@^0.1.2:
   resolved "https://registry.npm.taobao.org/compare-version/download/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
   integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@^1.2.1, component-emitter@~1.3.0:
+component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.npm.taobao.org/component-inherit/download/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -3489,7 +3454,7 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@~3.1.0:
+debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz?cache=0&sync_timestamp=1600502855763&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=
@@ -3992,34 +3957,6 @@ end-or-error@^1.0.1:
   resolved "https://registry.npm.taobao.org/end-or-error/download/end-or-error-1.0.1.tgz#dc7a6210fe78d372fee24a8b4899dbd155414dcb"
   integrity sha1-3HpiEP5403L+4kqLSJnb0VVBTcs=
 
-engine.io-client@~3.4.0:
-  version "3.4.4"
-  resolved "https://registry.npm.taobao.org/engine.io-client/download/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967"
-  integrity sha1-d9gAP1ArB4LdeSsHOk0s98pauWc=
-  dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~6.1.0"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.npm.taobao.org/engine.io-parser/download/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha1-V85WEdk3DulPmWQbWJ+UyX5PXac=
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
 enhanced-resolve@^4.3.0:
   version "4.3.0"
   resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
@@ -5458,18 +5395,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npm.taobao.org/has-binary2/download/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha1-d3asYn8+p3JQz8My2rfd9eT10R0=
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npm.taobao.org/has-cors/download/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1577797756584&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5893,11 +5818,6 @@ indexes-of@^1.0.1:
   resolved "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -6334,11 +6254,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
 isbinaryfile@^3.0.2:
   version "3.0.3"
   resolved "https://registry.npm.taobao.org/isbinaryfile/download/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
@@ -8200,16 +8115,6 @@ parse5@^5.1.1:
   resolved "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz?cache=0&sync_timestamp=1595850971402&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse5%2Fdownload%2Fparse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg=
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npm.taobao.org/parseqs/download/parseqs-0.0.6.tgz?cache=0&sync_timestamp=1599417638682&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparseqs%2Fdownload%2Fparseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU=
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npm.taobao.org/parseuri/download/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha1-4Ulugp46wv9H85pN0ESzKCPEolo=
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -9794,32 +9699,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-client@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npm.taobao.org/socket.io-client/download/socket.io-client-2.3.1.tgz?cache=0&sync_timestamp=1602758544822&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-client%2Fdownload%2Fsocket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff"
-  integrity sha1-kaQDjvTQPBmWe7PGRv7G4OqnjP8=
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    engine.io-client "~3.4.0"
-    has-binary2 "~1.0.2"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    socket.io-parser "~3.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.1"
-  resolved "https://registry.npm.taobao.org/socket.io-parser/download/socket.io-parser-3.3.1.tgz?cache=0&sync_timestamp=1602755449293&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsocket.io-parser%2Fdownload%2Fsocket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199"
-  integrity sha1-8H2cjLP7kmM6qT522Y/TozRiMZk=
-  dependencies:
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
 sockjs-client@1.4.0:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.4.0.tgz?cache=0&sync_timestamp=1596409940223&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsockjs-client%2Fdownload%2Fsockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
@@ -10520,11 +10399,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npm.taobao.org/to-array/download/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -11421,13 +11295,6 @@ ws@^6.0.0, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.npm.taobao.org/ws/download/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha1-W1yIAK+rkl6UzLKdFTyNAsF3bvk=
-  dependencies:
-    async-limiter "~1.0.0"
-
 xml2js@^0.4.16:
   version "0.4.23"
   resolved "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.23.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxml2js%2Fdownload%2Fxml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
@@ -11451,11 +11318,6 @@ xmldom@0.1.x:
   resolved "https://registry.npm.taobao.org/xmldom/download/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
   integrity sha1-t2yaG9nwqXN+WnLcNyMc84N14v8=
 
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
-
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/xregexp/download/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
@@ -11553,11 +11415,6 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
 yorkie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/yorkie/download/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"

From f7d54c8b885e59518f17855b706460a00d587100 Mon Sep 17 00:00:00 2001
From: revive <1664535558@qq.com>
Date: Wed, 28 Oct 2020 16:25:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E3=80=81=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components_web/distWork/distWork.vue      | 69 +++++++------------
 src/views/main_web/workspace/workspace.vue    | 19 +++++
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index 0e8e1ca0..8f192c2f 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -332,18 +332,12 @@
                       <!-- 添加协作群与工作 -->
                       <el-collapse-item name="1" class="nomidline">
                         <template slot="title">
-                          <!-- <span class="fr mr_20">
-                          <el-checkbox class="checkBoxCol" v-model="ischeckAll" @change="handleCheckTopAll">全选</el-checkbox>
-                          </span> -->
                           <span>从部门中选择职员</span>
                         </template>
                         <el-collapse accordion v-for="(dept, group_index) in listDept" v-show="dept.listUser.length>0" :key="group_index">
                           <!-- 二级折叠面板 -->
                           <el-collapse-item>
                             <template slot="title">
-                              <!-- <span class="fr mr_20">
-                              <el-checkbox class="checkBoxCol" v-model="dept.selected" :key="group_index" @change="handleCheckItemAll(group_index,$event)">全选</el-checkbox>
-                              </span> -->
                               <span>{{ dept.deptName }} </span>
                             </template>
                             <!-- <div class="user_info_item" v-for="(user, index) in listUserManager(
@@ -408,12 +402,8 @@
                     </div>
                     <!-- 项目负责人选择后 -->
                     <div v-if="listManagerComputed(selectedUser).length != 0">
-                      <!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(
-                          selectedUser
-                        )" :key="index"> -->
-                      <div class="user_info_item mainpeople_H" v-for="(user, index) in selectedUser" :key="index">
+                      <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(selectedUser)" :key="index">
                         <i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i>
-                        <!-- <img v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> -->
                          <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" />
                         <span class="user_info_name">{{ user.cnName }}</span>
                           <el-popover placement="bottom-start" width="180" trigger="hover">
@@ -452,10 +442,8 @@
                               <span>{{dept.deptName}}</span>
                            </div>
                         </div>
-                        <!-- <div class="renyuanbox" v-for="(user,index) in listUserComputed(selectedUser)" :key="index"> -->
-                        <div class="renyuanbox" v-for="(user,index) in selectedUser" :key="index">
+                        <div class="renyuanbox" v-for="(user,index) in listUserComputed(selectedUser)" :key="index">
                           <div class="user_info_item" v-if="user.deptId == dept.id">
-                            <!-- <img v-lazy="headSrc+user.headImgUrl" alt="" class="user_info_faceImg"> -->
                             <img v-lazy="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg">
                             <span class="user_info_name">{{user.cnName}}</span>
                             <el-popover placement="bottom-start" width="180" trigger="hover">
@@ -467,7 +455,7 @@
                               <span class="user_info_job" slot="reference">{{user.position}}</span>
                             </el-popover>
                             <span class="user_info_role">
-                              <template>
+                              <!-- <template>
                                 <el-select v-model="user.folderPerm" placeholder="设置角色" class="setroleselect">
                                   <el-option v-for="item in roles" allow-create :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -475,7 +463,7 @@
                                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span>
                                   </el-option>
                                 </el-select>
-                              </template>
+                              </template> -->
                               <i class="el-icon-close" @click="removeSelectUser(user)" title="移除协作人"></i>
                             </span>
                           </div>
@@ -512,12 +500,10 @@
                             <div class="user_info_item" v-for="(user, index) in listUserStaff(
                                 dept.listUser
                               )" :label="user" :key="index">
-                              <!-- <div class="user_info_item" v-for="(user, index) in dept.listUser" :label="user" :key="index"> -->
                               <el-checkbox class="checkBoxCol" v-model="user.selected" @change="
                                   handleCheckedOne(group_index, user, $event)
                                 " :disabled="disabled">
                                 <div class="checkboxlabelitem">
-                                  <!-- <img v-lazy="headSrc + user.headImgUrl" alt="" class="user_info_faceImg" /> -->
                                    <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" />
                                   <span class="user_info_name">{{
                                     user.cnName
@@ -563,16 +549,11 @@
                     <div class="yiyun_line"></div>
                     <!-- 项目负责人选择前 -->
                     <div class="main_workerBox" v-if="listManagerComputed(selectedUser).length == 0">
-                    <!-- <div class="main_workerBox" v-if="selectedUser.length == 0"> -->
                       <i class="icon font_family icon-icon_huangguan-weijihuo largehuangguan"></i>
                       <div class="rentou_alrge"></div>
                     </div>
                     <!-- 项目负责人选择后 -->
                     <div v-if="listManagerComputed(selectedUser).length != 0">
-                    <!-- <div v-if="selectedUser.length != 0"> -->
-                      <!-- <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(
-                          selectedUser
-                        )" :key="index"> -->
                          <div class="user_info_item mainpeople_H" v-for="(user, index) in listManagerComputed(selectedUser)" :key="index">
                         <i class="icon font_family icon-icon_huangguan-jihuo middlehuangguan fl" title="负责人"></i>
                         <img :src="user.headImgUrl | resolveAvator" alt="" class="user_info_faceImg" />
@@ -591,7 +572,7 @@
                           </ul>
                           <span class="user_info_job" slot="reference">{{user.position}}</span>
                         </el-popover>
-                        <span class="user_info_role" @click="removeManageUser(user)">修改</span>
+                        <!-- <span class="user_info_role" @click="removeManageUser(user)">修改</span> -->
                       </div>
                     </div>
                     <p class="diaTip">
@@ -631,14 +612,14 @@
                             }}</span>
                             </el-popover>
                             <span class="user_info_role" v-if="isShowManager">
-                              <template>
+                              <!-- <template>
                                 <el-select v-model="user.folderPerm" placeholder="设置角色" class="setroleselect">
                                   <el-option v-for="item in roles" allow-create :key="item.value" :label="item.label" :value="item.value">
                                     <span style="float: left;margin-right:30px;">{{ item.label }}</span>
-                                      <!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span> -->
+                                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span>
                                   </el-option>
                                 </el-select>
-                              </template>
+                              </template> -->
                               <i class="el-icon-close" @click="removeSelectUser(user)" title="移除协作人"></i>
                             </span>
                             <span class="user_info_role" v-if="!isShowManager">
@@ -687,17 +668,17 @@ export default {
       nowProject: {},
       isShowPrjDesc: false, //分配项目--项目概况
       isSlectPal: true, //分配项目--项目概况
-      roles: [
-      {
-        value: 1,
-        label: "编辑和查看",
-        description: ""
-      },
-      {
-        value: 0,
-        label: "仅查看",
-        description: ""
-      }],
+      // roles: [
+      // {
+      //   value: 1,
+      //   label: "编辑和查看",
+      //   description: ""
+      // },
+      // {
+      //   value: 0,
+      //   label: "仅查看",
+      //   description: ""
+      // }],
       folderPerm: "1",
       // -----------------------------------------------
       isShowFirstPage: true,
@@ -1252,7 +1233,7 @@ export default {
      * 移除选中人员
      */
     removeSelectUser: function (item) {
-      if(item.userID == sessionStorage.userId)
+      if(item.id == sessionStorage.userId && !this.isShowManager)
       {
         this.$notify.info({
           title: "温馨提示",
@@ -1263,7 +1244,7 @@ export default {
         return;
       }
       this.checkDeptUserName(false, item);
-      this.cancelCheck(item.userID);
+      this.cancelCheck(item.id);
     },
     /**
      * 移除负责人
@@ -1272,12 +1253,12 @@ export default {
       user.folderPerm = 0;
       // user.roleName = "查看编辑";
       for (var k = 0; k < this.selectedUser.length; k++) {
-        if (this.selectedUser[k].userID == user.userID) {
+        if (this.selectedUser[k].id == user.id) {
           this.selectedUser[k].folderPerm = 0;
           this.selectedUser.splice(k, 1);
         }
       }
-      this.cancelCheck(user.userID);
+      this.cancelCheck(user.id);
       this.toSecondPage();
     },
     /*
@@ -1286,7 +1267,7 @@ export default {
     cancelCheck: function (userID) {
       for (var i = 0; i < this.listDept.length; i++) {
         for (var j = 0; j < this.listDept[i].listUser.length; j++) {
-          if (this.listDept[i].listUser[j].userID === userID) {
+          if (this.listDept[i].listUser[j].id === userID) {
             this.listDept[i].listUser[j].selected = false;
             this.listDept[i].listUser[j].folderPerm = 0;
             this.getIsCheckSecondLevel(i);
@@ -1306,7 +1287,7 @@ export default {
         this.selectedUser.push(valueUser);
       } else {
         for (var i = 0; i < this.selectedUser.length; i++) {
-          if (this.selectedUser[i].userID == item.userID) {
+          if (this.selectedUser[i].id == item.id) {
             this.selectedUser.splice(i, 1);
           }
         }
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 14726aca..d422043e 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -6470,6 +6470,25 @@ export default {
       }  
       console.log(this.folderGroupData);             
       const Res = await services.createSubFolder(this.folderGroupData);
+      if (Res.Code != -1) {
+        this.refreshPages();
+        this.$notify({
+          title: "恭喜您",
+          message: "文件夹创建成功！",
+          type: "success",
+          offset: 100,
+          duration: 2500,
+        });
+      } else {
+        this.$notify({
+          title: "温馨提示",
+          message: "创建失败",
+          type: "error",
+          offset: 100,
+          duration: 5000,
+        });
+      }
+      this.dialogNewFolderGroup = false;
       
     },