提交

.env.boe

@@ -1,6 +1,7 @@
 NODE_ENV=boe
 VUE_APP_BASE=/manage
 VUE_APP_BASE_API=/manageApi
+# 专业力必修API前缀
 VUE_APP_BASE_API_GROWTH=/growth
 VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl=
 VUE_APP_BOE_API_URL=//u-pre.boe.com

src/components/growthpath/GrowthActive.vue

@@ -9,6 +9,7 @@
     title="添加活动"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain" v-if="visible">
         <div class="header">
           <div class="headerTitle">{{ formData.id ? "编辑" : "添加" }}活动</div>
@@ -198,6 +199,7 @@
           <button class="btn2" @click="confirm">确定</button>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -300,7 +302,7 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
-
+const spinning = ref(false);
 async function confirm() {
   // debugger
   await validate().catch(({ errorFields }) => {
@@ -326,7 +328,9 @@ async function confirm() {
   } else {
     formData.value.duration = formData.value.info.activityDuration;
   }
-  saveTask(formData.value).then((res) => {
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -338,12 +342,16 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
   return;
 }
 
 function openDrawer(row) {
-  row && (formData.value = reactive(row));
+  row && (row = JSON.parse(JSON.stringify(row)));
+  row && (formData.value = row);
   row &&
     (dateTime.value = [
       dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"),

src/components/growthpath/GrowthActiveAttendance.vue

@@ -139,10 +139,10 @@
           </div>
         </div>
       </div>
-      <div class="btnn">
+      <!-- <div class="btnn">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
-      </div>
+      </div> -->
     </div>
   </a-drawer>
   <!-- 批量签到弹窗 -->

src/components/growthpath/GrowthCase.vue

@@ -9,6 +9,7 @@
     title="添加案例"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div v-if="taskIndex >= 0" class="headerTitle">编辑案例</div>
@@ -83,6 +84,7 @@
           </div>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -157,7 +159,7 @@ function search() {
 }
 
 function reset() {
-  params.reset()
+  params.reset();
   fetch();
 }
 
@@ -167,29 +169,43 @@ const closeDrawer = () => {
   reset();
 };
 
+const spinning = ref(false);
 function confirm(row) {
   dialog({
     content: "确定选择该案例吗？",
     ok: async () => {
       // 新增
+      spinning.value = true;
       if (!selectedRows?.value?.id) {
-        await saveTask({
+        saveTask({
           growthId: props.growId,
           taskName: row.title,
           taskType: props.type,
           taskId: row.id,
           type: props.activeKey,
-        });
+        })
+          .then((res) => {
             message.success("添加成功");
+            closeDrawer();
+            emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
       } else {
         // 编辑
         selectedRows.value.taskName = row.title;
         selectedRows.value.taskId = row.id;
-        await saveTask(selectedRows.value);
+        saveTask(selectedRows.value)
+          .then((res) => {
             message.success("编辑成功");
-      }
             closeDrawer();
             emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
+      }
     },
   });
 }

src/components/growthpath/GrowthCommonStudent.vue

@@ -1,6 +1,7 @@
 <!-- eslint-disable vue/no-parsing-error -->
 <!-- eslint-disable vue/require-v-for-key -->
 <template>
+  <a-spin :spinning="spinning">
     <div class="CommonStudent">
       <div class="drawer-content" style="">
         <div class="tabs" style="min-width: 800px">
@@ -93,7 +94,11 @@
                         allowClear
                       />
 
-                    <div class="tree" style="margin: 10px 4px 0 10px" v-if="!treeSpin">
+                      <div
+                        class="tree"
+                        style="margin: 10px 4px 0 10px"
+                        v-if="!treeSpin"
+                      >
                         <a-tree
                           allow-clear
                           tree-default-expand-all
@@ -157,12 +162,18 @@
                   <div v-if="person">
                     <div class="chose">
                       {{ item.userNickName }}
-                    <div class="ch" @click="projectStuTableRef.remove(i)"></div>
+                      <div
+                        class="ch"
+                        @click="projectStuTableRef.remove(i)"
+                      ></div>
                     </div>
                   </div>
                 </div>
               </div>
-            <div v-if="!member && projectSelectRows?.length > 10" class="ifsw">
+              <div
+                v-if="!member && projectSelectRows?.length > 10"
+                class="ifsw"
+              >
                 <div @click="member = !member" class="“sw”">查看更多></div>
               </div>
               <div v-if="member && projectSelectRows?.length > 10" class="ifsw">
@@ -202,6 +213,7 @@
         <button class="btn2" @click="confirm">确定</button>
       </div>
     </div>
+  </a-spin>
 </template>
 <script setup>
 import { message } from "ant-design-vue";
@@ -232,7 +244,12 @@ const props = defineProps({
     type: [String, Number],
     default: 1,
   },
+  autoClose: {
+    type: Boolean,
+    default: true,
+  },
 });
+const spinning = ref(false)
 const projectStuTableRef = ref(null);
 // 项目内学员获取列表
 const getProjectStu = () => projectStuTableRef.value.fetch();
@@ -394,7 +411,9 @@ const confirm = () => {
   }
   visiable.value = false;
   emit("confirm", stuSelectRows.value, projectSelectRows.value);
+  if (props.autoClose) {
     closeDrawer();
+  }
 };
 
 onMounted(() => {
@@ -410,6 +429,10 @@ onMounted(() => {
     stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: "" });
   }
 });
+
+defineExpose({
+  spinning
+})
 </script>
 <style lang="scss" scoped>
 .CommonStudent > .ant-drawer-content-wrapper {

src/components/growthpath/GrowthDiscuss.vue

@@ -8,6 +8,7 @@
     width="800"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ formData.id ? "编辑" : "添加" }}讨论</div>
@@ -79,6 +80,7 @@
           <button class="btn2" @click="confirm">确定</button>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -130,7 +132,7 @@ const closeDrawer = () => {
     },
   };
 };
-
+const spinning = ref(false);
 async function confirm() {
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
@@ -144,7 +146,9 @@ async function confirm() {
   formData.value.type = props.activeKey;
   // 任务名称
   formData.value.taskName = formData.value.info.discussName;
-  saveTask(formData.value).then((res) => {
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -156,10 +160,14 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   row &&
     (formData.value.info.discussSettings =

src/components/growthpath/GrowthDrawer.vue

@@ -6,6 +6,7 @@
     destroyOnClose
     :width="width"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain" style="">
         <div class="header">
           <div class="headerTitle">
@@ -19,6 +20,7 @@
         </div>
         <slot></slot>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -35,7 +37,7 @@ const props = defineProps({
   },
 });
 const visiable = ref(false);
-
+const spinning = ref(false);
 const openDrawer = () => {
   visiable.value = true;
 };
@@ -45,5 +47,6 @@ const closeDrawer = () => {
 defineExpose({
   openDrawer,
   closeDrawer,
+  spinning
 });
 </script>

src/components/growthpath/GrowthEval.vue

@@ -10,6 +10,7 @@
     placement="right"
     destroyOnClose
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">
@@ -120,6 +121,7 @@
           </EvList>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -239,6 +241,7 @@ function delTag() {
 }
 // 验证方法
 let validate = null;
+const spinning = ref(false);
 async function confirm() {
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
@@ -252,7 +255,9 @@ async function confirm() {
   formData.value.type = props.activeKey;
   // 任务名称
   formData.value.taskName = formData.value.info.evaluationName;
-  saveTask(formData.value).then((res) => {
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -264,10 +269,14 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   if (row && row.info.evaluationEndTime) {
     dateTime.value = [

src/components/growthpath/GrowthExa.vue

@@ -9,6 +9,7 @@
     placement="right"
     destroyOnClose
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">
@@ -99,7 +100,9 @@
                 <template v-if="!formData.id">
                   <div class="btnbox" @click="selectTest">
                     <button class="xkbtn" style="margin: 0">
-                    {{ formData.info.examinationPaperId ? "重选" : "选择" }}试卷
+                      {{
+                        formData.info.examinationPaperId ? "重选" : "选择"
+                      }}试卷
                     </button>
                   </div>
                 </template>
@@ -378,6 +381,7 @@
           ></iframe>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -538,6 +542,7 @@ function timeChange(time, timeStr) {
   formData.value.info.examinationEndTime = timeStr[1];
 }
 
+const spinning = ref(false);
 // 系统考试
 async function confirm() {
   console.log(formData.value);
@@ -569,7 +574,10 @@ async function confirm() {
   formData.value.taskName = formData.value.info.examinationName;
   // 任务时长
   formData.value.duration = formData.value.info.examinationDuration;
-  saveTask(formData.value).then((res) => {
+
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -581,10 +589,13 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 function openDrawer(row) {
-  console.log(row, "irow");
+  row && (row = JSON.parse(JSON.stringify(row)));
   row &&
     (dateTime.value = [
       row.info.examinationStartTime,

src/components/growthpath/GrowthFaceClass.vue

@@ -9,6 +9,7 @@
     title="添加面授"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ title }}</div>
@@ -42,6 +43,7 @@
           </div>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -96,27 +98,40 @@ const closeDrawer = () => {
     formData.reset();
   }
 };
-
+const spinning = ref(false);
 async function confirm(row) {
   // 新增
+  spinning.value = true;
   if (!formData.value?.id) {
-    await saveTask({
+    saveTask({
       growthId: props.growId,
       taskName: row.name,
       taskType: props.type,
       taskId: row.id,
       type: props.activeKey,
-    });
+    })
+      .then((res) => {
         message.success("添加成功");
+        closeDrawer();
+        emit("refresh");
+      })
+      .finally(() => {
+        spinning.value = false;
+      });
   } else {
     // 编辑
     formData.value.taskName = row.name;
     formData.value.taskId = row.id;
-    await saveTask(formData.value);
+    saveTask(formData.value)
+      .then((res) => {
         message.success("编辑成功");
-  }
         closeDrawer();
         emit("refresh");
+      })
+      .finally(() => {
+        spinning.value = false;
+      });
+  }
 }
 
 function openDrawer(row) {

src/components/growthpath/GrowthHomework.vue

@@ -8,6 +8,7 @@
     width="800"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ formData.id ? "编辑" : "添加" }}作业</div>
@@ -102,6 +103,7 @@
           >
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -117,7 +119,7 @@ const props = defineProps({
   activeKey: String,
 });
 const visible = ref(false);
-const formData = useResetRef({
+const formData = ref({
   info: {
     workName: "",
     submitStartTime: "",
@@ -156,8 +158,14 @@ const rulesRef = ref({
 
 const closeDrawer = () => {
   visible.value = false;
-  formData.reset();
+  formData.value = {
-  formData.value.info = {};
+    info: {
+      workName: "",
+      submitStartTime: "",
+      submitEndTime: "",
+      workRequirement: "",
+    },
+  };
   dateTime.value = [];
 };
 
@@ -165,7 +173,7 @@ function timeChange(time, timeStr) {
   formData.value.info.submitStartTime = timeStr[0];
   formData.value.info.submitEndTime = timeStr[1];
 }
-
+const spinning = ref(false);
 async function confirm() {
   // 表单校验
   await validate().catch(({ errorFields }) => {
@@ -190,8 +198,9 @@ async function confirm() {
     formData.value.info.submitStartTime,
     "minutes"
   );
-
+  spinning.value = true
-  saveTask(formData.value).then((res) => {
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -203,11 +212,14 @@ async function confirm() {
       } else {
         message.error(res.msg);
       }
+    })
+    .finally(() => {
+      spinning.value = false;
     });
-  
 }
 let validate = null;
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   row &&
     (dateTime.value = [

src/components/growthpath/GrowthInvist.vue

@@ -9,6 +9,7 @@
     title="添加评估"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div v-if="formData.id" class="headerTitle">编辑评估</div>
@@ -76,6 +77,7 @@
           </div>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup lang="jsx">
@@ -194,29 +196,42 @@ const closeDrawer = () => {
   visible.value = false;
   formData.reset();
 };
-
+const spinning = ref(false);
 async function confirm(record) {
   dialog({
     content: "确定选择该评估吗？",
     ok: async () => {
+      spinning.value = true;
       if (!formData?.value?.id) {
-        await saveTask({
+        saveTask({
           growthId: props.growId,
           taskName: record.assessmentName,
           taskType: props.type,
           taskId: record.id,
           type: props.activeKey,
-        });
+        })
+          .then((res) => {
             message.success("添加成功");
+            closeDrawer();
+            emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
       } else {
         // 编辑
         formData.value.taskName = record.assessmentName;
         formData.value.taskId = record.id;
-        await saveTask(formData.value);
+        saveTask(formData.value)
+          .then((res) => {
             message.success("编辑成功");
-      }
             closeDrawer();
             emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
+      }
     },
   });
 }

src/components/growthpath/GrowthLineCourse.vue

@@ -9,9 +9,12 @@
     title="添加在线"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
-        <div class="headerTitle">{{ selectData.id ? "编辑" : "添加" }}在线</div>
+          <div class="headerTitle">
+            {{ selectData.id ? "编辑" : "添加" }}在线
+          </div>
           <img
             style="width: 29px; height: 29px; cursor: pointer"
             src="../../assets/images/basicinfo/close.png"
@@ -29,6 +32,7 @@
           sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"
         ></iframe>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup lang="jsx">
@@ -50,27 +54,47 @@ const closeDrawer = () => {
   visible.value = false;
   selectData.value = {};
 };
+const spinning = ref(false);
 async function confirm(row) {
   console.log(row);
+
+  dialog({
+    content: "确定选择该案例吗？",
+    ok: async () => {
       // 新增
+      spinning.value = true;
       if (!selectData.value?.id) {
-    await saveTask({
+        saveTask({
           growthId: props.growId,
           taskName: row.name,
           taskType: props.type,
           taskId: row.id,
           type: props.activeKey,
-    });
+        })
+          .then((res) => {
             message.success("添加成功");
+            closeDrawer();
+            emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
       } else {
         // 编辑
         selectData.value.taskName = row.name;
         selectData.value.taskId = row.id;
-    await saveTask(selectData.value);
+        saveTask(selectData.value)
+          .then((res) => {
             message.success("编辑成功");
-  }
             closeDrawer();
             emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
+      }
+    },
+  });
 }
 
 function selectCourse(row) {

src/components/growthpath/GrowthLive.vue

@@ -10,6 +10,7 @@
     title="添加直播"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ formData.id ? "编辑" : "添加" }}直播</div>
@@ -323,6 +324,7 @@
           </GrowthInvistRoot>
         </template>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -482,6 +484,7 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
+const spinning = ref(false);
 async function confirm() {
   // debugger;
   console.log("确定按钮:");
@@ -505,8 +508,9 @@ async function confirm() {
   } else {
     formData.value.duration = formData.value.info.liveDuration;
   }
-
+  spinning.value = true;
-  saveTask(formData.value).then((res) => {
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -518,10 +522,14 @@ async function confirm() {
       } else {
         message.error(res.msg);
       }
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
   row && (imageUrl.value = row.info.liveCover);

src/components/growthpath/GrowthProject.vue

@@ -8,6 +8,7 @@
     width="1300"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div v-if="selectData.id" class="headerTitle">编辑项目</div>
@@ -103,6 +104,7 @@
           </div>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup lang="jsx">
@@ -235,30 +237,43 @@ const closeDrawer = () => {
   visible.value = false;
   reset();
 };
-
+const spinning = ref(false);
 async function confirm(record) {
   dialog({
     content: "确定选择该项目吗？",
     ok: async () => {
+      spinning.value = true;
       // 新增
       if (!selectData?.value?.id) {
-        await saveTask({
+        saveTask({
           growthId: props.growId,
           taskName: record.name,
           taskType: props.type,
           taskId: record.id,
           type: props.activeKey,
-        });
+        })
+          .then((res) => {
             message.success("添加成功");
+            closeDrawer();
+            emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
       } else {
         // 编辑
         selectData.value.taskName = record.name;
         selectData.value.taskId = record.id;
-        await saveTask(selectData.value);
+        await saveTask(selectData.value)
+          .then((res) => {
             message.success("编辑成功");
-      }
             closeDrawer();
             emit("refresh");
+          })
+          .finally(() => {
+            spinning.value = false;
+          });
+      }
     },
   });
 }

src/components/growthpath/GrowthRef.vue

@@ -8,6 +8,7 @@
     width="1000"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ formData.id ? "编辑" : "添加" }}外链</div>
@@ -81,6 +82,7 @@
           <button class="btn2" @click="confirm">确定</button>
         </div>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -135,6 +137,7 @@ const closeDrawer = () => {
   };
 };
 
+const spinning = ref(false);
 async function confirm() {
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
@@ -148,7 +151,9 @@ async function confirm() {
   formData.value.type = props.activeKey;
   // 任务名称
   formData.value.taskName = formData.value.info.linkName;
-  saveTask(formData.value).then((res) => {
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -160,10 +165,14 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   validate = Form.useForm(formData.value.info, rulesRef).validate;
   visible.value = true;

src/components/growthpath/GrowthScore.vue

@@ -273,7 +273,7 @@ export default {
                     state.fileList = [];
                     state.uploadpercent = -1;
                     message.destroy();
-                    message.error(`当前开课暂无作业，无法导入成绩`);
+                    // message.error(`当前开课暂无作业，无法导入成绩`);
                     clearInterval(timer);
                     clearTimeout(timeouts);
                     return;

src/components/growthpath/GrowthVote.vue

@@ -9,6 +9,7 @@
     title="添加投票"
     placement="right"
   >
+    <a-spin :spinning="spinning">
       <div class="drawerMain">
         <div class="header">
           <div class="headerTitle">{{ title }}</div>
@@ -118,6 +119,7 @@
           </CreateVote>
         </template>
       </div>
+    </a-spin>
   </a-drawer>
 </template>
 <script setup>
@@ -210,7 +212,7 @@ function timeChange(time, timeStr) {
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
 };
-
+const spinning = ref(false);
 async function confirm() {
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
@@ -228,7 +230,9 @@ async function confirm() {
   formData.value.type = props.activeKey;
   // 任务名称
   formData.value.taskName = formData.value.info.voteName;
-  saveTask(formData.value).then((res) => {
+  spinning.value = true;
+  saveTask(formData.value)
+    .then((res) => {
       if (res.data.code == 200) {
         if (formData.value.id) {
           message.success("编辑成功");
@@ -240,10 +244,14 @@ async function confirm() {
         message.error(res.msg);
       }
       closeDrawer();
+    })
+    .finally(() => {
+      spinning.value = false;
     });
 }
 
 function openDrawer(row) {
+  row && (row = JSON.parse(JSON.stringify(row)));
   row && (formData.value = row);
   row &&
     (dateTime.value = [

src/components/growthpath/StudentManage.vue

@@ -276,7 +276,6 @@
       </a-table>
     </div>
   </div>
-
   <!-- 查看学员 传入查看学员的id-->
   <see-stu :permissions="permissions" ref="seeStuRef" />
 
@@ -294,6 +293,7 @@
       :growthId="growId"
       @confirm="confirmDrawer"
       @close="closeDrawer"
+      :autoClose="false"
     ></GrowthCommonStudent>
   </GrowthDrawer>
 </template>
@@ -704,7 +704,7 @@ function closeDrawer() {
   GrowthDrawerRef.value.closeDrawer();
 }
 function confirmDrawer(selectList) {
-  closeDrawer();
+  GrowthDrawerRef.value.spinning = true
   tableData.value.loading = true;
   addLearners({
     growthId: props.id,
@@ -712,11 +712,14 @@ function confirmDrawer(selectList) {
   })
     .then((res) => {
       tableData.value.loading = false;
+      GrowthDrawerRef.value.spinning = false
       message.success("添加成功");
+      closeDrawer();
       getStuList();
     })
     .catch((err) => {
       tableData.value.loading = false;
+      GrowthDrawerRef.value.spinning = false
     });
 }
 

src/views/growthpath/EditingTasks.vue

@@ -14,20 +14,13 @@
                 </div>
               </div>
               <div class="rightt">
-                <router-link
+                <div style="display: flex" @click="goBack">
-                  :to="{
-                    path: '/pathmanage',
-                    query: { id: growId, routerEdit: true, pre: pre },
-                  }"
-                >
-                  <div style="display: flex">
                   <img
                     class="img2"
                     src="../../assets/images/leveladd/back.png"
                   />
                   <div class="return">返回</div>
                 </div>
-                </router-link>
               </div>
             </div>
           </div>
@@ -230,7 +223,10 @@
                         </template>
                         <template v-else>
                           <span
-                            v-if="element.status == '1' && checkMenu('growthTaskWithdraw')"
+                            v-if="
+                              element.status == '1' &&
+                              checkMenu('growthTaskWithdraw')
+                            "
                             style="color: #4ea6ff; cursor: pointer"
                             @click="withdraw(element, index)"
                           >
@@ -302,6 +298,7 @@ import {
   withdrawTask,
   deleteTask,
 } from "@/api/growthpath";
+import router from "@/router";
 const {
   query: { growId, pre, name },
 } = useRoute();
@@ -400,7 +397,10 @@ const getBasicInfoData = () => {
     }
   });
 };
-
+// 返回
+const goBack = () => {
+  router.go(-1);
+};
 // 发布
 const published = (element) => {
   // if(basicData.value.isPublished){

src/views/growthpath/GrowthAddPath.vue

@@ -757,9 +757,6 @@ export default {
               listDatas();
             }
           })
-          .catch((err) => {
-            message.error(err.data.msg);
-          });
       } else {
         saveGrowth(params)
           .then((res) => {
@@ -769,9 +766,6 @@ export default {
               listDatas();
             }
           })
-          .catch((err) => {
-            message.error(err.data.msg);
-          });
       }
     };
     const of_exit = () => {

src/views/growthpath/PathManage.vue

@@ -578,6 +578,8 @@
               :id="routerId"
               :growId="routerId"
               :visable="tabFlag"
+              @loading="spinning = true"
+              @closeLoading="spinning = false"
               :permissions="preId"
             >
               <template #extension="{ data: { record } }">

vue.config.js

@@ -18,16 +18,16 @@ module.exports = defineConfig({
             overlay: false,// 解决代码抛出异常
         },
         proxy: {
-            "/professional": {
+            // "/professional": {
-                target: 'http://192.168.31.211:32002',
+            //     target: 'http://192.168.31.211:32002',
-                // target: 'http://192.168.50.195:32002',
+            //     // target: 'http://192.168.50.195:32002',
-                // target: 'http://192.168.86.195:32002',
+            //     // target: 'http://192.168.86.195:32002',
-                changeOrigin: true,
-            },
-            // "/growth": {
-            //     target: 'https:' + process.env.VUE_APP_BOE_API_URL,
             //     changeOrigin: true,
             // },
+            "/growth": {
+                target: 'https:' + process.env.VUE_APP_BOE_API_URL,
+                changeOrigin: true,
+            },
             "/manageApi": {
                 target: 'https:' + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名