From 32607d24fed5bf1f3da4152c707d5dad519854c4 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Fri, 12 Jun 2020 14:51:08 +0800
Subject: [PATCH] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.文件状态样式修改
---
 src/views/main_web/workspace.vue | 105 +++++++++++++++++++------------
 static/css/main.css              |  17 ++++-
 2 files changed, 82 insertions(+), 40 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index ab132ef6..7069417a 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -226,7 +226,7 @@
             <div class="yinyong_warpBox hidescollbar">
               <div class="yiyun_section_top" id="bignav">
                 <div
-                  class="section_item fl section_item_aside_fl width4"
+                  class="section_item fl section_item_aside_fl"
                   v-if="!isCommonPage && nowFolder.folderPerm != 0 "
                 >
                   <!--我的文件 工作文件-->
@@ -286,7 +286,7 @@
                   </span>
                 </div>
                 <div
-                  class="section_item fl section_item_aside_fl width4"
+                  class="section_item fl section_item_aside_fl"
                   v-if="!isCommonPage && nowFolder.folderPerm == 0 "
                 >
                   <span class="yywenjiantitle" :class="{yyactive:true}" v-if="isShowWorkt">工作文件</span>
@@ -327,7 +327,7 @@
                     </draggable>
                   </span>
                 </div>
-                <div class="section_item fl section_item_aside_fl width4" v-if="isCommonPage">
+                <div class="section_item fl section_item_aside_fl" v-if="isCommonPage">
                   <span class="yywenjiantitle" :class="{yyactive:true}">公共文件</span>
                 </div>
                 <!-- 右侧操作栏 -->
@@ -650,11 +650,18 @@
                         <!-- 下载状态 -->
                         <div
                           class="downloadIcon"
-                          v-if="isClient && file.isDownload "
-                          @click="clientDownload"
+                          v-if="isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
+                          @click="clientDownLoad(file,1)"
                         >
                           <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="top_optionBar">
                           <el-dropdown>
@@ -1491,11 +1498,10 @@
     <div class="dia_8" v-show="isShowNewFiledialog == true" @click="hideNewFiledialog"></div>
     <div class="newfiledialog" v-show="isShowNewFiledialog == true">
       <div class="dragareaBox">
-        <div class="dragarea_top uploadBtn" v-if="isClient" @click="clientUpload">
+        <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
-              v-if="isClient"
               :multiple="true"
               label="点击上传本地文件"
               :auto="true"
@@ -1512,26 +1518,9 @@
             ></file-Uploader>
           </span>
         </div>
-        <div class="dragarea_top uploadBtn" v-if="!isClient">
+        <div class="dragarea_top uploadBtn" v-if="isClient" @click="clientUpload">
           <img src="static\img\upload.png" alt class="uploadBtnImg" />
-          <span class="dragarea_area" @click="showNewFiledialog">
-            <file-Uploader
-              v-if="isClient"
-              :multiple="true"
-              label="点击上传本地文件"
-              :auto="true"
-              :dragfile="true"
-              :accept="acceptType"
-              ref="webUploadlist2"
-              :btnId="btnUploadFileId"
-              :projId="uploadProjId"
-              :companyId="uploadCompId"
-              :typeId="uploadTypeProj"
-              @upload-success="uploadFileSuccess"
-              :url="chunkUploadUrl"
-              class="addUpfile2 dragbox"
-            ></file-Uploader>
-          </span>
+          <span class="uploadText">点击上传本地文件</span>
         </div>
         <div class="creatbox_mid mt-10">
           <div class="diahead">
@@ -3773,20 +3762,58 @@ export default {
     /**
      * 客户端下载方法
      */
-    clientDownLoad: function(file) {
+    clientDownLoad: function(file,type) {
+      var thisApp=this;
       if (this.isClient) {
-        var archid = file.archID;
-        var filename = file.archName + "." + file.extension;
-        var folderID = file.folderID;
-        var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
-        var projID = file.projID;
-        back.downloadFile(
-          archid,
-          filename,
-          folderID,
-          sessionStorage.projName,
-          folderName
-        );
+        this.$axios({
+        method: "put",
+        url: encodeURI(process.env.API_HOST + "projects/download/" + file.archID  +"/" +sessionStorage.userId + "/" + type)
+        })
+        .then(response => {
+          console.log(response)
+          if(response.data.state == 1)
+          {
+            thisApp.$notify({
+              title: "温馨提示",
+              message:"文件已开始下载...",
+              type: "info",
+              offset: 30, 
+              duration: 2000
+            });
+              var archid = file.archID;
+              var filename = file.archName + "." + file.extension;
+              var folderID = file.folderID;
+              var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
+              var projID = file.projID; 
+              back.downloadFile(
+                archid,-
+                filename,
+                folderID,
+                sessionStorage.projName,
+                folderName
+              );
+          }
+          else
+          {
+            this.$notify({
+              title: "温馨提示",
+              message: response.data.message,
+              type: "error",
+              offset: 30, 
+              duration: 2000
+            });
+          }
+          
+        })
+        .catch(error => {
+          this.$notify({
+              title: "温馨提示",
+              message: "下载失败",
+              type: "error",
+              offset: 30, 
+              duration: 2000
+            });
+        });
       }
     },
     /**
diff --git a/static/css/main.css b/static/css/main.css
index 01d83525..b6304e60 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -8678,7 +8678,22 @@ h5.dulilabel{
 	width: 48px;
 	height: 48px;
 	left: 50%;
-	top: 33%;
+	top:33%;
 	margin-left: -24px;
 	margin-top: -24px;
+}
+.uploadText{
+  position: relative;
+  top: 40px;
+  left: 30px;
+  font-size: 13px
+}
+.minifont{
+  font-size: 11px;
+  color: #71717d;
+  margin-top: 2px
+}
+.largeicon{
+  color: #000;
+  font-size: 22px
 }
\ No newline at end of file