+
+
+ 
+
+ 持续时间：
+
+
+
+
@@ -182,12 +182,12 @@ const rulesRef = ref({
message: '请输入活动结束时间',
},
],
- // activityDuration: [
- // {
- // required: true,
- // message: '请输入活动时长',
- // },
- // ],
+ activityDuration: [
+ {
+ required: true,
+ message: '请输入持续时间',
+ },
+ ],
activityAddress: [
{
required: true,
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 33f19fc7..693cf4a5 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -52,19 +52,19 @@
valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
+
+
+
+
+
+ 持续时间：
+
+
+
+
@@ -297,12 +297,12 @@ const rulesRef = ref({
message: "请输入直播公告",
},
],
- // liveDuration: [
- // {
- // required: true,
- // message: "请输入直播时长",
- // },
- // ],
+ liveDuration: [
+ {
+ required: true,
+ message: "请输入持续时间",
+ },
+ ],
liveTeacherId: [
{
required: true,
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index d6347759..34fe03ad 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -155,31 +155,31 @@
>
+
+
+
+
+
+ 持续时间
+
+
+
+
+
+ 分钟
+
+
@@ -516,12 +516,12 @@ const formDataRule = {
message: "请选择教师",
},
],
- // duration: [
- // {
- // required: true,
- // message: "请输入持续时间",
- // },
- // ],
+ duration: [
+ {
+ required: true,
+ message: "请输入持续时间",
+ },
+ ],
};
const { validate } = Form.useForm(formData, formDataRule);
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f362aa57..6a52ce10 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -933,28 +933,6 @@
>
-
-
-
-
-
- 地点
-
-
-
- {{ xjkkinputV2.length }}/50
-
-
@@ -977,7 +955,34 @@
/>
+
+
+
+
+
+ 持续时间
+
+
+
+
+
+ 分钟
+
+
@@ -995,6 +1000,28 @@
>
+
+
+
+
+
+ 地点
+
+
+
+ {{ xjkkinputV2.length }}/50
+
+
考勤设置：
@@ -2578,6 +2605,7 @@ export default defineComponent({
xjkkinputV1: "",
onceName: "",
xjkkinputV2: "",
+ duration: "",
xjkkinputV3: "",
xjkkinputV4: null,
beforeValue: null, //考勤 开始前
@@ -3624,6 +3652,7 @@ export default defineComponent({
state.xjkkinputV1 = "";
state.onceName = "";
state.xjkkinputV2 = "";
+ state.duration = "";
state.xjkkinputV3 = "";
state.xjkkinputV4 = null;
state.checked1 = false;
@@ -3668,6 +3697,7 @@ export default defineComponent({
offcourseId: state.offcourseId,
id: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2,
+ duration: state.duration,
applyFlag: state.checked1 ? 1 : 0,
attach: state.attach,
beginTime: startTime,
@@ -3739,6 +3769,7 @@ export default defineComponent({
// }
console.log("获取面授课开课详情", item);
state.xjkkinputV2 = item.address;
+ state.duration = item.duration;
state.checked1 = item.applyFlag === 1 ? true : false;
state.attach = item.attach;
From 4680d44799585dd2ef326654d16f8f1822234d5b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Jun 2023 00:33:27 +0800
Subject: [PATCH 02/16] --fix bug
---
src/components/drawers/SubsetManage.vue | 9 +++++++--
src/components/project/OrgClassCheck.vue | 6 +++++-
src/views/courselibrary/courseModal.vue | 2 ++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 0d63774c..b4f1f14d 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -116,7 +116,12 @@ export default {
// const showAddGroup = () => {
// state.Avisible = true;
// };
-
+ function uuid() {
+ const temp_url = URL.createObjectURL(new Blob());
+ const uuid = temp_url.toString();
+ URL.revokeObjectURL(temp_url);
+ return uuid.substr(uuid.lastIndexOf("/") + 1);
+ }
//展示要增加的小组
const showAddGroup = () => {
if (!state.groupNum) return message.warning("请输入要添加的小组数");
@@ -125,7 +130,7 @@ export default {
for (let i = 0; i < state.groupNum; i++) {
let obj = {
key: i,
- groupName: "第" + (i + 1) + "小组",
+ groupName: uuid(),
capacity: state.peopleNum,
};
arr.push(obj);
diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue
index c4e54668..f653c41f 100644
--- a/src/components/project/OrgClassCheck.vue
+++ b/src/components/project/OrgClassCheck.vue
@@ -36,7 +36,7 @@