样式调整修改 无部门企业无法指派bug修改 企业后台修改手机号权限修改

public/static/css/main.css

@@ -484,10 +484,9 @@ ul {
 .section_item_aside_fl .nowshijian {
 	font-size: 20px;
 	margin-right: 6px;
-	position: relative;
-	top: -13px;
 	font-weight: 400;
 	letter-spacing: 0.73px;
+	white-space: nowrap;
 	color: #323232;
 }
 
@@ -4392,8 +4391,8 @@ button:focus {
 	background-color: #adadad;
 }
 .neibianju1 .fifleBox{
-	height: calc(100vh - 236px);
-	max-height: calc(100vh - 236px);
+	height: calc(100% - 40px);
+	max-height: calc(100% - 40px);
     overflow-y: auto;
 }
 .yiyun_title_label{
@@ -4701,7 +4700,7 @@ button:focus {
 	left: -30px;
 }
 .layerout_H2{
-	height: calc(100vh - 368px);
+	height: calc(100vh - 64px - 259px);
 	overflow-y: auto;
 	transition: ease all 0.5s;
 	background-color: #f6f6f6;
@@ -4933,18 +4932,22 @@ div.mt-16{
 .yiyun_btn_new{
 	border: 0;
 	color: #fff;
-	width: 120px;
-	height: 32px;
-	font-size: 14px;
-	border-radius: 21px;
-	background-color: rgba(140, 0, 255, 1);
+	width: 200px;
+	height: 40px;
+	font-size: 16px;
+	border-radius: 8px;
+	text-align: center;
+	background-color: rgba(120, 80, 255, 1);
+	box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1), 0px 2px 5px 0px rgba(0, 0, 0, 0.16);
+
 	cursor: pointer;
 	transition: ease all 0.5s;
-	font-family: PingFang SC;
+	font-family: PingFangSC-Regular;
 }
-.yiyun_btn_new:hover{
-box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.25);
+.yiyun_btn_new:active {
+	background-color: rgba(68, 43, 170, 1);
 }
+
 .PaincenterBox .el-form-item__label{
 	color: #EBEBF2;
 	font-size: 15px;
@@ -5398,6 +5401,9 @@ div.textlabelgray .el-form-item__content{
 .mt-26{
 	margin-top: 26px;
 }
+.ml-64 {
+	margin-left: 64px;
+}
 .line_H60{
 	line-height: 60px;
 }
@@ -7416,7 +7422,7 @@ border-radius:2em;
 .DevtopIcon{
 	position: absolute;
     left: 30px;
-    top: 17px;
+    top: 7px;
 }
 .orginoverflow{
 	overflow: inherit;
@@ -7662,6 +7668,7 @@ li.secondMenu ul li:hover {
 .neibianju {
     background-color: #fff;
 	padding-top: 2px;
+	height: 259px;
 	min-height: 259px;
 	max-height: 300px;
 	border-radius: 16px 16px 0 0;
@@ -7671,12 +7678,12 @@ li.secondMenu ul li:hover {
 	bottom: 0;
 	width: 100%;
 	box-sizing: border-box;
-	
 }
+
 .neibianju1 {
     background-color: #fff;
     padding-top: 5px;
-	height: calc(100vh - 168px);
+	height: 100%;
 	border-radius: 16px 16px 0 0;
     box-shadow: 0 -3px 11px 1px rgba(0,0,0,0.06);
 	overflow-y: auto;
@@ -9048,19 +9055,25 @@ h5.dulilabel{
 	.mb-32 {
 		margin: 0 0 32px 4px;
 	}
+	.mb-36 {
+		margin: 0 0 36px 4px;
+	}
 	.mt-32 {
 		margin: 32px 0 0 0;
 	}
-/* 当前要进行工作指派的文件夹样式 */
+/* 当前要进行工作指派的文件夹样式 始终激活状态*/
 	 .active-folder {
-    background-color: #dededf;
-    border-radius: 8px;
-    background-color: rgba(50, 50, 60, 0.15);
-  }
-
+		border-radius: 8px;
+		background-color: #dbdbdb !important;
+	  }
+	/* 鼠标悬浮状态 */
 	.folder-hover:hover {
 		border-radius: 8px;
-		background-color: rgba(50, 50, 60, 0.15);
+		background-color:#eaeaeb !important;
+	}
+	/* 点击瞬间状态 */
+	.folder-click:active {
+		background-color: #ccc !important;
 	}
 	/* 清除 浮动 */
 	.clear-fix::after {

src/App.vue

@@ -78,6 +78,9 @@ export default {
   computed: {
     setMarginTop() {
       return this.isClient || this.$route.name == 'workspace';
+    },
+    currentRoutePath() {
+      return this.$route.path;
     }
   },
   mounted: function () {
@@ -155,6 +158,13 @@ export default {
     $route(to) {
       this.mypath = to.path;
     },
+    currentRoutePath(val) {
+      if(val.indexOf('projdetail') >=0 ) {
+        document.body.classList.add('set-bgc');
+      } else {
+        document.body.classList.remove('set-bgc');
+      }
+    }
   },
 };
 </script>
@@ -200,4 +210,8 @@ jmnode {
  .calc-height {
     height: calc(100vh - 60px) !important;
   }
+
+  .set-bgc {
+    background-color: #ebebeb !important;
+  }
 </style>

src/components/app-header/app-header.vue

@@ -263,7 +263,11 @@ export default {
     transform: translateX(-50%);
     line-height: 40px;
     font-size: $font-level-6;
+    // font-size: 18px;
+    // font-weight: bold;
+    color: #32323C;
     /* @include setOnelineHeight($app-header-height); */
+
   }
 }
 

src/components/app-header/components/user_center.vue

@@ -132,13 +132,16 @@
               @click.stop="closeSetPain"
             ></i> -->
             <div class="close-wrap"
-                 :class="{'close-hover': isCloseHover}"
-                @click.stop="closeSetPain" 
+                @click.stop="closeSetPain"
                 @mouseenter="isCloseHover = true" 
                 @mouseleave="isCloseHover = false"
             >
-              <img v-show="!isCloseHover" class="close-icon vert-hori-center" src="/static/img/operate-pop-window/关闭.svg" alt />
-              <img v-show="isCloseHover" class="close-icon vert-hori-center" src="/static/img/operate-pop-window/关闭激活.svg" alt />
+              <img v-show="!isCloseHover"
+                  class="close-icon vert-hori-center" 
+                  src="/static/img/operate-pop-window/关闭.svg" alt />
+              <img v-show="isCloseHover"
+                  class="close-icon vert-hori-center" 
+                  src="/static/img/operate-pop-window/关闭激活.svg" alt />
             </div>
           </div>
         </div>
@@ -1161,6 +1164,7 @@ export default {
       isClient: system.isClient,
 
       isCloseHover: false,
+      closeImgSrc: '/static/img/operate-pop-window/关闭.svg'
     };
   },
   watch: {
@@ -2005,7 +2009,7 @@ export default {
 
 
 /* 关闭弹窗 */
-.close-hover {
+.close-wrap:hover {
   background-color: #d6243a;
 }
 .close-wrap {
@@ -2022,7 +2026,9 @@ export default {
   border-radius: 4px;
 
   cursor: pointer;
-
+  .close-icon {
+    cursor: pointer;
+  }
 }
 
 </style>

src/views/components_web/projDetail/components/personnel-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="personnel-list" v-if="listDept.length > 0">
+  <div class="personnel-list">
     <div class="top-title">选择成员</div>
     <div class="search-bar">
       <i class="search-icon"></i>
@@ -10,20 +10,22 @@
     <div class="content-wrap">
       <!-- 折叠面板 -->
       <div class="people-wrap">
-        <el-collapse accordion v-model="activeCompanyName">
+        <el-collapse  v-model="activeCompanyName">
           <!-- 添加协作群与工作 -->
           <el-collapse-item name="C0">
             <template slot="title">
               <span class="company-title">我的企业</span>
             </template>
-            <el-collapse accordion v-for="(dept, group_index) in listDept" v-show="dept.listUser && dept.listUser.length>0" :key="dept.id" v-model="activeDeptNameInData">
+            <el-collapse v-model="activeDeptNameList" v-if="listDept.length > 0">
               <!-- 二级折叠面板 -->
-              <el-collapse-item :name="`D${group_index}`">
+              <el-collapse-item v-for="(dept, group_index) in listDept" v-show="dept.listUser && dept.listUser.length>0" :name="dept.id" :key="dept.id">
                 <template slot="title" class="dept-entry">
                   <span class="dept-name">{{ dept.deptName }}</span>
-                  <div class="check-all-wrap" @click.stop="handleCheckItemAll(
-                    group_index, 
-                    !dept.selected)">
+                  <div class="check-all-wrap" 
+                      @click.stop="handleCheckItemAll(
+                      group_index, 
+                      !dept.selected)"
+                  >
                     <div class="checkbox" :class="{checked: dept.selected}"/><span>全选</span>
                   </div>
                 </template>
@@ -38,17 +40,10 @@
                   <span class="user-info-name">{{user.cnName}}</span>
                   <div class="checkbox" :class="{checked:user.selected}" 
                   ></div>
-                  <!-- <el-checkbox  v-model="user.selected" @change="
-                  handleCheckedOne(
-                        group_index,
-                        user,
-                        $event
-                      )
-                    " >
-                  </el-checkbox> -->
                 </div>
               </el-collapse-item>
             </el-collapse>
+            <div class="empty-people-tips" v-else>暂未添加人员</div>
           </el-collapse-item>
         </el-collapse>
       </div>
@@ -63,12 +58,14 @@
     data() {
       return {
         ischeckAll: false,
-        activeCompanyName: 'C0',
-        activeDeptNameInData: 'D0'
+        activeCompanyName: ['C0'],
+        activeDeptNameList: [],
       }
     },
     methods: {
-
+      handleDeptChange(val) {
+        console.log(val);
+      }
     },
     props: {
       listDept: {
@@ -80,6 +77,14 @@
       handleCheckItemAll: Function,
       handleCheckedOne: Function,
     },
+    watch: {
+      listDept: {
+        immediate: true,
+        handler(val) {
+           this.activeDeptNameList = val.map(dept => dept.id);
+        }
+      }
+    }
   }
 </script>
 
@@ -134,7 +139,7 @@
     .content-wrap {
       padding: 0 8px;
       overflow-y: scroll;
-      height: calc(100vh - 197px);
+      height: calc(100vh - 177px);
        /* 我的企业文字样式 */
       .company-title {
         margin: 12px 0 10px 16px;
@@ -165,7 +170,7 @@
   }
  
   .user-info-item:hover {
-    background-color: #f6f6f6;
+    background-color: rgba(50, 50, 60, 0.1)
   }
   
   .user-info-item {
@@ -257,4 +262,13 @@
     }
   }
 
+.personnel-list  .app-header-content {
+  background-color: #f8f8f8;
+}
+
+.empty-people-tips {
+  font-size: 16px;
+  text-align: center;
+  margin: 20px 0;
+}
 </style>

src/views/components_web/projDetail/components/plain-folder-list.vue

@@ -6,9 +6,9 @@
     >
       <div >
         <div @click.stop="activeFolderClick(folder)"
-          class="folder-wrap" ref="activeFolder"
-          :class="{'active-folder': folder.id === activeFolderId && isEnterEdit, 
-                   'folder-hover': !isEnterEdit }">
+          class="folder-wrap folder-hover" ref="activeFolder"
+          :class="{'active-folder': folder.id == activeFolderId && isEnterEdit,
+                  'folder-click': !isEnterEdit}">
         <div class="folder-name" 
             :class="{'opacity-5': !isAllowedAssignedStaffFolder }">
             <span>{{folder.folderName}}</span>
@@ -17,7 +17,7 @@
 
         <div  v-if="!isEnterEdit || activeFolderId !== folder.id" 
               class="clear-fix border-box" 
-              :class="{'mb-32': folder.id === activeFolderId && isEnterEdit, 
+              :class="{'mb-36': folder.id === activeFolderId && isEnterEdit, 
               'ml-4': !isEnterEdit,
               'adjust-position': isEnterEdit }"
         >
@@ -45,7 +45,7 @@
           <!-- 竖线 -->
           <div class="vertical-line" v-show="!isEnterEdit"/>
       
-          <div class="use-flex">
+          <div class="use-flex" :class="{'mb-6': isEnterEdit && activeFolderId !== folder.id}">
             <div
               v-for="user in listUserComputed(folder.listUser)"
               :key="user.id"
@@ -69,7 +69,8 @@
           </div>          
         </div>
         <div v-if="isEnterEdit && activeFolderId == folder.id"
-            class="use-relative ml-4 mb-32 use-flex border-box"
+            class="use-relative ml-4 mb-36 use-flex border-box"
+            :class="{'adjust-margin': folder.id === lastFolderId}"
         >
           <temp-selected-user-list :selectedUserList="selectedUser"
               @changeManagerClick="changeManagerClick" 
@@ -82,6 +83,7 @@
         <plain-folder-list
           :folderList="folder.listChildren"
           :id="id"
+          :lastFolderId="lastFolderId"
           :allManager="allManager"
           :allManagerChild="allManagerChild"
           :aloneAddUserForFolder="aloneAddUserForFolder"
@@ -112,6 +114,7 @@ export default {
   },
   props: {
     id:String,//用户的id,
+    lastFolderId: String,
     allManager:Object,
     allManagerChild:Array,
     folderList: Array,
@@ -203,7 +206,6 @@ export default {
       })
     }
   },
-
   computed: {
     listUserComputed: function () {
       var thisApp=this;
@@ -297,7 +299,10 @@ export default {
   .folder-wrap {
     position: relative;
     padding: 6px 0 0 0;
-    margin: 6px 0 0 0;
+    margin: 12px 0 0 0;
+    border-radius: 8px;
+    background-color: #fff;
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
   }
   /* 编辑按钮 */
   .edit-btn {
@@ -318,7 +323,12 @@ export default {
     border: 0.5px solid rgba(151, 151, 151, 1);
     cursor: pointer;
   }
+  // 最后一个元素不显示32px的间距 因为这样会和原先设置的底部28px的留白重复
+  .adjust-margin {
+    margin-bottom: 0;
+  }
 
-  
-
+  .mb-6 {
+    margin: 0 0 6px 0;
+  }
 </style>

src/views/components_web/projDetail/projDetail.vue

@@ -21,8 +21,8 @@
   
         <div class="right-part" :class="{'set-right-part-width': isEnterEdit}">
           <!-- 开始页面 -->
-          <div class="proj-desc" v-if="!isShowDistWorkPage && isShowStartProjDesc"  ref="projdesc">
-            <top-header class="set-header-position header-wrap adjust-top-radius"
+          <div class="proj-desc adjust-top-radius" v-if="!isShowDistWorkPage && isShowStartProjDesc"  ref="projdesc">
+            <top-header class="set-header-position header-wrap"
                         :class="{'header-bottom-shadow': isProjDescScroll}"
                         :showUserCenter="false">
               <div class="title" slot="left">项目概况</div>
@@ -96,8 +96,8 @@
             <div class="part-wrap" ref="distworkpart">
               <div v-if="!isEnterEdit" class="template-detail-btn"
                 @click.stop="isShowTemplateSummary = true">模板概况</div>
-              <div v-if="isProjManager"
-              :class="{'active-folder mb-32': isEditProjManager,'only-manager-see': !isEnterEdit}">
+              <div v-if="isProjManager" class="manager-folder-wrap"
+                  :class="{'active-folder mb-36': isEditProjManager,'only-manager-see folder-click': !isEnterEdit}">
                 <div class="row-title">项目管理权限</div>
                 <div class="proj-manager-row  use-relative" 
                     @click.stop="activeManagerClick">
@@ -132,6 +132,7 @@
                 :nestNodeList="nestNodeList"
                 :isEnterEdit="isEnterEdit"
                 :id="userId"
+                :lastFolderId="lastFolderId"
                 :folderList="listNewFolder"
                 :allManager="currUser"
                 :allManagerChild="listManagerUser"
@@ -301,6 +302,8 @@ import NestTemp from '../project/nestTemp.vue';
         isEnterEditPropValue: false,//是否进入编辑模板自定义字段
         isDistworkDone: false,//是否有进行过工作指派
         isDistworkSuccess: false,//每一次工作指派是否成功
+
+        lastFolderId: ''
       }
     },
     components: {
@@ -897,21 +900,25 @@ import NestTemp from '../project/nestTemp.vue';
      */
     getIsCheckSecondLevel(topIndex) {
       var checkCount = 0;
-      for (var i = 0; i < this.listDept[topIndex].listUser.length; i++) {
-        if (this.listDept[topIndex].listUser[i].selected == true) {
-          checkCount++;
-        } else {
-          checkCount--;
-        }
+      let len = this.listDept[topIndex] && this.listDept[topIndex].listUser ? this.listDept[topIndex].listUser.length : 0;
+      if(len > 0) {
+        for (var i = 0; i < len; i++) {
+          if (this.listDept[topIndex].listUser[i].selected == true) {
+            checkCount++;
+          } else {
+            checkCount--;
+          }
       }
       
-      if (checkCount == this.listDept[topIndex].listUser.length) {
-        //三级级全勾选
-        this.listDept[topIndex].selected = true;
-      } else {
-        //三级级全不勾选
-        this.listDept[topIndex].selected = false;
+        if (checkCount == this.listDept[topIndex].listUser.length) {
+          //三级级全勾选
+          this.listDept[topIndex].selected = true;
+        } else {
+          //三级级全不勾选
+          this.listDept[topIndex].selected = false;
+        }
       }
+
     },
 
     /*
@@ -1072,6 +1079,7 @@ import NestTemp from '../project/nestTemp.vue';
       }
       circulate(this.oldFolderList);
       this.oldPlainFolderList = plainFolderList;
+      this.lastFolderId = this.oldPlainFolderList[this.oldPlainFolderList.length -1].id;
     },
     async fetchProjectDetail() {
       const [userList, projectDataRes, deptList] = await Promise.all([
@@ -1080,7 +1088,16 @@ import NestTemp from '../project/nestTemp.vue';
         fetchDeptList(this.$store.state.currentCompanyId),
       ]);
       // const deptHeadList = deptList[0].children || [];
-      const oList = this.plainTreeNodes(deptList, userList);
+      let oList = this.plainTreeNodes(deptList, userList);
+      if(oList.length == 0) {
+        // 如果人员没有设置部门的话
+        const emptyDept = {};
+        emptyDept.id = "0";
+        emptyDept.deptName = sessionStorage.CompanyName || "";
+        emptyDept.listUser = [];
+        emptyDept.listUser.push(...userList);
+        oList.push(emptyDept);
+      }
       oList.forEach(item=>{
         // console.log(1)
         // console.log(item.listUser)
@@ -1381,6 +1398,7 @@ import NestTemp from '../project/nestTemp.vue';
     align-items: flex-start;
     justify-content: center;
     padding: 0 64px;
+    background-color: #ebebeb;
 
   }
 
@@ -1395,6 +1413,9 @@ import NestTemp from '../project/nestTemp.vue';
     box-sizing: border-box;
     border-top-left-radius: 8px;
     border-top-right-radius: 8px;
+
+    overflow: hidden;
+
     background-color: #fcfcfc;
 
     transition: width .5s ease;
@@ -1414,7 +1435,7 @@ import NestTemp from '../project/nestTemp.vue';
       }
       .proj-desc-wrap {
         padding: 0 24px;
-        height: calc(100vh - 146px);
+        height: calc(100vh - 126px);
         overflow: scroll;
         .cover-container {
           height: 226px;
@@ -1523,15 +1544,16 @@ import NestTemp from '../project/nestTemp.vue';
   .right-part {
     .part-wrap {
       padding: 0 12px;
-      height:calc(100vh - 146px);
+      height:calc(100vh - 126px);
       overflow-y: scroll;
+      background-color: #f8f8f8;
       .proj-manager-row {
         margin: 0 0 8px 0;
       }
       .only-manager-see {
         &:hover {
           border-radius: 8px;
-          background-color: #dededf;
+          background-color: rgba(50, 50, 60, 0.1);
         }
       }
       /* 项目管理权限文字样式 */
@@ -1550,7 +1572,7 @@ import NestTemp from '../project/nestTemp.vue';
   
   .template-summary {
     .summary-wrap {
-      height: calc(100vh - 146px - 16px);
+      height: calc(100vh - 126px - 16px);
       overflow: scroll;
       padding: 0 24px;
       margin: 16px 0 0 0;
@@ -1634,7 +1656,15 @@ import NestTemp from '../project/nestTemp.vue';
     }
   }
   .plain-folder-list {
-    padding: 0 0 20px 0;
+    padding: 0 0 28px 0;
   }
-  
+  .right-part .app-header-content {
+    background-color: #f8f8f8;
+  }
+
+.manager-folder-wrap {
+  border-radius: 8px;
+  background-color: #fff;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
+}
 </style>

src/views/main_web/index/index.vue

@@ -55,7 +55,7 @@
               <timer :cnName="cnName"/>
             </div>
           </div>
-          <div class="yiyun-col-4 adjust-position">
+          <!-- <div class="yiyun-col-4 adjust-position">
             <div class="yiyun_row">
               <div class="center">
                 <button
@@ -66,7 +66,7 @@
                 >新建项目</button>
               </div>
             </div>
-          </div>
+          </div> -->
           <div class="yiyun-col-4">
             <div class="yiyun_row">
               <!-- 右侧操作栏 -->
@@ -82,6 +82,11 @@
           <h1>空空如也</h1>
         </div>
       </section>
+      <button class="yiyun_btn_new new-btn-margin"
+        id="buttonbtn"
+        @click.stop="createNewProjectClick"
+        v-if="isUserPerm"
+      >新建项目</button>
       <!-- 项目列表 -->
       <proj-list
       :projPageList="showProjList"
@@ -750,5 +755,8 @@ export default {
     display: flex;
   }
 
+  .new-btn-margin {
+    margin: 24px 0 0 64px;
+  }
 
 </style>

src/views/main_web/proj-item.vue

@@ -178,7 +178,7 @@ export default {
         text-align: left;
         cursor: pointer;
 
-        transition: bottom .3s linear;
+        transition: bottom .15s ease-in;
     }
     .newprj_icon{
         width: 52px;
@@ -205,7 +205,7 @@ export default {
         box-sizing: border-box;
         width: 100%;
         opacity: 0;
-        transition: opacity .4s linear;
+        transition: opacity .3s ease-in;
         
         .bar-item {
             flex: 1;
@@ -217,9 +217,16 @@ export default {
             font-family: PingFangSC-Regular;
             border-radius: 8px;
             color: #fff;
-            background-color: rgba(50, 50, 60, 0.25);
+            background-color: rgba(50, 50, 60, 0.1);
             cursor: pointer;
+            &:hover {
+                background-color: rgba(0, 0, 0, 0.2);
+            }
+            &:active {
+                background-color: rgba(50, 50, 60, 0.1);
+            }
         }
+       
     }
     .height-full {
         min-height: 100%;

src/views/main_web/time.vue

@@ -1,10 +1,9 @@
 <template>
     <!-- 系统时间 -->
     <div class="section_item fl section_item_aside_fl" v-if="cnName">
-    <h1>{{ nowTime }}</h1>
-    <div class="nowTime">
-        <span class="nowshijian">{{ nowDate }}</span>
-        <span class="nowshijian">{{ welcome }}{{cnName}}</span>
+    <div class="big-time">{{ nowTime }}</div>
+    <div class="now-time">
+        <span class="nowshijian">{{ nowDate.substr(5) }} {{ welcome }}{{cnName}}</span>
     </div>
     </div>
 </template>
@@ -61,4 +60,18 @@ export default {
         this.timer=null;
     }   
 }
-</script>
+</script>
+
+<style scoped>
+    .now-time {
+        margin: 12px 0 0 0;
+    }
+    .big-time {
+        height: 41px;
+        line-height: 41px;
+        color: rgba(0, 0, 0, 1);
+        font-size: 44px;
+        text-align: left;
+        font-family: PingFangSC-Regular;
+    }
+</style>

src/views/main_web/workspace/components/workLine.vue

@@ -218,14 +218,19 @@
                     </div>
                   
                   </div> -->
-                  <div class="worklinkBtngroup use-flex2 set-transition no-drag" :style="setTranslate"  :class="{'height-0': isHideWorkFolders}">
-                    <div class="has-prev-node" v-if="nowFolderIndex > 2 && isCalcuteExchangeNode"></div>
-                    <template v-for="(currFolder, index) in listUserFolders" class="">
+                  <div class="worklinkBtngroup use-flex2 set-transition" :style="setTranslate"  :class="{'height-0': isHideWorkFolders}">
+                    <div class="has-prev-node" v-if="nowFolderIndex > 2 && isCalcuteExchangeNode"
+                          @click.stop="nowFolderClick(nowFolderIndex - 1)">
+                        <img  class="prev-icon no-drag"
+                              src="/static/img/下拉箭头.svg"/>
+                    </div>
+                    <template v-for="(currFolder, index) in listUserFolders">
                       <button ref="nowFolderEl"
                         type="button"
                         v-if="
                           !isShowworklink
                         "
+                        class="no-drag"
                         :class="{'nowfolder-wrap yiyuntitle nowFolderName': index == nowFolderIndex,
                                 'yiyuntitle sectitle': index !== nowFolderIndex,
                                   'hide-folder': Math.abs(index - nowFolderIndex) > 2}"
@@ -242,7 +247,11 @@
                         </div>
                       </button>
                     </template>
-                    <div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode && totalNodeNum > 5 "></div>
+                    <div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode && totalNodeNum > 5 "
+                        @click.stop="nowFolderClick(nowFolderIndex + 1)">
+                         <img  class="next-icon no-drag"
+                              src="/static/img/下拉箭头.svg"/>
+                    </div>
                   </div>
                   <!-- <i
                     class="icon font_family icon-icon_shezhi-jihuo rota90 workbtn workderct"
@@ -577,12 +586,27 @@ export default {
     background-color: #F0F0F0;
   }
   .has-next-node, .has-prev-node {
-    width: 16px;
-    height: 16px;
+    width: 20px;
+    height: 20px;
     border-radius: 4px;
     background-color: rgba(250, 250, 250, 1);
     margin: 0 8px;
+    cursor: pointer;
+    overflow: hidden;
+  }
+  .prev-icon, .next-icon {
+    width: 100%;
+    height: 100%;
+    vertical-align: top;
+    cursor: pointer;
+  }
+  .prev-icon {
+    transform: rotate(90deg);
   }
+  .next-icon {
+    transform: rotate(-90deg);
+  }
+  
   // 最多显示7个字符 多余的用省略号表示
   .now-folder-text {
     max-width: 157px;

src/views/main_web/workspace/workspace.new.vue

@@ -124,7 +124,7 @@
           @finishGetExchangeNodes="finishGetExchangeNodes"
         />
         <div class="layout_content2" v-show="!showWorkline" v-loading="loading">
-          <section
+          <section v-show="isShowpageIcon"
             id="workspace"
             :class="`${closepageH} layerout_H2`"
             @contextmenu.prevent="rightShowMenu($event, '新建文件夹', 4)"
@@ -137,7 +137,7 @@
                     class="section_item section_item_aside_fl"
                   >
                     <span
-                      class="yiyun_text-title-workspace ml-4-mt-20" 
+                      class="yiyun_text-title-workspace ml-4" 
                     >
                       <el-breadcrumb class="folder_breadcrumb" separator-class="el-icon-arrow-right">
                         <el-breadcrumb-item @click.native="clickBreadcrumb(-1, 0)">工作文件</el-breadcrumb-item>
@@ -290,7 +290,7 @@
               </div>
             </div>
 
-            <div class="fifleBox">
+            <div class="fifleBox" id="coopFileBox">
               <div class="yiyun_section_warp layerout_H3">
                 <!-- 文件大box -->
                 <div class="yinyong_warpBox">
@@ -656,6 +656,7 @@ export default {
   mounted: function () {
     this.hackWorkLine = this.$refs.hackworkline;
     window.addEventListener("scroll", this.onscroll, true);
+    this.listenBottomHeight();
     window.addEventListener("resize", this.listenBottomHeight, true);
     if(this.isClient) {
       this.initWorkspaceDropEvent();
@@ -1141,9 +1142,9 @@ export default {
       // }
     },
     listenBottomHeight() {
-      let oDivH = document.getElementById('bottomBox') ? document.getElementById("bottomBox").offsetHeight : 0;
+      let oDivH = document.getElementById('coopFileBox') ? document.getElementById("coopFileBox").offsetHeight : 0;
       let oShodow = document.getElementById("bottomoShodow");
-      // console.log(oDivH)
+      console.log(oDivH)
       if (oDivH > 259) {
         this.showadow = true;
       } else {
@@ -1263,6 +1264,7 @@ export default {
         this.currentFolder = folder;
         this.breadcrumbFolderList.push(folder);
       } else if(flag == 1) {
+        this.listenBottomHeight();
         this.currentFolderInCoop = folder;
         this.breadcrumbFolderListInCoop.push(folder);
       }
@@ -1913,8 +1915,8 @@ export default {
       user-select: none;
       font-size: 18px;
       display: inline-block;
-      height: 56px;
-      line-height: 56px;
+      height: 40px;
+      line-height: 40px;
       .el-breadcrumb__separator {
         color: #a7a8b7;
       }
@@ -2078,4 +2080,12 @@ export default {
   .height-0 {
     height: 0;
   }
+
+  .layout_content2 {
+    height: calc(100vh - 64px);
+  }
+// 调整协作文件显示区域的高度
+  .set-coop-file-box-height {
+    height: 300px;
+  }
 </style>

src/views/manage_company/user/index.vue

@@ -525,6 +525,7 @@
                               </div>
                               <div v-if="eidit == true" class="eidit_Input">
                                 <el-input
+                                  :disabled="currentUser.default == 1"
                                   v-model="currentUser.phone"
                                   placeholder="输入内容"
                                 ></el-input>