diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index c23fd1bd..35c42159 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -282,4 +282,28 @@ function submitCall(flag) {
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
+.cus-btn {
+ width: 100%;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 16px;
+ border: 1px solid #4ea6ff;
+ border-radius: 8px;
+ background: #4ea6ff;
+ cursor: pointer;
+ color: #fff;
+}
+
+.white {
+ background: #fff;
+ color: #4ea6ff;
+}
+
+.cus-input {
+ height: 40px;
+ border-radius: 8px;
+}
+
\ No newline at end of file
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 28cc9c2d..d1e3afb0 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2218,9 +2218,7 @@
-
+
@@ -3415,21 +3413,21 @@ export default defineComponent({
}
},
},
- {
- title: "加入方式",
- width: "10%",
- dataIndex: "join",
- key: "6",
- align: "center",
- customRender: ({ record }) => {
- switch (String(record.source)) {
- case "1":
- return "手动加入";
- case "2":
- return "报名加入";
- }
- },
- },
+ // {
+ // title: "加入方式",
+ // width: "10%",
+ // dataIndex: "join",
+ // key: "6",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // switch (String(record.source)) {
+ // case "1":
+ // return "手动加入";
+ // case "2":
+ // // return "报名加入";
+ // }
+ // },
+ // },
// {
// title: "签到状态",
// width: '10%',
@@ -4844,7 +4842,7 @@ export default defineComponent({
};
//保存开课
const handleSureStu = () => {
- state.addLoading = true;
+
let startTime,
endTime = 0;
if (state.xjkkinputV3) {
@@ -4886,17 +4884,19 @@ export default defineComponent({
message.destroy();
return message.error("请输入必填项");
} else {
- state.addLoading = true;
+
console.log("state.addLoading ", state.addLoading);
}
+ state.addLoading = true;
editPlan(postData).then((res) => {
if (res.data.code === 200) {
getTableDate3();
handleCancelStu();
rest();
}
+ state.addLoading = false;
});
- state.addLoading = false;
+
};
//编辑开课
const handelEditStu = async (itm) => {
@@ -8127,183 +8127,9 @@ export default defineComponent({
display: flex;
justify-content: space-between;
- .i5_left {
- display: flex;
+
- .select {
- margin-right: 20px;
- margin-bottom: 20px;
- }
-
- .addTimeBox {
- position: relative;
- display: flex;
- align-items: center;
-
- .addTime {
- position: absolute;
- z-index: 10;
- margin-left: 10px;
- color: rgba(0, 0, 0, 0.4);
- }
-
- .ant-picker {
- padding-left: 85px;
- }
-
- .ant-picker-range .ant-picker-active-bar {
- margin-left: 85px;
- }
- }
-
- .btn {
- padding: 0px 26px 0px 26px;
- height: 38px;
- background: #4ea6ff;
- border-radius: 8px;
- //border: 1px solid rgba(64, 158, 255, 1);
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 14px;
- flex-shrink: 0;
- cursor: pointer;
-
- .search {
- background-size: 100%;
- }
-
- .btnText {
- font-size: 14px;
- font-weight: 400;
- color: #ffffff;
- line-height: 36px;
- margin-left: 5px;
- }
- }
-
- .btnn {
- padding: 0px 26px 0px 26px;
- height: 38px;
- background: #ffffff;
- border-radius: 8px;
- border: 1px solid rgba(64, 158, 255, 1);
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 14px;
- flex-shrink: 0;
- cursor: pointer;
-
- .search {
- background-size: 100%;
- }
-
- .btnText {
- font-size: 14px;
- font-weight: 400;
- color: #4ea6ff;
- line-height: 36px;
- margin-left: 5px;
- }
- }
-
- .btn1 {
- .search {
- width: 15px;
- height: 17px;
- background-image: url("../../assets/images/courseManage/search0.png");
- }
- }
-
- .btn2 {
- .search {
- width: 16px;
- height: 18px;
- background-image: url("../../assets/images/courseManage/reset1.png");
- }
- }
-
- .btn1:hover {
- background: rgba(64, 158, 255, 0.76);
-
- .search {
- background-image: url("../../assets/images/courseManage/search0.png");
- }
-
- .btnText {
- color: #ffffff;
- }
- }
-
- .btn1:active {
- background: #0982ff;
- }
-
- .btn2:hover {
- background: rgba(64, 158, 255, 0.1);
- }
-
- .btn2:active {
- background: rgba(64, 158, 255, 0.2);
- }
- }
-
- .btns {
- display: flex;
- // flex-wrap: wrap;
- .btn {
- padding: 0px 26px 0px 26px;
- height: 38px;
- background: #4ea6ff;
- border-radius: 8px;
- //border: 1px solid rgba(64, 158, 255, 1);
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 14px;
- flex-shrink: 0;
- cursor: pointer;
-
- .search {
- background-size: 100%;
- }
-
- .btnText {
- font-size: 14px;
- font-weight: 400;
- color: #ffffff;
- line-height: 36px;
- margin-left: 5px;
- }
- }
-
- .btn3 {
- margin-right: 0px;
-
- .search {
- width: 17px;
- height: 18px;
- background-image: url("../../assets/images/courseManage/add0.png");
- }
- }
-
- .btn3:hover {
- background: rgba(64, 158, 255, 0.76);
-
- .search {
- background-image: url("../../assets/images/courseManage/add0.png");
- }
-
- .btnText {
- color: #ffffff;
- }
- }
-
- .btn3:active {
- background: #0982ff;
- }
- }
+
}
.stmm_i6 {
@@ -8643,29 +8469,7 @@ export default defineComponent({
margin-bottom: 20px;
}
-.cus-btn {
- width: 100%;
- height: 40px;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 16px;
- border: 1px solid #4ea6ff;
- border-radius: 8px;
- background: #4ea6ff;
- cursor: pointer;
- color: #fff;
-}
-.white {
- background: #fff;
- color: #4ea6ff;
-}
-
-.cus-input {
- height: 40px;
- border-radius: 8px;
-}
// .tableSelect {
// position: relative;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 632693a9..f6279f78 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -851,7 +851,7 @@
编辑
-->
-
+
@@ -1442,14 +1442,7 @@
>
@@ -1626,7 +1626,36 @@ export default {
console.log("获取任务列表失败", err);
});
};*/
-
+ // 删除所有阶段
+ const removeAllLevel = () => {
+ // state.cancelModal = false;
+ console.log(state.level);
+ let removeArr = state.level;
+ for (let i = 0; i < removeArr.length; i++) {
+
+ api
+ .deleteStage(removeArr[i].id)
+ .then((res) => {
+ console.log("删除阶段成功", res);
+ if (removeArr.length - 1 == i) {
+ message.destroy();
+ message.success("删除全部阶段成功");
+ closeDeleteStage();
+ localStorage.setItem("stageId", "");
+ getTask();
+ state.cancelModal = false;
+ }
+ })
+ .catch((err) => {
+ if (removeArr.length - 1 == i) {
+ console.log("删除阶段失败", err);
+ message.destroy();
+ message.success("删除全部阶段失败");
+ state.cancelModal = false;
+ }
+ });
+ }
+ };
//获取任务列表
const getTask = async () => {
await api
@@ -2161,6 +2190,7 @@ export default {
getTableData,
deleteTask,
editStage,
+ removeAllLevel,
updateTableData,
changeVData,
changeRow,
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index e970fa48..97688ba0 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -171,7 +171,8 @@