feat:合并

package-lock.json

@@ -16,6 +16,7 @@
 				"element-resize-detector": "^1.2.4",
 				"html2canvas": "^1.4.1",
 				"jquery": "^3.6.1",
+				"mitt": "^3.0.0",
 				"qrcode.vue": "^3.3.3",
 				"qs": "^6.11.0",
 				"sortablejs": "^1.15.0",
@@ -8052,6 +8053,11 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/mitt": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz",
+			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
+		},
 		"node_modules/mkdirp": {
 			"version": "0.5.6",
 			"resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -18237,6 +18243,11 @@
 				"yallist": "^4.0.0"
 			}
 		},
+		"mitt": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.0.tgz",
+			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
+		},
 		"mkdirp": {
 			"version": "0.5.6",
 			"resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",

package.json

@@ -16,6 +16,7 @@
 		"element-resize-detector": "^1.2.4",
 		"html2canvas": "^1.4.1",
 		"jquery": "^3.6.1",
+		"mitt": "^3.0.0",
 		"qrcode.vue": "^3.3.3",
 		"qs": "^6.11.0",
 		"sortablejs": "^1.15.0",

src/components/drawers/NoticeHis.vue

@@ -17,6 +17,7 @@
 import { reactive, toRefs, onMounted } from "vue";
 import { getTask } from "../../api/indexTaskadd";
 import { noticeList } from "../../api/indexNotice";
+import emitter from "../../utils/bus";
 // import { toDate } from "../../api/method";
 export default {
   name: "NoticeHis",
@@ -47,6 +48,11 @@ export default {
         //下一步是把公告赋值给state.notice
       });
     };
+    //获取公告历史
+    emitter.on("setNotice", (data) => {
+      console.log("setNotice", data);
+      getNotice();
+    });
     const setNoticeData = (tableData) => {
       let data = tableData;
       let array = [];

src/components/drawers/NoticePub.vue

@@ -30,6 +30,7 @@ import { reactive, toRefs, onMounted } from "vue";
 import { getTask } from "../../api/indexTaskadd";
 // import { editProj } from "../../api/indexTaskadd";
 import { publishNotice } from "../../api/indexNotice";
+import emitter from "../../utils/bus";
 export default {
   name: "NoticePub",
   props: {
@@ -68,6 +69,7 @@ export default {
             message.destroy();
             message.success("发布成功", res);
             state.noticeContent = "";
+            emitter.emit("setNotice", false);
           })
           .catch((err) => {
             message.destroy();

src/components/drawers/SelectTest.vue

@@ -204,6 +204,7 @@ export default {
       }
     };
 
+    // 分页
     const onChange = (pageNumber) => {
       state.pageNo = pageNumber;
       state.currentPage = pageNumber;
@@ -249,8 +250,23 @@ export default {
       };
       api
         .queryExaminationList(obj)
-        .then((res) => {
+        .then((data) => {
-          getTableDate(res.data.data);
+
+          // getTableDate(res.data.data);
+          //**   表格repaint   */
+          let array = []
+          data.map((value, index) => {
+          let obj = {
+          key: index + 1,
+          sysCreateBy: value.sysCreateBy,
+          paperId: value.paperId,
+          testName: value.testName,
+          paperMode: value.paperMode,
+          sysUpdateTime: value.sysUpdateTime,
+        };
+        array.push(obj);
+      });
+      //**         */
           message.success("获取选择考试列表成功");
         })
         .catch(() => {

src/components/drawers/TestManage.vue

@@ -449,7 +449,26 @@ export default {
           state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
-          getTableDate(res.data.data.rows)
+          // getTableDate(res.data.data.rows)
+          //**table repint */
+          getTableDate()
+          let data,array=[];
+          data.map((item,index)=>{
+        let obj = {
+          key : index+1,
+          workNum : item.workNum,
+          userName : item.userName,
+          deptName : item.deptName,
+          jobName : item.jobName,
+          testNum : item.testNum,
+          score : item.score,
+          time : item.time,
+          status : "已完成",
+          operation:"",
+        }
+        array.push(obj)
+      })
+      /**........ */
         })
         .catch((err) => {
           console.log("获取测试任务列表失败", err);

src/utils/bus.js

@@ -0,0 +1,6 @@
+//用于公告和公告历史兄弟组件
+import mitt from "mitt";
+
+const emitter = mitt()
+
+export default emitter

src/views/examine/ProjectReviewed.vue

@@ -68,7 +68,7 @@
           </div>
         </div>
         <div class="tmplh_btn">
-          <div class="btn btn1" @click="search">
+          <div class="btn btn1" @click="getProjList">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
           </div>
@@ -151,7 +151,6 @@
 import { reactive, toRefs, onMounted } from "vue";
 import { listView, auditList } from "../../api/indexAudit";
 import { toDate } from "@/api/method";
-import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewed",
@@ -168,10 +167,10 @@ export default {
           label: "rose",
         },
       ],
-      valueproj: null,
+      valueproj: "",
-      valuecreater: null,
+      valuecreater: "",
-      valuename: null,
+      valuename: "",
-      valueDate: [],
+      valueDate: undefined,
       valuestate: null,
       currentPage: 1,
       total: null,
@@ -265,7 +264,6 @@ export default {
           dataIndex: "belong",
           key: "belong",
           align: "center",
-          // width: "10%",
         },
 
         {
@@ -284,28 +282,17 @@ export default {
       ],
       //审核记录的数据
       tableDataAudit: [],
-      tableData1: [
+      tableData1: [],
-        {
-          number: "1",
-          name: "课程1",
-          belong: "管理者进阶/管理者进阶腾飞班",
-          manager: "黄华，刘军",
-          status: "通过",
-          creater: "管理员",
-          time: "-",
-          msg: "-",
-        },
-      ],
     });
-    const getProjList = (obj) => {
+    const getProjList = () => {
-      let objn = obj || {
+      let objn = {
-        beginTime: 0,
+        beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]) ,
-        createName: "",
+        endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
-        endTime: "",
+        createName: state.valuecreater,
-        manager: "",
+        manager: state.valuename,
-        name: "",
+        name: state.valueproj,
         pageNo: state.currentPage,
-        pageSize: 10,
+        pageSize: state.pageSize,
         status: 0,
       };
       listView(objn)
@@ -313,9 +300,7 @@ export default {
           console.log("获取已审核项目成功", res.data.data.rows);
           let result = res.data.data;
           state.total = res.data.data.total;
-          if (result.total > 0) {
             setTableData(result.rows);
-          }
         })
         .catch((err) => {
           console.log("获取已审核项目失败", err);
@@ -324,26 +309,21 @@ export default {
     const setTableData = (tabledata) => {
       let data = tabledata;
       let array = [];
-      data.map((item) => {
+      data.map((item,index) => {
+        if(item.type == 3){
         let obj = {
+          key:index+1,
           number: item.projectId,
-          // 需要加上
+          name: item.name,
-          // name: getName(item),
+          belong: "",
-          // belong: getBelong(item),
           manager: item.manager || "-",
           status:
             item.status == 0
               ? "草稿"
               : item.status == 1
-              ? "待审核"
+              ? "已发布"
               : item.status == 2
-              ? "通过"
-              : item.status == 3
-              ? "发布"
-              : item.status == -1
               ? "已结束"
-              : item.status == -2
-              ? "拒绝"
               : "-",
           creater: item.createName,
           time: toDate(item.beginTime, "Y-M-D h:m"),
@@ -351,70 +331,81 @@ export default {
           id: item.projectId,
         };
         array.push(obj);
+      } else {
+        let obj = {
+          key:index+1,
+          number: item.projectId,
+          name: item.name,
+          belong: "",
+          manager: item.manager || "-",
+          status:
+            item.status == 0
+              ? "草稿"
+              : item.status == 1
+              ? "已发布"
+              : item.status == 2
+              ? "已结束"
+              : "-",
+          creater: item.createName,
+          time: toDate(item.beginTime, "Y-M-D h:m"),
+          msg: item.description || "-",
+          id: item.projectId,
+          children: item.subList ? setTableData(item.subList) : [] ,
+        };
+        array.push(obj);
+      }
       });
       state.tableData1 = array;
+      return array
     };
-    const getName = (item) => {
+    // const getName = (item) => {
-      if (
+    //   if (
-        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-        !Object.prototype.hasOwnProperty.call(
+    //     !Object.prototype.hasOwnProperty.call(
-          item.subList[0].subList[0],
+    //       item.subList[0].subList[0],
-          "name"
+    //       "name"
-        )
+    //     )
-      ) {
+    //   ) {
-        // 两层
+    //     // 两层
-        return item.subList[0].name;
+    //     return item.subList[0].name;
-      } else if (
+    //   } else if (
-        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+    //     Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
-      ) {
+    //   ) {
-        //三层
+    //     //三层
-        return item.subList[0].subList[0].name;
+    //     return item.subList[0].subList[0].name;
-        // return item.name
+    //     // return item.name
-      } else {
+    //   } else {
-        // 单层
+    //     // 单层
-        return item.name;
+    //     return item.name;
-      }
+    //   }
-    };
+    // };
-    const getBelong = (item) => {
+    // const getBelong = (item) => {
-      if (
+    //   if (
-        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-        !Object.prototype.hasOwnProperty.call(
+    //     !Object.prototype.hasOwnProperty.call(
-          item.subList[0].subList[0],
+    //       item.subList[0].subList[0],
-          "name"
+    //       "name"
-        )
+    //     )
-      ) {
+    //   ) {
-        // 两层
+    //     // 两层
-        return item.name;
+    //     return item.name;
-      } else if (
+    //   } else if (
-        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+    //     Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
-        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+    //     Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
-      ) {
+    //   ) {
-        //三层
+    //     //三层
-        return item.subList[0].name + "/" + item.subList[0].subList[0].name;
+    //     return item.subList[0].name + "/" + item.subList[0].subList[0].name;
-        // return item.name
+    //     // return item.name
-      } else {
+    //   } else {
-        // 单层
+    //     // 单层
-        return item.name;
+    //     return item.name;
-      }
+    //   }
-    };
+    // };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
       getProjList();
     };
-    const search = () => {
-      let obj = {
-        beginTime: dayjs(state.valueDate[0]).format("YYYY-MM-DD"),
-        createName: state.valuecreater,
-        endTime: dayjs(state.valueDate[1]).format("YYYY-MM-DD"),
-        manager: state.valuename,
-        name: state.valueproj,
-        pageNo: state.currentPage,
-        pageSize: 10,
-        status: 0,
-      };
-      getProjList(obj);
-    };
     const reset = () => {
       state.valueproj = null;
       state.valuecreater = null;
@@ -436,9 +427,7 @@ export default {
         .then((res) => {
           console.log("获取到了审核日志列表", res);
           let result = res.data.data;
-          // if (result.total > 0) {
           setAudit(result.rows);
-          // }
         })
         .catch((err) => {
           console.log("审核日志列表获取失败", err);
@@ -474,10 +463,7 @@ export default {
       ...toRefs(state),
       getProjList,
       setTableData,
-      getName,
-      getBelong,
       changePagination,
-      search,
       reset,
       closeProjAuditModal,
       showProjAuditModal,

src/views/examine/ProjectReviewedN.vue

@@ -309,10 +309,10 @@ export default {
       getProjList();
     };
     const reset = () => {
-      (state.valueproj = null),
+      state.valueproj = "",
-        (state.valuecreater = null),
+      state.valuecreater = "",
-        (state.valuename = null),
+      state.valuename = "",
-        (state.valueDate = []);
+      state.valueDate = undefined;
       getProjList();
     };
     onMounted(() => {