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

This commit is contained in:
songwc
2022-10-12 09:59:56 +08:00
29 changed files with 3657 additions and 1156 deletions

View File

@@ -247,6 +247,11 @@
:scroll="{ x: 1500, y: 300 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
columnWidth: '40px',
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<!-- :pagination= showSizeChanger: true, showQuickJumper: true,
hideOnSinglePage: true, pageSizeOptions: [], pageSize: pageSize, current:
@@ -374,16 +379,11 @@ export default {
projectNameList2: [
{
id: 1,
value: "批量操作",
label: "批量操作",
},
{
id: 2,
value: "删除任务",
label: "删除任务",
},
{
id: 3,
id: 2,
value: "移动任务到关卡",
label: "移动任务到关卡",
},
@@ -556,6 +556,7 @@ export default {
tableDataTotal: 100,
pageSize: 10,
visible: false,
selectedRowKeys: [],
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
@@ -576,18 +577,29 @@ export default {
dataIndex: "state",
// width: "30%",
key: "state",
width: 90,
align: "center",
className: "h",
width: 40,
align: "left",
className: "classify",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
console.log(text.record.checked1);
// console.log(text.record.checked1);
return (
<div class="racona">
<div class="img"></div>
<a-checkbox class="ch" v-model:checked={text.record.checkedd}>
<div
class="img"
style={{ cursor: "pointer" }}
onClick={() => {
console.log("点击了");
}}
></div>
<span> {text.record.lei}</span>
{/**
<div class="img"></div>
<a-checkbox class="ch" checked={text.record.checkedd}>
{text.record.lei}
</a-checkbox>
*/}
</div>
);
},
@@ -610,15 +622,19 @@ export default {
className: "h",
scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
console.log(text.record.checked1);
// console.log(text.record.checked1);
return (
<div class="opat">
<div class="opacationt clearfix">
<a-switch
style="margin-left:-50px;margin-top:3px"
v-model:checked={text.record.checked1}
checked={text.record.checked1}
size="small"
active-color="red"
onClick={() => {
console.log("点击了");
text.record.checked1 = !text.record.checked1;
}}
/>
<div class="showt clearfix">
<div
@@ -669,6 +685,11 @@ export default {
return columns;
};
const onSelectChange = (selectedRowKeys) => {
console.log("selectedRowKeys changed: ", selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
return {
...toRefs(state),
selectProjectName,
@@ -677,12 +698,13 @@ export default {
showDrawer,
afterVisibleChange,
drawercolumns,
onSelectChange,
};
},
};
</script>
<style lang="scss" >
<style lang="scss">
.clearfix:after,
.clearfix:before {
content: " ";
@@ -1103,6 +1125,21 @@ export default {
}
}
.tableBox {
.classify {
margin-left: 10px !important;
padding-left: 9px !important;
}
.ant-checkbox-wrapper {
align-items: center;
margin-top: -2px;
}
.ant-table-selection-column {
padding: 0px !important;
padding-left: 68px !important;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1);
}
// margin: 20px 38px 30px;
th.h {
background-color: #eff4fc !important;
@@ -1186,18 +1223,20 @@ export default {
// background-color: #bfa;
display: flex;
align-items: center;
justify-content: center;
// justify-content: center;
height: 100%;
.img {
margin-left: -40px;
margin-top: -2px;
// margin-left: -40px;
// margin-top: -2px;
width: 17px;
height: 14px;
background-image: url("../../assets/images/leveladd/z1.png");
position: absolute;
left: -47px;
}
.ch {
margin-left: 10px;
}
}
}
</style>
</style>