feat:合并

This commit is contained in:
songwc
2022-10-25 15:33:41 +08:00
24 changed files with 2427 additions and 930 deletions

View File

@@ -541,8 +541,8 @@
</div>
</div>
</div>
<div class="pad"></div></div
></a-tab-pane>
<div class="pad"></div></div>
</a-tab-pane>
<a-tab-pane key="4" tab="设置">
<div class="split"></div>
<div class="sametab">
@@ -552,7 +552,11 @@
<div class="headone">
<div class="box"></div>
<div class="onetitle">关卡内容可见可学设置</div>
<div class="oneedi">编辑</div>
<div class="oneedi" @click="showbtn" v-show="twobtn">编辑</div>
<div v-show="twobtnn" class="twobtn">
<div class="btnone" @click="closebtn">取消</div>
<div class="btntwo" @click="closebtn">确定</div>
</div>
</div>
<div class="onemain clearfix">
<div class="checkcon">
@@ -564,9 +568,17 @@
/>
<span class="yulan">预览其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<span class="yulan2">学员可预览第</span
><span style="color: #4ea6ff">1</span><span>-</span
><span style="color: #4ea6ff">4</span><span>关内容</span>
<div style="display: flex;align-items: center;">
<span class="yulan2">学员可预览</span
>
<span style="color: #4ea6ff" v-show="number">1</span>
<a-input-number v-model:value="nubvalue" v-show="inputbox" :controls="false" :autofocus="true" :min="1" />
<span>-</span
><span style="color: #4ea6ff" v-show="number">4</span>
<a-input-number v-model:value="nubvalue1" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
<span>关内容</span>
</div>
</div>
<div class="checkcon" style="margin-top: 20px">
<input
@@ -577,9 +589,16 @@
/>
<span class="yulan">学习其他关卡</span><br />
<div style="width: 10px; height: 4px"></div>
<span class="yulan2">学员可预览第</span
><span style="color: #4ea6ff">1</span><span>-</span
><span style="color: #4ea6ff">4</span><span>关内容</span>
<div style="display: flex;align-items: center;">
<span class="yulan2">学员可预览</span
>
<span style="color: #4ea6ff" v-show="number">1</span>
<a-input-number v-model:value="nubvalue2" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
<span>-</span
><span style="color: #4ea6ff" v-show="number">4</span>
<a-input-number v-model:value="nubvalue3" v-show="inputbox" :controls="false" :autofocus="true" :min="1"/>
<span>关内容</span>
</div>
</div>
<br />
</div>
@@ -814,6 +833,10 @@ export default {
AddSvisible: false, //添加学员抽屉
AddImpStuvisible: false, //导入学员抽屉
CheckStuvisible: false, //学员管理的查看抽屉
twobtn: true,
number: true,
twobtnn: false,
inputbox: false,
Wvisible: false, //作业管理
projectNameListt: [
{
@@ -993,6 +1016,10 @@ export default {
],
activeKey: ref("1"),
value: ref(" "),
nubvalue: ref("1"),
nubvalue2: ref("1"),
nubvalue3: ref("4"),
nubvalue1: ref("4"),
checked2: false,
currentPage: 1,
tableDataTotal: 100,
@@ -1261,6 +1288,18 @@ export default {
const showCheckStu = () => {
state.CheckStuvisible = true;
};
const showbtn = () => {
state.twobtn = false;
state.twobtnn = true;
state.number = false;
state.inputbox = true;
}
const closebtn = () => {
state.twobtnn = false;
state.twobtn = true;
state.number = true;
state.inputbox = false;
}
const showCopyModal = () => {
state.copyModal = true;
};
@@ -1312,6 +1351,8 @@ export default {
showAddStu,
showImpStu,
showCheckStu,
showbtn, //设置-编辑
closebtn,
showFS,
showAA,
showCopyModal,
@@ -2762,6 +2803,28 @@ export default {
color: #4ea6ff;
cursor: pointer;
}
.twobtn {
display: flex;
.btnone {
width: 42px;
height: 24px;
border: 1px solid rgba(64, 158, 255, 1);
border-radius: 4px;
color: rgba(64, 158, 255, 1);
margin-left: 20px;
cursor: pointer;
}
.btntwo {
width: 42px;
height: 24px;
border: 1px solid rgba(64, 158, 255, 1);
border-radius: 4px;
color: #FFFFFF;
margin-left: 20px;
background: #409EFF;
cursor: pointer;
}
}
}
.onemain {
margin-top: 20px;
@@ -2784,6 +2847,21 @@ export default {
.yulan2 {
margin-left: 22px;
}
.ant-input-number {
height: 24px;
width: 24px;
margin: 10px;
border-radius: 4px;
border: 1px solid #6D7584;
.ant-input-number-input {
width: 100%;
height: 100%;
font-size: 14px;
padding: 0;
color: #409EFF;
text-align: center;
}
}
}
}
.twomain {