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

src/views/main_web/workspace.vue

@@ -227,7 +227,7 @@
               <div class="yiyun_section_top titlebar_head" id="bignav">
                 <div
                   class="section_item section_item_aside_fl"
-                  v-if="!isCommonPage && nowFolder.folderPerm != 0 "
+                  v-if="!isCommonPage &&  (nowFolder.folderPerm != 0  || isProjectManager) "
                 >
                   <!--我的文件 工作文件-->
                   <span
@@ -287,7 +287,7 @@
                 </div>
                 <div
                   class="section_item section_item_aside_fl"
-                  v-if="!isCommonPage && nowFolder.folderPerm == 0 "
+                  v-if="!isCommonPage && (nowFolder.folderPerm == 0  && !isProjectManager )"
                 >
                   <span class="yywenjiantitle" :class="{yyactive:true}" v-if="isShowWorkt">工作文件</span>
                   <!--文件分组面包屑-->
@@ -371,7 +371,7 @@
               <div class="clear"></div>
               <!-- 应用列表（缩略图） -->
               <div class="yiyun_row scollbarBox nobianju py-x-22" v-show="isShowMyFileList == true">
-                <div class="yiyun_wenjian_list nohover" v-if="this.currentPageType == 0">
+                <div class="yiyun_wenjian_list nohover" v-if="this.currentPageType == 0 ">
                   <div class="yiyunwenjian_imgbox newbtn" v-on:click="showNewFiledialog">
                     <img src="/static/img/newadd.png" alt class="wenjian_bg_img" />
                     <span class="newbtn_label">新建文件</span>
@@ -703,12 +703,12 @@
                               >
                                 <span>在线查看</span>
                               </el-dropdown-item>
-                              <el-dropdown-item @click.native="fileClick(file)" v-if="isClient">
+                              <el-dropdown-item @click.native="fileClick(file)" v-if="isClient && file.downloadStatus == 2">
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickSelect(file)"
-                                v-if="isClient"
+                                v-if="isClient && file.downloadStatus == 2"
                               >
                                 <span>打开方式</span>
                               </el-dropdown-item>
@@ -732,14 +732,12 @@
                                 <span>取消协同</span>
                               </el-dropdown-item>
                               <el-dropdown-item
-                                v-show="false"
                                 @click.native="createMilestone(file)"
                                 divided
                               >
                                 <span>保存历史文件</span>
                               </el-dropdown-item>
                               <el-dropdown-item
-                                v-show="false"
                                 @click.native="showFileMilestone(file)"
                               >
                                 <span>选择历史文件</span>
@@ -1018,6 +1016,22 @@
                           {{ file.archName }}
                         </strong>
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && !file.isDownload && file.status == 2"
+                          @click="clientDownLoad(file,2)"
+                        >
+                          <img src="/static/img/downloadImg.png" alt />
+                        </div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && file.isDownload && file.downloadStatus == 1"
+                        >
+                          <span>
+                            <i class="el-icon-loading largeicon"></i>
+                            <div class="minifont">下载中</div>
+                          </span>
+                        </div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                             编辑中
                         </div>-->
@@ -1049,13 +1063,13 @@
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickColl(file)"
-                                v-if="file.status == 2 && isClient"
+                                v-if="file.status == 2 && isClient  && file.downloadStatus == 2"
                               >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickSelectColl(file)"
-                                v-if="file.status == 2 && isClient"
+                                v-if="file.status == 2 && isClient  && file.downloadStatus == 2"
                               >
                                 <span>打开方式</span>
                               </el-dropdown-item>
@@ -1137,6 +1151,22 @@
                           </div>
                         </div>
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && !file.isDownload && file.status == 2"
+                          @click="clientDownLoad(file,2)"
+                        >
+                          <img src="/static/img/downloadImg.png" alt />
+                        </div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && file.isDownload && file.downloadStatus == 1"
+                        >
+                          <span>
+                            <i class="el-icon-loading largeicon"></i>
+                            <div class="minifont">下载中</div>
+                          </span>
+                        </div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
@@ -1183,13 +1213,13 @@
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickColl(file)"
-                                v-if="isClient && file.status == 2"
+                                v-if="isClient && file.status == 2  && file.downloadStatus == 2"
                               >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickSelectColl(file)"
-                                v-if="isClient && file.status == 2"
+                                v-if="isClient && file.status == 2  && file.downloadStatus == 2"
                               >
                                 <span>打开方式</span>
                               </el-dropdown-item>
@@ -1259,6 +1289,22 @@
                           </div>
                         </div>
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && !file.isDownload && file.status == 2"
+                          @click="clientDownLoad(file,2)"
+                        >
+                          <img src="/static/img/downloadImg.png" alt />
+                        </div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && file.isDownload && file.downloadStatus == 1"
+                        >
+                          <span>
+                            <i class="el-icon-loading largeicon"></i>
+                            <div class="minifont">下载中</div>
+                          </span>
+                        </div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
@@ -1306,13 +1352,13 @@
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickColl(file)"
-                                v-if="isClient && file.status == 2"
+                                v-if="isClient && file.status == 2 && file.downloadStatus == 2"
                               >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
                                 @click.native="fileClickSelectColl(file)"
-                                v-if="isClient && file.status == 2"
+                                v-if="isClient && file.status == 2  && file.downloadStatus == 2"
                               >
                                 <span>打开方式</span>
                               </el-dropdown-item>
@@ -1406,8 +1452,8 @@
                   BtnRightFile.extension == 'txt'
               "
             >在线查看</li>
-            <li @click="fileClick(BtnRightFile)" v-if="isClient">打开</li>
-            <li @click="fileClickSelect(BtnRightFile)" v-if="isClient">打开方式</li>
+            <li @click="fileClick(BtnRightFile)" v-if="isClient && BtnRightFile.downloadStatus == 2">打开</li>
+            <li @click="fileClickSelect(BtnRightFile)" v-if="isClient && BtnRightFile.downloadStatus == 2">打开方式</li>
             <div class="line" v-if="isClient"></div>
             <li
               @click="setFileStatus(BtnRightFile, 2, '更新为已完成',1)"
@@ -1422,8 +1468,8 @@
               v-if="isUseShare && BtnRightFile.status != 3"
             >取消协同</li>
             <div class="line"></div>
-            <li v-show="false" @click="createMilestone(BtnRightFile)">保存历史文件</li>
-            <li v-show="false" @click="showFileMilestone(BtnRightFile)">选择历史文件</li>
+            <li  @click="createMilestone(BtnRightFile)">保存历史文件</li>
+            <li  @click="showFileMilestone(BtnRightFile)">选择历史文件</li>
             <div class="line"></div>
             <li @click="copyFile(BtnRightFile)">建立副本</li>
             <div class="line"></div>
@@ -1461,10 +1507,10 @@
                   BtnRightFile.extension == 'txt')
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2">打开</li>
+            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2">打开</li>
             <li
               @click="fileClickSelectColl(BtnRightFile)"
-              v-if="isClient && BtnRightFile.status == 2"
+              v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
             >打开方式</li>
             <div class="line" v-if="BtnRightFile.status == 2"></div>
             <li
@@ -1491,10 +1537,10 @@
                   BtnRightFile.extension == 'txt' ) 
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2">打开</li>
+            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2">打开</li>
             <li
               @click="fileClickSelectColl(BtnRightFile)"
-              v-if="isClient && BtnRightFile.status == 2"
+              v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 2"
             >打开方式</li>
             <div class="line" v-if="BtnRightFile.status == 2"></div>
             <li
@@ -3295,6 +3341,10 @@ export default {
      * 点击文件事件：直接打开文件
      */
     fileClick: function(file) {
+      if(file.downloadStatus == 1)
+      {
+          return;        
+      }
       if (this.isClient) {
         if (file.extension == "map") {
           this.instanceType = 1;
@@ -3433,6 +3483,10 @@ export default {
      * 点击文件事件：打开文件并选择打开方式
      */
     fileClickSelect: function(file) {
+      if(file.downloadStatus == 1)
+      {
+          return;        
+      }
       if (this.isClient) {
         if (file.extension == "map") {
           this.instanceType = 1;
@@ -3545,6 +3599,10 @@ export default {
      * 协作文件点击文件事件：直接打开文件
      */
     fileClickColl: function(file) {
+      if(file.downloadStatus == 1)
+      {
+          return;        
+      }
       if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
           this.$confirm("对方正在工作中，请稍后查看", "", {
@@ -3619,6 +3677,10 @@ export default {
      * 协作文件点击文件事件：打开文件并选择打开方式
      */
     fileClickSelectColl: function(file) {
+      if(file.downloadStatus == 1)
+      {
+          return;        
+      }
       if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
           this.$confirm("对方正在工作中，请稍后查看", "", {
@@ -3783,6 +3845,7 @@ export default {
     },
     /**
      * 客户端下载方法
+     * type ：1 为文件，2位协作文件
      */
     clientDownLoad: function(file, type) {
       var thisApp = this;
@@ -3816,11 +3879,26 @@ export default {
               var folderName =
                 thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
               var projID = file.projID;
-              back.downloadFile(
-                archid,
-                filename,
-                folderID
-              );
+              if(type == 1 )
+              {
+                 back.downloadFile(
+                    archid,
+                    filename,
+                    folderID
+                  );
+              }
+              else{
+                var folderName =
+                  thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
+                  back.downloadFile(
+                    archid,
+                    filename,
+                    folderID,
+                    sessionStorage.projName,
+                    folderName
+                  );
+              }
+              
             } else {
               this.$notify({
                 title: "温馨提示",