feat:合并

package.json

@@ -13,6 +13,7 @@
 		"ant-design-vue": "^3.2.12",
 		"axios": "^1.1.3",
 		"core-js": "^3.8.3",
+		"dayjs": "^1.11.6",
 		"element-plus": "^2.2.17",
 		"element-resize-detector": "^1.2.4",
 		"html2canvas": "^1.4.1",

src/api/config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-05 17:39:23
+ * @LastEditTime: 2022-12-05 21:56:56
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -55,10 +55,10 @@ http.interceptors.response.use(
     if (code === 0 || code === 200) {
       return response;
     } else {
-      if (code === 1000) {
+      // if (code === 1000) {
       //   window.open("https://u-pre.boe.com/web/", '_self');
-        // window.open("http://111.231.196.214:12013/manage/login", '_self');
+      //   // window.open("http://111.231.196.214:12013/manage/login", '_self');
-      }
+      // }
       console.log("api %o", msg);
     }
     return response;

src/api/indexFace.js

@@ -1,7 +1,7 @@
 import http from "./config";
 
 //获取面授课开课详情
-export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/manageApi/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``)
+export const queryFaceDetailById = (offcoursePlanId) => http.post(`/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``)
 
 //新建或编辑面授课开课
 export const editPlan = (obj) => http.post('/admin/offcourse/editPlan', obj)

src/components/drawers/AddCase.vue

@@ -216,6 +216,7 @@ export default {
       state.apiTaskList = selectedRows;
     };
     const handelChangePage = (page, pageSize) => {
+      state.selectedRowKeys = []
       state.currentPage = page;
       state.pageSize = pageSize;
       getAllCaseText();
@@ -250,7 +251,14 @@ export default {
           isTop: "",
         })
         .then((res) => {
+          console.log('案例列表',res)
           if (res.status === 200) {
+            state.selectedRowKeys=[0]
+            for(let i=0;i<res.data.data.length;i++){
+              if(Number(res.data.data[i].casesId) == props.EditCaseId){
+                state.selectedRowKeys = [i]
+              }
+            }
             getTableDate(res.data.data);
           }
         })

src/components/drawers/AddFaceteach.vue

@@ -32,7 +32,7 @@
             </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerSelFacet">
-                {{ chooseCourse == null ? "选择" : "重选" }}面授课
+                {{ chooseCourseName ? chooseCourseName : "选择面授课" }}
               </button>
               <div v-if="chooseCourse">
                 <a-tag closable color="processing" @close="logC">
@@ -43,7 +43,8 @@
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/>
+              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
+                         v-model:chooseCourseName="chooseCourseName"/>
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -52,7 +53,8 @@
               <span style="margin-right: 3px">面授说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200" :rows="6"/>
+              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200"
+                          :rows="6"/>
             </div>
           </div>
           <div class="main_item">
@@ -408,6 +410,7 @@ export default {
     };
     const closeDrawer = () => {
       ctx.emit("update:addfaceteachVisible", false);
+      ctx.emit("update:edit", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
       state.fileList = []
@@ -796,6 +799,7 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 423px;
 
@@ -817,6 +821,7 @@ export default {
               border-radius: 8px;
             }
           }
+
           .signbox {
             width: 120px;
             display: flex;

src/components/drawers/AddLive.vue

@@ -66,8 +66,10 @@
             </div>
             <div class="btnbox">
               <a-range-picker
+                  show-time
                   style="width: 424px"
                   v-model:value="time"
+                  format="YYYY/MM/DD HH:mm"
                   :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -492,9 +494,11 @@ export default {
             console.log("获取的数据",res)
             state.inputV1 = res.data.data.liveName;
             state.time = [
-              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
-              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
             ];
+            console.log(state.time)
+
             state.inputV2 = res.data.data.liveDuration;
             state.inputV3 = res.data.data.liveTeacherId;
             //state.fileList= res.data.data
@@ -632,11 +636,11 @@ export default {
       }
       let startTime = toDate(
           new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
       );
       let endTime = toDate(
           new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
       );
       state.obj = {
         afterSignIn: state.inputV6,
@@ -661,6 +665,7 @@ export default {
         isEvaluate: state.needEval ? "1" : "0",
       };
       console.log('我是要更新的数据',state.obj )
+      
       if (props.edit) {
         api
             .updateLiveBroadcastMessage(state.obj)

src/components/drawers/AddOnline.vue

@@ -79,24 +79,7 @@
         <div class="main_table">
           <!-- 编辑的表格 -->
           <div v-if="edit">
-            <div
+            <div>
-              v-if="choicecourse"
-              class="main_btns"
-              style="justify-content: flex-start"
-            >
-              <div
-                class="btn2"
-                style="
-                  display: flex;
-                  justify-content: center;
-                  align-items: center;
-                "
-                @click="ChoiceCourse"
-              >
-                选择在线课
-              </div>
-            </div>
-            <div v-else>
               <a-table
                 class="ant-table-striped"
                 :row-class-name="
@@ -338,6 +321,7 @@ export default {
     };
     const handelChangePage = (page) => {
       state.currentPage = page;
+      state.selectedRowKeys = []
       getAllOnlineText();
     };
     const getTableDate = (tableData) => {
@@ -381,6 +365,11 @@ export default {
           state.tableDataTotal = res.data.data.count;
           if (res.status === 200) {
             console.log("获取在线课列表数据", res);
+            for(let i=0;i<res.data.data.list.length;i++){
+              if(Number(res.data.data.list[i].onlineClassesId) == props.EditOnlineId){
+                state.selectedRowKeys = [i+1]
+              }
+            }
             getTableDate(arr);
           }
         })

src/components/drawers/AddTest.vue

@@ -68,7 +68,8 @@
                   has-feedback
                   label="考试说明"
                   name="examinationExplain"
-              ><div class="textarea">
+              >
+                <div class="textarea">
                   <a-textarea
                       v-model:value="formState.examinationExplain"
                       placeholder="请输入考试说明"
@@ -76,7 +77,8 @@
                       :rows="6"
                       style="margin-left: 35px"
                       show-count :maxlength="200"
-                /></div>
+                  />
+                </div>
               </a-form-item>
             </div>
             <div class="main_item">
@@ -126,9 +128,6 @@
             </div>
 
 
-
-
-
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -195,13 +194,15 @@
                         v-model:checked="checked"
                         :value="1"
                         @click="cloradio1"
-                      >允许查看</a-radio
+                    >允许查看
+                    </a-radio
                     >
                     <a-radio
                         v-model:checked="checked"
                         :value="2"
                         @click="cloradio1"
-                      >不允许查看</a-radio
+                    >不允许查看
+                    </a-radio
                     >
                   </a-radio-group>
                 </a-form-item>
@@ -218,13 +219,15 @@
                         v-model:checked="checked"
                         :value="1"
                         @click="cloradio2"
-                      >允许查看</a-radio
+                    >允许查看
+                    </a-radio
                     >
                     <a-radio
                         v-model:checked="checked"
                         :value="2"
                         @click="cloradio2"
-                      >不允许查看</a-radio
+                    >不允许查看
+                    </a-radio
                     >
                   </a-radio-group>
                 </a-form-item>
@@ -241,13 +244,15 @@
                         v-model:checked="checked"
                         :value="1"
                         @click="cloradio3"
-                      >最高一次</a-radio
+                    >最高一次
+                    </a-radio
                     >
                     <a-radio
                         v-model:checked="checked"
                         :value="2"
                         @click="cloradio3"
-                      >最后一次</a-radio
+                    >最后一次
+                    </a-radio
                     >
                   </a-radio-group>
                 </a-form-item>
@@ -280,19 +285,22 @@
                         v-model:checked="checked"
                         :value="1"
                         @click="cloradio4"
-                      >试题乱序</a-radio
+                    >试题乱序
+                    </a-radio
                     >
                     <a-radio
                         v-model:checked="checked"
                         :value="2"
                         @click="cloradio4"
-                      >试题排序</a-radio
+                    >试题排序
+                    </a-radio
                     >
                     <a-radio
                         v-model:checked="checked"
                         :value="3"
                         @click="cloradio4"
-                      >全部乱序</a-radio
+                    >全部乱序
+                    </a-radio
                     >
                   </a-radio-group>
                 </a-form-item>
@@ -367,7 +375,8 @@
                       :rows="6"
                       style="margin-left: 35px"
                       show-count :maxlength="200"
-                /></div>
+                  />
+                </div>
               </a-form-item>
             </div>
           </div>
@@ -398,6 +407,7 @@ import STest from "./SelectTest.vue";
 import {ProjectEditTask, RouterEditTask} from "@/api/indexTask";
 import {addTempTask} from "../../api/indexTaskadd";
 import dayjs from "dayjs";
+
 export default {
   name: "AddTest",
   components: {
@@ -642,6 +652,7 @@ export default {
       console.log(args);
     };
     const closeDrawer = () => {
+      console.log('closeDrawer')
       formState.choosedTime = "";
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
@@ -652,10 +663,12 @@ export default {
     };
     const closeDrawer2 = () => {
       formState.choosedTime = "";
+      ctx.emit("update:edit", false);
       ctx.emit("update:addtestVisible", false);
       resetForm();
     };
     const afterVisibleChange = () => {
+      console.log('props', props)
       if (props.addtestVisible && props.edit) {
         // 该页面显示同时 edit为true 时，发送查询请求,
         queryTest();
@@ -897,6 +910,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .outer {
   background-color: #4ea6ff;
   color: #fff;
@@ -905,6 +919,7 @@ export default {
   height: 36px;
   margin-right: 10px;
 }
+
 .notOuter {
   color: #000;
   border-radius: 5px;
@@ -913,10 +928,12 @@ export default {
   margin-right: 10px;
   padding: 3px;
 }
+
 .tag-style {
   color: rgb(113, 113, 237);
   background-color: #d7d1f7;
 }
+
 .addtestDrawer {
   .drawerMain {
     .header {
@@ -926,6 +943,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -934,31 +952,38 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+
         .main_item {
           display: flex;
           align-items: center;
           margin-top: 32px;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -971,10 +996,12 @@ export default {
             }
           }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 423px;
 
@@ -996,24 +1023,29 @@ export default {
               border-radius: 8px;
             }
           }
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 56px;
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -1023,10 +1055,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -1043,6 +1077,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -1052,6 +1087,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;
@@ -1061,6 +1097,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

src/components/drawers/ProjPowerList.vue

@@ -134,6 +134,7 @@
 import {toRefs, reactive} from "vue";
 import * as api from "../../api/index1";
 import {message} from "ant-design-vue";
+
 export default {
   name: "ProjPowerList",
   props: {
@@ -271,9 +272,8 @@ export default {
           align: "center",
           scopedSlots: {customRender: "action"}, //引入的插槽
           customRender: (text) => {
-            return (
+            return (text.record.state === '归属权' ? '' : <div
-              <div
+                    className="opa"
-                class="opa"
                     onClick={() => {
                       console.log("text.record.id", text.record.id);
                       showCancelModal(text.record);
@@ -430,16 +430,19 @@ export default {
     .ant-drawer-header {
       display: none !important;
     }
+
     .ant-drawer-body {
       padding: 0;
     }
   }
+
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
     // overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -449,6 +452,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -457,11 +461,13 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       width: 100%;
       height: 100%;
       // background-color: #bfa;
       overflow-y: auto;
+
       .search {
         width: 100%;
         display: flex;
@@ -471,14 +477,17 @@ export default {
         .leftchoose {
           display: flex;
           margin-right: 20px;
+
           .namecon {
             display: flex;
             flex-wrap: nowrap;
             margin-bottom: 10px;
+
             .name {
               margin-top: 8px;
               white-space: nowrap;
             }
+
             // .name {
             //   margin-top: 8px;
 
@@ -501,6 +510,7 @@ export default {
             display: flex;
             justify-content: center;
             align-items: center;
+
             .img1 {
               width: 15px;
               height: 17px;
@@ -508,6 +518,7 @@ export default {
               background-size: 100% 100%;
               margin-right: 7px;
             }
+
             .img2 {
               width: 16px;
               height: 18px;
@@ -522,6 +533,7 @@ export default {
 
             color: #ffffff;
           }
+
           .btn2 {
             background: #ffffff;
 
@@ -539,17 +551,21 @@ export default {
           // padding-left: 9px !important;
           padding-left: 20px !important;
         }
+
         .ant-checkbox-wrapper {
           align-items: center;
           margin-top: -2px;
         }
+
         .ant-table-selection-column {
           padding: 0px !important;
           // padding-left: 45px !important;
         }
+
         .ant-table-thead > tr > th {
           background-color: rgba(239, 244, 252, 1);
         }
+
         th.h {
           background-color: #eff4fc !important;
         }
@@ -559,6 +575,7 @@ export default {
         > td {
           background: #f6f9fd;
         }
+
         .opa {
           // background-color: #bfa;
           font-size: 14px;
@@ -567,6 +584,7 @@ export default {
           cursor: pointer;
         }
       }
+
       .pa {
         // left: 0;
         margin-top: 25px;
@@ -585,6 +603,7 @@ export default {
           margin-bottom: 10px;
         }
       }
+
       // .tab {
       //   .ant-table-thead > tr > th {
       //     background-color: rgba(239, 244, 252, 1) !important;
@@ -602,6 +621,7 @@ export default {
       // }
     }
   }
+
   // .botm {
   //   width: 100%;
   //   height: 100%;
@@ -619,6 +639,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;
@@ -628,6 +649,7 @@ export default {
       background-color: #fff;
       cursor: pointer;
     }
+
     .btn2 {
       cursor: pointer;
       width: 100px;

src/components/project/ProjectManager.vue

@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log('onMounted')
-      init()
+      // init()
     })
 
     function getMember() {

src/views/courselibrary/CoursewareManage.vue

@@ -2924,7 +2924,11 @@
       </div>
     </a-modal>
     <!-- 预览弹窗 -->
-    <!-- <SeeModal :show="lookCourseModal" /> -->
+    <SeeModal
+      :visible="lookCourseModal"
+      :detail="faceDetailObj"
+      @cancel="ft_exit_see"
+    />
     <!--删除 复制 停用弹窗 -->
     <!-- 学员管理课程库-归属权抽屉 -->
     <!-- <own-power v-model:ownpowervisible="ownpowervisible" /> -->
@@ -3037,7 +3041,7 @@ import "@wangeditor/editor/dist/css/style.css";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManager";
 
-// import SeeModal from "./components/seeModal.vue";
+import SeeModal from "./components/seeModal.vue";
 
 //列表表格
 const columns1 = [
@@ -3090,7 +3094,17 @@ const columns1 = [
   {
     title: " 所属项目",
     width: 250,
-    dataIndex: "project",
+    dataIndex: "projectName",
+    key: "3",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },{
+    title: " 所属路径",
+    width: 250,
+    dataIndex: "routerName",
     key: "3",
     align: "center",
     ellipsis: true,
@@ -3498,6 +3512,7 @@ export default defineComponent({
     // Corpowerlist,
     Editor,
     Toolbar,
+    SeeModal,
     // StuAdd,
     ProjectManager,
     ProjOwnerShip,
@@ -4770,10 +4785,13 @@ export default defineComponent({
             score: state.lrcj_inputV1,
             studentIds: [state.studentId],
             type: 1,
-          });
+          }).then((res) => {
+            if (res.data.code === 200) {
               getTableDate2();
               delete_exit1();
             }
+          });
+        }
       }
     };
     const handleJie = async () => {
@@ -4783,10 +4801,13 @@ export default defineComponent({
           score: "",
           studentIds: [state.studentId],
           type: 2,
-        });
+        }).then((res) => {
+          if (res.data.code === 200) {
             getTableDate2();
             delete_exit1();
           }
+        });
+      }
     };
     //确认复制
     const handleAgreeTrue = async () => {
@@ -4796,21 +4817,27 @@ export default defineComponent({
           score: "",
           studentIds: [state.studentId],
           type: 3,
-        });
+        }).then((res) => {
+          if (res.data.code === 200) {
             getTableDate2();
             delete_exit1();
             state.addLoading = false;
           }
+        });
+      }
       if (state.rejectstudy_hs) {
         handleStudent({
           offcoursePlanId: state.offcoursePlanId,
           score: "",
           studentIds: [state.studentId],
           type: 4,
-        });
+        }).then((res) => {
+          if (res.data.code === 200) {
             getTableDate2();
             delete_exit1();
           }
+        });
+      }
     };
     //确认复制课程
     const handleDeleteExit = async () => {
@@ -4825,16 +4852,22 @@ export default defineComponent({
             score: "",
             studentIds: [state.studentId],
             type: 5,
-          });
+          }).then((res) => {
+            if (res.data.code === 200) {
               getTableDate2();
               delete_exit1();
+            }
+          });
         } else if (state.offcourseId && state.offcoursePlanId) {
           console.log(2222222);
           deletePlan({
             offcoursePlanId: state.offcoursePlanId,
-          });
+          }).then((res) => {
+            if (res.data.code === 200) {
               getTableDate3();
               delete_exit1();
+            }
+          });
         } else if (state.offcourseId) {
           console.log(3333333);
           handle({
@@ -5086,7 +5119,6 @@ export default defineComponent({
       state.lookCourseModal = false;
     };
     const handleLook = async (itm, type) => {
-      state.lookCourseModal = true;
       // state.isEdit = 0;
       console.log(45555);
       console.log(itm);
@@ -5100,12 +5132,14 @@ export default defineComponent({
       }).then((res) => {
         if (res.data.code === 200) return res.data.data;
       });
+      state.lookCourseModal = true;
       state.faceDetailObj = item;
       // heroImg.value.src = item.picUrl;
       // valueHtmlRef.value = item.outline;
       // attachMap.value = item.attach == "" ? [] : item.attach.split(",");
       console.log("res222222222");
       console.log(item);
+      console.log(state.lookCourseModal);
 
       // state.qdms_inputV1 = item.name;
       // state.imageUrl = item.picUrl;

src/views/courselibrary/components/seeModal.vue

@@ -2,14 +2,14 @@
 <template>
   <!-- 预览弹窗 -->
   <a-modal
-    v-model:visible="showM"
+    :visible="visible"
     title="查看"
-    @ok="handleCancel"
     :footer="null"
     :closable="false"
     wrapClassName="modalStyle lookCourseModal"
     width="80%"
     @cancel="handleCancel"
+    @ok="handleCancel"
   >
     <div class="modalHeader">
       <div class="headerLeft">
@@ -37,7 +37,7 @@
                   <div class="asterisk_icon">
                     <img
                       src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                      alt="img"
                     />
                   </div>
                   <span style="margin-right: 14px">课程名称：</span>
@@ -48,7 +48,7 @@
                   </div>
                 </div>
               </div>
-              <div class="i2_cz">
+              <!-- <div class="i2_cz">
                 <div class="i2_top">
                   <div
                     class="i2_right"
@@ -58,13 +58,13 @@
                     <div class="b_icon"></div>
                   </div>
                 </div>
-              </div>
+              </div> -->
               <div class="mbl_items2">
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img
                       src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                      alt="img"
                     />
                   </div>
                   <span style="margin-right: 14px">封面图：</span>
@@ -82,7 +82,7 @@
                     <img
                       style="width: 10px; height: 10px"
                       src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                      alt="img"
                     />
                   </div>
                   <span style="margin-right: 14px">目标人群：</span>
@@ -193,10 +193,10 @@
                 </div>
               </div>
               <div class="mbl_items">
-                <div v-if="attachMap.length > 0" class="item_nam">
+                <!-- <div v-if="attachMap.length > 0" class="item_nam">
                   <span style="margin-right: 10px">附件</span>
-                </div>
+                </div> -->
-                <div
+                <!-- <div
                   class="item_inp"
                   v-for="(value, index) in attachMap"
                   :key="index"
@@ -216,6 +216,7 @@
                   <a style="margin-left: 120px" :src="value" :href="value">
                     查看
                   </a> 
+                       </div>-->
                 <!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2">
                       <div class="accessory" style="cursor: pointer">
                         <div class="accessory_icon">
@@ -228,7 +229,6 @@
                       支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
                     </span> -->
               </div>
-              </div>
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
@@ -253,13 +253,13 @@
                       </div>
                     </div>
                   </div>
-                  <div class="file_operation">
+                  <!-- <div class="file_operation">
                     <div class="fobox">
                       <span style="color: #4ea6ff" @click="handleDel(index)">
                         删除
                       </span>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
             </div>
@@ -301,11 +301,11 @@
   </a-modal>
 </template>
 <script>
-import { reactive, toRefs, defineComponent } from "vue";
+import { reactive, toRefs, defineComponent, toRef, watch } from "vue";
 
 export default defineComponent({
   props: {
-    show: {
+    visible: {
       type: Boolean,
       default: false,
     },
@@ -316,10 +316,18 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     console.log(props);
-    // const showM = ref(props.show);
+    const detailWatch = toRef(props, "detail");
     const state = reactive({
-      showM: false,
+      imgList: [],
     });
+    watch(
+      () => detailWatch,
+      (newValue) => {
+        console.log(78787878);
+        console.log(newValue);
+      },
+      { deep: true }
+    );
 
     const filterTxt = (txt) => {
       if (txt) {
@@ -329,7 +337,6 @@ export default defineComponent({
       }
     };
     const handleCancel = () => {
-      console.log(6767767);
       emit("cancel");
     };
 

src/views/projectcenter/ProjectManage.vue

@@ -377,7 +377,7 @@
                   <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
-                  单层项目
+                  单层{{projectInfo.parentId?'子':''}}项目
                 </div>
                 <div class="centermain">
                   不包含子项目，直接填写项目基础信息后创建任务
@@ -402,10 +402,10 @@
                 <img src="../../assets/images/taskpage/right3.png"/>
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
-                多层项目
+                多层{{projectInfo.parentId?'子':''}}项目
               </div>
               <div class="centermain1">
-                包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务
+                {{projectInfo.parentId?'可创建班级，通过班级填写基础信息并创建任务':'包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务'}}
               </div>
             </div>
           </div>
@@ -644,6 +644,37 @@
         </div>
       </div>
     </a-modal>
+<!--    撤回结束弹窗-->
+    <a-modal
+        v-model:visible="backFinashModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeBackFinashModal"></div>
+          </div>
+          <div class="body">
+            <span>是否撤回结束</span>
+            <div class="back">（项目撤回结束后学员可继续学习）</div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeBackFinashModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="reFinashedProject">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <!-- 创建项目提示框 -->
     <a-modal
         v-model:visible="reminderModal"
@@ -778,6 +809,8 @@ import {storage} from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManager";
 import ProjectClass from "@/components/project/ProjectClass";
 import OrgClass from "@/components/project/OrgClass";
+import dayjs from "dayjs";
+
 
 export default {
   name: "projectManage",
@@ -848,6 +881,7 @@ export default {
       projectClass: [],
       managerList: [],
       managerLoading: false,
+      backFinashModal:false,
       memberParam: {
         pageNo: 1,
         pageSize: 10,
@@ -965,16 +999,11 @@ export default {
       api
           .getProjectCount(object.projectId)
           .then((res) => {
-            if (res.status === 200) {
             console.log("获取关卡、任务、学员统计数据", res.data);
             state.projectStudentsNum = res.data.students;
             state.projectStages = res.data.stages;
             state.projectTasks = res.data.tasks;
-            }
           })
-          .catch((err) => {
-            console.log("err", err);
-          });
       // //获取学员总数
       // let obj = {
       //   pageNo: 0,
@@ -1003,8 +1032,7 @@ export default {
         projectId: state.releaseProjectId,
         type: 4,
       };
-      api
+      api.handleProject(obj)
-          .handleProject(obj)
           .then((res) => {
             console.log("发布成功", res);
             message.destroy();
@@ -1012,19 +1040,21 @@ export default {
             state.projectPub = false;
             getTableDate();
           })
-          .catch((err) => {
-            console.log("发布失败", err);
-          });
     };
     //关闭发布弹窗
     const closeProjectPub = () => {
       state.projectPub = false;
     };
-    //打开撤回弹窗
+    //打开撤回发布弹窗
     const showBackModal = (projectId) => {
       state.backModal = true;
       state.recallProjectId = projectId;
     };
+    //打开撤回结束弹窗
+    const showBackFinashModal = (projectId) => {
+      state.backFinashModal = true;
+      state.recallProjectId = projectId;
+    };
     //确认撤回发布
     const recallProject = () => {
       let obj = {
@@ -1044,10 +1074,32 @@ export default {
             console.log("撤回失败", err);
           });
     };
+    //确认撤回结束
+    const reFinashedProject = () => {
+      let obj = {
+        projectId: state.recallProjectId,
+        type: -6,
+      };
+      api
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backFinashModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("撤回失败", err);
+          });
+    };
     //关闭撤回弹窗
     const closeBackModal = () => {
       state.backModal = false;
     };
+    const closeBackFinashModal = () => {
+      state.backFinashModal = false;
+    };
     //打开结束弹窗
     const showStopModal = (projectId) => {
       state.stopModal = true;
@@ -1250,24 +1302,15 @@ export default {
         customRender: (value) => {
           return (
               <div>
-                {value.record.status == 0 ||
+                {value.record.type === 3 ? {
-                value.record.status == 1 ||
+                  '0': () => '草稿',
-                value.record.status == 2 ||
+                  '1': () => '草稿',
-                value.record.status == -2
+                  '2': () => '草稿',
-                    ? "草稿"
+                  '3': () => dayjs().isBefore(value.record.beginTime) ? '未开始' : '进行中',
-                    : value.record.status == 3 &&
+                  '4': () => dayjs().isBefore(value.record.end) ? '进行中' : '已结束',
-                    Number(value.record.beginTime) <
+                  '-1': () => '已结束',
-                    Math.ceil(new Date().getTime() / 1000)
+                  '-5': () => '草稿'
-                        ? "进行中"
+                }[value.record.status + '']() || '' : '-'}
-                        : value.record.status == 3 &&
-                        Number(value.record.beginTime) >
-                        Math.ceil(new Date().getTime() / 1000) &&
-                        value.record.type !== 1 &&
-                        value.record.type !== 2
-                            ? "未开始"
-                            : value.record.status == -1
-                                ? "已结束"
-                                : "-"}
               </div>
           );
         },
@@ -1290,19 +1333,15 @@ export default {
         customRender: (value) => {
           return (
               <div>
-                {value.record.type !== 3
+                {value.record.type === 3 ? {
-                    ? "-"
+                  '0': '未审核',
-                    : value.record.status == 0
+                  '1': '审核中',
-                        ? "未审核"
+                  '2': '已审核',
-                        : value.record.status == 1
+                  '3': '已审核',
-                            ? "审核中"
+                  '4': '已审核',
-                            : value.record.status == 2 ||
+                  '-1': '已审核',
-                            value.record.status == 3 ||
+                  '-5': '拒绝'
-                            value.record.status == -1
+                }[value.record.status + ''] || '' : '-'}
-                                ? "已审核"
-                                : value.record.status == -2
-                                    ? "未通过"
-                                    : "-"}
               </div>
           );
         },
@@ -1325,7 +1364,7 @@ export default {
           // console.log("value", value.record.type, value.record.status);
           return (
               <div className="operation">
-                {value.record.status === 0 || value.record.status === -2 ? (
+                {value.record.status === 0 || value.record.status === -5 ? (
                     <span
                         onClick={() => {
                           if (value.record.type === 1 || value.record.type === 2) {
@@ -1351,7 +1390,7 @@ export default {
                 ) : (
                     ""
                 )}
-                {(value.record.status === 0 || value.record.status === -2) &&
+                {(value.record.status === 0 || value.record.status === -5) &&
                 value.record.type === 3 ? (
                     <span
                         onClick={() => {
@@ -1365,7 +1404,7 @@ export default {
                 ) : (
                     ""
                 )}
-                {value.record.status === 1 && value.record.type !== 1 ? (
+                {value.record.status === 1 && value.record.type === 3 ? (
                     <span
                         onClick={() => {
                           showRecallReviewModal(value.record.projectId);
@@ -1378,10 +1417,10 @@ export default {
                 ) : (
                     ""
                 )}
-                {value.record.status === 2 ? (
+                {value.record.status === 2 && value.record.type === 3 ? (
                     <span
                         onClick={() => {
-                          let time = value.record.beginTime + "-" + value.record.beginTime;
+                          let time = value.record.beginTime + "-" + value.record.endTime;
                           let obj = {
                             projectId: value.record.projectId,
                             name: value.record.name,
@@ -1397,6 +1436,19 @@ export default {
                 ) : (
                     ""
                 )}
+                {value.record.status === 3 && value.record.type === 3 ? (
+                    <span
+                        onClick={() => {
+                          showBackModal(value.record.projectId);
+                        }}
+                        style="cursor:pointer"
+                        class="operation3"
+                    >
+                  撤回发布
+                </span>
+                ) : (
+                    ""
+                )}
                 <div className="tableSelect">
                   <a-select
                       style="width: 50px"
@@ -1519,6 +1571,33 @@ export default {
                     ) : (
                         ""
                     )}
+                    {value.record.status === 3 && value.record.type === 3 ? (
+                        <a-select-option value="结束" label="结束">
+                          <div
+                              onClick={() => {
+                                showStopModal(value.record.projectId);
+                              }}
+                          >
+                            结束
+                          </div>
+                        </a-select-option>
+                    ) : (
+                        ""
+                    )}
+
+                    {value.record.status === -1 && value.record.type === 3 ? (
+                        <a-select-option value="撤回" label="撤回">
+                          <div
+                              onClick={() => {
+                                showBackFinashModal(value.record.projectId);
+                              }}
+                          >
+                            撤回
+                          </div>
+                        </a-select-option>
+                    ) : (
+                        ""
+                    )}
                     {value.record.type === 3 ? (
                         <a-select-option value="基础信息" label="基础信息">
                           <div
@@ -1664,6 +1743,9 @@ export default {
     );
     return {
       ...toRefs(state),
+      dayjs,
+      reFinashedProject,
+      showBackFinashModal,
       timeChange,
       expandTable,
       showModal,
@@ -1684,6 +1766,7 @@ export default {
       closeStartModal,
       showBackModal,
       closeBackModal,
+      closeBackFinashModal,
       getTableDate,
       showProjOwner,
       showProjPrower,