feat:合并

src/views/projectcenter/TaskPage.vue

@@ -643,7 +643,7 @@
                         <div class="leader1">进度</div>
                         <a-progress :percent="55" />
                       </div>
-                      <div class="grofooter">
+                      <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
                         <div class="peoples">
                           <div class="people1">
@@ -690,7 +690,7 @@
                         <div class="leader1">进度</div>
                         <a-progress :percent="55" />
                       </div>
-                      <div class="grofooter">
+                      <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
                         <div class="peoples">
                           <div class="people1">
@@ -737,7 +737,7 @@
                         <div class="leader1">进度</div>
                         <a-progress :percent="55" />
                       </div>
-                      <div class="grofooter">
+                      <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
                         <div class="peoples">
                           <div class="people1">
@@ -784,7 +784,7 @@
                         <div class="leader1">进度</div>
                         <a-progress :percent="55" />
                       </div>
-                      <div class="grofooter">
+                      <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
                         <div class="peoples">
                           <div class="people1">
@@ -816,7 +816,27 @@
             </a-tabs>
           </div>
         </a-tab-pane>
-        <a-tab-pane key="4" tab="公告">Content of Tab Pane 3</a-tab-pane>
+        <a-tab-pane key="4" tab="公告">
+          <div class="noticeTitle">
+            <h3>公告</h3>
+            <a-divider style="margin-top: -5px"></a-divider>
+            <a-switch
+              v-model:checked="noticeChecked"
+              style="size: small"
+            /><span style="margin-left: 13px">开启</span>
+            <p style="margin-top: 35px">公告内容</p>
+            <a-textarea
+              v-model:value="noticeContent"
+              show-count
+              :maxlength="150"
+              style="margin-top: -10px; height: 110px"
+            />
+            <div class="publish">
+              <div class="iconPub"></div>
+              <div class="btnText">发布</div>
+            </div>
+          </div>
+        </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">Content of Tab Pane 3</a-tab-pane>
         <a-tab-pane key="6" tab="排行榜">
           <div class="content6">
@@ -998,6 +1018,8 @@
     <face-manage v-model:Fvisible="FaceVisivle" />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
+    <!-- 组员名单抽屉 -->
+    <member-list v-model:Lvisible="Lvisible" />
     <!-- 面授学员抽屉 -->
     <face-stu v-model:FSvisible="FSvisible" />
     <!-- 活动考勤抽屉 -->
@@ -1172,6 +1194,7 @@ import { reactive, toRefs } from "vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import SubsetManage from "../../components/drawers/SubsetManage";
+import MemberList from "../../components/drawers/MemberList";
 import ActiveAttendance from "../../components/drawers/ActiveAttendance";
 import WorkManage from "../../components/drawers/WorkManage";
 import FaceStu from "../../components/drawers/FaceStu";
@@ -1182,6 +1205,7 @@ export default {
     TimeManage,
     FaceManage,
     SubsetManage,
+    MemberList,
     FaceStu,
     ActiveAttendance,
     WorkManage,
@@ -1345,6 +1369,7 @@ export default {
       visible: false, //时间管理
       FaceVisivle: false, //面授管理
       subsetVisivle: false, //随机小组
+      Lvisible: false, //组员名单
       FSvisible: false, //面授学员
       AAvisible: false, //活动考勤
       Wvisible: false, //作业管理
@@ -1360,6 +1385,8 @@ export default {
       activeKey1: "8",
       valueName: "", //排行榜输入姓名
       valueDate: "", //排行榜输入日期
+      noticeChecked: true,
+      noticeContent: "请输入要发布的公告",
     });
     const showModal = () => {
       state.pubproject = true;
@@ -1393,6 +1420,10 @@ export default {
     const showFS = () => {
       state.FSvisible = true;
     };
+    //面授学员的弹窗
+    const showMemberList = () => {
+      state.Lvisible = true;
+    };
     //活动考勤的抽屉
     const showAA = () => {
       state.AAvisible = true;
@@ -1421,6 +1452,7 @@ export default {
       showTime,
       showFace,
       showSubset,
+      showMemberList,
       showFS,
       showAA,
       showWork,
@@ -2081,9 +2113,7 @@ export default {
         //height: 71px;
         margin-left: 12px;
         margin-right: 50px;
-        .icon {
-          //position: absolute;
-        }
+
         .iconame {
           //position: absolute;
           color: #4f5156;
@@ -2153,6 +2183,42 @@ export default {
         }
       }
     }
+    .noticeTitle {
+      margin-left: 38px;
+      margin-right: 38px;
+      padding-top: 20px;
+      .publish {
+        width: 100px;
+        // padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: rgb(64, 158, 255);
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-shrink: 0;
+        float: right;
+        margin-top: 60px;
+        margin-bottom: 60px;
+        margin-right: 20px;
+        cursor: pointer;
+        .iconPub {
+          width: 15px;
+          height: 15px;
+          background-image: url(@/assets/images/taskpage/pub.png);
+          background-size: 100% 100%;
+          color: rgb(255, 255, 255);
+        }
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: rgb(255, 255, 255);
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+    }
   }
   .content3 {
     margin-top: 20px;