合并

package-lock.json

@@ -1414,11 +1414,6 @@
 			"integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
 			"dev": true
 		},
-		"@popperjs/core": {
-			"version": "npm:@sxzz/popperjs-es@2.11.7",
-			"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-			"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-		},
 		"@sideway/address": {
 			"version": "4.1.4",
 			"resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
@@ -2029,6 +2024,29 @@
 				"webpack-merge": "^5.7.3",
 				"webpack-virtual-modules": "^0.4.2",
 				"whatwg-fetch": "^3.6.2"
+			},
+			"dependencies": {
+				"@vue/vue-loader-v15": {
+					"version": "npm:vue-loader@15.10.0",
+					"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
+					"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+					"dev": true,
+					"requires": {
+						"@vue/component-compiler-utils": "^3.1.0",
+						"hash-sum": "^1.0.2",
+						"loader-utils": "^1.1.0",
+						"vue-hot-reload-api": "^2.3.0",
+						"vue-style-loader": "^4.1.0"
+					},
+					"dependencies": {
+						"hash-sum": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+							"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+							"dev": true
+						}
+					}
+				}
 			}
 		},
 		"@vue/cli-shared-utils": {
@@ -2272,27 +2290,6 @@
 			"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.39.tgz",
 			"integrity": "sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw=="
 		},
-		"@vue/vue-loader-v15": {
-			"version": "npm:vue-loader@15.10.0",
-			"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-			"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-			"dev": true,
-			"requires": {
-				"@vue/component-compiler-utils": "^3.1.0",
-				"hash-sum": "^1.0.2",
-				"loader-utils": "^1.1.0",
-				"vue-hot-reload-api": "^2.3.0",
-				"vue-style-loader": "^4.1.0"
-			},
-			"dependencies": {
-				"hash-sum": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-					"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-					"dev": true
-				}
-			}
-		},
 		"@vue/web-component-wrapper": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -3958,6 +3955,13 @@
 				"lodash-unified": "^1.0.2",
 				"memoize-one": "^6.0.0",
 				"normalize-wheel-es": "^1.2.0"
+			},
+			"dependencies": {
+				"@popperjs/core": {
+					"version": "npm:@sxzz/popperjs-es@2.11.7",
+					"resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+					"integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+				}
 			}
 		},
 		"emoji-regex": {

src/api/method.js

@@ -1,3 +1,4 @@
+
 function formatNumber(n) {
 	n = n.toString();
 	return n[1] ? n : "0" + n;
@@ -161,8 +162,12 @@ function autoComma(number) {
 		return 0;
 	}
 }
+const commonData={
+	timeout:50
+}
 export {
 	toDate,
 	getWeek,
 	autoComma,
+	commonData,
 }

src/assets/scss/common.scss

@@ -437,4 +437,18 @@ textarea {
   }
 }
 
-//弹窗--------------------------------------------------------
+//弹窗--------------------------------------------------------
+
+//loading--------------------------------------------------------
+.aeLoading {
+  width: 100%;
+  height: 100%;
+background: rgba(0, 0, 0, 0.2);
+display: flex;
+align-items: center;
+justify-content: center;
+position: absolute;
+left: 0;
+top:0,
+}
+//loading--------------------------------------------------------

src/components/drawers/AddDiscuss.vue

@@ -67,6 +67,9 @@
         <button class="btn2" @click="createDiscuss">确定</button>
       </div>
     </div>
+     <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+    <a-spin :spinning="addLoading" tip="添加中..." />
+  </div>
   </a-drawer>
 </template>
 <script>
@@ -136,6 +139,7 @@ export default {
       inputV2: "",
       textV1: "",
       checkedC1: "",
+      addLoading:false,
     });
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
@@ -153,6 +157,7 @@ export default {
         message.destroy();
         return message.warning("请输入讨论名称");
       }
+      state.addLoading=true
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
@@ -190,8 +195,7 @@ export default {
           console.log("创建成功", res);
           state.inputV1 = "";
           state.textV1 = "";
-          message.success("创建成功");
+         
-          ctx.emit("update:adddiscussVisible", false);
           //console.log("discussName",obj.discussName);
           console.log("学习路径",props.isStudiscuss);
           if(props.isStudiscuss){
@@ -207,7 +211,12 @@ export default {
             }
             RouterEditTask(editObj1).then(res => {
               console.log("新增关卡任务成功",res);
-              closeDrawer();
+              setTimeout(()=>{
+                 message.success("创建成功");
+          ctx.emit("update:adddiscussVisible", false);
+                closeDrawer();
+              state.addLoading=false
+              },1000)
             }).catch(err => {
               console.log("新增关卡任务失败",err);
             })
@@ -230,6 +239,7 @@ export default {
               //重新获取任务列表
               // apiTask.getTask({ projectId: 28 });
               // router.push("/taskadd");
+              state.addLoading=false
             })
             .catch((err) => {
               console.log(err);
@@ -375,5 +385,6 @@ export default {
       }
     }
   }
+
 }
 </style>

src/components/drawers/AddEval.vue

@@ -147,6 +147,10 @@ export default {
       type: Number,
       default: null,
     },
+    EditEvalId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -245,7 +249,7 @@ export default {
         createUser: 0,
         evaluationEndTime: state.endTimes,
         evaluationFlag: "",
-        evaluationId: "",
+        evaluationId: 0,
         evaluationPictureAddress: "",
         evaluationStartTime: state.startTimes,
         evaluationTag: "",
@@ -259,7 +263,7 @@ export default {
         createUser: 0,
         evaluationEndTime: "",
         evaluationFlag: "",
-        evaluationId: 125,
+        evaluationId: props.EditEvalId == null ? 0 : props.EditEvalId,
         evaluationName: state.inputV1,
         evaluationPictureAddress: "",
         evaluationStartTime: "",
@@ -276,11 +280,11 @@ export default {
             console.log("创建成功", res);
             message.success("创建成功");
             closeDrawer();
-            //渲染到学历路径
+            //渲染到项目列表            
             if (props.learn == 0)
               apitaskadd
                 .addTask({
-                  courseId: 0,
+                  courseId: res.data.data.evaluationId,
                   duration: 0,
                   flag: true,
                   name: obj.evaluationName,
@@ -300,11 +304,11 @@ export default {
                 .catch((err) => {
                   console.log(err);
                 });
-            //渲染到项目列表
+            //渲染到学历路径
             else {
               let editObj1 = {
                 chapterId: props.isactive,
-                courseId: 0,
+                courseId:  res.data.data.evaluationId,
                 duration: 0,
                 flag: true,
                 name: obj.evaluationName,
@@ -322,11 +326,12 @@ export default {
       }
       else {
         api
-          .queryEvaluationDetailById(obj.evaluationId)
+          .queryEvaluationDetailById(objedit.evaluationId)
           .then((res) => {
               setTimeout(() => {
-                console.log("获取成功", res,obj.evaluationId);
+                console.log("获取成功", res,objedit.evaluationId);
                 message.success("获取成功");
+                
               }, 1000);
             })
             .catch((err) => {

src/components/drawers/AddInvist.vue

@@ -237,7 +237,7 @@ export default {
         .queryAssessmentDetailList(obj)
         .then((res) => {
           if (res.status === 200) {
-            console.log("获取全部评估信息", res.data.data);
+            // console.log("获取全部评估信息", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
@@ -250,9 +250,9 @@ export default {
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }
-          console.log("获取全部评估信息接口成功", res);
+          // console.log("获取全部评估信息接口成功", res);
-          message.success("获取全部评估信息接口成功");
+          // message.success("获取全部评估信息接口成功");
-          console.log(obj);
+          // console.log(obj);
         })
         .catch((err) => {
           console.log("获取全部评估信息接口失败", err);

src/views/learningpath/LearningPath.vue

@@ -226,23 +226,11 @@
             <button class="samtn btn2" @click="createLearnPath">确定</button>
           </div>
         </div>
+         <div class="aeLoading" :style="{display:lpLoading?'flex':'none'}">
+        <a-spin :spinning="lpLoading" tip="添加中..." />
       </div>
-      <!-- <div
+      </div>
-        style="
+     
-          width: 300px;
-          height: 200px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background:pink;
-          flex-shrink: 0;
-					position:absolute,
-					 z-index: 100;
-        "
-        v-if="true"
-      >
-        <a-spin :spinning="true" />
-      </div> -->
     </a-modal>
 
     <!-- 编辑路径弹窗 -->
@@ -602,7 +590,7 @@ import QueryRight from "../../components/drawers/QueryRight";
 import ManageRight from "../../components/drawers/ManageRight";
 import * as api from "../../api/index1";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
+import { toDate,commonData } from "../../api/method";
 import { storage } from "../../api/storage";
 export default {
   name: "learningPath",
@@ -732,6 +720,8 @@ export default {
       routeStudentsNum: 0,
       recallPathId: null, //撤回路径id
       stopPathId: null, //停用路径id
+
+      lpLoading:false,
     });
 
     const selectProjectName = (value, index) => {
@@ -1298,7 +1288,7 @@ export default {
       // 	 message.destroy();
       // 	 return message.warning("请选择归属组织");
       // }
-      // state.createLoading = true;
+      state.lpLoading = true;
       let obj = {
         name: state.pathName,
         picUrl: "",
@@ -1308,19 +1298,19 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          console.log("创建成功", res);
+          // console.log("创建成功", res);
-          message.destroy();
+          // message.destroy();
-          message.success("创建成功");
+          // message.success("创建成功");
-          router.push("/leveladd");
+          // router.push("/leveladd");
-          // setTimeout(() => {
+          setTimeout(() => {
-          // 	console.log("创建成功", res);
+          	console.log("创建成功", res);
-          // 	 message.destroy();
+          	 message.destroy();
-          //   message.success("创建成功");
+            message.success("创建成功");
-          //   // state.createLoading = false;
+            state.lpLoading = false;
-          //   state.currentPage = 1;
+            state.currentPage = 1;
-          //   router.push("/leveladd");
+            router.push("/leveladd");
-          //   // getLearnPath();
+            // getLearnPath();
-          // }, 1000);
+          }, commonData.timeout);
         })
         .catch((err) => {
           console.log("创建失败", err);

src/views/projectcenter/TaskAdd.vue

@@ -853,6 +853,7 @@ export default {
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
       editDiscussId:null,//要编辑的讨论的id
+      EditEvalId:null,
       projectNameList: [
         {
           id: 1,
@@ -1520,38 +1521,6 @@ export default {
         });
     };
 
-    //编辑测评信息
-    const editEvalPath = () => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        evaluationEndTime: "",
-        evaluationFlag: "",
-        evaluationId: "",
-        evaluationName: "",
-        evaluationPictureAddress: "",
-        evaluationStartTime: "",
-        evaluationTag: "",
-        evaluationTypeId: 0,
-        evaluationTypeName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apieval
-        .updateEvaluation(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
 
     //删除评估测试
     const deleteInvistText = () => {
@@ -1890,13 +1859,20 @@ export default {
       state.isLiveEdit = 2;
       state.EditLiveId = id;
     };
+    //打开测评外链的弹窗
+    const showEditEvalDrawer = (id) => {
+      console.log('222222222222222222222',id);
+      state.addevalvisible = true;
+      state.EditRefId = id;
+    };
     //编辑的按钮
     const decideType = (type, id) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);
-      } else if (type == "直播") {
+      } 
+      else if (type == "直播") {
         showEditLiveDrawer(id);
       } else if (type == "测评") {
         showDrawerAddEval(id);
@@ -1909,7 +1885,7 @@ export default {
       } else if (type == "活动") {
         showDrawerAddActive(id);
       }
-    };
+    }
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1931,6 +1907,7 @@ export default {
       showDrawerAddDiscuss,
       showDrawerAddActive,
       showDrawerAddEval,
+      showEditEvalDrawer,
       showDrawerAddInvist,
       showDrawerAddVote,
       showConfirm,
@@ -1950,7 +1927,6 @@ export default {
       deleteActivity,
       deleteVoteText,
       editActivity,
-      editEvalPath,
       deleteInvistText,
       editInvistPath,
       editVotePath,