feat:合并

.env.boe

@@ -7,9 +7,9 @@ VUE_APP_LOGIN_URL=//u-pre.boe.com/web
 VUE_APP_BOE_API_URL=//u-pre.boe.com
 
 # 导入学员模板
-VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx
+VUE_APP_UP_LOAD_STUDENT_TEMPLATE=coursefile/导入学员模版-1677140876274.xlsx 
 # 外部考试导入成绩模板
-VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx
+VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=coursefile/外部考试学员成绩导入模板-1677055614438.xlsx
 #在线
 VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id=

src/components/NavLeft.vue

@@ -191,6 +191,33 @@
                 circle: selectedKeys[0]!=='sub6-1',
               }"
             ></span>
+            <router-link to="/OldSystemManage">旧版管理员界面</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub6-2">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub6-2',
+                circle: selectedKeys[0]!=='sub6-2',
+              }"
+            ></span>
+            <router-link to="/ReadingClubManage">业务支援读书会管理</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub6-3">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub6-3',
+                circle: selectedKeys[0]!=='sub6-3',
+              }"
+            ></span>
+            <router-link to="/AudienceManage">受众管理</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub6-4">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub6-4',
+                circle: selectedKeys[0]!=='sub6-4',
+              }"
+            ></span>
             <router-link to="/dictmanage">字典管理</router-link>
           </a-menu-item>
         </a-sub-menu>

src/components/drawers/ActiveAttendance.vue

@@ -1,28 +1,20 @@
 <template>
-  <a-drawer
+  <a-drawer :visible="AAvisible" class="largeDrawerStyle" placement="right" width="80%"
-    :visible="AAvisible"
+    @after-visible-change="afterVisibleChange">
-    class="largeDrawerStyle"
-    placement="right"
-    width="80%"
-    @after-visible-change="afterVisibleChange"
-  >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【{{ datasource.type==6?"直播":"活动" }}】考勤</div>
+        <div class="headerTitle">【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤1</div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
       </div>
       <div class="centermain">
         <div class="titl">
           <div class="endtime">
             起止时间：{{
-              datasource && datasource.startTime ? datasource.startTime : "-"
+              datasource.info && datasource.info.liveStartTime ? datasource.info.liveStartTime : "-"
             }}
             ～
-            {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
+            {{ datasource.info && datasource.info.liveEndTime ? datasource.info.liveEndTime : "-" }}
           </div>
 
           <div class="endtime" style="margin-left: 64px">签到时间：{{ beginTime }}</div>
@@ -33,12 +25,8 @@
           <div class="leftchoose">
             <div class="namecon" style="margin-right: 30px">
               <div class="name">姓名：</div>
-              <a-input
+              <a-input v-model:value="name" style="width: 270px; height: 40px; border-radius: 8px" placeholder="请输入姓名"
-                v-model:value="name"
+                maxlength="20" />
-                style="width: 270px; height: 40px; border-radius: 8px"
-                placeholder="请输入姓名"
-                maxlength="20"
-              />
             </div>
             <!-- <div class="namecon" style="margin-right: 30px">
               <div class="name">考勤：</div>
@@ -57,14 +45,8 @@
             <div class="namecon">
               <div class="name">签到状态：</div>
               <div class="select">
-                <a-select
+                <a-select v-model:value="projectName2" style="width: 160px" placeholder="请选择" :options="projectNameList2"
-                  v-model:value="projectName2"
+                  @change="selectProjectName2" allowClear></a-select>
-                  style="width: 160px"
-                  placeholder="请选择"
-                  :options="projectNameList2"
-                  @change="selectProjectName2"
-                  allowClear
-                ></a-select>
               </div>
             </div>
           </div>
@@ -107,18 +89,11 @@
         </div> -->
 
         <div class="tableBox" style="margin-top: 30px">
-          <a-table
+          <a-table style="border: 1px solid #f2f6fe" :columns="tableDataFunc()" :data-source="tableData"
-            style="border: 1px solid #f2f6fe"
+            :loading="tableDataTotalLoading" :scroll="{ x: 1300 }" :pagination="false" :row-selection="{
-            :columns="tableDataFunc()"
-            :data-source="tableData"
-            :loading="tableDataTotalLoading"
-            :scroll="{ x: 1300 }"
-            :pagination="false"
-            :row-selection="{
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
-            }"
+            }" />
-          />
         </div>
       </div>
       <div class="btnn">
@@ -128,13 +103,7 @@
     </div>
   </a-drawer>
   <!-- 批量签到弹窗 -->
-  <a-modal
+  <a-modal v-model:visible="qdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
-    v-model:visible="qdModal"
-    :footer="null"
-    :closable="closeCopy"
-    wrapClassName="CopyModal"
-    centered="true"
-  >
     <div class="delete">
       <div class="del_header"></div>
       <div class="del_main">
@@ -159,13 +128,7 @@
   </a-modal>
 
   <!-- 单独签到弹窗 -->
-  <a-modal
+  <a-modal v-model:visible="singleqdModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
-    v-model:visible="singleqdModal"
-    :footer="null"
-    :closable="closeCopy"
-    wrapClassName="CopyModal"
-    centered="true"
-  >
     <div class="delete">
       <div class="del_header"></div>
       <div class="del_main">
@@ -189,13 +152,7 @@
     </div>
   </a-modal>
   <!-- 单独签退弹窗 -->
-  <a-modal
+  <a-modal v-model:visible="singleqtModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
-    v-model:visible="singleqtModal"
-    :footer="null"
-    :closable="closeCopy"
-    wrapClassName="CopyModal"
-    centered="true"
-  >
     <div class="delete">
       <div class="del_header"></div>
       <div class="del_main">
@@ -219,13 +176,7 @@
     </div>
   </a-modal>
   <!-- 单独请假弹窗 -->
-  <a-modal
+  <a-modal v-model:visible="singleqjModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
-    v-model:visible="singleqjModal"
-    :footer="null"
-    :closable="closeCopy"
-    wrapClassName="CopyModal"
-    centered="true"
-  >
     <div class="delete">
       <div class="del_header"></div>
       <div class="del_main">
@@ -252,12 +203,8 @@
   <SignQR v-model:signQRvisible="signQRvisible" />
 
   <!-- 二维码弹窗 -->
-   <two-dimensional-code
+  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" :index="codeIndex"
-    v-model:codevisible="codevisible"
+    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''" />
-    :codeInfo="codeInfo"
-    :index="codeIndex"
-    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
-  />
   <!-- 二维码弹窗 -->
 </template>
 
@@ -408,24 +355,24 @@ export default {
     // 计算签到时间
     const isSignClick = () => {
       // debugger
-      console.log("计算签到时间", props.datasource);
+      console.log("计算签到时间", props.datasource.info);
-      let beginTime = new Date(props.datasource.startTime).getTime();
+      let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
-      let endTime = !props.datasource.afterStart
+      let endTime = !props.datasource.info.afterSignIn
-        ? new Date(props.datasource.endTime).getTime()
+        ? new Date(props.datasource.info.liveEndTime).getTime()
-        : new Date(props.datasource.startTime).getTime();
+        : new Date(props.datasource.info.liveStartTime).getTime();
 
-      if (props.datasource.beforeStart && props.datasource.afterStart) {
+      if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
         //有开始前有开始后
-        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
-        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
         console.log("1111", beginTime, endTime);
-      } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
+      } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
         //只有开始前无开始后
-        beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+        beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
         console.log("11112222", beginTime);
-      } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
+      } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
         //无开始前有开始后
-        endTime = endTime + props.datasource.afterStart * 60 * 1000;
+        endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
         console.log("1111333", endTime);
       }
 
@@ -437,6 +384,8 @@ export default {
     const afterVisibleChange = (bol) => {
       if (bol == true) {
         console.log("当前是什么类型", props.datasource.type);
+        console.log("当前是什么类型", props.datasource);
+
         state.tableDataTotalLoading = true;
         getTableData();
         isSignClick();
@@ -876,8 +825,7 @@ export default {
         name: props.datasource?.name,
         url:
           process.env.VUE_APP_BASE_API +
-          `/admin/student/studentSign?taskId=${
+          `/admin/student/studentSign?taskId=${props.datasource.routerTaskId
-            props.datasource.routerTaskId
           }&taskType=${props.datasource.type}&type=${2}`,
       };
       console.log("codeInfo", state.codeInfo);
@@ -911,18 +859,14 @@ export default {
       console.log("props.datasource", props.datasource);
       if (props.types == 1) {
         window.open(
-          `${
+          `${process.env.VUE_APP_BASE_API
-            process.env.VUE_APP_BASE_API
+          }/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
-          }/admin/student/exportTaskStudent?currentStageId=${
-            props.datasource.chapterId
           }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
         );
       } else {
         window.open(
-          `${
+          `${process.env.VUE_APP_BASE_API
-            process.env.VUE_APP_BASE_API
+          }/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
-          }/admin/student/exportTaskStudent?currentStageId=${
-            props.datasource.stageId
           }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
         );
       }
@@ -984,14 +928,17 @@ export default {
     .ant-drawer-header {
       display: none !important;
     }
+
     .ant-drawer-body {
       padding: 0;
+
       .drawerMain {
         min-width: 600px;
         margin: 0px 32px 0px 32px;
         display: flex;
         flex-direction: column;
         height: 100%;
+
         .header {
           height: 73px;
           border-bottom: 1px solid #e8e8e8;
@@ -1000,6 +947,7 @@ export default {
           align-items: center;
           margin-bottom: 20px;
           flex-shrink: 0;
+
           .headerTitle {
             font-size: 18px;
             font-weight: 600;
@@ -1007,13 +955,16 @@ export default {
             line-height: 25px;
           }
         }
+
         .centermain {
           flex: 1;
           overflow-y: auto;
           margin-bottom: 75px;
           padding-right: 10px;
+
           .titl {
             display: flex;
+
             .endtime {
               font-size: 16px;
               font-weight: 500;
@@ -1021,20 +972,24 @@ export default {
               white-space: nowrap;
             }
           }
+
           .search {
             width: 100%;
             display: flex;
             flex-wrap: wrap;
             margin-top: 20px;
             justify-content: space-between;
+
             .leftchoose {
               display: flex;
               margin-right: 20px;
               flex-wrap: wrap;
+
               .namecon {
                 display: flex;
                 flex-wrap: nowrap;
                 margin-bottom: 10px;
+
                 .name {
                   margin-top: 8px;
                   white-space: nowrap;
@@ -1054,6 +1009,7 @@ export default {
                 display: flex;
                 justify-content: center;
                 align-items: center;
+
                 .img1 {
                   width: 15px;
                   height: 17px;
@@ -1061,6 +1017,7 @@ export default {
                   background-size: 100% 100%;
                   margin-right: 7px;
                 }
+
                 .img2 {
                   width: 16px;
                   height: 18px;
@@ -1075,6 +1032,7 @@ export default {
 
                 color: #ffffff;
               }
+
               .btn2 {
                 background: #ffffff;
 
@@ -1083,6 +1041,7 @@ export default {
               }
             }
           }
+
           .btnss {
             display: flex;
             flex-wrap: nowrap;
@@ -1095,6 +1054,7 @@ export default {
               display: flex;
               justify-content: center;
               align-items: center;
+
               .img1 {
                 width: 15px;
                 height: 17px;
@@ -1102,6 +1062,7 @@ export default {
                 background-size: 100% 100%;
                 margin-right: 7px;
               }
+
               .img2 {
                 width: 17px;
                 height: 16px;
@@ -1116,6 +1077,7 @@ export default {
               margin-right: 20px;
               color: #ffffff;
             }
+
             .btn2 {
               background: #ffffff;
               margin-right: 20px;
@@ -1123,6 +1085,7 @@ export default {
               border: 1px solid #4ea6ff;
             }
           }
+
           .line {
             width: 100%;
             height: 40px;
@@ -1132,34 +1095,41 @@ export default {
             align-items: center;
             margin-top: 20px;
             border: 1px solid #c3e6fc;
+
             .inline {
               width: 95%;
               height: 100%;
               display: flex;
               justify-content: space-between;
+
               .left {
                 height: 100%;
                 display: flex;
                 align-items: center;
+
                 .img {
                   width: 15px;
                   height: 15px;
                   background-image: url(../../assets/images/leveladd/gan.png);
                   background-size: 100% 100%;
                 }
+
                 .text {
                   color: #999ba3;
                 }
+
                 .text2 {
                   color: #4ea6ff;
                   margin-left: 5px;
                   margin-right: 5px;
                 }
+
                 .text3 {
                   color: #999ba3;
                   margin-left: 20px;
                 }
               }
+
               .right {
                 font-size: 14px;
                 font-weight: 400;
@@ -1171,31 +1141,35 @@ export default {
               }
             }
           }
+
           .tableBox {
             .classify {
               padding-left: 0px !important;
             }
+
             .ant-checkbox-wrapper {
               align-items: center;
               margin-top: -2px;
             }
+
             .ant-table-selection-column {
               padding: 0px !important;
             }
+
             .ant-table-thead>tr>th {
               background-color: rgba(239, 244, 252, 1);
             }
+
             th.h {
               background-color: #eff4fc !important;
             }
 
-            .ant-table-tbody
+            .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-              > td {
               background: #f6f9fd;
             }
           }
         }
+
         .btnn {
           height: 72px;
           width: 100%;
@@ -1204,6 +1178,7 @@ export default {
           align-items: center;
           justify-content: center;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
           .btn1 {
             width: 100px;
             height: 40px;
@@ -1213,6 +1188,7 @@ export default {
             background-color: #fff;
             cursor: pointer;
           }
+
           .btn2 {
             cursor: pointer;
             width: 100px;

src/components/drawers/AddActive.vue

@@ -53,7 +53,7 @@
             <div class="btnbox">
               <a-range-picker
                   :disabled-date="disabledDate"
-                  :disabled-time="disabledRangeTime"
+                 
                   :show-time="{ format: 'HH:mm' }"
                   format="YYYY-MM-DD HH:mm"
                   style="width: 400px; height: 40px; border-radius: 8px"
@@ -274,14 +274,14 @@ const closeDrawer = () => {
   dateTime.value = []
   resetFields()
 };
-
+/** 
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
     result.push(i);
   }
   return result;
-};
+};*/
 
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
@@ -291,14 +291,14 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf('day');
 };
-
+/** 
 const disabledRangeTime = () => ({
   // disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
 
-
+*/
 async function confirm() {
   // debugger
   await validate().catch(({errorFields}) => {

src/components/drawers/AddCase.vue

@@ -175,6 +175,7 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1
   params.value.keyWord = ''
+  params.value.authorName = ''
   fetch()
 }
 

src/components/drawers/AddFaceteach.vue

@@ -105,7 +105,8 @@
             <div class="select">
               <a-range-picker style="width: 400px;"
                               :show-time="{ format: 'HH:mm' }"
-                              :disabled-date="disabledDate" :disabled-time="disabledRangeTime"
+                              :disabled-date="disabledDate" 
+                             
                               format="YYYY/MM/DD HH:mm"
                               v-model:value="chooseTime"
                               :placeholder="['      开始时间', '        结束时间']"

src/components/drawers/AddHomework.vue

@@ -44,7 +44,7 @@
                   style="width: 400px; height: 40px; border-radius: 8px"
                   :show-time="{ format: 'hh:mm' }"
                   :disabled-date="disabledDate"
-                  :disabled-time="disabledRangeTime"
+                 
                   v-model:value="dateTime"
                   format="YYYY-MM-DD HH:mm"
                   @change="timeChange"
@@ -107,7 +107,7 @@ const closeDrawer = () => {
   formData.value = {}
   dateTime.value = []
 };
-
+/**
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
@@ -115,7 +115,7 @@ const range = (start, end) => {
   }
   return result;
 };
-
+*/
 function timeChange(time, timeStr) {
   formData.value.submitStartTime = timeStr[0]
   formData.value.submitEndTime = timeStr[1]
@@ -124,13 +124,13 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf('day');
 };
-
+/**
 const disabledRangeTime = () => ({
   disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
-
+ */
 function confirm() {
   if (taskIndex.value === -1) {
     const list = props.taskList

src/components/drawers/AddLive.vue

@@ -3,151 +3,91 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer
+  <a-drawer :visible="visible" class="drawerStyle addliveDrawer" width="1000" title="添加直播" placement="right">
-    :visible="visible"
-    class="drawerStyle addliveDrawer"
-    width="1000"
-    title="添加直播"
-    placement="right"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">
           {{ taskIndex >= 0 ? "编辑" : "添加" }}直播
         </div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.liveName" style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveName"
+                placeholder="请输入直播名称" :maxlength="20" />
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入直播名称"
-                :maxlength="20"
-              />
             </div>
           </div>
           <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播链接：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="formData.liveLink" style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveLink"
+                placeholder="请输入直播链接" :maxlength="100" />
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入直播链接"
-                :maxlength="100"
-              />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
+              <a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
-                :show-time="{ format: 'HH:mm' }"
+                style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" format="YYYY-MM-DD HH:mm"
-                :disabled-date="disabledDate"
+                valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
-                :disabled-time="disabledRangeTime"
-                style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="dateTime"
-                format="YYYY-MM-DD HH:mm"
-                valueFormat="YYYY-MM-DD HH:mm"
-                @change="timeChange"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number
+              <a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
-                :min="0"
+                v-model:value="formData.liveDuration"></a-input-number>
-                :max="300"
-                :precision="0"
-                style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="formData.liveDuration"
-              ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">授课老师：</span>
             </div>
             <div class="select" style="width: 400px">
-              <ProjectManager
+              <ProjectManager v-model:value="formData.liveTeacherId" v-model:name="formData.liveTeacherName">
-                v-model:value="formData.liveTeacherId"
+              </ProjectManager>
-                v-model:name="formData.liveTeacherName"
-              ></ProjectManager>
             </div>
           </div>
           <div class="mbl_items2">
             <div class="item_nam">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 2px">直播封面：</span>
             </div>
             <div class="item_inp">
-              <a-upload
+              <a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
-                name="avatar"
+                :before-upload="beforeUpload">
-                list-type="picture-card"
+                <img class="i_upload_img" v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                class="avatar-uploader"
-                :show-upload-list="false"
-                :before-upload="beforeUpload"
-              >
-                <img
-                  class="i_upload_img"
-                  v-if="imageUrl"
-                  :src="imageUrl"
-                  alt="avatar"
-                />
                 <div class="i_upload" v-else>
                   <div class="addimg">
                     <div class="heng"></div>
@@ -157,9 +97,7 @@
               </a-upload>
               <div class="i_bottom">
                 <div class="tip">
-                  <span style="color: #999999; margin-left: 8px"
+                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png 图片最大为2MB</span>
-                    >支持图片格式为jpg/jpeg/png 图片最大为2MB</span
-                  >
                 </div>
               </div>
             </div>
@@ -167,22 +105,13 @@
           <div class="main_item2">
             <div class="signbox">
               <div class="asterisk_icon">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">直播公告：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="formData.liveNotice" placeholder="请输入直播公告" allow-clear show-count
-                v-model:value="formData.liveNotice"
+                :maxlength="200" :rows="6" />
-                placeholder="请输入直播公告"
-                allow-clear
-                show-count
-                :maxlength="200"
-                :rows="6"
-              />
             </div>
           </div>
 
@@ -191,10 +120,7 @@
               <span style="margin-right: 3px">回放设置：</span>
             </div>
             <div class="btnbox">
-              <a-switch
+              <a-switch v-model:checked="formData.livePlayback" @change="getchange(formData.livePlayback)" />
-                v-model:checked="formData.livePlayback"
-                @change="getchange(formData.livePlayback)"
-              />
             </div>
           </div>
           <div v-if="formData.livePlayback">
@@ -203,12 +129,8 @@
                 <span style="margin-right: 3px">回放链接：</span>
               </div>
               <div class="btnbox">
-                <a-input
+                <a-input v-model:value="formData.livePlaybackLink" style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.livePlaybackLink"
+                  placeholder="请输入回放链接" :maxlength="100" />
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入回放链接"
-                  :maxlength="100"
-                />
               </div>
             </div>
           </div>
@@ -218,14 +140,8 @@
               <span style="margin-right: 3px">直播说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
+              <a-textarea v-model:value="formData.liveExplain" placeholder="请输入直播说明" allow-clear show-count
-                v-model:value="formData.liveExplain"
+                :maxlength="200" :rows="6" />
-                placeholder="请输入直播说明"
-                allow-clear
-                show-count
-                :maxlength="200"
-                :rows="6"
-              />
             </div>
           </div>
 
@@ -242,39 +158,23 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>直播开始前：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="30" :precision="0" style="
-                    :min="0"
-                    :max="30"
-                    :precision="0"
-                    style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
                                                 overflow: hidden;
-                    "
+                                              " v-model:value="formData.beforeSignIn"></a-input-number>
-                    v-model:value="formData.beforeSignIn"
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
-                  ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px"
-                    >分钟允许签到</span
-                  >
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
-                  <a-input-number
+                  <a-input-number :min="0" :max="30" :precision="0" style="
-                    :min="0"
-                    :max="30"
-                    :precision="0"
-                    style="
                                                 width: 88px;
                                                 height: 32px;
                                                 border-radius: 8px;
                                                 overflow: hidden;
-                    "
+                                              " v-model:value="formData.afterSignIn"></a-input-number>
-                    v-model:value="formData.afterSignIn"
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
-                  ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px"
-                    >分钟允许签到</span
-                  >
                 </div>
               </div>
             </div>
@@ -284,18 +184,14 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)"
+              <a-checkbox v-model:checked="formData.isEvaluate" @change="getchanges(formData.isEvaluate)">需要评估
-                >需要评估
               </a-checkbox>
             </div>
           </div>
           <div v-if="formData.isEvaluate" class="main_item">
             <div class="signbox"></div>
             <div class="btnbox">
-              <AddInvistRoot
+              <AddInvistRoot v-model:id="formData.assessmentId" v-model:name="formData.assessmentName">
-                v-model:id="formData.assessmentId"
-                v-model:name="formData.assessmentName"
-              >
                 <button class="xkbtn">选择评估</button>
               </AddInvistRoot>
 
@@ -428,12 +324,14 @@ const rulesRef = ref({
 const { resetFields, validate } = Form.useForm(formData, rulesRef);
 
 const closeDrawer = () => {
+  formData.value.liveCover = "";
+  imageUrl.value = "";
   visible.value = false;
   taskIndex.value = -1;
   dateTime.value = [];
   resetFields();
 };
-
+/** 
 const range = (start, end) => {
   const result = [];
   for (let i = start; i < end; i++) {
@@ -441,7 +339,7 @@ const range = (start, end) => {
   }
   return result;
 };
-
+*/
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0];
   formData.value.liveEndTime = timeStr[1];
@@ -450,13 +348,13 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
-
+/**
 const disabledRangeTime = () => ({
   // disabledHours: () => range(0, 24).splice(4, 20),
   disabledMinutes: () => range(30, 60),
   disabledSeconds: () => [55, 56],
 });
-
+ */
 async function confirm() {
   // debugger;
   console.log("确定按钮:");
@@ -467,7 +365,8 @@ async function confirm() {
   if (taskIndex.value === -1) {
     let list = props.taskList
     list.push(
-            {name: formData.value.liveName,
+      {
+        name: formData.value.liveName,
         type: props.type,
         info: { ...formData.value },
         duration: dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
@@ -484,6 +383,7 @@ async function confirm() {
 }
 
 function openDrawer(i, row) {
+  console.log(i, row)
   row && (formData.value = { ...row.info });
   row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
   i >= 0 && (taskIndex.value = i);
@@ -506,9 +406,10 @@ const beforeUpload = (file) => {
     return false;
   }
 
-  let isLt1M = file.size / 10240 / 10240 <= 1;
+  let isLt1M = file.size < 2097152;
+  console.log(file.size, isLt1M)
   if (!isLt1M) {
-    this.$message.error("图片大小超过10MB!");
+    message.error("图片大小超过2MB!");
     return false;
   }
 

src/components/drawers/AddProject.vue

@@ -291,6 +291,9 @@ function reset() {
   selectsData.value = [];
   params.value.pageNo = 1
   params.value.keyWord = ''
+  params.value.createName = ''
+  params.value.manager = ''
+  params.value.name = ''
   fetch()
 }
 

src/components/drawers/AddTest.vue

@@ -30,7 +30,6 @@
       >
         <div>
           <button
-            :disabled="taskIndex >= 0"
             style="width: 100px; cursor: pointer"
             @click="changeOuter(1)"
             :class="formData.examType === 1 ? 'outer' : 'notOuter'"
@@ -480,7 +479,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.examinationName;
-    data.info = formData.value;
+    data.info = { ...formData.value };
   }
   emit("update:taskList", [...props.taskList]);
   closeDrawer();
@@ -503,6 +502,9 @@ const delTag = () => {
 };
 
 function changeOuter(v) {
+  if (taskIndex.value >= 0) {
+    return message.warn("编辑状态不允许切换。");
+  }
   formData.value.examType = v;
 }
 

src/components/drawers/AssessmentAll.vue

@@ -180,6 +180,7 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1;
   params.value.keyWord = "";
+  params.value.assessmentName ="";
   fetch();
 }
 
@@ -231,6 +232,8 @@ const goResearchmanage = () => {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 20px;
+          margin-bottom: 20px;
 
           .fi_input {
             margin-right: 20px;

src/components/drawers/ProjectScore.vue

@@ -360,7 +360,7 @@ export default {
           className: "h",
         },
         {
-          title: "证书",
+          title: "已获得积分",
           dataIndex: "diploma",
           key: "diploma",
           width: 40,

src/components/drawers/project/AddCertificate.vue

@@ -1,42 +1,26 @@
 <template>
-  <a-drawer
+  <a-drawer :visible="ACertificate" class="drawerStyle AddCertificate" width="80%" title="添加证书" placement="right"
-    :visible="ACertificate"
+    @after-visible-change="afterVisibleChange">
-    class="drawerStyle AddCertificate"
-    width="80%"
-    title="添加证书"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">
           {{ ACertificateEditId ? "编辑" : "添加" }}证书
         </div>
-        <img
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+          @click="closeDrawer" />
-          src="../../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">证书名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input v-model:value="certificateName" style="width: 400px; height: 40px; border-radius: 8px"
-                v-model:value="certificateName"
+                placeholder="请输入证书名称" maxlength="20" />
-                style="width: 400px; height: 40px; border-radius: 8px"
-                placeholder="请输入证书名称"
-                maxlength="20"
-              />
             </div>
           </div>
 
@@ -63,28 +47,13 @@
           <div class="main_item" style="align-items: flex-start">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
               <span style="margin-right: 3px">证书封面：</span>
             </div>
-            <div
+            <div class="btnbox" style="flex-direction: column; align-items: flex-start">
-              class="btnbox"
+              <a-upload v-model:file-list="fileList" name="file" style="width: 200px" list-type="picture-card"
-              style="flex-direction: column; align-items: flex-start"
+                class="avatar-uploader" :show-upload-list="false" :before-upload="beforeUpload">
-            >
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                style="width: 200px"
-                list-type="picture-card"
-                class="avatar-uploader"
-                :show-upload-list="false"
-                action="/manageApi/file/uploadFile"
-                @change="handleChange"
-                :before-upload="beforeUpload"
-              >
                 <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
@@ -102,90 +71,58 @@
               <span style="margin-right: 3px">证书说明：</span>
             </div>
             <div class="textarea" style="width: 400px">
-              <a-textarea
+              <a-textarea v-model:value="certificateRemark" placeholder="请输入证书说明" allow-clear :rows="8" show-count
-                v-model:value="certificateRemark"
+                :maxlength="200" />
-                placeholder="请输入证书说明"
-                allow-clear
-                :rows="8"
-                show-count
-                :maxlength="200"
-              />
             </div>
           </div>
 
           <div class="main_item" style="margin-bottom: 16px">
             <div class="signbox">
               <div class="sign">
-                <img
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
               </div>
-              <span
+              <span style="
-                style="
                                       margin-right: 3px;
                                       font-size: 16px;
                                       color: #333;
                                       font-size: 14px;
-                "
+                                    ">设置获得条件</span>
-                >设置获得条件</span
-              >
             </div>
             <div class="btnbox"></div>
           </div>
 
-          <div
+          <div class="main_item" style="
-            class="main_item"
-            style="
                                   border: 1px solid rgba(0, 0, 0, 0.1);
                                   width: ;
                                   margin-left: 35px;
                                   padding-top: 30px;
                                   margin-top: 0px;
-            "
+                                ">
-          >
             <div class="signbox" style="width: 30px">
-              <span
+              <span style="margin-right: 3px; font-size: 16px; color: #333"></span>
-                style="margin-right: 3px; font-size: 16px; color: #333"
-              ></span>
             </div>
             <div class="btnbox">
-              <a-radio-group
+              <a-radio-group v-model:value="condition" @change="selectCondition">
-                v-model:value="condition"
-                @change="selectCondition"
-              >
                 <a-radio v-model:checked="checked" :value="1">
                   完成项目
                   <a-popover>
                     <template #content>
-                      <div
+                      <div style="font-size: 12px; color: rgba(153, 153, 153, 1)">
-                        style="font-size: 12px; color: rgba(153, 153, 153, 1)"
-                      >
                         后续新增自动包括
                       </div>
                     </template>
-                    <img
+                    <img style="width: 16px; height: 16px" src="../../../assets/images/project/tishi.png" />
-                      style="width: 16px; height: 16px"
-                      src="../../../assets/images/project/tishi.png"
-                    />
                   </a-popover>
                 </a-radio>
 
                 <br />
-                <div
+                <div style="
-                  style="
                                         height: 60px;
                                         margin-left: 24px;
                                         display: flex;
                                         align-items: center;
-                  "
+                                      ">
-                >
+                  <a-radio-group v-model:value="large" size="small" @change="selectlarge" :disabled="condition !== 1">
-                  <a-radio-group
-                    v-model:value="large"
-                    size="small"
-                    @change="selectlarge"
-                    :disabled="condition !== 1"
-                  >
                     <a-radio-button value="1">全部任务</a-radio-button>
                     <a-radio-button value="2">完成必修任务</a-radio-button>
                   </a-radio-group>
@@ -194,132 +131,84 @@
                   完成阶段
                 </a-radio>
                 <br />
-                <div
+                <div style="
-                  style="
                                         height: 60px;
                                         margin-left: 24px;
                                         display: flex;
                                         align-items: center;
-                  "
+                                      ">
-                >
+                  <a-select ref="select" size="small" placeholder="请选择阶段" v-model:value="selectStageName"
-                  <a-select
+                    style="width: 120px" @focus="focus" @change="selectStage" :options="stageList" :fieldNames="{
-                    ref="select"
-                    size="small"
-                    placeholder="请选择阶段"
-                    v-model:value="selectStageName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectStage"
-                    :options="stageList"
-                    :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
+                    }" :disabled="condition !== 2">
-                    :disabled="condition !== 2"
-                  >
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="3">
                   完成任务
                 </a-radio>
                 <br />
-                <div
+                <div style="
-                  style="
                                         height: 60px;
                                         margin-left: 24px;
                                         display: flex;
                                         align-items: center;
-                  "
+                                      ">
-                >
+                  <a-select ref="select" size="small" placeholder="请选择任务" v-model:value="selectTaskName"
-                  <a-select
+                    style="width: 120px" @focus="focus" @change="selectTask" :options="taskList" :fieldNames="{
-                    ref="select"
-                    size="small"
-                    placeholder="请选择任务"
-                    v-model:value="selectTaskName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectTask"
-                    :options="taskList"
-                    :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
+                    }" :disabled="condition !== 3">
-                    :disabled="condition !== 3"
-                  >
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="4">
                   考试合格
                 </a-radio>
                 <br />
-                <div
+                <div style="
-                  style="
                                         height: 60px;
                                         margin-left: 24px;
                                         display: flex;
                                         align-items: center;
-                  "
+                                      ">
-                >
+                  <a-select ref="select" size="small" placeholder="请选择考试" v-model:value="selectExamName"
-                  <a-select
+                    style="width: 120px" @focus="focus" @change="selectExam" :options="examList" :fieldNames="{
-                    ref="select"
-                    size="small"
-                    placeholder="请选择考试"
-                    v-model:value="selectExamName"
-                    style="width: 120px"
-                    @focus="focus"
-                    @change="selectExam"
-                    :options="examList"
-                    :fieldNames="{
                       key: 'id',
                       title: 'name',
                       value: 'name',
-                    }"
+                    }" :disabled="condition !== 4">
-                    :disabled="condition !== 4"
-                  >
                   </a-select>
                 </div>
                 <a-radio v-model:checked="checked" :value="5">
                   获得积分
                 </a-radio>
                 <br />
-                <div
+                <div style="
-                  style="
                                         height: 60px;
                                         margin-left: 24px;
                                         display: flex;
                                         align-items: center;
-                  "
+                                      ">
-                >
+                  <div style="
-                  <div
-                    style="
                                           font-size: 14px;
                                           font-weight: 400;
                                           color: #333333;
                                           line-height: 20px;
                                           margin-right: 5px;
-                    "
+                                        ">
-                  >
                     高于
                   </div>
-                  <a-input-number
+                  <a-input-number id="inputNumber" v-model:value="score" :min="1" :max="projectPoints" style="width: 70px"
-                    id="inputNumber"
+                    :disabled="condition !== 5" />
-                    v-model:value="score"
+                  <div style="
-                    :min="1"
-                    :max="projectPoints"
-                    style="width: 70px"
-                    :disabled="condition !== 5"
-                  />
-                  <div
-                    style="
                                           font-size: 14px;
                                           font-weight: 400;
                                           color: #333333;
                                           line-height: 20px;
                                           margin-left: 5px;
-                    "
+                                        ">
-                  >
                     分可获得，当前项目积分为 {{ projectPoints }} 分
                   </div>
                 </div>
@@ -853,6 +742,7 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 400px;
 
@@ -874,6 +764,7 @@ export default {
               border-radius: 8px;
             }
           }
+
           .signbox {
             width: 120px;
             display: flex;

src/components/project/OrgClass.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-23 10:53:15
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-23 20:28:28
+ * @LastEditTime: 2023-02-23 21:31:59
  * @FilePath: /fe-manage/src/components/project/OrgClass.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -49,7 +49,7 @@ const props = defineProps({
 });
 const emit = defineEmits({});
 const stuTreeExpandedKeys = ref([]);
-const labelValue = ref({});
+const labelValue = ref({ value: props.value, label: props.name });
 const { data: options, loading: orgLoading } = useBoeApi(
   ORG_LIST,
   { keyword: "" },

src/components/student/CommonStudent.vue

@@ -2,22 +2,14 @@
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
   <div class="CommonStudent">
-    <a-drawer
+    <a-drawer :visible="visiable" class="drawerStyle ProjCheckship CommonStudent" placement="right" width="60%">
-      :visible="visiable"
-      class="drawerStyle ProjCheckship CommonStudent"
-      placement="right"
-      width="60%"
-    >
       <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
             {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || title }}
           </div>
-          <img
+          <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-            style="width: 29px; height: 29px; cursor: pointer"
+            @click="closeDrawer" />
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-          />
         </div>
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
@@ -26,38 +18,22 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="姓名：">
-                      <a-input
+                      <a-input v-model:value="proStudentName" style="width: 260px; height: 40px; border-radius: 8px"
-                        v-model:value="proStudentName"
+                        placeholder="请输入姓名" />
-                        style="width: 260px; height: 40px; border-radius: 8px"
+                      <a-button type="primary" @click="getStu" style="margin-left: 20px; border-radius: 4px">
-                        placeholder="请输入姓名"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="getStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
+                      <a-button @click="getStu" style="margin-left: 20px; border-radius: 4px">重置
-                        @click="getStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
-                    <a-table
+                    <a-table style="border: 1px solid #f2f6fe; width: 800px" row-key="id" :columns="stuColumns"
-                      style="border: 1px solid #f2f6fe; width: 800px"
+                      :data-source="projectList" :loading="projectListTotal" :pagination="projectPagination"
-                      row-key="id"
+                      :row-selection="projectRowSelection" />
-                      :columns="stuColumns"
-                      :data-source="projectList"
-                      :loading="projectListTotal"
-                      :pagination="projectPagination"
-                      :row-selection="projectRowSelection"
-                    />
                   </div>
                 </div>
               </a-tab-pane>
@@ -65,75 +41,41 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
-                      <a-input
+                      <a-input v-model:value="nameSearch.keyword" style="width: 270px; height: 40px; border-radius: 8px"
-                        v-model:value="nameSearch.keyword"
+                        placeholder="请输入姓名" @change="peopleName" />
-                        style="width: 270px; height: 40px; border-radius: 8px"
+                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px; border-radius: 4px">
-                        placeholder="请输入姓名"
-                        @change="peopleName"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="onSearchStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
+                      <a-button @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
-                        @click="resetStu"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
-                  <div
+                  <div class="chooseLeft" style="display: grid; grid-template-columns: 250px auto">
-                    class="chooseLeft"
+                    <div :style="{
-                    style="display: grid; grid-template-columns: 250px auto"
-                  >
-                    <div
-                      :style="{
                       height: screenHeight - 180 + 'px',
                       overflowY: 'auto',
-                      }"
+                    }" style="border: 1px solid #f0f0f0">
-                      style="border: 1px solid #f0f0f0"
-                    >
                       <div class="tree" style="margin: 10px 4px 220px 10px">
-                        <a-tree
+                        <a-tree allow-clear tree-default-expand-all :tree-data="treeData" :loading="orgLoading"
-                          allow-clear
+                          :load-data="onLoadData" v-model:selectedKeys="stuTreeSelectKeys"
-                          tree-default-expand-all
+                          v-model:expandedKeys="stuTreeExpandedKeys" :fieldNames="{
-                          :tree-data="treeData"
-                          :loading="orgLoading"
-                          :load-data="onLoadData"
-                          v-model:selectedKeys="stuTreeSelectKeys"
-                          v-model:expandedKeys="stuTreeExpandedKeys"
-                          :fieldNames="{
                             children: 'treeChildList',
                             key: 'id',
                             title: 'name',
                             value: 'name',
-                          }"
+                          }" @select="stuStuOrgSelect">
-                          @select="stuStuOrgSelect"
-                        >
                         </a-tree>
                       </div>
                     </div>
-                    <div
+                    <div class="tableBox tabb" style="
-                      class="tableBox tabb"
-                      style="
                                     margin: 0px 4px 120px 10px;
                                     border: 1px solid #f0f0f0;
-                      "
+                                  ">
-                    >
+                      <a-table :columns="stuColumns" :data-source="stuData" :pagination="stuPagination"
-                      <a-table
+                        :loading="stuLoading" row-key="id" :row-selection="stuRowSelection" />
-                        :columns="stuColumns"
-                        :data-source="stuData"
-                        :pagination="stuPagination"
-                        :loading="stuLoading"
-                        row-key="id"
-                        :row-selection="stuRowSelection"
-                      />
                     </div>
                   </div>
                 </div>
@@ -142,44 +84,26 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab2">
                     <a-form-item label="组织：">
-                      <a-input
+                      <a-input v-model:value="searchOrgName.keyword"
-                        v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" />
-                        style="width: 230px; height: 40px; border-radius: 8px"
+                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px; border-radius: 4px">
-                        placeholder="请输入组织"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="searchOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
+                      <a-button @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
-                        @click="resetOrg"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="boeTree">
-                    <a-tree
+                    <a-tree :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
-                      :tree-data="searchOrgName.keyword ? orgData : treeOrgData"
+                      :loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
-                      @select="onOrgSelectChange"
-                      :loading="orgOrgLoading"
-                      :load-data="onLoadOrgData"
-                      :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
-                      }"
+                      }" row-key="id" :row-selection="orgRowSelection" multiple>
-                      row-key="id"
-                      :row-selection="orgRowSelection"
-                      multiple
-                    >
                     </a-tree>
                   </div>
                 </div>
@@ -188,38 +112,22 @@
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="受众名称：">
-                      <a-input
+                      <a-input v-model:value="audienceName.keyword" style="width: 260px; height: 40px; border-radius: 8px"
-                        v-model:value="audienceName.keyword"
+                        placeholder="请输入受众名称" />
-                        style="width: 260px; height: 40px; border-radius: 8px"
+                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px; border-radius: 4px">
-                        placeholder="请输入受众名称"
-                      />
-                      <a-button
-                        type="primary"
-                        @click="searchAudi"
-                        style="margin-left: 20px; border-radius: 4px"
-                      >
                         <template #icon>
                           <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button
+                      <a-button @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">重置
-                        @click="resetAudienceInfo"
-                        style="margin-left: 20px; border-radius: 4px"
-                        >重置
                       </a-button>
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
-                    <a-table
+                    <a-table style="border: 1px solid #f2f6fe; width: 800px" row-key="id" :columns="audiColums"
-                      style="border: 1px solid #f2f6fe; width: 800px"
+                      :data-source="audiData" :loading="audiLoading" :pagination="auditPagination"
-                      row-key="id"
+                      :row-selection="auditRowSelection" />
-                      :columns="audiColums"
-                      :data-source="audiData"
-                      :loading="audiLoading"
-                      :pagination="auditPagination"
-                      :row-selection="auditRowSelection"
-                    />
                   </div>
                 </div>
               </a-tab-pane>
@@ -231,16 +139,10 @@
                 <div class="already">已选</div>
               </div>
             </div>
-            <div
+            <div :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto">
-              :style="{ 'max-height': screenHeight - 235 + 'px' }"
-              style="overflow-y: auto"
-            >
               <div class="selecteds" v-if="isGroup">
                 <div class="person">项目内学员</div>
-                <div
+                <div v-for="(item, i) in selectsData.projectMemberList" :key="i">
-                  v-for="(item, i) in selectsData.projectMemberList"
-                  :key="i"
-                >
                   <div v-if="i < 11">
                     <div class="chose">
                       {{ item.realName }}
@@ -256,16 +158,10 @@
                     </div>
                   </div>
                 </div>
-                <div
+                <div v-if="!member && selectsData.projectMemberList?.length > 10" class="ifsw">
-                  v-if="!member && selectsData.projectMemberList?.length > 10"
-                  class="ifsw"
-                >
                   <div @click="member = !member" class="“sw”">查看更多></div>
                 </div>
-                <div
+                <div v-if="member && selectsData.projectMemberList?.length > 10" class="ifsw">
-                  v-if="member && selectsData.projectMemberList?.length > 10"
-                  class="ifsw"
-                >
                   <div @click="member = !member" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -287,16 +183,10 @@
                     </div>
                   </div>
                 </div>
-                <div
+                <div v-if="!person && selectsData.studentList.length > 10" class="ifsw">
-                  v-if="!person && selectsData.studentList.length > 10"
-                  class="ifsw"
-                >
                   <div @click="person = !person" class="“sw”">查看更多></div>
                 </div>
-                <div
+                <div v-if="person && selectsData.studentList.length > 10" class="ifsw">
-                  v-if="person && selectsData.studentList.length > 10"
-                  class="ifsw"
-                >
                   <div @click="person = !person" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -318,16 +208,10 @@
                     </div>
                   </div>
                 </div>
-                <div
+                <div v-if="!dept && selectsData.deptList.length > 10" class="ifsw">
-                  v-if="!dept && selectsData.deptList.length > 10"
-                  class="ifsw"
-                >
                   <div @click="dept = !dept" class="“sw”">查看更多></div>
                 </div>
-                <div
+                <div v-if="dept && selectsData.deptList.length > 10" class="ifsw">
-                  v-if="dept && selectsData.deptList.length > 10"
-                  class="ifsw"
-                >
                   <div @click="dept = !dept" class="sw">收起&lt;</div>
                 </div>
               </div>
@@ -350,10 +234,7 @@
                     </div>
                   </div>
                 </div>
-                <div
+                <div v-if="!group && selectsData.groupList.length > 10" class="ifsw">
-                  v-if="!group && selectsData.groupList.length > 10"
-                  class="ifsw"
-                >
                   <div @click="group = !group" class="“sw”">查看更多></div>
                 </div>
                 <div v-if="group && selectsData.groupList > 10" class="ifsw">
@@ -369,17 +250,12 @@
         </div>
       </div>
     </a-drawer>
-    <a-button @click="openDrawer" type="link"><slot></slot></a-button>
+    <a-button @click="openDrawer" type="link">
+      <slot></slot>
+    </a-button>
   </div>
-  <a-modal
+  <a-modal :style="{ padding: 0, position: relative, right: '-20%' }" :closable="true" :visible="stageVisible"
-    :style="{ padding: 0, position: relative, right: '-20%' }"
+    :footer="null" centered="true" @ok="handleStageOk" wrapClassName="changeModal">
-    :closable="true"
-    :visible="stageVisible"
-    :footer="null"
-    centered="true"
-    @ok="handleStageOk"
-    wrapClassName="changeModal"
-  >
     <div class="con">
       <div class="header">
         <div class="inhe">
@@ -391,36 +267,18 @@
         <div class="inher">
           <!-- <div class="cur">当前关卡：关卡2</div> -->
           <div class="select">
-            <a-select
+            <a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'" v-model:value="selectsData.stageId"
-              style="width: 400px"
+              className="cus-select">
-              :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
+              <a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id">{{ item.name || "默认" }}
-              v-model:value="selectsData.stageId"
-              className="cus-select"
-            >
-              <a-select-option
-                v-for="(item, i) in stageIds"
-                :key="i"
-                :value="item.id"
-                >{{ item.name || "默认" }}
               </a-select-option>
             </a-select>
           </div>
-          <span style="color: #999999; margin-left: 10px"
+          <span style="color: #999999; margin-left: 10px"><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span>
-            ><minus-circle-outlined />已在其他关卡的学员，不会被添加到该关卡</span
-          >
           <div class="btn" style="margin-top: 50px">
-            <button
+            <button class="sameb btn1" @click="closeChangeModal" style="cursor: pointer">
-              class="sameb btn1"
-              @click="closeChangeModal"
-              style="cursor: pointer"
-            >
               取消
             </button>
-            <button
+            <button class="sameb btn2" @click="handleStageOk" style="cursor: pointer">
-              class="sameb btn2"
-              @click="handleStageOk"
-              style="cursor: pointer"
-            >
               确定
             </button>
           </div>
@@ -516,11 +374,13 @@ const projectRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }));
 const getStu = () => {
+  debugger
   let obj = {
     studentName: proStudentName.value,
     pageNo: procurrentPage.value,
     pageSize: 10,
-    projectId: props.id,
+    pid: props.id,
+    type: props.type
   };
   projectListTotal.value = -1;
   console.log("获取项目学员", obj);
@@ -801,10 +661,11 @@ function stuDel(i) {
   selectsData.value.studentList.splice(i, 1);
 }
 
-// function orgDel(i) {
+function orgDel(i) {
-//   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+  orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
-//   selectsData.value.deptList.splice(i, 1)
+  selectsData.value.deptList.splice(i, 1)
-// }
+}
+
 function AuditDel(i) {
   auditSelectKeys.value = auditSelectKeys.value.filter(
     (e) => e !== selectsData.value.groupList[i].id

src/components/student/TableStudent.vue

@@ -1,17 +1,9 @@
 <template>
   <div class="TableStudent">
-    <a-row
+    <a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px">
-      type="flex"
-      gutter="12"
-      style="padding-left: 20px; margin-right: 0px"
-    >
       <a-col>
         <a-form-item title="姓名：">
-          <a-input
+          <a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名" />
-            class="cus-input"
-            v-model:value="tableParam.studentName"
-            placeholder="请输入姓名"
-          />
         </a-form-item>
       </a-col>
       <!-- <a-col v-if="type === 1">
@@ -27,73 +19,39 @@
       <a-col v-if="type === 1">
         <a-form-item title="部门：">
           <div class="select in" style="width: 270px">
-            <OrgClass
+            <OrgClass v-model:value="tableParam.studentDepartId" v-model:name="tableParam.studentDepartName"></OrgClass>
-              v-model:value="tableParam.studentDepartId"
-              v-model:name="tableParam.studentDepartName"
-            ></OrgClass>
           </div>
         </a-form-item>
       </a-col>
       <a-col v-if="type === 1">
         <a-form-item title="优秀学员：">
           <div class="select">
-            <a-select
+            <a-select v-model:value="tableParam.topFlag" style="width: 260px; height: 40px" placeholder="是否为优秀学员"
-              v-model:value="tableParam.topFlag"
+              :options="topFlagList" @change="selectProjectName" allowClear showSearch></a-select>
-              style="width: 260px; height: 40px"
-              placeholder="是否为优秀学员"
-              :options="topFlagList"
-              @change="selectProjectName"
-              allowClear
-              showSearch
-            ></a-select>
           </div>
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button
+        <a-button class="cus-btn" style="background: #4ea6ff; color: #fff; width: 100px" @click="getStuList">
-          class="cus-btn"
-          style="background: #4ea6ff; color: #fff; width: 100px"
-          @click="getStuList"
-        >
           <template #icon>
-            <img
+            <img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png" /></template>
-              style="margin-right: 10px"
-              src="../../assets/images/courseManage/search0.png"
-          /></template>
           搜索
         </a-button>
       </a-col>
       <a-col :span="2">
         <a-button class="cus-btn white" style="width: 100px" @click="reset">
           <template #icon>
-            <img
+            <img style="margin-right: 10px" src="../../assets/images/leveladd/reset.png" /></template>
-              style="margin-right: 10px"
-              src="../../assets/images/leveladd/reset.png"
-          /></template>
           重置
         </a-button>
       </a-col>
     </a-row>
 
-    <a-row
+    <a-row type="flex" gutter="12" style="padding-left: 20px; margin-right: 0px" v-if="checkPer(permissions)">
-      type="flex"
-      gutter="12"
-      style="padding-left: 20px; margin-right: 0px"
-      v-if="checkPer(permissions)"
-    >
       <a-col :span="1.5">
-        <CommonStudent
+        <CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage">
-          :type="type"
-          :id="id"
-          @finash="submitCall"
-          :stage="stage"
-        >
           <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
-            <template #icon
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png" /></template>
-              ><img
-                style="margin-right: 10px"
-                src="../../assets/images/courseManage/add0.png"
-            /></template>
             添加学员
           </a-button>
         </CommonStudent>
@@ -101,11 +59,7 @@
       <!-- 新加导入学员 批量换组 导出学习信息  -->
       <a-col :span="1.5" v-if="type === 1 || type === 2">
         <a-button class="cus-btn white" @click="showImpStu">
-          <template #icon
+          <template #icon><img style="margin-right: 10px" src="../../assets/images/basicinfo/in2.png" /></template>
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/basicinfo/in2.png"
-          /></template>
           导入学员
         </a-button>
       </a-col>
@@ -128,11 +82,7 @@
       </a-col>
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
-          <template #icon
+          <template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png" /></template>
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/projectadd/delete.png"
-          /></template>
           批量删除
         </a-button>
       </a-col>
@@ -147,19 +97,10 @@
         <div class="stmm_btn btn4" @click="hideShow">
           <div class="btn4_sub">
             <span style="color: #4ea6ff; margin-right: 4px"> 批量操作 </span>
-            <div
+            <div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }"></div>
-              class="b_zk"
+            <div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }"></div>
-              :style="{ display: hideshow ? 'block' : 'none' }"
-            ></div>
-            <div
-              class="b_sq"
-              :style="{ display: hideshow ? 'none' : 'block' }"
-            ></div>
           </div>
-          <div
+          <div class="btn4_sup" :style="{ display: hideshow ? 'none' : 'block' }">
-            class="btn4_sup"
-            :style="{ display: hideshow ? 'none' : 'block' }"
-          >
             <div class="btnsbox">
               <div class="btn4_tit" @click="showEScoreModal">
                 <span>批量录入成绩</span>
@@ -180,25 +121,14 @@
           <div class="export"></div>
           <div class="btnText">导出</div>
         </div>
-        <div
+        <div class="stmm_btn btn5" style="margin-left: 15px" @click="exportHomeWorkShow">
-          class="stmm_btn btn5"
-          style="margin-left: 15px"
-          @click="exportHomeWorkShow"
-        >
           <div class="btnText">导出作业</div>
         </div>
       </a-col>
     </a-row>
     <div style="margin-top: 20px">
-      <a-table
+      <a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination"
-        :columns="tablecolumns"
+        :loading="tableData.loading" :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection">
-        :data-source="tableData.list"
-        :pagination="stuPagination"
-        :loading="tableData.loading"
-        :scroll="{ x: 1500 }"
-        row-key="id"
-        :row-selection="stuRowSelection"
-      >
         <template #action="{ record }">
           <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -219,56 +149,28 @@
           <a-space :size="2">
             <slot name="extension" v-bind:data="{ record }"></slot>
 
-            <a-button
+            <a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
+              @click="updateStatus(0, record.id)" type="link">通过</a-button>
-              @click="updateStatus(0, record.id)"
+            <a-button v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              type="link"
+              @click="updateStatus(2, record.id)" type="link">拒绝</a-button>
-              >通过</a-button
+            <a-button v-if="checkPer(permissions)" :disabled="record.isLeader === '1'" @click="del(record.id, record)"
-            >
+              type="link" danger>删除</a-button>
-            <a-button
-              v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
-              @click="updateStatus(2, record.id)"
-              type="link"
-              >拒绝</a-button
-            >
-            <a-button
-              v-if="checkPer(permissions)"
-              :disabled="record.isLeader === '1' "
-              @click="del(record.id,record)"
-              type="link"
-              danger
-              >删除</a-button
-            >
           </a-space>
         </template>
       </a-table>
     </div>
   </div>
   <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal
+  <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
-    v-model:visiblene="visiblene"
-    :stage="stage"
-    :ids="stuSelectKeys"
-    @finash="submitCall"
-  />
 
   <!-- 换组弹窗 -->
-  <ChangeGroupModal
+  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList"
-    v-model:changegroupV="checkgroupParam.changegroupV"
+    :checkgroupStuId="stuSelectKeys" />
-    :groupList="groupList"
-    :checkgroupStuId="stuSelectKeys"
-  />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
   <div>
-    <a-modal
+    <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
-      v-model:visible="canclestu"
+      @cancel="closeModal1">
-      :footer="null"
-      :closable="close"
-      wrapClassName="canclestu"
-      centered="true"
-      @cancel="closeModal1"
-    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -294,13 +196,7 @@
   <!-- 取消学员弹窗 -->
   <!-- 优秀学员弹窗 -->
   <div>
-    <a-modal
+    <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-      v-model:visible="canclestu1"
-      :footer="null"
-      :closable="close"
-      wrapClassName="canclestu1"
-      centered="true"
-    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -324,35 +220,18 @@
     </a-modal>
   </div>
   <!-- 查看学员 传入查看学员的id-->
-  <see-stu
+  <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" />
-    v-model:Seevisible="Seevisible"
-    v-model:checkStuId="checkStuId"
-    v-model:projectId="projectId"
-  />
 
   <!-- 导入作业成绩抽屉 -->
-  <EScore
+  <EScore v-model:eScorevisible="eScorevisible" :type="3" :id="id" :pid="id" v-model:searchTaskList="getStuList" />
-    v-model:eScorevisible="eScorevisible"
-    :type="3"
-    :id="id"
-    :pid="id"
-    v-model:searchTaskList="getStuList"
-  />
   <!-- 导出作业提示框 -->
-  <ExportHomeWork
+  <ExportHomeWork v-model:exportHomeWorkV="exportHomeWorkV" :downloadUrl="downloadUrl" />
-    v-model:exportHomeWorkV="exportHomeWorkV"
-    :downloadUrl="downloadUrl"
-  />
 
   <!-- 导入学员抽屉 -->
   <!--  :courseId="projectTaskInfo.courseId"
     :courseType="2" -->
-  <imp-stu
+  <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" @AddImpStuvisibleClose="AddImpStuvisibleClose" :courseId="id"
-    v-model:AddImpStuvisible="AddImpStuvisible"
+    :courseType="type" />
-    @AddImpStuvisibleClose="AddImpStuvisibleClose"
-    :courseId="id"
-    :courseType="type"
-  />
 </template>
 <script setup>
 import { computed, createVNode, defineProps, onMounted, ref, watch } from "vue";
@@ -481,9 +360,9 @@ const tablecolumns = ref([
     // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
     ({
       0: "导入",
-        1: "导入",
+      1: "手动加入",
-        2: "导入",
+      2: "手动加入",
-        3: "导入",
+      3: "手动加入",
       4: "导入",
       5: "报名",
       6: "导入",
@@ -557,8 +436,7 @@ function showChangeGroupModal() {
 function exportTaskStu() {
   console.log("props.datasource", props);
   window.open(
-    `${
+    `${process.env.VUE_APP_BASE_API
-      process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
   );
 }
@@ -566,8 +444,7 @@ function exportTaskStu() {
 function exportTaskStuRouter() {
   console.log("props.datasource", props, props.id);
   window.open(
-    `${
+    `${process.env.VUE_APP_BASE_API
-      process.env.VUE_APP_BASE_API
     }/admin/student/exportTaskStudent?type=${2}&pid=${props.id}`
   );
 }
@@ -779,8 +656,7 @@ const exportStu = () => {
   console.log("props.datasource", props);
   if (props.id != undefined) {
     window.open(
-      `${
+      `${process.env.VUE_APP_BASE_API
-        process.env.VUE_APP_BASE_API
       }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
     );
   }
@@ -833,11 +709,13 @@ defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
 .TableStudent {
+
   table tr th.ant-table-selection-column,
   table tr td.ant-table-selection-column {
     padding-left: 3px;
   }
 }
+
 .stydentName {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -906,13 +784,13 @@ defineExpose({ getStuList, startLoading });
   position: absolute;
   width: calc(100%);
   height: 40px;
-  background: linear-gradient(
+  background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-    rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%);
-    rgba(78, 166, 255, 0) 100%
-  );
 }
+
 .batchOpera {
   display: flex;
+
   .stmm_btn {
     width: 100px;
     height: 40px;
@@ -985,6 +863,7 @@ defineExpose({ getStuList, startLoading });
           margin-bottom: 10px;
           white-space: nowrap;
         }
+
         .btn4_tit:hover,
         .btn4_op1:hover,
         .btn4_op2:hover,
@@ -1006,6 +885,7 @@ defineExpose({ getStuList, startLoading });
     }
   }
 }
+
 /*.delete {
   z-index: 9999;
   width: 424px;

src/views/examine/CourseReviewedN.vue

@@ -920,7 +920,7 @@ export default {
 
 		{/* 获取课程审核记录 */}
 		const getCourseRecord = (courseId) => {
-			state.loading2.value = true;
+			state.loading2 = true;
 			editCourseRecord(courseId)
 				.then((res) => {
 					console.log("获取修改记录", res);
@@ -928,11 +928,11 @@ export default {
 						state.tableData2 = res.data.data.records;
 						// console.log("state.tableData", state.tableData);
 					}
-					state.loading2.value = false;
+					state.loading2 = false;
 				})
 				.catch((err) => {
 					console.log("获取修改记录失败", err);
-					state.loading2.value = false;
+					state.loading2 = false;
 				});
 		}
 

src/views/examine/ProjectReviewed.vue

@@ -14,53 +14,36 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valueproj" style="
-                v-model:value="valueproj"
-                style="
                                           width: 270px;
                                           height: 40px;
                                           border-radius: 8px;
                                           margin-right: 14px;
-                "
+                                        " placeholder="请输入项目名称/所属项目" />
-                placeholder="请输入项目名称/所属项目"
-              />
             </div>
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valuename" style="
-                v-model:value="valuename"
-                style="
                                           width: 270px;
                                           height: 40px;
                                           border-radius: 8px;
                                           margin-right: 14px;
-                "
+                                        " placeholder="请输入项目经理" />
-                placeholder="请输入项目经理"
-              />
             </div>
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valuecreater" style="
-                v-model:value="valuecreater"
-                style="
                                           width: 270px;
                                           height: 40px;
                                           border-radius: 8px;
                                           margin-right: 14px;
-                "
+                                        " placeholder="请输入创建人" />
-                placeholder="请输入创建人"
-              />
             </div>
 
 
             <div class="inpbox1">
               <div class="select addTimeBox">
                 <div class="addTime">审核时间：</div>
-              <a-range-picker
+                <a-range-picker v-model:value="valueDate" style="width: 360px" format="YYYY-MM-DD" separator="至"
-                v-model:value="valueDate"
+                  :placeholder="['      开始时间', '        结束时间']" />
-                style="width: 360px"
-                format="YYYY-MM-DD"
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
               </div>
             </div>
           </div>
@@ -78,40 +61,20 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table
+          <a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
-            :columns="columns1"
+            @expand="expandTable" :scroll="{ x: 1300 }" :pagination="false" />
-            :data-source="tableData1"
-            :loading="loading"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :scroll="{ x: 1300 }"
-            :pagination="false"
-          />
         </div>
         <div class="tableBox">
           <div class="pa">
-            <a-pagination
+            <a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
-              v-if="total > 10"
+              v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
-              :showSizeChanger="false"
-              show-quick-jumper
-              :pageSize="pageSize"
-              v-model:current="currentPage"
-              :total="total"
-              class="pagination"
-              @change="changePagination"
-            />
           </div>
         </div>
       </div>
     </div>
     <!-- 审核日志弹窗 -->
-    <a-modal
+    <a-modal v-model:visible="projAuditModal" :footer="null" :closable="closeBack" wrapClassName="projAuditModal"
-      v-model:visible="projAuditModal"
+      centered="true">
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="projAuditModal"
-      centered="true"
-    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -121,16 +84,9 @@
             <div class="close_exit" @click="closeProjAuditModal"></div>
           </div>
           <div class="body">
-            <a-table
+            <a-table style="width: 100%" :columns="columnsAudit" :data-source="tableDataAudit"
-              style="width: 100%"
+              :loading="tableDataTotalAudit === -1 ? true : false" expandRowByClick="true" :scroll="{ y: 250 }"
-              :columns="columnsAudit"
+              @expand="expandTable" :pagination="false" />
-              :data-source="tableDataAudit"
-              :loading="tableDataTotalAudit === -1 ? true : false"
-              expandRowByClick="true"
-              :scroll="{ y: 250 }"
-              @expand="expandTable"
-              :pagination="false"
-            />
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeProjAuditModal">
@@ -201,12 +157,13 @@ export default {
           ellipsis: true,
           width: "20%",
           customRender: ({ record: { gaName, faName, name } }) => (
-            <div>
+            <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
-              {faName
+              {
-                ? gaName !== null
+                faName ? gaName !== null
-                  ? gaName + "/" + faName
+                  ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
-                  : faName
+                  : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
-                : name}
+                  : name.length > 16 ? name.slice(0, 16) + '...' : name
+              }
             </div>
           ),
         },
@@ -435,6 +392,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -443,10 +401,8 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(
+            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%);
-              rgba(78, 166, 255, 0) 100%
-            );
           }
 
           .del_main {
@@ -546,6 +502,7 @@ export default {
 
 .projectviewed {
   width: 100%;
+
   .addTimeBox {
     position: relative;
     display: flex;
@@ -566,6 +523,7 @@ export default {
       margin-left: 85px;
     }
   }
+
   .tmpl {
     width: 100%;
 

src/views/examine/ProjectReviewedN.vue

@@ -14,40 +14,28 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valueproj" style="
-                v-model:value="valueproj"
-                style="
                             width: 270px;
                             height: 40px;
                             border-radius: 8px;
                             margin-right: 14px;
-                "
+                          " placeholder="请输入项目名称/所属项目" />
-                placeholder="请输入项目名称/所属项目"
-              />
             </div>
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valuename" style="
-                v-model:value="valuename"
-                style="
                             width: 270px;
                             height: 40px;
                             border-radius: 8px;
                             margin-right: 14px;
-                "
+                          " placeholder="请输入项目经理" />
-                placeholder="请输入项目经理"
-              />
             </div>
             <div class="inpbox1">
-              <a-input
+              <a-input v-model:value="valuecreater" style="
-                v-model:value="valuecreater"
-                style="
                             width: 270px;
                             height: 40px;
                             border-radius: 8px;
                             margin-right: 14px;
-                "
+                          " placeholder="请输入创建人" />
-                placeholder="请输入创建人"
-              />
             </div>
             <!--            <div class="inpbox1">-->
             <!--              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
@@ -55,13 +43,8 @@
             <!--            </div>-->
             <div class="select addTimeBox">
               <div class="addTime">提交时间：</div>
-							<a-range-picker
+              <a-range-picker v-model:value="searchParam" style="width: 420px" format="YYYY-MM-DD" separator="至"
-								v-model:value="searchParam"
+                :placeholder="['      开始时间', '        结束时间']" />
-								style="width: 420px"
-								format="YYYY-MM-DD"
-								separator="至"
-								:placeholder="['      开始时间', '        结束时间']"
-							/>
             </div>
           </div>
         </div>
@@ -78,40 +61,20 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table
+          <a-table :columns="columns1" :data-source="tableData1" :loading="loading" expandRowByClick="true"
-            :columns="columns1"
+            @expand="expandTable" :pagination="false" :scroll="{ x: 1300 }" />
-            :data-source="tableData1"
-            :loading="loading"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :pagination="false"
-            :scroll="{ x: 1300 }"
-          />
         </div>
         <div class="tableBox">
           <div class="pa">
-            <a-pagination
+            <a-pagination v-if="total > 10" :showSizeChanger="false" show-quick-jumper :pageSize="pageSize"
-              v-if="total > 10"
+              v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
-              :showSizeChanger="false"
-              show-quick-jumper
-              :pageSize="pageSize"
-              v-model:current="currentPage"
-              :total="total"
-              class="pagination"
-              @change="changePagination"
-            />
           </div>
         </div>
       </div>
     </div>
     <!-- 审核项目页面 -->
-    <project-audit
+    <project-audit v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseProject="chooseProject"
-      v-model:ProjAuditvisible="ProjAuditvisible"
+      v-model:chooseCreateId="chooseCreateId" v-model:chooseCreater="chooseCreater" v-model:finishdFun="getProjList" />
-      v-model:chooseProject="chooseProject"
-      v-model:chooseCreateId="chooseCreateId"
-      v-model:chooseCreater="chooseCreater"
-      v-model:finishdFun="getProjList"
-    />
   </div>
 </template>
 <script>
@@ -170,12 +133,13 @@ export default {
           ellipsis: true,
           width: "20%",
           customRender: ({ record: { gaName, faName, name } }) => (
-              <div>
+            <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
-                {faName
+              {
-                    ? gaName !== null
+                faName ? gaName !== null
-                        ? gaName + "/" + faName
+                  ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
-                        : faName
+                  : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
-                    : name}
+                  : name.length > 16 ? name.slice(0, 16) + '...' : name
+              }
             </div>
           ),
         },

src/views/learningpath/LevelAdd.vue

@@ -2105,6 +2105,7 @@ export default {
         pid: state.routerId,
         type: 2,
       };
+      debugger
       getStuPage(stuobj)
         .then((res) => {
           console.log("获取学员列表", res.data.data.total);

src/views/projectcenter/ProjectAdd.vue

@@ -2,16 +2,9 @@
 <template xmlns:display="http://www.w3.org/1999/xhtml">
   <div class="projectAdd">
     <div class="header">
-      <span class="title"
+      <span class="title">{{ projectInfo.id ? "编辑" : "创建"
-        >{{ projectInfo.id ? "编辑" : "创建"
+      }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
-        }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
+      <div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
-      >
-      <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
-      >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
     </div>
@@ -19,10 +12,7 @@
       <div class="main">
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
@@ -33,66 +23,40 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
             </div>
           </div>
           <div class="in">
-            <NameInput
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
-              placeholder="请输入项目名称"
+              :maxlength="30" show-count :id="projectInfo.id"></NameInput>
-              v-model:value="projectInfo.name"
-              v-model:validate="projectInfo.validate"
-              :maxlength="30"
-              show-count
-              :id="projectInfo.id"
-            ></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
-            <div
+            <div :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" style="
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
                   width: 100px;
                   height: 100px;
                   border-radius: 5px;
                   cursor: pointer;
                   position: relative;
                   overflow: hidden;
-              "
+                " v-for="(src, index) in projectPic" :style="{
-              v-for="(src, index) in projectPic"
-              :style="{
                   display: index >= 3 ? 'none' : 'flex',
-              }"
+                }" :key="index" @click="() => (projectInfo.picUrl = src.value)">
-              :key="index"
+              <img style="
-              @click="() => (projectInfo.picUrl = src.value)"
-            >
-              <img
-                style="
                     width: 100px;
                     height: 100px;
                     margin-bottom: 4px;
                     margin-right: 4px;
-                "
+                  " :src="src.value" alt="avatar" />
-                :src="src.value"
-                alt="avatar"
-              />
             </div>
-            <div
+            <div @click="showLearnBgMore" v-if="projectPic.length > 3" style="
-              @click="showLearnBgMore"
-              v-if="projectPic.length > 3"
-              style="
                   width: 100px;
                   height: 100px;
                   padding-left: 15px;
@@ -108,8 +72,7 @@
                   font-weight: 400;
                   color: #4ea6ff;
                   line-height: 36px;
-              "
+                ">
-            >
               查看更多
               <img src="../../assets/images/projectadd/go.png" alt="" />
             </div>
@@ -117,70 +80,41 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
-            <a-range-picker
+            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }" :placeholder="['      开始时间', '        结束时间']"
-              separator="至"
+              :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
-              :show-time="{ format: 'HH:mm' }"
+              style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false" format="YYYY-MM-DD HH:mm"
-              :placeholder="['      开始时间', '        结束时间']"
+              valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail" />
-              :disabledDate="disabledDate"
-              v-model:value="timeRange"
-              @calendarChange="calendarChange"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              :allowClear="false"
-              format="YYYY-MM-DD HH:mm"
-              valueFormat="YYYY-MM-DD HH:mm"
-              @change="timeChange"
-              :disabled="!!viewDetail"
-            />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <ProjectManager
+            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
-              v-model:value="projectInfo.managerId"
+              @onChange="managerChange" mode="multiple"></ProjectManager>
-              v-model:name="projectInfo.manager"
-              @onChange="managerChange"
-              mode="multiple"
-            ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
-            <OrgClass
+            <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"
-              v-model:value="projectInfo.sourceBelongId"
+              v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
-              v-model:name="projectInfo.sourceBelongName"
-              v-model:fullName="projectInfo.sourceBelongFullName"
-            ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
@@ -189,10 +123,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
@@ -201,17 +132,11 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio-group
+            <a-radio-group v-model:value="projectInfo.boeFlag" :disabled="viewDetail ? true : false">
-              v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
-            >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
             </a-radio-group>
@@ -224,13 +149,11 @@
           <div class="in ggysxz" v-if="courseSyncFlag">
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
-              <span
+              <span style="
-                style="
                     width: 100%;
                     color: rgba(109, 117, 132, 1);
                     font-size: 14px;
-                "
+                  ">
-              >
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
@@ -238,13 +161,11 @@
           <div class="in" v-else>
             <!-- :disabled="viewDetail ? true : false" -->
             <a-checkbox v-model:checked="courseSyncFlag" disabled>
-              <span
+              <span style="
-                style="
                     width: 100%;
                     color: rgba(109, 117, 132, 1);
                     font-size: 14px;
-                "
+                  ">
-              >
                 同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
               </span>
             </a-checkbox>
@@ -255,14 +176,8 @@
             <div class="inname" style="margin-top: 13px">项目说明</div>
           </div>
           <div class="in">
-            <a-textarea
+            <a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
-              v-model:value="projectInfo.remark"
+              :maxlength="200" :disabled="viewDetail ? true : false" />
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
-            />
           </div>
         </div>
 
@@ -279,20 +194,13 @@
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
-            <a-select
+            <a-select :getPopupContainer="
-              :getPopupContainer="
               (triggerNode) => triggerNode.parentNode || document.body
-              "
+            " placeholder="请选择模版" style="width: 100%" :options="classifyList5" @change="classificationChange5"
-              placeholder="请选择模版"
+              @popupScroll="templateScroll" :fieldNames="{
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-              :fieldNames="{
                 label: 'name',
                 value: 'id',
-              }"
+              }">
-            >
             </a-select>
           </div>
         </div>
@@ -301,26 +209,13 @@
     <div class="footer">
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
-        <a-button
+        <a-button :loading="loading" v-on:click="createProject" type="primary" class="btn1" style="margin-left: 20px">确定
-          :loading="loading"
-          v-on:click="createProject"
-          type="primary"
-          class="btn1"
-          style="margin-left: 20px"
-          >确定
         </a-button>
       </div>
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
-    <a-modal
+    <a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
-      :closable="sh"
+      wrapClassName="learnBgMoreModal" :z-index="9999">
-      centered="true"
-      v-model:visible="learnBgMore"
-      :footer="null"
-      :width="650"
-      wrapClassName="learnBgMoreModal"
-      :z-index="9999"
-    >
       <div class="main">
         <div class="top">
           <div class="topc">封面图</div>
@@ -332,19 +227,13 @@
                   :key="item.code"
                   class="learnBgItem"
             > -->
-          <div
+          <div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
-            @click="chooseImg2(item)"
-            v-for="item in projectPic"
-            :key="item.code"
-            class="learnBgItem"
-            :style="{
             border:
               projectInfo.picUrl === item.value
                 ? '3px solid rgba(78, 166, 255, 1)'
                 : '1px solid #ccc',
             'background-image': 'url(' + item.value.split(',')[0] + ')',
-            }"
+          }">
-          >
             <!-- <img class="im" :src="item.source" /> -->
           </div>
         </div>
@@ -607,8 +496,8 @@ export default {
           current > dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm")
         );
       }
-      // return current && current < dayjs().endOf('day');
+      // 去除创建项目时间限制 可以选择创建时间之前的时间
-      return current && current < dayjs().subtract(1, "days").endOf("day");
+      // return current && current < dayjs().subtract(1, 'days').endOf('day')
     };
 
     //显示更多路径背景弹窗
@@ -1093,7 +982,9 @@ export default {
   color: #fff;
   margin-left: 16px;
 }
+
 .treeDropdown {
+
   // width: 240px !important;
   // border-radius: 5px;
   // min-height: 600px !important;

src/views/research/ManagePage.vue

@@ -35,7 +35,8 @@
           </div>
           <div style="width: 88px; margin-right: 126px; float: left">
             <span class="name">状态:</span>
-            <span class="descript">{{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}}</span>
+            <span
+              class="descript">{{ basicInfo.releaseStatus ? basicInfo.releaseStatus == 1 ? "待发布" : basicInfo.releaseStatus == 2 ? "已发布" : "已结束" : '' }}</span>
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">创建时间:</span>
@@ -59,36 +60,22 @@
       </div>
       <!-- 表格 -->
       <div class="tableBox">
-        <a-table
+        <a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="evalStuListData"
-          style="border: 1px solid #f2f6fe"
+          :loading="evalStuListLoading" expandRowByClick="true" :scroll="{ x: 1500 }" @expand="expandTable"
-          :columns="columns"
+          :pagination="false" />
-          :data-source="evalStuListData" 
-          :loading="evalStuListLoading"
-          expandRowByClick="true"
-          :scroll="{ x: 1500 }"
-          @expand="expandTable"
-          :pagination="false"
-        />
       </div>
       <!-- 表格 -->
       <!-- 分页 -->
       <div style="width:100%;display:flex;justify-content:center;align-items:center;">
-        <a-pagination 
+        <a-pagination v-if="evalStuListDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
-          v-if="evalStuListDataTotal > 10"
+          hideOnSinglePage="true" :pageSize="pageSize" :current="evalCurrentPage" :total="evalStuListDataTotal"
-          :showSizeChanger="false"
+          class="pagination" @change="changePaginationStu" />
-          showQuickJumper="true"
-          hideOnSinglePage="true"
-          :pageSize="pageSize"
-          :current="evalCurrentPage"
-          :total="evalStuListDataTotal"
-          class="pagination"
-          @change="changePaginationStu"
-        />
       </div>
       <!-- 分页 -->
     </div>
   </div>
-  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName" :basicdata="basicInfo"/>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="basicInfo.assessmentName"
+    :basicdata="basicInfo" />
 </template>
 
 <script>
@@ -156,7 +143,7 @@ export default {
 
     // 导出学员信息
     function exportStudentInfo() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${router.currentRoute.value.params.id}`)
     }
 
     //分页
@@ -347,10 +334,12 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .up {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .header {
       width: 100%;
       display: flex;
@@ -359,6 +348,7 @@ export default {
       align-items: center;
       padding-right: 38px;
       border-bottom: 1px solid #f2f6fc;
+
       .text {
         font-size: 16px;
         color: #363636;
@@ -366,6 +356,7 @@ export default {
         margin-left: 38px;
         margin-bottom: 10px;
       }
+
       .export {
         float: left;
         width: 130px;
@@ -377,11 +368,13 @@ export default {
         text-align: center;
         padding-top: 7px;
       }
+
       .goback {
         float: right;
         padding-right: 70px;
         //padding-top: 37px;
         position: relative;
+
         .return {
           display: inline-block;
           width: 42px;
@@ -390,6 +383,7 @@ export default {
           margin-right: 10px;
           background-image: url("../../assets/images/projectadd/return.png");
         }
+
         .returntext {
           display: inline-block;
           position: absolute;
@@ -399,10 +393,12 @@ export default {
         }
       }
     }
+
     .message {
       width: 100%;
       display: flex;
       flex-direction: column;
+
       .title {
         color: #4f5156;
         font-size: 14px;
@@ -410,16 +406,19 @@ export default {
         margin-top: 20px;
         font-weight: 500;
       }
+
       .messagebox {
         //width: 100%;
         //display: flex;
         margin-top: 20px;
         margin-left: 38px;
         margin-bottom: 20px;
+
         .name {
           color: #999ba3;
           font-size: 14px;
         }
+
         .descript {
           color: #4f5156;
           font-size: 14px;
@@ -427,32 +426,37 @@ export default {
       }
     }
   }
+
   .split {
     width: 100%;
     height: 20px;
     background-color: #edf0f5;
   }
+
   .down {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .tableBox {
       margin: 20px 38px 30px;
+
       .opacationn {
         color: #4ea6ff;
         cursor: pointer;
       }
+
       th.ant-table-cell {
         background-color: #eff4fc !important;
         text-align: center;
         color: #999ba3;
       }
+
       td.ant-table-cell {
         text-align: center;
       }
-      .ant-table-tbody
+
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-        > td {
         background: #f6f9fd;
       }
     }
@@ -496,5 +500,4 @@ export default {
     color: #4ea6ff;
     border: 1px solid #4ea6ff;
   }
-}
+}</style>
-</style>

src/views/system/AudienceManage.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="courseManage">
+    <iframe
+        id="iframe"
+        style="width: 100%; height: 100%"
+        :src="`${BOE_URL}/iframe/ugroup/manages`"
+        name="myframe"
+        security="restricted"
+        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+    ></iframe>
+  </div>
+</template>
+<script setup>
+
+const BOE_URL = window.location.protocol + process.env.VUE_APP_BOE_API_URL
+
+</script>
+<style lang="scss">
+.courseManage {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.btnn {
+  height: 72px;
+  width: 100%;
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+  .btn1 {
+    width: 100px;
+    height: 40px;
+    border: 1px solid #4ea6ff;
+    border-radius: 8px;
+    color: #4ea6ff;
+    background-color: #fff;
+    cursor: pointer;
+  }
+  .btn2 {
+    cursor: pointer;
+    width: 100px;
+    height: 40px;
+    background: #4ea6ff;
+    border-radius: 8px;
+    border: 0;
+    margin-left: 15px;
+    color: #fff;
+  }
+}
+</style>
+  

src/views/system/OldSystemManage.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="courseManage">
+    <iframe
+        id="iframe"
+        style="width: 100%; height: 100%"
+        :src="`${BOE_URL}/resource/index.html`"
+        name="myframe"
+        security="restricted"
+        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+    ></iframe>
+  </div>
+</template>
+<script setup>
+
+const BOE_URL = window.location.protocol + process.env.VUE_APP_BOE_API_URL
+
+</script>
+<style lang="scss">
+.courseManage {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.btnn {
+  height: 72px;
+  width: 100%;
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+  .btn1 {
+    width: 100px;
+    height: 40px;
+    border: 1px solid #4ea6ff;
+    border-radius: 8px;
+    color: #4ea6ff;
+    background-color: #fff;
+    cursor: pointer;
+  }
+  .btn2 {
+    cursor: pointer;
+    width: 100px;
+    height: 40px;
+    background: #4ea6ff;
+    border-radius: 8px;
+    border: 0;
+    margin-left: 15px;
+    color: #fff;
+  }
+}
+</style>
+  

src/views/system/ReadingClubManage.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="courseManage">
+    <iframe
+        id="iframe"
+        style="width: 100%; height: 100%"
+        :src="`${BOE_URL}/train/manager/index.html`"
+        name="myframe"
+        security="restricted"
+        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+    ></iframe>
+  </div>
+</template>
+<script setup>
+
+const BOE_URL = window.location.protocol + process.env.VUE_APP_BOE_API_URL
+
+</script>
+<style lang="scss">
+.courseManage {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.btnn {
+  height: 72px;
+  width: 100%;
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+  .btn1 {
+    width: 100px;
+    height: 40px;
+    border: 1px solid #4ea6ff;
+    border-radius: 8px;
+    color: #4ea6ff;
+    background-color: #fff;
+    cursor: pointer;
+  }
+  .btn2 {
+    cursor: pointer;
+    width: 100px;
+    height: 40px;
+    background: #4ea6ff;
+    border-radius: 8px;
+    border: 0;
+    margin-left: 15px;
+    color: #fff;
+  }
+}
+</style>
+  

vue.config.js

@@ -15,7 +15,8 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                // target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                target: 'http://localhost:30001',
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",