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

src/views/main_web/workspace.vue

@@ -224,9 +224,9 @@
           <!-- 文件大box -->
           <section class="yiyun_section_warp">
             <div class="yinyong_warpBox hidescollbar">
-              <div class="yiyun_section_top" id="bignav">
+              <div class="yiyun_section_top titlebar_head" id="bignav">
                 <div
-                  class="section_item fl section_item_aside_fl"
+                  class="section_item 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"
+                  class="section_item section_item_aside_fl"
                   v-if="!isCommonPage && nowFolder.folderPerm == 0 "
                 >
                   <span class="yywenjiantitle" :class="{yyactive:true}" v-if="isShowWorkt">工作文件</span>
@@ -327,11 +327,11 @@
                     </draggable>
                   </span>
                 </div>
-                <div class="section_item fl section_item_aside_fl" v-if="isCommonPage">
+                <div class="section_item section_item_aside_fl" v-if="isCommonPage">
                   <span class="yywenjiantitle" :class="{yyactive:true}">公共文件</span>
                 </div>
                 <!-- 右侧操作栏 -->
-                <div class="section_item fr section_item_aside_fr width4">
+                <div class="section_item section_item_aside_fr">
                   <div class="fr ml-10">
                     <el-button
                       v-if="nowFolder.folderPerm == 0"
@@ -659,8 +659,10 @@
                           class="downloadIcon"
                           v-if="isClient && file.isDownload && file.downloadStatus == 1"
                         >
-                           <span> <i class="el-icon-loading largeicon"></i> 
-                           <div class="minifont">下载中</div> </span>
+                          <span>
+                            <i class="el-icon-loading largeicon"></i>
+                            <div class="minifont">下载中</div>
+                          </span>
                         </div>
                         <!-- 下拉列表 -->
                         <div class="top_optionBar">
@@ -3762,58 +3764,63 @@ export default {
     /**
      * 客户端下载方法
      */
-    clientDownLoad: function(file,type) {
-      var thisApp=this;
+    clientDownLoad: function(file, type) {
+      var thisApp = this;
       if (this.isClient) {
         this.$axios({
-        method: "put",
-        url: encodeURI(process.env.API_HOST + "projects/download/" + file.archID  +"/" +sessionStorage.userId + "/" + type)
+          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
-            });
+          .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; 
+              var folderName =
+                thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
+              var projID = file.projID;
               back.downloadFile(
-                archid,-
-                filename,
+                archid,
+                -filename,
                 folderID,
                 sessionStorage.projName,
                 folderName
               );
-          }
-          else
-          {
+            } else {
+              this.$notify({
+                title: "温馨提示",
+                message: response.data.message,
+                type: "error",
+                offset: 30,
+                duration: 2000
+              });
+            }
+          })
+          .catch(error => {
             this.$notify({
-              title: "温馨提示",
-              message: response.data.message,
-              type: "error",
-              offset: 30, 
-              duration: 2000
-            });
-          }
-          
-        })
-        .catch(error => {
-          this.$notify({
               title: "温馨提示",
               message: "下载失败",
               type: "error",
-              offset: 30, 
+              offset: 30,
               duration: 2000
             });
-        });
+          });
       }
     },
     /**

static/css/main.css

@@ -539,7 +539,7 @@ ul {
 
 .section_item_aside_fl {
 	/* min-height: 85px; */
-	min-width: 203px;
+	width: 80%;
 	/*	border: 1px solid #000;*/
 }
 
@@ -8696,4 +8696,8 @@ h5.dulilabel{
 .largeicon{
   color: #000;
   font-size: 22px
+}
+.titlebar_head{
+	display: flex;
+	justify-content: space-between;
 }