feat:合并

src/api/indexInvist.js

@@ -43,7 +43,6 @@ import http from "./config";
 //根据ID获取评估信息详情
 export const queryAppraiseDetailById = (obj) => http.post('/assessment/queryAssessmentDetailById',  obj,{
     headers: {
-      'token': '123',
       'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
     }
   })

src/components/drawers/ AssessmentList.vue

@@ -234,7 +234,9 @@ export default {
         .then((res) => {
           let arr = res.data.data.rows;
           if (res.status === 200) {
-            // console.log("获取全部评估信息", res.data.data);
+            console.log("获取全部评估信息", res.data.data);
+            state.selectedRowKeys = [props.assessmentId]
+            console.log(props.assessmentId,props)
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }

src/components/drawers/AddInvist.vue

@@ -212,6 +212,7 @@ export default {
             console.log(res);
             //更新讨论信息
             state.assessment1 = res.data.data;
+            state.assessmentId = res.data.data.assessmentId;
           })
           .catch(() => {});
       }

src/components/drawers/ProjPowerList.vue

@@ -96,7 +96,7 @@
         v-model:visible="cancelModal"
         :footer="null"
         :closable="closeCancel"
-        wrapClassName="CopyModal"
+        wrapClassName="DelModal"
         centered="true"
     >
       <div class="delete">
@@ -422,6 +422,119 @@ export default {
     padding: 0px;
   }
 }
+.DelModal {
+  .ant-modal {
+    .ant-modal-content {
+      width: 424px !important;
+
+      .ant-modal-body {
+        .delete {
+          width: 424px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+          position: absolute;
+          left: 50%;
+          top: 10%;
+          transform: translate(-50%, -50%);
+
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
+            );
+          }
+
+          .del_main {
+            width: 100%;
+            position: relative;
+
+            .header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+
+              .del-icons {
+                width: 16px;
+                height: 16px;
+                position: relative;
+                margin-right: 10px;
+
+                img {
+                  width: 100%;
+                  height: 100%;
+                  position: absolute;
+                  top: 0px;
+                  left: 0px;
+                  background-size: 100% 100%;
+                }
+              }
+
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            }
+
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-right: 14px;
+                flex-shrink: 0;
+                cursor: pointer;
+
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
+              }
+
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+              }
+
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #ffffff;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 
 .ProjPowerList {
   // width: 80%;

src/components/project/ProjectManagerNew.vue

@@ -122,9 +122,9 @@ const searchMember = (keyWord) => {
 };
 
 function change(e, l) {
-  selectOptions.value = l
   isOpen.value = false
-  emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
+  Array.isArray(l) && (selectOptions.value = l)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
   if (Array.isArray(l)) {
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))

src/views/courselibrary/CoursewareManage.vue

@@ -2487,13 +2487,13 @@
               <div class="stmm_i1">
                 <span style="margin-right: 52px">
                   {{ currentPlanItem.name }}课程-第1期-
-                  {{ getdateToDateFn(currentPlanItem.createTime) }}
+                  {{ currentPlanItem.createTime }}
                 </span>
                 <span style="color: #ffb751">已开课 4.5</span>
               </div>
               <div class="stmm_i2">
                 <span style="color: #999ba3">时间：</span>
-                <span>{{ getdateToTimeFn(currentPlanItem.endTime) }}</span>
+                <span>{{ currentPlanItem.endTime }}</span>
               </div>
               <div class="stmm_i3">
                 <span style="color: #999ba3">地点：</span>
@@ -3148,8 +3148,10 @@ const columns1 = [
     dataIndex: "num",
     key: "num",
     align: "center",
-    customRender: ({ index }) => {
+    customRender: ({ index, record }) => {
-      return index + 1;
+      const pageNum =
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+      return index + 1 + pageNum;
     },
   },
   {
@@ -3397,9 +3399,10 @@ const columns6 = [
     width: "6%",
     align: "center",
     ellipsis: true,
-    customRender: ({ index }) => {
+    customRender: ({ index, record }) => {
-      //{ text, record, index, column }
+      const pageNum =
-      return index + 1;
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+      return index + 1 + pageNum;
     },
   },
   {
@@ -3454,7 +3457,8 @@ const columns6 = [
     ellipsis: true,
     align: "center",
     customRender: ({ text }) => {
-      return text ? getdateToTime(text * 1000) : "-";
+      // return text ? getdateToTime(text * 1000) : "-";
+      return text ? text : "-";
     },
   },
   {
@@ -3465,7 +3469,8 @@ const columns6 = [
     ellipsis: true,
     align: "center",
     customRender: ({ text }) => {
-      return text ? getdateToTime(text * 1000) : "-";
+      // return text ? getdateToTime(text * 1000) : "-";
+      return text ? text : "-";
     },
   },
   {
@@ -3484,9 +3489,10 @@ const columns7 = [
     dataIndex: "num",
     key: "num",
     align: "center",
-    customRender: ({ index }) => {
+    customRender: ({ index, record }) => {
-      //{ text, record, index, column }
+      const pageNum =
-      return index + 1;
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+      return index + 1 + pageNum;
     },
   },
   {
@@ -3885,7 +3891,7 @@ export default defineComponent({
       selectTime: "",
 
       pageSize3: 10,
-      currentPage3: 0,
+      currentPage3: 1,
       tableDataTotal3: 0,
 
       checked1: false,
@@ -4107,14 +4113,17 @@ export default defineComponent({
         endTime: endTime,
         beginTime: startTime,
       });
-      const { rows, total } = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       console.log(res.data.data);
       state.tableDataTotal1 = total;
+      for (let i = 0; i < rows.length; i++) {
+        rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
+      }
       const datas = traverseArr(
         rows,
         {
           key: "offcourseId",
-          num: "offcourseId",
+          num: "num",
           name: "name",
           content: "categoryId",
           courseform: "type",
@@ -4132,6 +4141,7 @@ export default defineComponent({
         true
       );
       datas.forEach((itm) => {
+        itm.pageNo = pageNo;
         for (let item of options2.value) {
           if (String(item.value) === String(itm.content)) {
             itm.contentTxt = item.label;
@@ -4416,8 +4426,12 @@ export default defineComponent({
       // console.log("获取学员信息", obj);
       let res = await studentList(obj);
       // console.log("获取学员列表", res);
-      const { rows, total } = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal3 = total;
+
+      for (let i = 0; i < rows.length; i++) {
+        rows[i].num = i + 1 + (state.currentPage3 - 1) * 10;
+      }
       rows.forEach((item, index) => {
         rows[index] = {
           ...item,
@@ -4428,7 +4442,7 @@ export default defineComponent({
         rows,
         {
           key: "studentId",
-          num: "studentId",
+          num: "num",
           name: "name",
           number: "studentId",
           department: "deptName",
@@ -4442,6 +4456,9 @@ export default defineComponent({
         },
         true
       );
+      data2.forEach((itm) => {
+        itm.pageNo = pageNo;
+      });
       state.tableData7 = data2;
     };
     getTableDate2();
@@ -4518,13 +4535,17 @@ export default defineComponent({
       console.log("获取开课", obj);
       let res = await planList(obj);
       console.log("开课res", res);
-      const { rows, total } = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal222 = total;
+
+      for (let i = 0; i < rows.length; i++) {
+        rows[i].num = i + 1 + (state.currentPage222 - 1) * 10;
+      }
       const datas = traverseArr(
         rows,
         {
           key: "offcoursePlanId",
-          num: "offcoursePlanId",
+          num: "num",
           organization: "name",
           address: "address",
           starttime: "beginTime",
@@ -4532,6 +4553,9 @@ export default defineComponent({
         },
         true
       );
+      datas.forEach((itm) => {
+        itm.pageNo = pageNo;
+      });
       state.tableData6 = datas;
     };
 
@@ -4618,6 +4642,8 @@ export default defineComponent({
         state.of_hs = false;
         state.ft_hs = true;
         state.valueE1 = "";
+        state.teacher = "";
+        state.teacherName = "";
         state.qdms_inputV1 = state.xzinputV1;
         state.xzinputV1 = "";
         getDictList("faceclassPic");
@@ -4818,7 +4844,6 @@ export default defineComponent({
     const handelEditStu = async (itm) => {
       console.log(itm);
 
-    
       state.offcourseId = itm.offcourseId;
       state.offcoursePlanId = itm.offcoursePlanId;
 
@@ -4830,10 +4855,13 @@ export default defineComponent({
 
       let obj = {
         assessmentId: item.evaluateId,
-      }
+      };
-      api.queryAppraiseDetailById(obj).then((res) => {
+      api
+        .queryAppraiseDetailById(obj)
+        .then((res) => {
           state.assessmentName = res.data.data.assessmentName;
-        }).catch();
+        })
+        .catch();
 
       console.log("res");
       console.log(item);
@@ -5247,10 +5275,6 @@ export default defineComponent({
     };
     //编辑面授课
     const handleEdit = async (itm, type) => {
-
-     
-
-     
       console.log(45555);
       console.log(itm);
       if (type === "1") {
@@ -5322,7 +5346,6 @@ export default defineComponent({
       state.lookCourseModal = false;
     };
     const handleLook = async (itm, type) => {
-   
       if (type === "1") {
         return;
       }

src/views/projectcenter/LibraryAdd.vue

@@ -959,6 +959,7 @@ export default defineComponent({
           state.projectInfo.status = res.data.data.projectTemplateInfo.status;
           state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl;
           state.projectInfo.attach = res.data.data.projectTemplateInfo.attach;
+          state.projectInfo.category = res.data.data.projectTemplateInfo.category;
           let data = res.data.data.stageList;
           console.log("data=====", data);
           for (let i in data) {
@@ -1131,8 +1132,28 @@ export default defineComponent({
         console.log(file);
         list = state.fileList;
         console.log("list", list);
-        let str = JSON.stringify(list);
+        let str = JSON.stringify(fileList);
         console.log("str", str);
+        console.table({
+            name: state.projectInfo.name,
+            category: state.projectInfo.category,
+            picUrl: state.projectInfo.picUrl,
+            beginTime: new Date(state.projectInfo.beginTime).getTime()/1000,
+            endTime: new Date(state.projectInfo.endTime).getTime()/1000,
+            manager: state.projectInfo.manager,
+            managerId: state.projectInfo.managerId || 0,
+            sourceBelongId: state.projectInfo.sourceBelongId,
+            level: state.projectInfo.level,
+            systemId: state.projectInfo.systemId,
+            boeFlag: state.projectInfo.boeFlag ? 1 : 0,
+            courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
+            notice: state.projectInfo.notice,
+            noticeFlag: state.projectInfo.noticeFlag,
+            projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
+            remark: state.projectInfo.remark,
+            status: state.projectInfo.status,
+            attach: str,
+          })
         //要编辑项目
         api
           .templateEdit({

src/views/projectcenter/ProjectAdd.vue

@@ -129,7 +129,7 @@
             <ProjectManager
                 v-model:value="projectInfo.managerId"
                 v-model:name="projectInfo.manager"
-                @change="managerChange"
+                @onChange="managerChange"
                 mode="multiple"
             ></ProjectManager>
           </div>