Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/components/drawers/ActiveAttendance.vue

@@ -15,7 +15,7 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="main">
+      <div class="centermain">
         <div class="titl">
           <div class="endtime">
             起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00
@@ -76,13 +76,13 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1">
+          <div class="btn btn2" @click="showqdModal">
             <div class="wz">批量签到</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="showqtModal">
-            <div class="wz" @click="showEntryScore">批量签退</div>
+            <div class="wz">批量签退</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn1">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
@@ -137,14 +137,162 @@
           />
         </div> -->
       </div>
-    </div>
-
-    <div class="botm"></div>
       <div class="btnn">
         <button class="btn1">取消</button>
         <button class="btn2">确定</button>
       </div>
+    </div>
   </a-drawer>
+  <!-- 批量签到弹窗 -->
+  <a-modal
+    v-model:visible="qdModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closeqdModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要批量签到吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+  <!-- 批量签退弹窗 -->
+  <a-modal
+    v-model:visible="qtModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closeqtModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要批量签退吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+  <!-- 单独签到弹窗 -->
+  <a-modal
+    v-model:visible="singleqdModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closesingleqdModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要签到吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+  <!-- 单独签退弹窗 -->
+  <a-modal
+    v-model:visible="singleqtModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closesingleqtModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要签退吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+  <!-- 单独请假弹窗 -->
+  <a-modal
+    v-model:visible="singleqjModal"
+    :footer="null"
+    :closable="closeCopy"
+    wrapClassName="CopyModal"
+    centered="true"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="icon"></div>
+          <span>提示</span>
+          <div class="close_exit" @click="closesingleqjModal"></div>
+        </div>
+        <div class="body">
+          <span>您确定要请假吗</span>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1">
+            <div class="btnText" @click="delete_exit">取消</div>
+          </div>
+          <div class="del_btn btn2">
+            <div class="btnText" @click="delete_exit">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
 </template>
 
 <script>
@@ -168,6 +316,12 @@ export default {
       currentPage: 1,
       tableDataTotal: 100,
       selectedRowKeys: [],
+      qtModal: false, //批量签退
+      qdModal: false, //批量签到
+      singleqjModal: false, //单独请假
+      singleqdModal: false, //单独签到
+      singleqtModal: false, //单独签退
+      closeCopy: false,
       projectNameList: [
         {
           id: 1,
@@ -361,6 +515,7 @@ export default {
               checked={value.signIn}
               onChange={(e) => {
                 console.log("点击签到", e);
+                showsingleqdModal();
               }}
             >
               签到
@@ -369,6 +524,7 @@ export default {
               checked={value.signOut}
               onChange={(e) => {
                 console.log("点击签退", e);
+                showsingleqtModal();
               }}
             >
               签退
@@ -377,6 +533,7 @@ export default {
               checked={value.leave}
               onChange={(e) => {
                 console.log("点击请假", e);
+                showsingleqjModal();
               }}
             >
               请假
@@ -476,6 +633,36 @@ export default {
       ];
       return columns;
     };
+    const showqdModal = () => {
+      state.qdModal = true;
+    };
+    const showqtModal = () => {
+      state.qtModal = true;
+    };
+    const closeqdModal = () => {
+      state.qdModal = false;
+    };
+    const closeqtModal = () => {
+      state.qtModal = false;
+    };
+    const showsingleqdModal = () => {
+      state.singleqdModal = true;
+    };
+    const showsingleqtModal = () => {
+      state.singleqtModal = true;
+    };
+    const showsingleqjModal = () => {
+      state.singleqjModal = true;
+    };
+    const closesingleqdModal = () => {
+      state.singleqdModal = false;
+    };
+    const closesingleqtModal = () => {
+      state.singleqtModal = false;
+    };
+    const closesingleqjModal = () => {
+      state.singleqjModal = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -484,6 +671,16 @@ export default {
       onSelectChange,
       showEntryScore,
       tableDataFunc,
+      showqdModal,
+      showqtModal,
+      closeqtModal,
+      closeqdModal,
+      showsingleqdModal,
+      showsingleqtModal,
+      showsingleqjModal,
+      closesingleqdModal,
+      closesingleqtModal,
+      closesingleqjModal,
     };
   },
 };
@@ -511,6 +708,7 @@ export default {
         // overflow-x: scroll;
         display: flex;
         flex-direction: column;
+        height: 100%;
         .header {
           height: 73px;
           border-bottom: 1px solid #e8e8e8;
@@ -528,12 +726,13 @@ export default {
             // margin-left: 24px;
           }
         }
-        .main {
+        .centermain {
-          width: 100%;
+          // width: 100%;
-          height: 100%;
+          // height: 100%;
-          background-color: #bfa;
+          // background-color: #bfa;
+          flex: 1;
           overflow-y: auto;
-
+          margin-bottom: 75px;
           .titl {
             display: flex;
             .endtime {
@@ -634,7 +833,7 @@ export default {
               .img2 {
                 width: 17px;
                 height: 16px;
-                background-image: url(../../assets/images/coursewareManage/export.png);
+                background-image: url(../../assets/images/coursewareManage/export1.png);
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
@@ -736,7 +935,7 @@ export default {
               background: #f6f9fd;
             }
             .opa {
-              background-color: #bfa;
+              // background-color: #bfa;
             }
           }
           // .tab {
@@ -755,21 +954,15 @@ export default {
           //   }
           // }
         }
-      }
-      .botm {
-        width: 100%;
-        height: 90px;
-        // background-color: red;
-        // flex-shrink: 1;
-      }
         .btnn {
           height: 72px;
           width: 100%;
-        position: absolute;
+          // position: absolute;
           background-color: #fff;
-        bottom: 0;
+          // bottom: 0;
-        left: 0;
+          // left: 0;
           display: flex;
+          // display: none;
           align-items: center;
           justify-content: center;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
@@ -794,6 +987,13 @@ export default {
           }
         }
       }
+      // .botm {
+      //   width: 100%;
+      //   height: 90px;
+      //   // background-color: red;
+      //   // flex-shrink: 1;
+      // }
+    }
   }
 }
 </style>

src/components/drawers/AddActive.vue

@@ -90,9 +90,16 @@
               <span style="margin-right: 3px">活动时长：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input-number
+                :min="0"
+                :precision="0"
+                style="
+                  width: 388px;
+                  height: 32px;
+                  border-radius: 8px;
+                  overflow: hidden;
+                "
                 v-model:value="inputV2"
-                style="width: 388px; height: 32px"
               />
               <span style="margin-left: 5px">分钟</span>
             </div>
@@ -126,18 +133,34 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>开始前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV4"
-                  ></a-input>
+                  />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
                 <div class="timerbox">
                   <span>开始后：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV5"
-                  ></a-input>
+                  />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
@@ -147,10 +170,18 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV6"
-                  ></a-input>
+                  />
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
                   >
@@ -164,7 +195,9 @@
             </div>
             <div class="btnbox">
               <a-radio-group v-model:value="radioV1">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio1">仅签到</a-radio>
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >仅签到</a-radio
+                >
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >签到、签退全部完成</a-radio
                 >
@@ -231,7 +264,7 @@ export default {
       if (value != "") {
         state.radioV1 = "";
       }
-    }
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,

src/components/drawers/AddFaceteach.vue

@@ -151,18 +151,20 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>开始前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV5"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
                 <div class="timerbox">
                   <span>开始后：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV6"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
@@ -172,10 +174,11 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV7"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
                   >

src/components/drawers/AddLive.vue

@@ -194,18 +194,20 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>开始前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV6"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
                 <div class="timerbox">
                   <span>开始后：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV7"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
@@ -215,10 +217,11 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
-                  <a-input
+                  <a-input-number
-                    style="width: 88px; height: 32px"
+                    :min="0" :max="30" :precision="0"
+                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
                     :v-model:value="inputV8"
-                  ></a-input>
+                  ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
                   >

src/components/drawers/AddTest.vue

@@ -118,9 +118,10 @@
             </div>
             <div class="btnbox">
               <span style="margin-right: 8px">允许重复考试</span>
-              <a-input
+              <a-input-number
+                :min="-1" :precision="0"
                 v-model:value="inputV3"
-                style="width: 88px; height: 32px"
+                style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
               />
               <span style="margin-left: 8px">次</span>
               <span style="margin-left: 24px; color: #999999"
@@ -177,7 +178,7 @@
             </div>
             <div class="btnbox">
               <a-input
-                v-model:value="value2"
+                v-model:value="inputV4"
                 style="width: 88px; height: 32px"
               />
               <span style="margin-left: 8px">分</span>
@@ -237,6 +238,7 @@ export default {
       inputV1: "",
       inputV2: "",
       inputV3: "",
+      inputV4: "60",
       testV1: "",
       radioV1: "",
       radioV2: "",

src/components/drawers/CorPowerlist.vue

@@ -221,10 +221,12 @@
           color: #333333;
           line-height: 25px;
           margin-left: 24px;
+          background-color: #ffffff;
         }
       }
       .contentMain {
         margin-top: 32px;
+        padding-right: 20px;
         .main_items {
           display: flex;
           justify-content: space-between;

src/components/drawers/FaceManage.vue

@@ -52,7 +52,7 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" style="margin-right: 20px">
+          <div class="btn btn1" style="margin-right: 20px" @click="showopen">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>
@@ -136,6 +136,10 @@
           <button class="btn btn2" @click="check">确定</button>
         </div>
       </a-modal>
+      <div class="noticebox" v-show="open">
+        <div><img src="../../assets/images/taskpage/check.png" /></div>
+        <div class="notext">催促学员成功</div>
+      </div>
     </div>
   </a-drawer>
   <!-- 录入成绩抽屉 -->
@@ -143,7 +147,7 @@
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import EntryScores from "./EntryScores.vue";
 export default {
   name: "FaceManage",
@@ -164,6 +168,8 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
+      showdonemodal: false,
+      open: false,
       selectedRowKeys: [],
       projectNameList: [
         {
@@ -334,6 +340,12 @@ export default {
     const showEntryScore = () => {
       state.Evisible = true;
     };
+    const showdoneModal = () => {
+      state.showdonemodal = true;
+    };
+    const closedoneModal = () => {
+      state.showdonemodal = false;
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       showModal();
@@ -344,7 +356,18 @@ export default {
       // }
       // state.selectedRowKeys = selectedRowKeys;
     };
-
+    const showopen = () => {
+      state.open = true;
+    };
+    let timer;
+    onMounted(() => {
+      timer = setInterval(() => {
+        state.open = false;
+      }, 3000);
+    });
+    onUnmounted(() => {
+      clearInterval(timer);
+    });
     return {
       ...toRefs(state),
       selectProjectName,
@@ -354,6 +377,9 @@ export default {
       showModal,
       closeModal,
       showEntryScore,
+      showdoneModal,
+      closedoneModal,
+      showopen,
     };
   },
 };
@@ -372,6 +398,7 @@ export default {
 //   }
 
 // }
+
 //面授管理弹窗
 .FacMa {
   .ant-modal {
@@ -489,6 +516,23 @@ export default {
     overflow-x: scroll;
     display: flex;
     flex-direction: column;
+    .noticebox {
+      width: 240px;
+      height: 64px;
+      background: rgba(255, 255, 255, 1);
+      border-radius: 4px;
+      position: absolute;
+      top: 161px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .notext {
+        color: rgba(51, 51, 51, 1);
+        font-size: 14px;
+        font-weight: 500;
+        margin-left: 20px;
+      }
+    }
 
     .header {
       height: 73px;
@@ -606,7 +650,7 @@ export default {
           .img1 {
             width: 15px;
             height: 17px;
-            background-image: url(../../assets/images/courseManage/search0.png);
+            background-image: url(../../assets/images/basicinfo/call.png);
             background-size: 100% 100%;
             margin-right: 7px;
           }

src/components/drawers/ManageRight.vue

@@ -823,7 +823,7 @@ export default {
 <style lang="scss">
 .ManageRight {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;

src/components/drawers/Ownership.vue

@@ -778,7 +778,7 @@ export default {
 <style lang="scss">
 .Ownership {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;

src/components/drawers/PowerList.vue

@@ -456,7 +456,7 @@ export default {
   }
   .drawerMain {
     // overflow: auto;
-    min-width: 550px;
+    min-width: 500px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
@@ -467,6 +467,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       // background-color: red;
       margin-bottom: 20px;
       .headerTitle {
@@ -482,6 +483,7 @@ export default {
       // height: 100%;
       // background-color: #bfa;
       overflow-y: auto;
+      margin-bottom: 80px;
       .search {
         width: 100%;
         display: flex;
@@ -538,15 +540,15 @@ export default {
           }
 
           .btn1 {
-            background: #409EFF;
+            background: #409eff;
 
             color: #ffffff;
           }
           .btn2 {
             background: #ffffff;
 
-            color: #409EFF;
+            color: #409eff;
-            border: 1px solid #409EFF;
+            border: 1px solid #409eff;
           }
         }
       }
@@ -599,7 +601,9 @@ export default {
         // position: absolute;
         // bottom: 20px;
         // margin-bottom: 20px;
-        .ant-pagination-prev, .ant-pagination-next,.ant-pagination-options {
+        .ant-pagination-prev,
+        .ant-pagination-next,
+        .ant-pagination-options {
           margin-bottom: 10px;
         }
         .ant-pagination-item {

src/components/drawers/ProjPowerList.vue

@@ -48,7 +48,7 @@
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
             @expand="expandTable"
-            :scroll="{ x: 900, y: 400 }"
+            :scroll="{ x: 900 }"
             :pagination="false"
             :row-selection="{
               columnWidth: 30,
@@ -345,9 +345,9 @@ export default {
     }
   }
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    // overflow-x: scroll;
     display: flex;
     flex-direction: column;
     .header {
@@ -358,6 +358,7 @@ export default {
       align-items: center;
       // background-color: red;
       margin-bottom: 20px;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -370,7 +371,7 @@ export default {
       width: 100%;
       height: 100%;
       // background-color: #bfa;
-      // overflow-y: auto;
+      overflow-y: auto;
       .search {
         width: 100%;
         display: flex;
@@ -487,6 +488,12 @@ export default {
         justify-content: center;
         // position: absolute;
         // bottom: 20px;
+        .ant-pagination-item,
+        .ant-pagination-prev,
+        .ant-pagination-next,
+        .ant-pagination-options {
+          margin-bottom: 10px;
+        }
       }
       // .tab {
       //   .ant-table-thead > tr > th {

src/components/drawers/ProjectOwn.vue

@@ -1,3 +1,4 @@
+<!-- 项目的归属权 -->
 <template>
   <a-drawer
     :visible="ProjOwnervisible"
@@ -48,7 +49,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="line">
+                <!-- <div class="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -60,7 +61,7 @@
                     </div>
                     <div class="right1">清空</div>
                   </div>
-                </div>
+                </div> -->
                 <div class="tabb" style="margin-top: 16px">
                   <a-table
                     style="border: 1px solid #f2f6fe"
@@ -68,7 +69,7 @@
                     :data-source="tabledata"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 100, y: 560 }"
+                    :scroll="{ x: 500, y: 560 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
@@ -92,29 +93,36 @@
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
                 <div class="tab2">
-                  <div class="organize">组织：</div>
+                  <div class="t1">
+                    <div class="organize">选择组织：</div>
                     <div class="select">
-                    <a-cascader
+                      <a-tree-select
-                      v-model:value="value"
+                        v-model:value="valueSelect"
+                        style="width: 200px"
+                        dropdownClassName="changetreedropdown"
+                        :dropdown-style="{
+                          maxHeight: '400px',
+                          overflow: 'auto',
+                        }"
                         placeholder="请输入组织名称"
-                      :options="organizeList"
+                        allow-clear
-                    />
+                        tree-default-expand-all
-                  </div>
+                        :tree-data="treeData"
-                </div>
+                      >
-              </a-tab-pane>
+                      </a-tree-select>
-              <a-tab-pane key="3" tab="受众关联">
+                    </div>
-                <div class="tab1">
+                  </div>
-                  <div class="nameinp">
+                  <div class="t1">
-                    <div class="namee">受众名称：</div>
+                    <div class="organize">姓名：</div>
-                    <div class="select">
+                    <a-input
-                      <a-select
+                      v-model:value="nameadd"
-                        v-model:value="choosevalue"
+                      style="width: 200px; height: 40px; border-radius: 8px"
-                        style="width: 264px; border-radius: 8px"
+                      placeholder="请输入姓名"
-                        placeholder="请输入组织名称"
-                        :options="organizeList1"
                     />
                   </div>
                 </div>
+                <!-- 选完后出现下面 -->
+                <div class="searchdown">
                   <div class="btns">
                     <div class="btn1">
                       <div class="img1">
@@ -133,8 +141,75 @@
                       <div class="wz">重置</div>
                     </div>
                   </div>
+                  <div class="tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns1"
+                      :data-source="tabledata1"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500, y: 560 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys1,
+                        onChange: onSelectChange1,
+                      }"
+                    />
+                    <div class="pa">
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize1"
+                        :current="currentPage1"
+                        :total="tableDataTotal1"
+                        class="pagination"
+                      />
                     </div>
-                <div class="line">
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div class="tab1">
+                  <div class="t1">
+                    <div class="nameinp">
+                      <div class="namee">选择受众：</div>
+                      <div class="select">
+                        <a-select
+                          v-model:value="choosevalue"
+                          style="width: 200px; border-radius: 8px"
+                          placeholder="请输入组织名称"
+                          :options="organizeList1"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                  <div class="t1" style="margin-top: 10px">
+                    <div class="organize">姓名：</div>
+                    <a-input
+                      v-model:value="nameaddd"
+                      style="width: 200px; height: 40px; border-radius: 8px"
+                      placeholder="请输入姓名"
+                    />
+                  </div>
+                </div>
+                <div class="btns">
+                  <div class="btn1">
+                    <div class="img1">
+                      <img src="../../assets/images/courseManage/search0.png" />
+                    </div>
+                    <div class="wz">搜索</div>
+                  </div>
+                  <div class="btn2">
+                    <div class="img2">
+                      <img src="../../assets/images/courseManage/reset1.png" />
+                    </div>
+                    <div class="wz">重置</div>
+                  </div>
+                </div>
+                <!-- <div class="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -146,21 +221,21 @@
                     </div>
                     <div class="right1">清空</div>
                   </div>
-                </div>
+                </div> -->
                 <div class="tabb" style="margin-top: 16px">
                   <a-table
                     style="border: 1px solid #f2f6fe"
-                    :columns="tablecolumns1"
+                    :columns="tablecolumns2"
-                    :data-source="tabledata1"
+                    :data-source="tabledata2"
                     :loading="tableDataTotal === -1 ? true : false"
                     expandRowByClick="true"
-                    :scroll="{ x: 700, y: 400 }"
+                    :scroll="{ x: 500, y: 560 }"
                     @expand="expandTable"
                     :pagination="false"
                     :row-selection="{
                       columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys,
+                      selectedRowKeys: selectedRowKeys2,
-                      onChange: onSelectChange,
+                      onChange: onSelectChange2,
                     }"
                   />
                   <div class="pa">
@@ -168,9 +243,9 @@
                       showSizeChanger="true"
                       showQuickJumper="true"
                       hideOnSinglePage="true"
-                      :pageSize="pageSize"
+                      :pageSize="pageSize2"
-                      :current="currentPage"
+                      :current="currentPage2"
-                      :total="tableDataTotal"
+                      :total="tableDataTotal2"
                       class="pagination"
                     />
                   </div>
@@ -181,7 +256,11 @@
         </div>
         <div class="right">
           <div class="onerow">
+            <div class="onleft">
               <div class="already">已选</div>
+              <div class="count">6</div>
+              <div class="peo">人</div>
+            </div>
             <div class="clbox">
               <div class="colose"></div>
               <span class="allclear">全部清除</span>
@@ -238,47 +317,116 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
+      pageSize1: 10,
+      currentPage1: 1,
+      tableDataTotal1: 50,
+      pageSize2: 10,
+      currentPage2: 1,
+      tableDataTotal2: 50,
+      selectedRowKeys: [],
+      selectedRowKeys1: [],
+      selectedRowKeys2: [],
       activeKey: "1",
-      name: "", //输入名字搜索
       value: [], //级联选择框
       choosevalue: null, //受众选择
-      organizeList: [
+      valueSelect: null, //树形选择
+      name: "",
+      nameadd: "",
+      nameaddd: "",
+      treeData: [
         {
-          id: 1,
+          title: "京东方",
           value: "京东方",
-          label: "京东方",
           children: [
             {
-              id: 2,
+              title: "产研部",
               value: "产研部",
-              label: "产研部",
               children: [
                 {
-                  id: 4,
+                  title: "产品部",
-                  value: "产品部门",
+                  value: "产品部",
-                  label: "产品部门",
                 },
                 {
-                  id: 5,
+                  title: "研究部",
-                  value: "研发部门",
+                  value: "研究部",
-                  label: "研发部门",
                 },
               ],
             },
             {
-              id: 3,
+              title: "二级标题",
-              value: "人力资源部",
+              value: "二级标题",
-              label: "人力资源部",
               children: [
                 {
-                  id: 6,
+                  title: "三级标题",
-                  value: "人事部",
+                  value: "三级标题",
-                  label: "人事部",
+                  children: [
+                    {
+                      title: "四级标题",
+                      value: "四级标题",
+                      children: [
+                        {
+                          title: "五级标题",
+                          value: "五级标题",
+                          children: [
+                            {
+                              title: "六级标题",
+                              value: "六级标题",
+                              children: [
+                                {
+                                  title: "七级标题",
+                                  value: "七级标题",
+                                  children: [
+                                    {
+                                      title: "八级标题",
+                                      value: "八级标题",
+                                      children: [
+                                        {
+                                          title: "九级标题",
+                                          value: "九级标题",
+                                          children: [
+                                            {
+                                              title: "十级标题",
+                                              value: "十级标题",
+                                              children: [
+                                                {
+                                                  title: "十一级标题",
+                                                  value: "十一级标题",
+                                                  children: [
+                                                    {
+                                                      title: "十二级标题",
+                                                      value: "十二级标题",
+                                                    },
+                                                  ],
+                                                },
+                                              ],
+                                            },
+                                          ],
+                                        },
+                                      ],
+                                    },
+                                  ],
+                                },
+                              ],
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
             },
             {
-                  id: 7,
+              title: "人力资源部",
+              value: "人力资源部",
+              children: [
+                {
+                  title: "人事部",
+                  value: "人事部",
+                },
+                {
+                  title: "行政部",
                   value: "行政部",
-                  label: "行政部",
                 },
               ],
             },
@@ -290,55 +438,64 @@ export default {
           key: 1,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 2,
           name: "小刘",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 3,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 4,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 5,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 6,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 7,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 8,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
         {
           key: 9,
           name: "小李",
           bum: "产研部",
-          gangw: "产品经理",
+          numb: "000000",
+          guishu: "",
         },
       ],
       tablecolumns: [
@@ -351,18 +508,26 @@ export default {
           className: "h",
         },
         {
-          title: "部门",
+          title: "工号",
-          dataIndex: "bum",
+          dataIndex: "numb",
-          key: "bum",
+          key: "numb",
-          width: 45,
+          width: 35,
           align: "center",
           className: "h",
         },
         {
-          title: "岗位",
+          title: "归属组织",
-          dataIndex: "gangw",
+          dataIndex: "guishu",
-          key: "gangw",
+          key: "guishu",
-          width: 45,
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          width: 40,
           align: "center",
           className: "h",
         },
@@ -370,56 +535,71 @@ export default {
       tabledata1: [
         {
           key: 1,
-          name: "学习受众",
+          name: "小李",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "1",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
         },
         {
           key: 2,
-          name: "2",
+          name: "小刘",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "2",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
         },
         {
           key: 3,
-          name: "mask",
+          name: "小李",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "1",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
         },
         {
           key: 4,
-          name: "学习受众",
+          name: "小李",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "1",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
         },
         {
           key: 5,
-          name: "学业受众",
+          name: "小李",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "2",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
         },
         {
           key: 6,
-          name: "案例受众",
+          name: "小李",
-          time: "2022-10-31 23:12:00",
+          bum: "产研部",
-          total: "3",
+          numb: "000000",
-          state: "已发布",
+          guishu: "",
-          type: "普通受众",
+        },
+        {
+          key: 7,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 8,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 9,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
         },
       ],
       tablecolumns1: [
         {
-          title: "受众名称",
+          title: "姓名",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -427,57 +607,168 @@ export default {
           className: "h",
         },
         {
-          title: "创建时间",
+          title: "工号",
-          dataIndex: "time",
+          dataIndex: "numb",
-          key: "time",
+          key: "numb",
+          width: 35,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "guishu",
+          key: "guishu",
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
           width: 40,
           align: "center",
           className: "h",
         },
+      ],
+      tabledata2: [
         {
-          title: "人数",
+          key: 1,
-          dataIndex: "total",
+          name: "小李",
-          key: "total",
+          bum: "产研部",
-          width: 20,
+          numb: "000000",
-          align: "center",
+          guishu: "",
-          className: "h",
         },
         {
-          title: "状态",
+          key: 2,
-          dataIndex: "state",
+          name: "小刘",
-          key: "state",
+          bum: "产研部",
-          width: 20,
+          numb: "000000",
-          align: "center",
+          guishu: "",
-          className: "h",
         },
         {
-          title: "类型",
+          key: 3,
-          dataIndex: "type",
+          name: "小李",
-          key: "type",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 4,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 5,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 6,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 7,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 8,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+        {
+          key: 9,
+          name: "小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "",
+        },
+      ],
+      tablecolumns2: [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          key: "name",
           width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "工号",
+          dataIndex: "numb",
+          key: "numb",
+          width: 35,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "guishu",
+          key: "guishu",
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          width: 40,
           align: "center",
           className: "h",
         },
       ],
       organizeList1: [
         {
-          value: "项目一",
+          value: "产品受众群体",
-          label: "项目一",
+          label: "产品受众群体",
+        },
+        {
+          value: "人力资源hrbp",
+          label: "人力资源hrbp",
         },
       ],
     });
     const closeDrawer = () => {
+      state.activeKey = "1";
       ctx.emit("update:ProjOwnervisible", false);
     };
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+    const onSelectChange = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+    };
+    const onSelectChange1 = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+    };
+    const onSelectChange2 = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+    };
 
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
+      onSelectChange,
+      onSelectChange1,
+      onSelectChange2,
       // change,
     };
   },
@@ -486,25 +777,18 @@ export default {
 
 <style lang="scss">
 .ProjOwnership {
-  // .ant-drawer-content-wrapper {
-  //   // max-width: 1000px;
-  //   .ant-drawer-header {
-  //     display: none !important;
-  //   }
-  //   .ant-drawer-body {
-  //     padding: 0;
-  //   }
-  // }
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    // overflow-y: scroll;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
       display: flex;
+      flex-shrink: 0;
       justify-content: space-between;
       align-items: center;
       // background-color: red;
@@ -519,11 +803,12 @@ export default {
     }
     .main {
       display: flex;
-      height: 80%;
+      // height: 80%;
+      margin-bottom: 72px;
+      overflow-y: auto;
       .left {
-        // overflow-y: auto;
         width: 65%;
-        height: 100%;
+        // height: 100%;
         border-right: 1px solid rgba(233, 233, 233, 1);
         .tabs {
           margin-right: 33px;
@@ -531,6 +816,12 @@ export default {
             display: flex;
             flex-wrap: wrap;
             justify-content: space-between;
+            align-items: center;
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
             .nameinp {
               display: flex;
               align-items: center;
@@ -578,6 +869,43 @@ export default {
               }
             }
           }
+          .btns {
+            display: flex;
+            margin-top: 10px;
+            .btn1 {
+              width: 100px;
+              height: 40px;
+              margin-right: 16px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #ffffff;
+              font-size: 14px;
+              background: #409eff;
+              border-radius: 8px;
+              border: 1px solid #409eff;
+              cursor: pointer;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+            .btn2 {
+              width: 100px;
+              height: 40px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #409eff;
+              font-size: 14px;
+              background: #ffffff;
+              border-radius: 8px;
+              cursor: pointer;
+              border: 1px solid #409eff;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+          }
           .line {
             width: 100%;
             height: 40px;
@@ -672,18 +1000,39 @@ export default {
               justify-content: center;
               // position: absolute;
               // bottom: 20px;
+              .ant-pagination-item,
+              .ant-pagination-prev,
+              .ant-pagination-next,
+              .ant-pagination-options {
+                margin-bottom: 10px;
               }
             }
+          }
+
           .tab2 {
             display: flex;
             align-items: center;
             margin-top: 10px;
+            flex-wrap: wrap;
+            justify-content: space-between;
+
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
             .organize {
               color: rgba(0, 0, 0, 0.85);
               font-size: 14px;
+              white-space: nowrap;
+            }
+
+            .ant-select-dropdown {
+              min-width: 800px !important;
             }
             .ant-select {
               border-radius: 8px !important;
+              // background-color: red;
             }
             .ant-cascader {
               width: 264px;
@@ -697,6 +1046,46 @@ export default {
               }
             }
           }
+
+          .searchdown {
+            .btns {
+              display: flex;
+              margin-top: 10px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+          }
         }
       }
       .right {
@@ -707,6 +1096,9 @@ export default {
           align-items: center;
           margin-right: 40px;
           flex-wrap: wrap;
+          .onleft {
+            display: flex;
+            text-align: center;
             .already {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
@@ -715,6 +1107,17 @@ export default {
               white-space: nowrap;
               // margin-bottom: 20px;
             }
+            .count {
+              color: #388be1;
+              font-size: 16px;
+              margin: 0 6px;
+            }
+            .peo {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+            }
+          }
           .clbox {
             margin-left: 30px;
             display: flex;
@@ -765,7 +1168,6 @@ export default {
               background-image: url(../../assets/images/basicinfo/ch.png);
               right: -8px;
               top: -8px;
-              cursor: pointer;
             }
           }
         }
@@ -775,6 +1177,7 @@ export default {
       height: 72px;
       width: 100%;
       position: absolute;
+      background-color: #fff;
       bottom: 0;
       left: 0;
       display: flex;
@@ -803,4 +1206,14 @@ export default {
     }
   }
 }
+.changetreedropdown {
+  width: 550px !important;
+}
+
+.ant-select-tree-list-scrollbar {
+  width: 5px !important;
+  .ant-select-tree-list-scrollbar-thumb {
+    background-color: #4ea6ff !important;
+  }
+}
 </style>

src/components/drawers/QueryRight.vue

@@ -778,7 +778,7 @@ export default {
 <style lang="scss">
 .QueryRight {
   .drawerMain {
-    min-width: 600px;
+    min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-y: scroll;
     display: flex;

src/components/drawers/WorkManage.vue

@@ -97,6 +97,7 @@
         :closable="close"
         :footer="null"
         wrapClassName="WorkManage"
+        centered="true"
       >
         <div class="header">
           <div class="inheader">

src/views/courselibrary/CoursewareManage.vue

@@ -1692,12 +1692,27 @@
       style="margin-top: 400px"
       @cancel="delete_exit"
     >
-      <div class="delete" :style="{ display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none' }">
+      <div
+        class="delete"
+        :style="{
+          display: delete_hs || copy_hs || nouse_hs ? 'block' : 'none',
+        }"
+      >
         <div class="del_header"></div>
         <div class="del_main">
           <div class="header">
-            <div class="del-icon" :style="{ display: del_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/notice.png" alt=""></div>
+            <div
-            <div class="del-icon" :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/QR.png" alt=""></div>
+              class="del-icon"
+              :style="{ display: del_hs ? 'block' : 'none' }"
+            >
+              <img src="@/assets/images/coursewareManage/notice.png" alt="" />
+            </div>
+            <div
+              class="del-icon"
+              :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
+            >
+              <img src="@/assets/images/coursewareManage/QR.png" alt="" />
+            </div>
             <span>提示</span>
             <div class="close_exit" @click="delete_exit"></div>
           </div>
@@ -2998,11 +3013,15 @@ export default defineComponent({
                 {value.status === "已拒绝" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <div class="jc"
+                      <div
+                        class="jc"
                         onClick={() => {
                           state.delete_hs = true;
                           state.del_hs = true;
-                        }}>删除</div>
+                        }}
+                      >
+                        删除
+                      </div>
                     </div>
                   </div>
                 ) : (
@@ -3414,7 +3433,7 @@ export default defineComponent({
         }
       }
       .tableSelect {
-        margin-right: 10px;
+        // margin-right: 10px;
         margin-left: -5px;
         display: flex;
         align-items: center;
@@ -4835,7 +4854,7 @@ export default defineComponent({
                   }
                 }
                 .tableSelect {
-                  margin-right: 10px;
+                  // margin-right: 10px;
                   margin-left: -5px;
                   display: flex;
                   align-items: center;

src/views/learningpath/LevelAdd.vue

@@ -423,6 +423,10 @@
                         @click="
                           item.course === '面授'
                             ? showCopyModal(item.course)
+                            : item.course === '直播'
+                            ? showzhibModal(item.course)
+                            : item.course === '活动'
+                            ? showhuodModal(item.course)
                             : null
                         "
                       >
@@ -541,7 +545,8 @@
                 </div>
               </div>
             </div>
-            <div class="pad"></div></div>
+            <div class="pad"></div>
+          </div>
         </a-tab-pane>
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
@@ -552,7 +557,9 @@
                 <div class="headone">
                   <div class="box"></div>
                   <div class="onetitle">关卡内容可见可学设置</div>
-                  <div class="oneedi" @click="showbtn" v-show="twobtn">编辑</div>
+                  <div class="oneedi" @click="showbtn" v-show="twobtn">
+                    编辑
+                  </div>
                   <div v-show="twobtnn" class="twobtn">
                     <div class="btnone" @click="closebtn">取消</div>
                     <div class="btntwo" @click="closebtn">确定</div>
@@ -568,17 +575,27 @@
                     />
                     <span class="yulan">预览其他关卡</span><br />
                     <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex;align-items: center;">
+                    <div style="display: flex; align-items: center">
-                        <span class="yulan2">学员可预览第</span
+                      <span class="yulan2">学员可预览第</span>
-                          >
                       <span style="color: #4ea6ff" v-show="number">1</span>
-                            <a-input-number v-model:value="nubvalue" v-show="inputbox" :controls="false" :autofocus="true" :min="1" />
+                      <a-input-number
+                        v-model:value="nubvalue"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
                       <span>关-第</span
                       ><span style="color: #4ea6ff" v-show="number">4</span>
-                            <a-input-number v-model:value="nubvalue1" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
+                      <a-input-number
+                        v-model:value="nubvalue1"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
                       <span>关内容</span>
                     </div>
-                    
                   </div>
                   <div class="checkcon" style="margin-top: 20px">
                     <input
@@ -589,14 +606,25 @@
                     />
                     <span class="yulan">学习其他关卡</span><br />
                     <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex;align-items: center;">
+                    <div style="display: flex; align-items: center">
-                        <span class="yulan2">学员可预览第</span
+                      <span class="yulan2">学员可预览第</span>
-                          >
                       <span style="color: #4ea6ff" v-show="number">1</span>
-                            <a-input-number v-model:value="nubvalue2" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
+                      <a-input-number
+                        v-model:value="nubvalue2"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
                       <span>关-第</span
                       ><span style="color: #4ea6ff" v-show="number">4</span>
-                            <a-input-number v-model:value="nubvalue3" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
+                      <a-input-number
+                        v-model:value="nubvalue3"
+                        v-show="inputbox"
+                        :controls="false"
+                        :autofocus="true"
+                        :min="1"
+                      />
                       <span>关内容</span>
                     </div>
                   </div>
@@ -779,6 +807,62 @@
           </div>
         </div>
       </a-modal>
+      <!-- 直播管理二维码 -->
+      <a-modal
+        v-model:visible="zhibModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="facemanageModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>直播管理</span>
+              <div class="close_exit" @click="closezhibModal"></div>
+            </div>
+            <div class="body">
+              <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+            </div>
+            <div class="footerr">
+              <div class="onload">下载二维码</div>
+              <div class="onloadpx">200*200</div>
+              <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <!-- 活动管理二维码 -->
+      <a-modal
+        v-model:visible="huodModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="facemanageModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>活动管理</span>
+              <div class="close_exit" @click="closehuodModal"></div>
+            </div>
+            <div class="body">
+              <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+            </div>
+            <div class="footerr">
+              <div class="onload">下载二维码</div>
+              <div class="onloadpx">200*200</div>
+              <div class="onloadpx">400*400</div>
+              <div class="onloadpx">800*800</div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
       <!-- 添加学员抽屉 -->
       <add-stu v-model:AddSvisible="AddSvisible" />
       <!-- 导入学员抽屉 -->
@@ -838,6 +922,8 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      huodModal: false,
+      zhibModal: false,
       projectNameListt: [
         {
           id: 1,
@@ -1293,13 +1379,13 @@ export default {
       state.twobtnn = true;
       state.number = false;
       state.inputbox = true;
-    }
+    };
     const closebtn = () => {
       state.twobtnn = false;
       state.twobtn = true;
       state.number = true;
       state.inputbox = false;
-    }
+    };
     const showCopyModal = () => {
       state.copyModal = true;
     };
@@ -1336,6 +1422,18 @@ export default {
     const showWork = () => {
       state.Wvisible = true;
     };
+    const showzhibModal = () => {
+      state.zhibModal = true;
+    };
+    const showhuodModal = () => {
+      state.huodModal = true;
+    };
+    const closezhibModal = () => {
+      state.zhibModal = false;
+    };
+    const closehuodModal = () => {
+      state.huodModal = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1361,6 +1459,10 @@ export default {
       showTest,
       showFace,
       showWork,
+      showzhibModal,
+      showhuodModal,
+      closehuodModal,
+      closezhibModal,
     };
   },
 };
@@ -2819,9 +2921,9 @@ export default {
               height: 24px;
               border: 1px solid rgba(64, 158, 255, 1);
               border-radius: 4px;
-              color: #FFFFFF;
+              color: #ffffff;
               margin-left: 20px;
-              background: #409EFF;
+              background: #409eff;
               cursor: pointer;
             }
           }
@@ -2852,13 +2954,13 @@ export default {
               width: 24px;
               margin: 10px;
               border-radius: 4px;
-              border: 1px solid #6D7584;
+              border: 1px solid #6d7584;
               .ant-input-number-input {
                 width: 100%;
                 height: 100%;
                 font-size: 14px;
                 padding: 0;
-                color: #409EFF;
+                color: #409eff;
                 text-align: center;
               }
             }

src/views/learningpath/LevelAddDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="allCon">
+  <div class="leveladddetail">
     <div class="left clearfix">
       <div class="leftmain">
         <div class="tit" style="margin-left: 18px">关卡</div>
@@ -319,7 +319,7 @@
             </div>
             <div class="drawerbox">
               <a-table
-                :columns="drawercolumns"
+                :columns="drawertableColumns()"
                 :data-source="drawertableData"
                 :loading="tableDataTotal === -1 ? true : false"
                 :scroll="{ x: 700 }"
@@ -374,9 +374,11 @@
                 <button class="addx" @click="showAddStu">添加学员</button>
                 <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
                 <button class="addd" @click="showImpStu">导入学员</button>
-                <button class="addd"  @click="showDeleteALLModal">批量删除</button>
+                <button class="addd" @click="showDeleteALLModal">
+                  批量删除
+                </button>
               </div>
-              <div class="talk">
+              <!-- <div class="talk">
                 <img class="im" src="../../assets/images/leveladd/gan.png" />
                 <div class="xu">
                   <span class="yi">已选择</span>
@@ -388,12 +390,11 @@
                   <span class="yi">5</span>
                   <span class="yi">条</span>
                 </div>
-              </div>
+              </div> -->
-              <div class="tableBox" style="margin-top: 30px">
+              <div class="tableBox" style="margin-top: 20px">
                 <a-table
                   style="border: 1px solid #f2f6fe"
                   :columns="tableDataFunc2()"
-                  :scroll="{ y: 235 }"
                   :data-source="tableData2"
                   :loading="tableDataTotal === -1 ? true : false"
                   expandRowByClick="true"
@@ -405,7 +406,7 @@
                     onChange: onSelectChange,
                   }"
                 />
-                <div class="pa">
+                <!-- <div class="pa">
                   <a-pagination
                     showSizeChanger="true"
                     showQuickJumper="true"
@@ -415,7 +416,7 @@
                     :total="tableDataTotal"
                     class="pagination"
                   />
-                </div>
+                </div> -->
                 <!-- 无数据样式 -->
                 <div
                   class="notable"
@@ -496,44 +497,6 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-const drawercolumns = [
-  {
-    title: "项目名称",
-    dataIndex: "projectName",
-    key: "projectName",
-    width: 200,
-    // align: "center",
-    ellipsis: true,
-    // scopedSlots: { customRender: "action" }, //引入的插槽
-    // customRender: (text, record) => {
-    //   console.log(text, record);
-    //   return <span>{text.text}</span>;
-    // },
-  },
-  {
-    title: "项目经理",
-    dataIndex: "manager",
-    key: "manager",
-    width: 100,
-    align: "center",
-  },
-
-  {
-    title: "创建人",
-    dataIndex: "creater",
-    // width: "30%",
-    key: "creater",
-    width: 100,
-    align: "center",
-  },
-  {
-    title: "创建时间",
-    dataIndex: "time",
-    key: "time",
-    width: 180,
-    align: "center",
-  },
-];
 export default {
   name: "LevelAddDetail",
   components: {
@@ -737,7 +700,6 @@ export default {
               key: "1-1",
               projectName: "管理者进阶-腾飞班",
               manager: "黄华  刘俊",
-
               creater: "毛继禹",
               time: "2022-07-20 14:00:03",
               children: [
@@ -836,6 +798,8 @@ export default {
       selectedRowKeys: [],
       isActive: false,
       gqxy_hs: true,
+
+      projectChecked: null, //项目单选框
     });
     const showDrawer = () => {
       state.visible = true;
@@ -1067,6 +1031,82 @@ export default {
       state.selectedRowKeys = selectedRowKeys;
     };
 
+    const drawertableColumns = () => {
+      // let arr = state.drawertableData;
+      // function traverse(arr) {
+      //   for (var a in arr) {
+      //     // console.log(arr[a]);
+      //     if (arr[a].children) {
+      //       traverse(arr[a].children); //递归遍历
+      //     } else {
+      // 			console.log(arr[a].children); //如果是值就显示
+
+      //     }
+      //   }
+      // }
+      // traverse(arr);
+      const drawercolumns = [
+        {
+          title: "项目名称",
+          dataIndex: "projectName",
+          key: "projectName",
+          width: 200,
+          // align: "center",
+          ellipsis: true,
+          // scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.key);
+            if (!text.record.children) {
+              return (
+                <div style={{ display: "flex" }}>
+                  <a-checkbox
+                    checked={
+                      state.projectChecked === text.record.key ? true : false
+                    }
+                    value={text.record.key}
+                    onChange={() => {
+                      // console.log("改变了", text.record.key);
+                      if (state.projectChecked === text.record.key) {
+                        state.projectChecked = null;
+                      } else {
+                        state.projectChecked = text.record.key;
+                      }
+                    }}
+                  ></a-checkbox>
+                  <span style="margin-left: 5px">{text.text}</span>
+                </div>
+              );
+            } else {
+              return <span>{text.text}</span>;
+            }
+          },
+        },
+        {
+          title: "项目经理",
+          dataIndex: "manager",
+          key: "manager",
+          width: 100,
+          align: "center",
+        },
+
+        {
+          title: "创建人",
+          dataIndex: "creater",
+          // width: "30%",
+          key: "creater",
+          width: 100,
+          align: "center",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: 180,
+          align: "center",
+        },
+      ];
+      return drawercolumns;
+    };
     // const getClientHeight = () => {
     //   state.rightheight =
     //     document.getElementsByClassName("addhead")[0].offsetHeight +
@@ -1096,8 +1136,8 @@ export default {
       state.deleteAll = true;
     };
     const delete_exit = () => {
-      state.deleteAll = false
+      state.deleteAll = false;
-    }
+    };
     return {
       ...toRefs(state),
       tableDataFunc,
@@ -1109,12 +1149,13 @@ export default {
       afterVisibleChange,
       showAddStu,
       showImpStu,
-      drawercolumns,
+      // drawercolumns,
       onSelectChange,
       changebgc,
       gqxy_hShow,
       showDeleteALLModal,
       delete_exit,
+      drawertableColumns,
     };
   },
 };
@@ -1342,7 +1383,7 @@ export default {
     }
   }
 }
-.allCon {
+.leveladddetail {
   width: 100%;
   display: flex;
   min-width: 933px;
@@ -1681,7 +1722,7 @@ export default {
         }
         .tableBox {
           margin-top: 21px;
-          margin-bottom: 80px;
+          margin-bottom: 20px;
           .classify {
             margin-left: 10px !important;
             padding-left: 9px !important;
@@ -1786,8 +1827,7 @@ export default {
               }
             }
             .tableBox {
-              margin-bottom: 80px;
+              margin-block-end: 20px;
-
               .classify {
                 margin-left: 11px !important;
                 padding-left: 9px !important;

src/views/projectcenter/ProjectManage.vue

@@ -672,12 +672,18 @@
     <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
     <!-- 授权名单抽屉 -->
     <proj-power-list v-model:ProjPvisible="ProjPvisible" />
+    <!-- 查看权抽屉 -->
+    <proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
+    <!-- 管理权抽屉 -->
+    <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
   </div>
 </template>
 <script>
 import { reactive, toRefs, onMounted } from "vue";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
+import ProjCheckShip from "../../components/drawers/ProjCheckPower";
+import ProjManageShip from "../../components/drawers/ProjManagePower";
 const columns = [
   {
     title: "项目名称",
@@ -734,7 +740,7 @@ const columns = [
 
 export default {
   name: "projectManage",
-  components: { ProjOwnerShip, ProjPowerList },
+  components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip },
   setup() {
     const state = reactive({
       projectNameList: [
@@ -1027,6 +1033,8 @@ export default {
       closeBack: false, //撤回弹窗关闭图标
       ProjOwnervisible: false,
       ProjPvisible: false,
+      ProjCheckvisible: false,
+      ProjManagevisible: false,
     });
 
     onMounted(() => {
@@ -1076,10 +1084,23 @@ export default {
                       </div>
                     </a-select-option>
                     <a-select-option value="查看权" label="查看权">
-                      <div>查看权</div>
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
                     </a-select-option>
                     <a-select-option value="管理权" label="管理权">
-                      <div>管理权</div>
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
                     </a-select-option>
                   </a-select>
                 </div>
@@ -1144,10 +1165,23 @@ export default {
                       </div>
                     </a-select-option>
                     <a-select-option value="查看权" label="查看权">
-                      <div>查看权</div>
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
                     </a-select-option>
                     <a-select-option value="管理权" label="管理权">
-                      <div>管理权</div>
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
                     </a-select-option>
                   </a-select>
                 </div>
@@ -1191,10 +1225,23 @@ export default {
                       </div>
                     </a-select-option>
                     <a-select-option value="查看权" label="查看权">
-                      <div>查看权</div>
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
                     </a-select-option>
                     <a-select-option value="管理权" label="管理权">
-                      <div>管理权</div>
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
                     </a-select-option>
                   </a-select>
                 </div>
@@ -1253,10 +1300,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -1321,10 +1381,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -1371,10 +1444,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -1432,10 +1518,23 @@ export default {
                             </div>
                           </a-select-option>
                           <a-select-option value="查看权" label="查看权">
-                            <div>查看权</div>
+                            <div
+                              onClick={() => {
+                                console.log("点击了111");
+                                showProjCheck();
+                              }}
+                            >
+                              查看权
+                            </div>
                           </a-select-option>
                           <a-select-option value="管理权" label="管理权">
-                            <div>管理权</div>
+                            <div
+                              onClick={() => {
+                                showProjManage();
+                              }}
+                            >
+                              管理权
+                            </div>
                           </a-select-option>
                         </a-select>
                       </div>
@@ -1510,10 +1609,23 @@ export default {
                             </div>
                           </a-select-option>
                           <a-select-option value="查看权" label="查看权">
-                            <div>查看权</div>
+                            <div
+                              onClick={() => {
+                                console.log("点击了111");
+                                showProjCheck();
+                              }}
+                            >
+                              查看权
+                            </div>
                           </a-select-option>
                           <a-select-option value="管理权" label="管理权">
-                            <div>管理权</div>
+                            <div
+                              onClick={() => {
+                                showProjManage();
+                              }}
+                            >
+                              管理权
+                            </div>
                           </a-select-option>
                         </a-select>
                       </div>
@@ -1595,10 +1707,23 @@ export default {
                             </div>
                           </a-select-option>
                           <a-select-option value="查看权" label="查看权">
-                            <div>查看权</div>
+                            <div
+                              onClick={() => {
+                                console.log("点击了111");
+                                showProjCheck();
+                              }}
+                            >
+                              查看权
+                            </div>
                           </a-select-option>
                           <a-select-option value="管理权" label="管理权">
-                            <div>管理权</div>
+                            <div
+                              onClick={() => {
+                                showProjManage();
+                              }}
+                            >
+                              管理权
+                            </div>
                           </a-select-option>
                         </a-select>
                       </div>
@@ -1679,10 +1804,23 @@ export default {
                             </div>
                           </a-select-option>
                           <a-select-option value="查看权" label="查看权">
-                            <div>查看权</div>
+                            <div
+                              onClick={() => {
+                                console.log("点击了111");
+                                showProjCheck();
+                              }}
+                            >
+                              查看权
+                            </div>
                           </a-select-option>
                           <a-select-option value="管理权" label="管理权">
-                            <div>管理权</div>
+                            <div
+                              onClick={() => {
+                                showProjManage();
+                              }}
+                            >
+                              管理权
+                            </div>
                           </a-select-option>
                         </a-select>
                       </div>
@@ -1771,10 +1909,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -1849,10 +2000,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -1934,10 +2098,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -2019,10 +2196,23 @@ export default {
                           </div>
                         </a-select-option>
                         <a-select-option value="查看权" label="查看权">
-                          <div>查看权</div>
+                          <div
+                            onClick={() => {
+                              console.log("点击了111");
+                              showProjCheck();
+                            }}
+                          >
+                            查看权
+                          </div>
                         </a-select-option>
                         <a-select-option value="管理权" label="管理权">
-                          <div>管理权</div>
+                          <div
+                            onClick={() => {
+                              showProjManage();
+                            }}
+                          >
+                            管理权
+                          </div>
                         </a-select-option>
                       </a-select>
                     </div>
@@ -2115,10 +2305,23 @@ export default {
                     </div>
                   </a-select-option>
                   <a-select-option value="查看权" label="查看权">
-                    <div>查看权</div>
+                    <div
+                      onClick={() => {
+                        console.log("点击了111");
+                        showProjCheck();
+                      }}
+                    >
+                      查看权
+                    </div>
                   </a-select-option>
                   <a-select-option value="管理权" label="管理权">
-                    <div>管理权</div>
+                    <div
+                      onClick={() => {
+                        showProjManage();
+                      }}
+                    >
+                      管理权
+                    </div>
                   </a-select-option>
                 </a-select>
               </div>
@@ -2319,6 +2522,12 @@ export default {
     const showProjPrower = () => {
       state.ProjPvisible = true;
     };
+    const showProjCheck = () => {
+      state.ProjCheckvisible = true;
+    };
+    const showProjManage = () => {
+      state.ProjManagevisible = true;
+    };
     return {
       ...toRefs(state),
       columns,
@@ -2345,6 +2554,8 @@ export default {
       getTableDate,
       showProjOwner,
       showProjPrower,
+      showProjCheck,
+      showProjManage,
     };
   },
 };

src/views/projectcenter/TaskAdd.vue

@@ -253,7 +253,7 @@
             </div>
           </div>
           <!-- 无数据样式 -->
-          <div class="notable" style="display:none;">
+          <div class="notable" style="display: none">
             <div class="notablebox">
               <div class="boxbody">
                 <div class="boximg"></div>
@@ -269,7 +269,7 @@
             </div>
           </div>
           <div class="rwbox">
-            <div class="talk">
+            <!-- <div class="talk">
               <img class="im" src="../../assets/images/leveladd/gan.png" />
               <div class="xu">
                 <span class="yi">已选择</span>
@@ -281,7 +281,7 @@
                 <span class="yi">5</span>
                 <span class="yi">条</span>
               </div>
-            </div>
+            </div> -->
             <div class="tableBox">
               <a-table
                 style="border: 1px solid #f2f6fe"
@@ -298,7 +298,7 @@
                 }"
               />
 
-              <div class="pa">
+              <!-- <div class="pa">
                 <a-pagination
                   showSizeChanger="true"
                   showQuickJumper="true"
@@ -308,7 +308,7 @@
                   :total="tableDataTotal"
                   class="pagination"
                 />
-              </div>
+              </div> -->
             </div>
           </div>
 
@@ -1860,7 +1860,8 @@ export default {
             }
           }
           .tableBox {
-            padding-bottom: 80px;
+            padding-bottom: 20px;
+            margin-top: 20px;
             .classify {
               margin-left: 10px !important;
               padding-left: 9px !important;

src/views/projectcenter/TaskPage.vue

@@ -3771,7 +3771,7 @@ export default {
           }
         }
         .tableSelect {
-          margin-right: 10px;
+          // margin-right: 10px;
           margin-left: -5px;
           display: flex;
           align-items: center;

src/views/research/ResearchAdd.vue

@@ -144,7 +144,7 @@
             @change="minChange"
           />
         </div>
-        <div class="namebox" style="margin-left: -180px">
+        <div class="namebox">
           <div class="inname">最高分</div>
         </div>
         <div class="in numberInp">

src/views/research/ResearchManage.vue

@@ -87,6 +87,7 @@
       :footer="null"
       :closable="false"
       style="margin-top: 250px"
+      :centered="center"
     >
       <div class="out">
         <div class="top">
@@ -101,12 +102,6 @@
         </div>
         <div class="mid clearfix">
           <div class="name">
-            <div class="d" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
             <div class="inname">调研名称</div>
             <div class="in">
               <a-input
@@ -477,7 +472,6 @@ export default {
   //display: flex;
   display: block;
   position: absolute;
-  top: 120px;
   width: 680px;
   // height: 525px;
   background-color: #fff;