From f77999fadb80e77ff06506a022cd81a940ea8378 Mon Sep 17 00:00:00 2001
From: dhj <dhj@123.com>
Date: Sun, 2 Aug 2020 10:24:34 +0800
Subject: [PATCH] [Version] V.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.资源管理器、项目管理/查看文件   树对齐
2.项目管理/标题显示对换；
3.工作空间协作文件下载状态；
4.xlsx 图标更新
---
 src/views/main_web/cloudsource.vue    |  2 +-
 src/views/main_web/workspace.vue      | 19 ++++++------
 src/views/manage_company/project.vue  |  8 ++---
 static/css/main.css                   | 10 ++++++-
 static/img/files/file_sample_xlsx.svg | 43 ++++++++++++++++++++++++++-
 5 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/views/main_web/cloudsource.vue b/src/views/main_web/cloudsource.vue
index a1e36aba..38dff81d 100644
--- a/src/views/main_web/cloudsource.vue
+++ b/src/views/main_web/cloudsource.vue
@@ -23,7 +23,7 @@
               <!-- 树形导航 -->
               <div class="navtreebox">
                 <template>
-                  <el-tree :data="listFolderData" node-key="id" default-expand-all ref="tree" @node-click="nodeClick" :highlight-current="true" :filter-node-method="filterTreeNode" :expand-on-click-node="false" class="mt-10">
+                  <el-tree :data="listFolderData" node-key="id" default-expand-all ref="tree" :indent="10" @node-click="nodeClick" :highlight-current="true" :filter-node-method="filterTreeNode" :expand-on-click-node="false" class="mt-10 chengjitree">
                     <span class="custom-tree-node" slot-scope="{ node }">
                       <span>
                         <i class="el-icon-floder"></i>
diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 0c6b9926..58deb3f5 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -776,7 +776,7 @@
                           class="defultImage-mid"
                           :class="
                             file.extension +'-mid'+
-                              (file.status == '2' ? ' opitcy1' : ' opitcy0')
+                              (file.status == '2' ? ' opitcy1' : ' opitcy1')
                               + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
                           "
                           v-if="
@@ -790,7 +790,7 @@
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
-                          :class="file.status == '2' ? ' opitcy1' : ' opitcy0' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
+                          :class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
                           v-if="
                             file.extension == 'jpg' ||
                               file.extension == 'png' ||
@@ -807,7 +807,7 @@
                         <strong
                           :class="
                             'yiyunwenjian_name ' +
-                              (file.status == 2 ? ' opitcy1' : ' opitcy0')
+                              (file.status == 2 ? ' opitcy1' : ' opitcy1')
                           "
                           :title="file.archName  + '.' + file.extension"
                         >
@@ -918,7 +918,7 @@
                           class="defultImage-mid"
                           :class="
                             file.extension +'-mid'+
-                              (file.status == '2' ? ' opitcy1' : ' opitcy0')
+                              (file.status == '2' ? ' opitcy1' : ' opitcy1')
                               + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
                           "
                           v-if="
@@ -932,7 +932,7 @@
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
-                          :class="file.status == '2' ? ' opitcy1' : ' opitcy0' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
+                          :class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
                           v-if="
                             file.extension == 'jpg' ||
                               file.extension == 'png' ||
@@ -969,7 +969,7 @@
                         <strong
                           :class="
                             'yiyunwenjian_name ' +
-                              (file.status == 2 ? ' opitcy1' : ' opitcy0')
+                              (file.status == 2 ? ' opitcy1' : ' opitcy1')
                           "
                           :title="file.archName  + '.' + file.extension"
                         >
@@ -1057,7 +1057,7 @@
                           class="defultImage-mid"
                           :class="
                             file.extension + '-mid'+
-                              (file.status == '2' ? ' opitcy1' : ' opitcy0')
+                              (file.status == '2' ? ' opitcy1' : ' opitcy1')
                               + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
                           "
                           v-if="
@@ -1071,7 +1071,7 @@
                         ></div>
                         <div
                           class="defultImage-mid img_bg-mid"
-                          :class="file.status == '2' ? ' opitcy1' : ' opitcy0' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
+                          :class="file.status == '2' ? ' opitcy1' : ' opitcy1' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
                           v-if="
                             file.extension == 'jpg' ||
                               file.extension == 'png' ||
@@ -1108,7 +1108,7 @@
                         <strong
                           :class="
                             'yiyunwenjian_name ' +
-                              (file.status == 2 ? ' opitcy1' : ' opitcy0')
+                              (file.status == 2 ? ' opitcy1' : ' opitcy1')
                           "
                         >
                           <i
@@ -2159,6 +2159,7 @@ export default {
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
       isClient: process.env.IS_CLIENT, // 是否是客户端
+      // isClient:true, // 是否是客户端
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
       //文件分组数据
diff --git a/src/views/manage_company/project.vue b/src/views/manage_company/project.vue
index 7b1d2399..82f551e8 100644
--- a/src/views/manage_company/project.vue
+++ b/src/views/manage_company/project.vue
@@ -14,8 +14,8 @@
           <div class="adminnavBox ProjTitleLabel">
             <div v-if="showSealedList">
               <div class="selctspan" v-show="selectUserTree">
+                <span v-on:click="goProjList"  style="margin-left:0; margin-right:12px">项目菜单</span>
                 <h3 v-on:click="goSealedList">归档项目</h3>
-                <span v-on:click="goProjList">项目菜单</span>
               </div>
               <!--归档项目 --- 添加人员 -->
               <div v-show="!selectUserTree">
@@ -26,8 +26,8 @@
             </div>
             <div v-if="showProjList">
               <div class="selctspan">
-                <span v-on:click="goSealedList" style="margin-left:0; margin-right:12px">归档项目</span>
-                <h3 v-on:click="goProjList">项目菜单</h3>
+                <h3 v-on:click="goProjList" style="margin-left:0; margin-right:12px">项目菜单</h3>
+                <span v-on:click="goSealedList" >归档项目</span>
               </div>
             </div>
             <!--归档项目 --- 查看文件 -->
@@ -85,7 +85,7 @@
                     </span>
                   </el-tree>
                   <!--归档项目 --- 查看文件 -->
-                  <el-tree v-show="checkFile" :data="listFolder" :highlight-current="true" default-expand-all :indent="10" :props="folderProps" @node-click="folderClick" class="mt-10">
+                  <el-tree v-show="checkFile" :data="listFolder" :highlight-current="true" default-expand-all :indent="10" :props="folderProps" @node-click="folderClick" class="mt-10  chengjitree">
                     <span class="custom-tree-node" slot-scope="{ node }">
                       <div class="fl">
                         <i class="el-icon-floder"></i>{{ node.label }}
diff --git a/static/css/main.css b/static/css/main.css
index 3cfa7eda..3953946a 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -5798,7 +5798,7 @@ button:hover:disabled,button:disabled{
 }
 .selctspan span{
 	cursor: pointer;
-	margin-left: 12px;
+	/* margin-left: 12px; */
 	font-size: 22px!important;
 }
 .no-mlr{
@@ -6419,6 +6419,11 @@ h4.biaoqianweizhi2{
     cursor: default;
     width: 0;
 }
+.chengjitree .el-tree-node__expand-icon.is-leaf {
+    color: transparent;
+    cursor: default;
+    width: 19px;
+}
 .treeItembox i{
 	margin-right: 5px;
 }
@@ -7964,6 +7969,9 @@ i.iconmidle{
 .fulltreebox{
 	height: calc(100vh - 146px);	
 }
+.iconduiqi .el-tree-node__content>.el-tree-node__expand-icon{
+    width: 20px;
+}
 .project_gantetubox_warp{
 	margin-top: 5px;
 }
diff --git a/static/img/files/file_sample_xlsx.svg b/static/img/files/file_sample_xlsx.svg
index 5dfd2c06..e6ead91b 100644
--- a/static/img/files/file_sample_xlsx.svg
+++ b/static/img/files/file_sample_xlsx.svg
@@ -1 +1,42 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 148 148"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#efefef;}.cls-3{fill:#1e7145;}</style></defs><title>file_sample</title><rect class="cls-1" x="22" y="0.06" width="104" height="147.94"/><rect class="cls-2" x="79.38" y="13.57" width="36" height="15.2"/><rect class="cls-2" x="32.62" y="13.57" width="36" height="15.2"/><rect class="cls-2" x="79.38" y="35.17" width="36" height="15.2"/><rect class="cls-2" x="32.62" y="35.17" width="36" height="15.2"/><rect class="cls-2" x="79.38" y="56.77" width="36" height="15.2"/><rect class="cls-2" x="32.62" y="56.77" width="36" height="15.2"/><rect class="cls-2" x="79.38" y="78.37" width="36" height="15.2"/><path class="cls-3" d="M76.25,127.84H67.87v3.37h7.69V134H67.87V138h8.76v2.85h-12V125H76.25Z"/><path class="cls-3" d="M77.8,140.88l4-5.93L78,129.19h3.75l2,3.39,1.92-3.39h3.64l-3.85,5.7,4,6H85.56l-2-3.52-2,3.52Z"/><path class="cls-3" d="M98.83,129.4a4.76,4.76,0,0,1,2,1.74,5.82,5.82,0,0,1,.94,2.42,15.89,15.89,0,0,1,.1,2.32H93.36a2.81,2.81,0,0,0,1.22,2.47,3.15,3.15,0,0,0,1.69.44,2.57,2.57,0,0,0,1.7-.54,2.49,2.49,0,0,0,.63-.8h3.13a3.83,3.83,0,0,1-1.14,2.11,5.69,5.69,0,0,1-4.4,1.71,6.39,6.39,0,0,1-4.13-1.44q-1.78-1.44-1.78-4.69a6.31,6.31,0,0,1,1.61-4.66,5.65,5.65,0,0,1,4.19-1.63A6.78,6.78,0,0,1,98.83,129.4Zm-4.58,2.65a3.18,3.18,0,0,0-.82,1.81h5.28a2.57,2.57,0,0,0-.82-1.85,2.68,2.68,0,0,0-1.81-.63A2.41,2.41,0,0,0,94.25,132.05Z"/><path class="cls-3" d="M110.44,133.37a2.9,2.9,0,0,0-.44-1.19,1.87,1.87,0,0,0-1.61-.7,2.11,2.11,0,0,0-2.12,1.53,6.43,6.43,0,0,0-.3,2.17,5.86,5.86,0,0,0,.3,2.06,2.06,2.06,0,0,0,2.07,1.47,1.82,1.82,0,0,0,1.53-.59,2.89,2.89,0,0,0,.55-1.5h3.12a5.11,5.11,0,0,1-1,2.64,4.91,4.91,0,0,1-4.27,2,5,5,0,0,1-4.16-1.67,6.78,6.78,0,0,1-1.33-4.35,6.88,6.88,0,0,1,1.47-4.69,5.15,5.15,0,0,1,4.07-1.67,6.08,6.08,0,0,1,3.6,1,4.59,4.59,0,0,1,1.67,3.49Z"/><path class="cls-3" d="M118.8,140.88h-3.07V125h3.07Z"/><rect class="cls-2" x="32.62" y="78.37" width="36" height="15.2"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 104 148" style="enable-background:new 0 0 104 148;" xml:space="preserve">
+<style type="text/css">
+	.st0{filter:url(#filter-2);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#EFEFEF;}
+	.st4{fill:#1E7145;}
+	.st5{font-family:'Arial-BoldMT';}
+	.st6{font-size:22px;}
+</style>
+<filter  filterUnits="objectBoundingBox" height="108.8%" id="filter-2" width="112.5%" x="-6.2%" y="-3.7%">
+	<feOffset  dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+	<feGaussianBlur  in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="2"></feGaussianBlur>
+	<feColorMatrix  in="shadowBlurOuter1" type="matrix" values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0"></feColorMatrix>
+</filter>
+<title>模块/文件/定制/execl</title>
+<desc>Created with Sketch.</desc>
+<g>
+	<g id="Fill-1">
+		<g class="st0">
+			<polygon id="path-1_1_" class="st1" points="0,147.9 104,147.9 104,0 0,0 			"/>
+		</g>
+		<g>
+			<polygon class="st2" points="0,147.9 104,147.9 104,0 0,0 			"/>
+		</g>
+	</g>
+	<g id="编组" transform="translate(10.000000, 20.000000)">
+		<polygon class="st3" points="48,15 84,15 84,0 48,0 		"/>
+		<polygon id="Fill-2" class="st3" points="0,15 36,15 36,0 0,0 		"/>
+		<polygon id="Fill-3" class="st3" points="48,37 84,37 84,22 48,22 		"/>
+		<polygon id="Fill-4" class="st3" points="0,37 36,37 36,22 0,22 		"/>
+		<polygon id="Fill-5" class="st3" points="48,58 84,58 84,43 48,43 		"/>
+		<polygon id="Fill-6" class="st3" points="0,58 36,58 36,43 0,43 		"/>
+		<polygon id="Fill-7" class="st3" points="48,80 84,80 84,65 48,65 		"/>
+		<polygon id="Fill-8" class="st3" points="0,80 36,80 36,65 0,65 		"/>
+	</g>
+	<text transform="matrix(1 0 0 1 41.5078 141)" class="st4 st5 st6">Excel</text>
+</g>
+</svg>