Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
dongwug
2022-10-25 11:43:17 +08:00
9 changed files with 853 additions and 494 deletions

View File

@@ -16,15 +16,15 @@
/>
</div>
<div class="main">
<div class="onerow">将此学员移动到</div>
<div class="secondrow">
<a-select
v-model:value="value"
style="width: 264px;border-radius: 8px"
placeholder="好好学习"
:options="stugroupList"
/>
</div>
<div class="onerow">将此学员移动到</div>
<div class="secondrow">
<a-select
v-model:value="value"
style="width: 264px; border-radius: 8px"
placeholder="好好学习"
:options="stugroupList"
/>
</div>
</div>
<div class="btnn">
<button class="btn1">取消</button>
@@ -32,7 +32,6 @@
</div>
</div>
</a-drawer>
</template>
<script>
@@ -47,23 +46,23 @@ export default {
},
setup(props, ctx) {
const state = reactive({
stugroupList: [
{
id: "1",
value: "好好学习",
label: "好好学习",
},
{
id: "2",
value: "天天向上",
label: "天天向上",
},
{
id: "3",
value: "好好学习",
label: "好好学习",
},
],
stugroupList: [
{
id: "1",
value: "好好学习",
label: "好好学习",
},
{
id: "2",
value: "天天向上",
label: "天天向上",
},
{
id: "3",
value: "好好学习",
label: "好好学习",
},
],
});
const closeDrawer = () => {
ctx.emit("update:Changevisible", false);
@@ -83,9 +82,8 @@ export default {
};
</script>
<style lang="scss" >
<style lang="scss">
.changegroup {
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
@@ -109,25 +107,24 @@ export default {
}
}
.main {
.onerow {
margin: 32px 0 32px 24px;
color: rgba(51, 51, 51, 1);
font-size: 16px;
.onerow {
margin: 32px 0 32px 24px;
color: rgba(51, 51, 51, 1);
font-size: 16px;
}
.secondrow {
margin-left: 24px;
.ant-select {
height: 40px;
}
.secondrow {
margin-left: 24px;
.ant-select {
height: 40px;
}
.ant-select-selector {
height: 100%;
border-radius: 8px;
}
.ant-select-selection-search-input {
height: 40px;
}
.ant-select-selector {
height: 100%;
border-radius: 8px;
}
.ant-select-selection-search-input {
height: 40px;
}
}
}
.btnn {
height: 72px;
@@ -161,4 +158,4 @@ export default {
}
}
}
</style>
</style>

View File

@@ -70,7 +70,7 @@
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
:scroll="{ x: 900, y: 350 }"
:scroll="{ x: 900 }"
@expand="expandTable"
:pagination="false"
/>