feat:合并

src/components/drawers/AddDiscuss.vue

@@ -143,6 +143,10 @@ export default {
             state.textV1 = "";
             message.success("创建成功");
             ctx.emit("update:adddiscussVisible", false);
+            // let emit = defineEmits(["changeData"]);
+            // emit("changeData", true);
+            ctx.emit("changeData", "传的参数");
+            // props.(true);
           }, 1000);
         })
         .catch((err) => {

src/components/drawers/AddVote.vue

@@ -103,7 +103,7 @@
     </div>
   </a-drawer>
 </template>
-    <script>
+<script>
 import { reactive, toRefs, ref } from "vue";
 import CreVote from "../../components/drawers/CreVote.vue";
 import * as api from "../../api/indexVote";
@@ -149,7 +149,7 @@ export default {
       textV1: "",
       crevotevisible: false,
       time: undefined,
-      basevote:'',
+      basevote: "",
       endTimes: "",
       startTimes: "",
     });
@@ -162,27 +162,27 @@ export default {
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
     };
-        //创建投票信息
+    //创建投票信息
-        const createVoteText = () => {
+    const createVoteText = () => {
-          if (!state.inputV1) {
+      if (!state.inputV1) {
-            message.destroy();
+        message.destroy();
-            return message.info("请输入投票名称");
+        return message.info("请输入投票名称");
-          }
+      }
 
-          if (state.basevote == '') {
+      if (state.basevote == "") {
-            state.basevote = 1;
+        state.basevote = 1;
-          }
+      }
 
-          if (state.time != undefined) {
+      if (state.time != undefined) {
-            state.endTimes = toDate(
+        state.endTimes = toDate(
-              new Date(state.time[0].$d).getTime() / 1000,
+          new Date(state.time[0].$d).getTime() / 1000,
-              "Y-M-D"
+          "Y-M-D"
-            );
+        );
-            state.startTimes = toDate(
+        state.startTimes = toDate(
-              new Date(state.time[1].$d).getTime() / 1000,
+          new Date(state.time[1].$d).getTime() / 1000,
-              "Y-M-D"
+          "Y-M-D"
-            );
+        );
-          }
+      }
 
       let obj = {
         baseVote: state.basevote,
@@ -236,7 +236,7 @@ export default {
   },
 };
 </script>
-    <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -376,4 +376,3 @@ export default {
   }
 }
 </style>
-    

src/views/learningpath/LearningPath.vue

@@ -1292,7 +1292,11 @@ export default {
         message.destroy();
         return message.warning("请输入路径图名称");
       }
-      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
+
+      // if (!state.organizationSelectName){
+      // 	 message.destroy();
+      // 	 return message.warning("请选择归属组织");
+      // }
       // state.createLoading = true;
       let obj = {
         name: state.pathName,
@@ -1303,14 +1307,19 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          setTimeout(() => {
+          console.log("创建成功", res);
-            console.log("创建成功", res);
+          message.destroy();
-            message.success("创建成功");
+          message.success("创建成功");
-            // state.createLoading = false;
+          router.push("/leveladd");
-            state.currentPage = 1;
+          // setTimeout(() => {
-            router.push("/leveladd");
+          // 	console.log("创建成功", res);
-            // getLearnPath();
+          // 	 message.destroy();
-          }, 1000);
+          //   message.success("创建成功");
+          //   // state.createLoading = false;
+          //   state.currentPage = 1;
+          //   router.push("/leveladd");
+          //   // getLearnPath();
+          // }, 1000);
         })
         .catch((err) => {
           console.log("创建失败", err);
@@ -1365,6 +1374,7 @@ export default {
         .handleLearnPath(obj)
         .then((res) => {
           console.log("删除成功", res);
+          message.destroy();
           message.success("删除成功");
           state.deleteModal = false;
           getLearnPath();
@@ -1375,8 +1385,15 @@ export default {
     };
     //编辑学习路径图
     const editLearnPath = () => {
-      if (!state.pathName) return message.warning("请输入路径图名称");
+      if (!state.pathName) {
-      // if (!state.organizationSelectName) return message.warning("请选择归属组织");
+        message.destroy();
+        return message.warning("请输入路径图名称");
+      }
+
+      // if (!state.organizationSelectName){
+      // 	 message.destroy();
+      // 	 return message.warning("请选择归属组织");
+      // }
       // state.createLoading = true;
       let obj = {
         routerId: state.editPathId,
@@ -1388,15 +1405,23 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          setTimeout(() => {
+          console.log("修改成功", res);
-            console.log("修改成功", res);
+          message.destroy();
-            message.success("修改成功");
+          message.success("修改成功");
-            // state.createLoading = false;
+          // state.createLoading = false;
-            // state.currentPage = 1;
+          // state.currentPage = 1;
-            state.out1 = false;
+          state.out1 = false;
-            // router.push("/leveladd");
+          // router.push("/leveladd");
-            getLearnPath();
+          getLearnPath();
-          }, 1000);
+          // setTimeout(() => {
+          //   console.log("修改成功", res);
+          //   message.success("修改成功");
+          //   // state.createLoading = false;
+          //   // state.currentPage = 1;
+          //   state.out1 = false;
+          //   // router.push("/leveladd");
+          //   getLearnPath();
+          // }, 1000);
         })
         .catch((err) => {
           console.log("修改失败", err);
@@ -2175,6 +2200,7 @@ export default {
       .g1 {
         color: #4ea6ff;
         font-size: 14px;
+        cursor: pointer;
       }
     }
   }

src/views/learningpath/LevelAdd.vue

@@ -258,9 +258,7 @@
               </router-link>
             </div>
             <!-- 无数据显示快速创建 -->
-            <router-link
+            <router-link :to="{ path: '/leveladddetail' }">
-              :to="{ path: '/leveladddetail', query: { routerId: routerId } }"
-            >
               <div
                 class="taskbox"
                 style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"

src/views/learningpath/LevelAddDetail.vue

@@ -529,6 +529,7 @@ export default {
   },
   setup() {
     const state = reactive({
+      routerId: localStorage.getItem("routerId"),
       level: [
         {
           id: "1",

src/views/projectcenter/TaskAdd.vue

@@ -184,7 +184,10 @@
           </div>
           <!-- 添加讨论侧弹窗 -->
           <div>
-            <add-discuss v-model:adddiscussVisible="adddiscussvisible" />
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible"
+              @changeData="updateTableData"
+            />
           </div>
           <!-- 添加讨论侧弹窗 -->
           <div class="lin"></div>
@@ -1473,6 +1476,10 @@ export default {
       state.isactive = index;
       state.isActive = !state.isActive;
     };
+
+    const updateTableData = (data) => {
+      console.log("添加数据", data);
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1519,6 +1526,7 @@ export default {
       editInvistPath,
       getTableData,
       deleteTask,
+      updateTableData,
     };
   },
 };