Merge remote-tracking branch 'origin/master'

This commit is contained in:
yujicun
2023-05-16 16:12:12 +08:00
5 changed files with 59 additions and 59 deletions

View File

@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
console.log("版本3.0.4------------");
console.log("版本3.0.5------------");

View File

@@ -37,19 +37,19 @@
:placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">持续时间</span>
</div>
<div class="btnbox">
<a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.activityDuration" />
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<!-- <div class="main_item">-->
<!-- <div class="signbox">-->
<!-- <div class="sign">-->
<!-- <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />-->
<!-- </div>-->
<!-- <span style="margin-right: 3px">持续时间</span>-->
<!-- </div>-->
<!-- <div class="btnbox">-->
<!-- <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"-->
<!-- v-model:value="formData.activityDuration" />-->
<!-- <span style="color: #999999; margin-left: 8px">分钟</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="main_item">
<div class="signbox">
<div class="sign">

View File

@@ -52,19 +52,19 @@
valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="[' 开始时间', ' 结束时间']" />
</div>
</div>
<div class="main_item">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">持续时间</span>
</div>
<div class="btnbox">
<a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
v-model:value="formData.liveDuration"></a-input-number>
<span style="color: #999999; margin-left: 8px">分钟</span>
</div>
</div>
<!-- <div class="main_item">-->
<!-- <div class="signbox">-->
<!-- <div class="sign">-->
<!-- <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />-->
<!-- </div>-->
<!-- <span style="margin-right: 3px">持续时间</span>-->
<!-- </div>-->
<!-- <div class="btnbox">-->
<!-- <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"-->
<!-- v-model:value="formData.liveDuration"></a-input-number>-->
<!-- <span style="color: #999999; margin-left: 8px">分钟</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="main_item">
<div class="signbox">
<div class="sign">

View File

@@ -155,31 +155,31 @@
></ProjectManager>
</div>
</div>
<div class="cstm_items">
<div class="signbox">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
</div>
<span style="margin-right: 3px">持续时间</span>
</div>
<div class="b_input">
<a-input-number
:min="0"
:max="999999"
:precision="0"
placeholder="请输入持续时间"
style="
width: 88%;
height: 32px;
border-radius: 8px;
overflow: hidden;"
v-model:value="formData.duration"
></a-input-number>
<div class="inp_num" style="right: 96px;line-height: 12px">
<span style="color: #c7cbd2">分钟</span>
</div>
</div>
</div>
<!-- <div class="cstm_items">-->
<!-- <div class="signbox">-->
<!-- <div class="sign">-->
<!-- <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>-->
<!-- </div>-->
<!-- <span style="margin-right: 3px">持续时间</span>-->
<!-- </div>-->
<!-- <div class="b_input">-->
<!-- <a-input-number-->
<!-- :min="0"-->
<!-- :max="999999"-->
<!-- :precision="0"-->
<!-- placeholder="请输入持续时间"-->
<!-- style="-->
<!-- width: 88%;-->
<!-- height: 32px;-->
<!-- border-radius: 8px;-->
<!-- overflow: hidden;"-->
<!-- v-model:value="formData.duration"-->
<!-- ></a-input-number>-->
<!-- <div class="inp_num" style="right: 96px;line-height: 12px">-->
<!-- <span style="color: #c7cbd2">分钟</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="cstm_items">
<div class="signbox">
<div class="sign">
@@ -516,12 +516,12 @@ const formDataRule = {
message: "请选择教师",
},
],
duration: [
{
required: true,
message: "请输入持续时间",
},
],
// duration: [
// {
// required: true,
// message: "请输入持续时间",
// },
// ],
};
const { validate } = Form.useForm(formData, formDataRule);

View File

@@ -400,7 +400,7 @@ function exportTaskStu() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=3&pid=${offcoursePlanId.value}&thirdType=2`);
}
const exportAssessment = () =>window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.type === 1 ? props.datasource.stageId : props.datasource.chapterId}&type=${props.type}&pid=${props.type === 1 ? props.datasource.projectId : props.datasource.routerId}&courseId=${data.value[coursePlanIndex.value].assessmentId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`);
const exportAssessment = () =>window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportCoursePlanAssessmentMessage?chapterId=${props.type === 1 ? props.datasource.stageId : props.datasource.chapterId}&type=${props.type}&pid=${props.type === 1 ? props.datasource.projectId : props.datasource.routerId}&courseId=${data.value[coursePlanIndex.value].assessmentId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`);
function afterVisibleChange(bool) {
bool && fetchData()