Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-04-12 17:30:54 +08:00
4 changed files with 24 additions and 8 deletions

View File

@@ -160,6 +160,7 @@
</div>
<div class="btnbox">
<a-input
min="0"
:disabled="info?.examinationName >= 0?true:false"
v-model:value="formData.passLine"
type="number"

View File

@@ -4530,9 +4530,9 @@ export default defineComponent({
};
const handleOpen = async (id, index) => {
dialog({
content: "确定用该课程吗?",
content: "确定用该课程吗?",
ok: () => {
message.success("用成功");
message.success("用成功");
state.tableData1[index].status = 1;
handle({ offcourseId: id, type: 2 });
},

View File

@@ -331,8 +331,8 @@
<div class="namebox">
<div class="inname">阶段说明</div>
</div>
<div class="intext" style="margin-left: 14px">
<a-textarea v-model:value="formValue.remark" style="height: 88px;width:384px" show-count :maxlength="100"
<div class="intext" style="margin-left: 14px;height:100%;width:100%">
<a-textarea v-model:value="formValue.remark" style="height:100%;width:100% " show-count rows=6 :maxlength="100"
placeholder="请输入阶段说明"/>
</div>
</div>
@@ -799,7 +799,7 @@ const openCourse = (ele) => {
}
.name {
width: 78%;
width: 83%;
display: flex;
margin-top: 20px;
align-items: center;
@@ -867,6 +867,14 @@ const openCourse = (ele) => {
height: 30px;
}
}
.intext {
.ant-input {
border-radius: 8px;
}
}
}
}

View File

@@ -321,8 +321,8 @@
<div class="namebox">
<div class="inname">阶段说明</div>
</div>
<div class="intext" style="margin-left: 14px;width:384px">
<a-textarea v-model:value="formValue.remark" style="height: 88px;width:384px" show-count :maxlength="100"
<div class="intext" style="margin-left: 14px;height:100%;width:100%">
<a-textarea v-model:value="formValue.remark" style="height:100%;width:100%" show-count rows="6" :maxlength="100"
placeholder="请输入阶段说明" />
</div>
</div>
@@ -865,7 +865,7 @@ const cancelStorage = async () => {
}
.name {
width: 78%;
width: 83%;
display: flex;
margin-top: 20px;
align-items: center;
@@ -933,6 +933,13 @@ const cancelStorage = async () => {
height: 30px;
}
}
.intext {
.ant-input {
border-radius: 8px;
}
}
}
}