From fa2b9ef990cb714493c06c1dc04bf7794f76a066 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Tue, 15 Dec 2020 16:44:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E7=AB=AF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8C=E5=87=BB=E9=A2=84=E8=A7=88=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=8F=8C=E5=87=BB=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main_web/workspace/components/file-item.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
index f432d261..77ed509c 100644
--- a/src/views/main_web/workspace/components/file-item.vue
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -7,7 +7,7 @@
       effect="light"
     >
       <div class="yiyun_wenjian_list loding-mask-parent"  
-          :class="{'yiyun_wenjian_list_add': !isLocalIpfsCidValidate}"
+          :class="{'yiyun_wenjian_list_add': !isLocalIpfsCidValidate && isClient}"
           @contextmenu.prevent.stop="fileRightBtnClick">
         <!-- 文件状态未加载出来时的loading 蒙版 -->
         <div class="set-loding-mask-position">
@@ -346,12 +346,15 @@ export default {
   methods: {
     oneOf,
     dblclickFile() {
-      if(!this.isClient || this.isLocalIpfsCidValidate) {
+      if(this.isClient && this.isLocalIpfsCidValidate) {
         this.$emit('dblclickFile');
+        return;
+      } 
+      if(!this.isClient) {
+        this.filePreview();
       }
     },
     fileRightBtnClick(e) {
-      console.log(this.isLocalIpfsCidValidate);
       if(this.isLocalIpfsCidValidate || !this.isClient) {
         this.isFileRightMenuVisible = true;
         this.fileRightMenuLeft = e.offsetX;

From 410f9eda40917a92e63ea3234e6692920dd99c29 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Tue, 15 Dec 2020 16:49:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=A6=82=E5=86=B5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/main.css                    |   8 +-
 .../projDetail/components/personnel-list.vue  |   9 +-
 .../components_web/projDetail/projDetail.vue  | 162 +++++++++++++-----
 3 files changed, 128 insertions(+), 51 deletions(-)

diff --git a/public/static/css/main.css b/public/static/css/main.css
index 4eb86bd9..1a652c63 100644
--- a/public/static/css/main.css
+++ b/public/static/css/main.css
@@ -8922,7 +8922,9 @@ h5.dulilabel{
 	/* 新项目人员列表超出部分滚动条样式 */
 	/* 滚动条样式 */
 	.personnel-list .content-wrap::-webkit-scrollbar,
-	.right-part .part-wrap::-webkit-scrollbar, 
+	.proj-detail .right-part .part-wrap::-webkit-scrollbar, 
+	.proj-detail .proj-desc-wrap::-webkit-scrollbar, 
+	.proj-detail .summary-wrap::-webkit-scrollbar, 
 	.new-proj .template_select_content::-webkit-scrollbar {
 		width: 8px;
 		height: 8px;
@@ -8934,6 +8936,8 @@ h5.dulilabel{
   /*滑块样式*/
 	.personnel-list .content-wrap::-webkit-scrollbar-thumb, 
 	.right-part .part-wrap::-webkit-scrollbar-thumb,
+	.proj-detail .proj-desc-wrap::-webkit-scrollbar-thumb, 
+	.proj-detail .summary-wrap::-webkit-scrollbar-thumb, 
 	.new-proj .template_select_content::-webkit-scrollbar-thumb {
     -webkit-border-radius: 4px;
     border-radius: 4px;
@@ -8944,6 +8948,8 @@ h5.dulilabel{
   /*当前窗口失去焦点时的滑块样式*/
 	.personnel-list .content-wrap::-webkit-scrollbar-thumb:window-inactive,
 	.right-part .part-wrap::-webkit-scrollbar-thumb:window-inactive,
+	.proj-detail .proj-desc-wrap::-webkit-scrollbar-thumb:window-inactive, 
+	.proj-detail .summary-wrap::-webkit-scrollbar-thumb:window-inactive, 
 	.new-proj .template_select_content::-webkit-scrollbar-thumb:window-inactive {
     background-color: #adadad;
 	}
diff --git a/src/views/components_web/projDetail/components/personnel-list.vue b/src/views/components_web/projDetail/components/personnel-list.vue
index c6b61903..380a5b45 100644
--- a/src/views/components_web/projDetail/components/personnel-list.vue
+++ b/src/views/components_web/projDetail/components/personnel-list.vue
@@ -21,7 +21,7 @@
                 <span class="dept-name">{{ dept.deptName }}</span>
                 <el-checkbox class="dept-select-all-btn"  v-model="dept.selected" @change="handleCheckItemAll(group_index, $event)">全选</el-checkbox>
               </template>
-              <div class="user-info-item" v-for="user in dept.listUser" :label="user" :key="user.id">
+              <div class="user-info-item" v-for="user in dept.listUser" :key="user.id">
                 <img :src="user.headImgUrl | resolveAvator" alt="" class="avatar-img" />
                 <span class="user-info-name">{{user.cnName}}</span>
                 <el-checkbox  v-model="user.selected" @change="
@@ -50,12 +50,7 @@
       }
     },
     methods: {
-      /*
-      * 部门全选
-      */
-      // handleCheckDeptTopAll(isChecked,dept_index) {
-      //   this.$emit('handleCheckDeptTopAll',isChecked, dept_index);
-      // }
+
     },
     props: {
       listDept: {
diff --git a/src/views/components_web/projDetail/projDetail.vue b/src/views/components_web/projDetail/projDetail.vue
index 98f85dab..0b300837 100644
--- a/src/views/components_web/projDetail/projDetail.vue
+++ b/src/views/components_web/projDetail/projDetail.vue
@@ -7,7 +7,7 @@
  * @
  -->
 <template>
-  <div>
+  <div class="proj-detail">
     <app-header backBtnTitle="退出项目编辑" theme="basis" 
                 :showUserCenter="false" :showBackBtn="true"
     />
@@ -15,10 +15,11 @@
         <div class="graph-left-part" v-if="!isEnterEdit"></div>
   
         <div class="right-part" :class="{'set-right-part-width': isEnterEdit}" key="0">
+          <!-- 开始页面 -->
           <div class="proj-desc" v-if="!isShowDistWorkPage">
             <app-header class="set-header-position header-wrap"
                         :class="{'header-bottom-shadow': isDistWorkPartScroll}"
-                         theme="basis" 
+                         theme="white" 
                         :showUserCenter="false" 
             >
               <div class="title" slot="left">项目概况</div>
@@ -26,8 +27,8 @@
             </app-header>
             <div class="proj-desc-wrap">
               <div class="item">
-                <div class="item-title">项目名称:</div>
-                <div class="item-value">11111</div>
+                <div class="item-title">项目名称项目名称项目名称项目名称项目名称项目名称项目名称项目名称项目名称</div>
+                <div class="item-value">项目名称项目名称项目名称项目名称项目名称项目名称项目名称项目名称项目名称</div>
               </div>
               <div class="item">
                 <div class="item-title">项目负责:</div>
@@ -47,8 +48,8 @@
                 </div>
               </div>
               <div class="item">
-                <div class="item-title proj-main-template">项目主要模板:</div>
-                <div class="item-value">11111</div>
+                <div class="item-title proj-main-template">项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板:</div>
+                <div class="item-value">11111项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板项目主要模板</div>
               </div>
               <div class="item">
                 <div class="item-title">模板负责:</div>
@@ -76,31 +77,30 @@
               </div>
             </div>
           </div>
-          <div class="distwork-page" v-else>
+          <!-- 工作指派页面 -->
+          <div class="distwork-page" v-if="isShowDistWorkPage && !isShowTemplateSummary">
             <app-header v-if="!isEnterEdit"
                         class="set-header-position header-wrap"
-                        :class="{'header-bottom-shadow': isDistWorkPartScroll}"
-                        backBtnTitle="项目概况" theme="basis"
+                        backBtnTitle="项目概况" theme="white"
                         :onBackBtnClick="showProjDetailClick" 
                         title="模板名称" :showUserCenter="false" :showBackBtn="true"
             />
             <app-header v-else
                         class="set-header-position header-wrap"
-                        :class="{'header-bottom-shadow': isDistWorkPartScroll}"
-                        theme="basis" title="指派工作" :showUserCenter="false" 
+                        theme="white" title="指派工作" :showUserCenter="false" 
             >
               <div class="finish-edit-btn" slot="left"  @click.stop="finishEditClick">完成编辑</div>
             </app-header>
             <div class="part-wrap" ref="distworkpart">
-              <div v-if="!isEnterEdit" class="template-detail-btn">模板概况</div>
-              <div v-if="isProjManager" class="only-manager-see">
+              <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 class="row-title">项目管理权限</div>
                 <div class="proj-manager-row  use-relative" 
-                    :class="{'active-folder mb-32': isEditProjManager}"
                     @click.stop="activeManagerClick">
                   <div v-if="!isEnterEdit || !isEditProjManager" class="use-relative ml-4 use-flex" >
                     <div class="use-relative">
-                      <people-item :user="currUser" class="mr-8"/>
+                      <people-item :user="currUser" class="mr-8" :isShowManagerMark="isEnterEdit"/>
                     </div>
                     <div v-show="!isEnterEdit" class="vertical-line"/>
                     <div v-if="listManagerUser && listManagerUser.length > 0" class="use-flex">
@@ -136,10 +136,44 @@
               />
             </div>
           </div>
+          <!-- 点击项目概况按钮看到的页面 -->
+          <div class="template-summary" v-if="isShowTemplateSummary">
+            <app-header class="set-header-position header-wrap"
+                        backBtnTitle="返回" theme="basis"
+                        :onBackBtnClick="returnToDistWorkClick" 
+                        title="模板名称" :showUserCenter="false" :showBackBtn="true"
+            />
+            <div class="summary-wrap">
+              <div class="item">
+                <div class="item-title">模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责</div>
+                <div class="item-value">1111模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责模板负责</div>
+              </div>
+              <div class="item">
+                <div class="item-title">创建时间:</div>
+                <div class="item-value">1111</div>
+              </div>
+              <div class="item">
+                <div class="item-title">工程名称:</div>
+                <div class="item-value">1111</div>
+              </div>
+              <div class="item">
+                <div class="item-title">工程号:</div>
+                <div class="item-value">1111</div>
+              </div>
+              <div class="item">
+                <div class="item-title">规模:</div>
+                <div class="item-value">1111</div>
+              </div>
+              <div class="item">
+                <div class="item-title">地址:</div>
+                <div class="item-value">1111</div>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="personnel-list-part" v-if="isEnterEdit" :key="1"
+        <div class="personnel-list-part" v-if="isEnterEdit" 
             :class="{'set-personnel-list-width': isEnterEdit}">
-        <personnel-list :listDept="listDept" :key="2"
+        <personnel-list :listDept="[...listDept]" 
                       :handleCheckItemAll="handleCheckItemAll"
                       :handleCheckedOne="handleCheckedOne"/>
         </div>
@@ -209,7 +243,8 @@
         userId:sessionStorage.userId,
         allChildrenLists:[],
 
-        isShowDistWorkPage: false,//是显示项目概况还是进行工作指派
+        isShowTemplateSummary: false,//是否显示模板概况页面
+        isShowDistWorkPage: false,//是显示开始的项目概况还是进行工作指派
         isEnterEdit: false,//是否进入编辑人员/指派人员状态
         distWorkPartScrollEl: null,//指派工作页面的内容元素
         isDistWorkPartScroll: false,//指派页面是否正在滚动 滚动的话导航栏加上底部阴影
@@ -234,10 +269,10 @@
       // 加载项目详情
       this.fetchProjectDetail();
 
-      this.distWorkPartScrollEl = this.$refs.distworkpart;
-      if(this.distWorkPartScrollEl) {
-        this.distWorkPartScrollEl.addEventListener('scroll', this.watchDistWorkPartScroll);
-      }
+      // this.distWorkPartScrollEl = this.$refs.distworkpart;
+      // if(this.distWorkPartScrollEl) {
+      //   this.distWorkPartScrollEl.addEventListener('scroll', this.watchDistWorkPartScroll);
+      // }
 
       // 监听plain-folder-list发来的事件 进入文件夹编辑
       this.$bus.$on('enterEditFolderClick', this.enterEditFolderClick);
@@ -249,7 +284,7 @@
       this.$bus.$on('setFirstPeopleToManager', this.setFirstPeopleToManager);
     },
     beforeDestroy() {
-      this.distWorkPartScrollEl && this.distWorkPartScrollEl.removeEventListener('scroll', this.watchDistWorkPartScroll);
+      // this.distWorkPartScrollEl && this.distWorkPartScrollEl.removeEventListener('scroll', this.watchDistWorkPartScroll);
 
       // 取消监听
       this.$bus.$off('enterEditFolderClick', this.enterEditFolderClick);
@@ -266,6 +301,9 @@
       },
       setSystemCoverRandom() {
 
+      },
+      returnToDistWorkClick() {
+        this.isShowTemplateSummary = false;
       },
       // 点击返回按钮 显示项目概况页面
       showProjDetailClick() {
@@ -285,10 +323,11 @@
       watchDistWorkPartScroll() {
         this.isDistWorkPartScroll = this.distWorkPartScrollEl.scrollTop > 0;
       },
-      // 切换到项目负责人
+      // 切换到项目负责人进行编辑
       activeManagerClick() {
         this.isEditProjManager = true;
         this.activeFolderId = '';
+        this.addProjManager();
       },
       // 切换当前激活的文件夹
       activeFolderClick(folder) {
@@ -494,7 +533,8 @@
       this.listDept=JSON.parse(JSON.stringify(this.currListDeptUserData));
       for (var j = 0; j < this.listDept.length; j++) {
         for (var k = 0; k < this.listDept[j].listUser.length; k++) {
-          this.listDept[j].listUser[k].selected = false;
+          // this.listDept[j].listUser[k].selected = false;
+          this.$set(this.listDept[j].listUser[k], 'selected', false);
           for (var i = 0; i < data.listUser.length; i++) {
             if (
               this.listDept[j].listUser[k].id == data.listUser[i].id
@@ -1021,6 +1061,7 @@
   }
 
   .right-part {
+    box-sizing: border-box;
     .proj-desc {
       /* 项目概况页面 */
       background-color: rgba(252, 252, 252, 1);
@@ -1051,21 +1092,9 @@
       }
 
       .proj-desc-wrap {
-        padding: 0 8px 0 41px;
-        .item {
-          display: flex;
-          height: 48px;
-          line-height: 48px;
-          font-size: 14px;
-          font-family: PingFangSC-Regular;
-          .item-title {
-            width: 139px;
-            text-align: right;
-          }
-          .item-value {
-            margin: 0 0 0 8px;
-          }
-        }
+        padding: 0 24px;
+        height: calc(100vh - 100px);
+        overflow: scroll;
         .cover-container {
           height: 226px;
           margin: 0 0 32px 0;
@@ -1113,6 +1142,23 @@
         }
       }
     }
+    .item {
+      display: flex;
+      width: 100%;
+      margin: 14px 0;
+      font-size: 14px;
+      font-family: PingFangSC-Regular;
+      color: #32323C;
+      .item-title {
+        color: #62492f;
+        width:35.06%;
+        text-align: right;
+      }
+      .item-value {
+        flex: 1;
+        margin: 0 0 0 12px;
+      }
+    }
   }
  
   .right-part {
@@ -1135,7 +1181,8 @@
       }
       /* 项目管理权限文字样式 */
       .row-title {
-        margin: 8px 0 6px 12px;
+        padding: 6px 0 0 0;
+        margin: 10px 0 6px 12px;
         height: 20px;
         line-height: 20px;
         color: rgba(50, 50, 60, 100);
@@ -1145,7 +1192,16 @@
       }
     }
   }
- 
+  
+  .template-summary {
+    .summary-wrap {
+      height: calc(100vh - 100px - 16px);
+      overflow: scroll;
+      padding: 0 24px;
+      margin: 16px 0 0 0;
+      background-color: #fcfcfc;
+    }
+  }
   .set-right-part-width {
     width: 63.768% !important;
     margin-right: 10px;
@@ -1178,6 +1234,7 @@
 
     text-align: center;
     margin: 15px 12px 8px;
+    cursor: pointer;
   }
 
 
@@ -1190,11 +1247,30 @@
   } */
 </style>
 
-<style>
+<style lang="scss">
   .header-wrap .app-header-back-btn {
     left: 24px !important;
   }
   .header-wrap .app-header-content {
     padding: 0 48px !important;
   }
+  .proj-summary  {
+    .app-header-center {
+      font-size: 20px;
+    }
+    .back_title {
+      color: rgba(12, 13, 16, 100);
+      font-size: 15px;
+      font-family: PingFangSC-Regular;
+    }
+  }
+  /* 返回图标变成紫色 */
+  .proj-detail {
+    .right-part {
+      .icon_topback_left {
+        background: url(/static/img/yiyunicon.png) no-repeat -28px -84px !important;
+      }
+    }
+  }
+  
 </style>
\ No newline at end of file