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

src/views/main_web/workspace.vue

@@ -265,7 +265,8 @@
                     <a
                       class="yywenjiantitle-text"
                       href="javascript:;"
-                      @click="breadNodeClickEvent(currentPageType,true)">
+                      @click="breadNodeClickEvent(currentPageType,true)"
+                    >
                       工作文件
                       <i class="el-icon-arrow-left"></i>
                     </a>
@@ -273,7 +274,8 @@
                       class="list-group"
                       :list="folderGroupBreads"
                       group="group"
-                      id="bread2">
+                      id="bread2"
+                    >
                       <a
                         class="yywenjiantitle-text"
                         v-for="item in folderGroupBreads"
@@ -288,14 +290,19 @@
                   </span>
                 </div>
                 <div class="section_item section_item_aside_fl" v-if="isCommonPage">
-                  <span class="yywenjiantitle fl" :class="{yyactive:true}" @click="breadNodeClickEvent(currentPageType,true)">公共文件</span>
+                  <span
+                    class="yywenjiantitle fl"
+                    :class="{yyactive:true}"
+                    @click="breadNodeClickEvent(currentPageType,true)"
+                  >公共文件</span>
                   <span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">
-                  <i class="el-icon-arrow-left first-leftarrow fl"></i>
+                    <i class="el-icon-arrow-left first-leftarrow fl"></i>
                     <draggable
                       class="list-group"
                       :list="folderGroupBreads"
                       group="group"
-                      id="bread3" >
+                      id="bread3"
+                    >
                       <a
                         class="list-group-item yywenjiantitle-text"
                         v-for="item in folderGroupBreads"
@@ -307,7 +314,7 @@
                         <i class="el-icon-arrow-left"></i>
                       </a>
                     </draggable>
-                  </span>                  
+                  </span>
                 </div>
                 <!-- 右侧操作栏 -->
                 <div class="section_item section_item_aside_fr">
@@ -366,7 +373,7 @@
                             file.extension != 'png' &&
                             file.extension != 'bmp' &&
                             file.extension != 'gif' &&
-                            file.extension != 'jpeg'"
+                            file.extension != 'jpeg' + (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
                           @contextmenu.prevent="rightShowMenu($event, file, 1)"
                         ></div>
                         <div
@@ -376,10 +383,10 @@
                             file.extension == 'png' ||
                             file.extension == 'bmp' ||
                             file.extension == 'gif' ||
-                            file.extension == 'jpeg'"
+                            file.extension == 'jpeg'+ (isClient && !file.isDownload && (file.status == 0 || file.status == 2))?'toumin':''"
                           @contextmenu.prevent="rightShowMenu($event, file, 1)"
                         >
-                          <div class="file_Imgbox-mid">
+                          <div class="file_Im gbox-mid">
                             <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
                           </div>
                         </div>
@@ -414,13 +421,13 @@
                             @click="setFileStatus(file, 0, '已开启文件协同',2)"
                           ></i>
                         </div>
-                        <!-- 下载状态 -->
+                        <!-- 下载状态 v-if="isClient && !file.isDownload && (file.status == 0 || file.status == 2)"-->
                         <div
                           class="downloadIcon"
-                          v-if="isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
                           @click="clientDownLoad(file,1)"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
                         >
-                          <img src="/static/img/downloadImg.png" alt />
+                          <img src="/static/img/download.svg" alt />
                         </div>
                         <div
                           class="downloadIcon"
@@ -453,7 +460,10 @@
                               >
                                 <span>在线查看</span>
                               </el-dropdown-item>
-                              <el-dropdown-item @click.native="fileClick(file)" v-if="isClient && file.downloadStatus == 2">
+                              <el-dropdown-item
+                                @click.native="fileClick(file)"
+                                v-if="isClient && file.downloadStatus == 2"
+                              >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
@@ -481,15 +491,10 @@
                               >
                                 <span>取消协同</span>
                               </el-dropdown-item>
-                              <el-dropdown-item
-                                @click.native="createMilestone(file)"
-                                divided
-                              >
+                              <el-dropdown-item @click.native="createMilestone(file)" divided>
                                 <span>保存历史文件</span>
                               </el-dropdown-item>
-                              <el-dropdown-item
-                                @click.native="showFileMilestone(file)"
-                              >
+                              <el-dropdown-item @click.native="showFileMilestone(file)">
                                 <span>选择历史文件</span>
                               </el-dropdown-item>
                               <el-dropdown-item @click.native="copyFile(file)" divided>
@@ -598,7 +603,7 @@
                       class="yiyunwenjian_name"
                       :title="foldergroup.folderGroupName"
                     >{{ foldergroup.folderGroupName}}</strong>
-                    <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong>
+                    <strong class="visontext">{{foldergroup.childCount}}个项目</strong>
                   </div>
                 </draggable>
                 <!-- zxm修改托拽 end -->
@@ -768,10 +773,10 @@
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
                         <div
                           class="downloadIcon"
-                          v-if="isClient && !file.isDownload && file.status == 2"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && file.status == 2"
                           @click="clientDownLoad(file,2)"
                         >
-                          <img src="/static/img/downloadImg.png" alt />
+                          <img src="/static/img/download.svg" alt />
                         </div>
                         <div
                           class="downloadIcon"
@@ -903,10 +908,10 @@
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
                         <div
                           class="downloadIcon"
-                          v-if="isClient && !file.isDownload && file.status == 2"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && file.status == 2"
                           @click="clientDownLoad(file,2)"
                         >
-                          <img src="/static/img/downloadImg.png" alt />
+                          <img src="/static/img/download.svg" alt />
                         </div>
                         <div
                           class="downloadIcon"
@@ -1041,10 +1046,10 @@
                         <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
                         <div
                           class="downloadIcon"
-                          v-if="isClient && !file.isDownload && file.status == 2"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && file.status == 2"
                           @click="clientDownLoad(file,2)"
                         >
-                          <img src="/static/img/downloadImg.png" alt />
+                          <img src="/static/img/download.svg" alt />
                         </div>
                         <div
                           class="downloadIcon"
@@ -1202,8 +1207,14 @@
                   BtnRightFile.extension == 'txt'
               "
             >在线查看</li>
-            <li @click="fileClick(BtnRightFile)" v-if="isClient && BtnRightFile.downloadStatus == 2">打开</li>
-            <li @click="fileClickSelect(BtnRightFile)" v-if="isClient && BtnRightFile.downloadStatus == 2">打开方式</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)"
@@ -1218,8 +1229,8 @@
               v-if="isUseShare && BtnRightFile.status != 3"
             >取消协同</li>
             <div class="line"></div>
-            <li  @click="createMilestone(BtnRightFile)">保存历史文件</li>
-            <li  @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>
@@ -1257,7 +1268,10 @@
                   BtnRightFile.extension == 'txt')
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 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 && BtnRightFile.downloadStatus == 2"
@@ -1287,7 +1301,10 @@
                   BtnRightFile.extension == 'txt' ) 
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2 && BtnRightFile.downloadStatus == 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 && BtnRightFile.downloadStatus == 2"
@@ -2068,7 +2085,7 @@ export default {
       strFoldergroupCopyOrMove: "", //右键菜单 文件分组 是复制还是移动标记
       strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记
       draggableData: {}, //记录要移动的数据
-      timer:{},//文件计时器对象
+      timer: {} //文件计时器对象
       /**新建文件夹 end*/
     };
   },
@@ -2113,7 +2130,7 @@ export default {
      * 0:我的文件   1：工作文件
      */
     changeWorkdata(i) {
-      clearInterval(this.timer)
+      clearInterval(this.timer);
       this.currentPageType = i;
       this.dbClickSelectedFolderGroupData = {}; //切换我的文件和工作文件 清空双击的文件分组对象
       if (this.currentPageType == 0) {
@@ -2710,9 +2727,13 @@ export default {
             }
             thisApp.nowFolder = thisApp.listUserFolders[thisApp.nowFolderIndex];
             thisApp.listFiles();
-            if(thisApp.dbClickSelectedFolderGroupData==null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData)=='{}')  
-            {
-              thisApp.timer=setInterval(()=>{thisApp.listFiles()}, 3 * 1000);    
+            if (
+              thisApp.dbClickSelectedFolderGroupData == null ||
+              JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == "{}"
+            ) {
+              thisApp.timer = setInterval(() => {
+                thisApp.listFiles();
+              }, 3 * 1000);
             }
           }
         })
@@ -2796,7 +2817,7 @@ export default {
             // 加载我的文件夹 zxm+
             thisApp.myListFolderGroups =
               thisApp.folderFileList.listFolderGroups;
-            thisApp.loadCommitedComFiles();          
+            thisApp.loadCommitedComFiles();
           })
           .catch(error => {
             console.log(error);
@@ -3078,9 +3099,8 @@ export default {
      * 点击文件事件：直接打开文件
      */
     fileClick: function(file) {
-      if(file.downloadStatus == 1)
-      {
-          return;        
+      if (file.downloadStatus == 1) {
+        return;
       }
       if (this.isClient) {
         if (file.extension == "map") {
@@ -3220,9 +3240,8 @@ export default {
      * 点击文件事件：打开文件并选择打开方式
      */
     fileClickSelect: function(file) {
-      if(file.downloadStatus == 1)
-      {
-          return;        
+      if (file.downloadStatus == 1) {
+        return;
       }
       if (this.isClient) {
         if (file.extension == "map") {
@@ -3336,9 +3355,8 @@ export default {
      * 协作文件点击文件事件：直接打开文件
      */
     fileClickColl: function(file) {
-      if(file.downloadStatus == 1)
-      {
-          return;        
+      if (file.downloadStatus == 1) {
+        return;
       }
       if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
@@ -3414,9 +3432,8 @@ export default {
      * 协作文件点击文件事件：打开文件并选择打开方式
      */
     fileClickSelectColl: function(file) {
-      if(file.downloadStatus == 1)
-      {
-          return;        
+      if (file.downloadStatus == 1) {
+        return;
       }
       if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
@@ -3609,33 +3626,26 @@ export default {
                 duration: 2000
               });
               file.downloadStatus = 1;
-              file.isDownload=true;
+              file.isDownload = true;
               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;
-              if(type == 1 )
-              {
-                 back.downloadFile(
-                    archid,
-                    filename,
-                    folderID
-                  );
-              }
-              else{
+              if (type == 1) {
+                back.downloadFile(archid, filename, folderID);
+              } else {
                 var folderName =
                   thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
-                  back.downloadFile(
-                    archid,
-                    filename,
-                    folderID,
-                    sessionStorage.projName,
-                    folderName
-                  );
+                back.downloadFile(
+                  archid,
+                  filename,
+                  folderID,
+                  sessionStorage.projName,
+                  folderName
+                );
               }
-              
             } else {
               this.$notify({
                 title: "温馨提示",
@@ -3662,7 +3672,7 @@ export default {
      */
     clientUpload() {
       if (this.isClient) {
-        this.isShowNewFiledialog=false;
+        this.isShowNewFiledialog = false;
         back.uploadFile(this.listUserFolders[this.nowFolderIndex].folderID);
       }
     },
@@ -4678,9 +4688,11 @@ export default {
       this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑
       this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件
       this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑
-      clearInterval(this.timer)
-      this.listFiles();   
-      this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000);   
+      clearInterval(this.timer);
+      this.listFiles();
+      this.timer = setInterval(() => {
+        this.listFiles();
+      }, 3 * 1000);
       // this.loadMyAppInstanceList();//zxm
     },
     /**
@@ -4696,9 +4708,11 @@ export default {
         this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑
         this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件
         this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑
-        clearInterval(this.timer)
-        this.listFiles();  
-        this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000);   
+        clearInterval(this.timer);
+        this.listFiles();
+        this.timer = setInterval(() => {
+          this.listFiles();
+        }, 3 * 1000);
       } else {
         this.$notify({
           title: "温馨提示",
@@ -5378,7 +5392,7 @@ export default {
     /**
      * 双击文件夹组名称 进入文件夹
      */
-    intoFoldergroup: function(foldergroup) {      
+    intoFoldergroup: function(foldergroup) {
       this.dbClickSelectedFolderGroupData = foldergroup;
       this.isShowWorkt = false;
       this.isShowBread = true;
@@ -5411,9 +5425,11 @@ export default {
             this.myListFolderGroups = response.data.data.listOtherFolderGroups;
             //zxm+ 加载文件分组面包屑
             this.folderGroupBreads = response.data.data.listBreadFolderGroups;
-          } 
-          clearInterval(this.timer)
-          this.timer = setInterval(()=>{this.intoFoldergroup(foldergroup)}, 3 * 1000);
+          }
+          clearInterval(this.timer);
+          this.timer = setInterval(() => {
+            this.intoFoldergroup(foldergroup);
+          }, 3 * 1000);
         }
       });
     },
@@ -5424,17 +5440,21 @@ export default {
      */
     breadNodeClickEvent: function(obj, isBreadFirstNode) {
       var thisApp = this;
-      clearInterval(thisApp.timer)
+      clearInterval(thisApp.timer);
       thisApp.folderGroupBreads = [];
       if (isBreadFirstNode) {
         thisApp.isShowWorkt = true;
         thisApp.isShowBread = false;
         thisApp.dbClickSelectedFolderGroupData = {};
-        this.listFiles()
-        thisApp.timer = setInterval(()=>{this.listFiles()}, 3 * 1000);  
+        this.listFiles();
+        thisApp.timer = setInterval(() => {
+          this.listFiles();
+        }, 3 * 1000);
       } else {
         thisApp.intoFoldergroup(obj);
-        thisApp.timer = setInterval(()=>{thisApp.intoFoldergroup(obj)}, 3 * 1000);  
+        thisApp.timer = setInterval(() => {
+          thisApp.intoFoldergroup(obj);
+        }, 3 * 1000);
       }
     },
     /**
@@ -5759,11 +5779,11 @@ export default {
     },
     outWorkSpace(data) {
       this.hideWorklinkPage();
-    },    
+    }
   },
   destroyed: function() {
     window.removeEventListener("scroll", this.onscroll);
-    clearInterval(this.timer)
+    clearInterval(this.timer);
   },
   components: {
     Forgeview: forgeview,

static/css/main.css

@@ -4266,7 +4266,8 @@ button:focus {
 	margin: 0 auto;
 }
 .fifleBox{
-	height: 275px;
+	min-height: 259px;
+	max-height: 275px;
     overflow-y: auto;
 }
 .neibianju1 .fifleBox{
@@ -4570,10 +4571,10 @@ button:focus {
 	left: -30px;
 }
 .layerout_H2{
-	height: calc(100vh - 422px);
+	height: calc(100vh - 406px);
 	overflow-y: auto;
 	transition: ease all 0.5s;
-	background-color: rgb(246, 246, 246,0.8);
+	background-color: #f6f6f6;
 }
 .layerout_H3{
 	min-height: 150px;
@@ -7313,7 +7314,7 @@ h3.defualth3:hover{
 	border: 0;
     font-weight: 500;
     font-family: PingFang SC;
-    max-width: 112px;
+    max-width: 76px;
     padding: 0 14px;
     height: 28px;
     border-radius: 4px;
@@ -7457,6 +7458,7 @@ li.secondMenu ul li:hover {
     display: inline-block;
 	margin-top: 20px;
 	transition: ease all 0.5s;
+	font-weight: 400;
 }
 .yiyun_wenjian_list{
 	text-align: center;
@@ -7495,8 +7497,9 @@ li.secondMenu ul li:hover {
 }
 .neibianju {
     background-color: #fff;
-    padding-top: 2px;
-	height: 316px;
+	padding-top: 2px;
+	min-height: 259px;
+	max-height: 300px;
 	border-radius: 16px 16px 0 0;
 	box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
 	overflow-y: auto;
@@ -7651,7 +7654,7 @@ li.secondMenu ul li:hover {
     height: 54px;
     overflow: hidden;
 	float: left;
-	max-width: 347px;
+	max-width: 368px;
 }
 .worklinkBtngroup button{
 	margin: 0 8px;
@@ -8718,4 +8721,7 @@ h5.dulilabel{
 .titlebar_head{
 	display: flex;
 	justify-content: space-between;
+}
+.toumin{
+	opacity: 0.5;
 }

static/img/download.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="26px" viewBox="0 0 22 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>符号/操作/下载</title>
+    <g id="UI规范" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="触发/文件/激活/白背景-copy-11复制-2备份-13" transform="translate(-57.000000, -55.000000)" fill="#A7A8B7" fill-rule="nonzero">
+            <g id="状态" transform="translate(23.000000, 48.000000)">
+                <g id="符号/操作/下载" transform="translate(31.000000, 6.000000)">
+                    <path d="M14.546875,17.3590895 L14.546875,23.5819254 L17.6585938,20.4702066 C17.9566406,20.1721598 18.4433594,20.1721598 18.7414063,20.4702066 C19.0394531,20.7682809 19.0394531,21.2549996 18.7414063,21.5530191 L18.7414063,21.5530191 L14.3226563,25.9717965 C14.0246094,26.269816 13.5378906,26.269816 13.2398438,25.9717965 L13.2398438,25.9717965 L8.82109375,21.5530191 C8.52304688,21.2549996 8.52304688,20.7682809 8.82109375,20.4702066 C8.97148438,20.319816 9.165625,20.2459879 9.3625,20.2459879 C9.559375,20.2459879 9.75351563,20.319816 9.90390625,20.4702066 L9.90390625,20.4702066 L13.015625,23.5819254 L13.015625,17.3590895 L14.546875,17.3590895 Z M12.5995898,1.85663516 C14.9971992,1.85663516 17.0304258,3.41544766 17.7419648,5.57478359 C17.9956055,5.54158828 18.2542773,5.52425234 18.5169961,5.52425234 C21.7850938,5.52425234 24.4344297,8.17356094 24.4344297,11.4416859 C24.4344297,14.7097562 21.7850938,17.3590922 18.5169961,17.3590922 L18.5169961,17.3590922 L14.546875,17.3590922 L14.546875,8.87099062 C14.546875,8.4471625 14.2050781,8.10536562 13.78125,8.10536562 C13.3574219,8.10536562 13.015625,8.4471625 13.015625,8.87099062 L13.015625,8.87099062 L13.015625,17.3590922 L8.23591016,17.3590922 C5.59614453,17.3590922 3.45619531,15.219143 3.45619531,12.5793773 C3.45619531,10.2870141 5.07013281,8.37188516 7.22358984,7.90745156 C7.19908984,7.69838125 7.18607422,7.48581094 7.18607422,7.27015078 C7.18607422,4.28035781 9.60976953,1.85663516 12.5995898,1.85663516 Z" id="形状结合"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>