feat:合并

This commit is contained in:
lixg
2022-12-21 08:47:55 +08:00
parent 389d0ac4a5
commit 22663e7e13
2 changed files with 381 additions and 401 deletions

View File

@@ -11,7 +11,7 @@
<div class="drawerMain" id="ProjCheckship"> <div class="drawerMain" id="ProjCheckship">
<div class="header"> <div class="header">
<div class="headerTitle"> <div class="headerTitle">
{{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }} {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
</div> </div>
<img <img
style="width: 29px; height: 29px; cursor: pointer" style="width: 29px; height: 29px; cursor: pointer"
@@ -19,8 +19,10 @@
@click="closeDrawer" @click="closeDrawer"
/> />
</div> </div>
<div style="width:100%;display: grid;grid-template-columns: 750px auto;"> <div
<div class="tabs" style="min-height:800px;"> style="width: 100%; display: grid; grid-template-columns: 750px auto"
>
<div class="tabs" style="min-height: 800px">
<a-tabs v-model:activeKey="activeKey"> <a-tabs v-model:activeKey="activeKey">
<a-tab-pane :key="1" tab="快速选人"> <a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }"> <div :style="{ height: screenHeight - 235 + 'px' }">
@@ -31,19 +33,35 @@
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
<a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px"> <a-button
type="primary"
@click="onSearchStu"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon> <template #icon>
<SearchOutlined/> <SearchOutlined />
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button> <a-button
@click="resetStu"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
</a-form-item> </a-form-item>
</div> </div>
<div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto"> <div
<div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}" class="chooseLeft"
style="border: 1px solid #f0f0f0; ;"> style="display: grid; grid-template-columns: 250px auto"
<div class="tree" style="margin: 10px 4px 220px 10px;"> >
<div
:style="{
height: screenHeight - 180 + 'px',
overflowY: 'auto',
}"
style="border: 1px solid #f0f0f0"
>
<div class="tree" style="margin: 10px 4px 220px 10px">
<a-tree <a-tree
allow-clear allow-clear
tree-default-expand-all tree-default-expand-all
@@ -59,7 +77,13 @@
</a-tree> </a-tree>
</div> </div>
</div> </div>
<div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;"> <div
class="tableBox tabb"
style="
margin: 0px 4px 120px 10px;
border: 1px solid #f0f0f0;
"
>
<a-table <a-table
:columns="stuColumns" :columns="stuColumns"
:data-source="stuData" :data-source="stuData"
@@ -111,9 +135,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </a-tab-pane>--> <!-- </a-tab-pane>-->
<a-tab-pane :key="3" tab="受众关联"> <a-tab-pane :key="3" tab="受众关联">
<div <div :style="{ height: screenHeight - 235 + 'px' }">
:style="{ height: screenHeight - 235 + 'px' }"
>
<div> <div>
<a-form-item label="受众名称:"> <a-form-item label="受众名称:">
<a-input <a-input
@@ -121,13 +143,21 @@
style="width: 260px; height: 40px; border-radius: 8px" style="width: 260px; height: 40px; border-radius: 8px"
placeholder="请输入受众名称" placeholder="请输入受众名称"
/> />
<a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px"> <a-button
type="primary"
@click="searchAudi"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon> <template #icon>
<SearchOutlined/> <SearchOutlined />
</template> </template>
搜索 搜索
</a-button> </a-button>
<a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button> <a-button
@click="resetAudienceInfo"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
</a-form-item> </a-form-item>
</div> </div>
<div class="tableBox tabb"> <div class="tableBox tabb">
@@ -149,9 +179,7 @@
<div class="onerow"> <div class="onerow">
<div class="onleft"> <div class="onleft">
<div class="already">已选</div> <div class="already">已选</div>
</div> </div>
</div> </div>
<div <div
class="selecteds" class="selecteds"
@@ -159,8 +187,8 @@
style="overflow-y: auto" style="overflow-y: auto"
> >
<div class="person">快速选人</div> <div class="person">快速选人</div>
<div v-for="(item,i) in selectsData.studentList"> <div v-for="(item, i) in selectsData.studentList">
<div v-if="i<11"> <div v-if="i < 11">
<div class="chose"> <div class="chose">
{{ item.realName }} {{ item.realName }}
<div class="ch" @click="stuDel(i)"></div> <div class="ch" @click="stuDel(i)"></div>
@@ -173,17 +201,20 @@
<div class="ch" @click="stuDel(i)"></div> <div class="ch" @click="stuDel(i)"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="!person && selectsData.studentList.length >10" class="ifsw"> <div
<div @click="person = !person" class=sw>查看更多></div> v-if="!person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="“sw”">查看更多></div>
</div> </div>
<div v-if="person && selectsData.studentList.length >10" class="ifsw"> <div
<div @click="person = !person" class="sw"> 收起&lt;</div> v-if="person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="sw">收起&lt;</div>
</div> </div>
<!--组织--> <!--组织-->
<!-- <div class="dept">添加组织</div>--> <!-- <div class="dept">添加组织</div>-->
<!-- <div v-for="(item,i) in selectsData.deptList" >--> <!-- <div v-for="(item,i) in selectsData.deptList" >-->
@@ -206,36 +237,33 @@
<!-- </div>--> <!-- </div>-->
<!-- <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=sw>查看更多></div></div>--> <!-- <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=sw>查看更多></div></div>-->
<!-- <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt; </div></div>--> <!-- <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt; </div></div>-->
<!--受众--> <!--受众-->
<div class="group">受众关联</div> <div class="group">受众关联</div>
<div v-for="(item,i) in selectsData.groupList"> <div v-for="(item, i) in selectsData.groupList">
<div v-if="i<11"> <div v-if="i < 11">
<div class="chose2"> <div class="chose2">
<div class="span"> {{ item.audienceName }}</div> <div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div> <div class="ch2" @click="AuditDel(i)"></div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="group"> <div v-if="group">
<div class="chose2"> <div class="chose2">
<div class="span"> {{ item.audienceName }}</div> <div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div> <div class="ch2" @click="AuditDel(i)"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="!group && selectsData.groupList.length >10" class="ifsw"> <div
<div @click="group = !group" class=sw>查看更多></div> v-if="!group && selectsData.groupList.length > 10"
class="ifsw"
>
<div @click="group = !group" class="“sw”">查看更多></div>
</div> </div>
<div v-if="group && selectsData.groupList >10" class="ifsw"> <div v-if="group && selectsData.groupList > 10" class="ifsw">
<div @click="group = !group" class="sw"> 收起&lt;</div> <div @click="group = !group" class="sw">收起&lt;</div>
</div> </div>
</div> </div>
</div> </div>
<!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;"> <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
@@ -243,7 +271,6 @@
<div style="margin-top: 20px">快速选人</div> <div style="margin-top: 20px">快速选人</div>
// eslint-disable-next-line vue/require-v-for-key // eslint-disable-next-line vue/require-v-for-key
<div v-for="(item,i) in selectsData.studentList" > <div v-for="(item,i) in selectsData.studentList" >
<a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)" <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
:key="i" style="margin-top:20px"> :key="i" style="margin-top:20px">
{{ item.realName }} {{ item.realName }}
@@ -252,7 +279,6 @@
style="margin-top:20px"> style="margin-top:20px">
{{ item.realName }} {{ item.realName }}
</a-tag> </a-tag>
<div></div> <div></div>
</div> </div>
</div> </div>
@@ -283,100 +309,103 @@
<slot></slot> <slot></slot>
</div> </div>
</div> </div>
<a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk"> <a-modal
v-model:visible="stageVisible"
width="1000px"
title="选择阶段"
@ok="handleStageOk"
>
<div> <div>
{{ type === 1 ? '选择阶段' : '选择关卡' }} {{ type === 1 ? "选择阶段" : "选择关卡" }}
<a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId" <a-select
className="cus-select"> style="width: 150px"
<a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{ :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
item.name || '默认' v-model:value="selectsData.stageId"
}} className="cus-select"
>
<a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
>{{ item.name || "默认" }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue"; import { computed, defineEmits, defineProps, ref, watch } from "vue";
import {useStore} from "vuex"; import { useStore } from "vuex";
import {useBoeApiPage} from "@/api/request"; import { useBoeApiPage } from "@/api/request";
import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi"; import { AUDIENCE_LIST, USER_LIST } from "@/api/ThirdApi";
import {saveStu} from "@/api/index1"; import { saveStu } from "@/api/index1";
const store = useStore(); const store = useStore();
const emit = defineEmits({}) const emit = defineEmits({});
const props = defineProps({ const props = defineProps({
type: Number, type: Number,
id: String, id: String,
stage: { stage: {
type: Array, type: Array,
default: () => [] default: () => [],
} },
}) });
const person = ref(false) const person = ref(false);
// const dept =ref(false) // const dept =ref(false)
const group = ref(false) const group = ref(false);
const visiable = ref(false) const visiable = ref(false);
const activeKey = ref(1) const activeKey = ref(1);
const stageVisible = ref(false) const stageVisible = ref(false);
const selectsData = ref({ const selectsData = ref({
stageId: '', stageId: "",
studentList: [], studentList: [],
deptList: [], deptList: [],
groupList: [] groupList: [],
}) });
const nameSearch = ref({ const nameSearch = ref({
keyword: '', keyword: "",
departId: null, departId: null,
page: 1, page: 1,
pageSize: 10 pageSize: 10,
}) });
const audienceName = ref({ const audienceName = ref({
keyword: '', keyword: "",
page: 1, page: 1,
pageSize: 10 pageSize: 10,
}) });
// const searchOrgName = ref({ // const searchOrgName = ref({
// keyword: '', // keyword: '',
// page: 1, // page: 1,
// pageSize: 10 // pageSize: 10
// }) // })
const stageIds = computed(() => props.stage);
const stageIds = computed(() => props.stage)
const { const {
data: stuData, data: stuData,
fetch: searchStu, fetch: searchStu,
page: stuPageNo, page: stuPageNo,
pageSize: stuPageSize, pageSize: stuPageSize,
loading: stuLoading, loading: stuLoading,
total: stuTotal total: stuTotal,
} = useBoeApiPage(USER_LIST, nameSearch.value, { } = useBoeApiPage(USER_LIST, nameSearch.value, {
init: false, init: false,
result: res => res.result.userInfoList, result: (res) => res.result.userInfoList,
totalPage: res => res.result.totalPage, totalPage: (res) => res.result.totalPage,
total: res => res.result.totalElement total: (res) => res.result.totalElement,
}) });
// const { // const {
// data: orgData, // data: orgData,
// fetch: searchOrg, // fetch: searchOrg,
// } = useBoeApi(ORG_LIST, searchOrgName.value) // } = useBoeApi(ORG_LIST, searchOrgName.value)
const { const {
data: audiData, data: audiData,
fetch: searchAudi, fetch: searchAudi,
page: audiPageNo, page: audiPageNo,
pageSize: audiPageSize, pageSize: audiPageSize,
loading: audiLoading, loading: audiLoading,
total: audiTotal total: audiTotal,
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true, init: true,
result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})), result: (res) =>
totalPage: res => res.result.totalPage, res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
total: res => res.result.totalElement totalPage: (res) => res.result.totalPage,
}) total: (res) => res.result.totalElement,
});
const stuColumns = ref([ const stuColumns = ref([
{ {
title: "姓名", title: "姓名",
@@ -414,7 +443,7 @@ const stuColumns = ref([
className: "h", className: "h",
ellipsis: true, ellipsis: true,
}, },
]) ]);
const audiColums = ref([ const audiColums = ref([
{ {
title: "受众名称", title: "受众名称",
@@ -441,142 +470,125 @@ const audiColums = ref([
align: "center", align: "center",
className: "h", className: "h",
}, },
]) ]);
const stuSelectKeys = ref([]) const stuSelectKeys = ref([]);
const orgSelectKeys = ref([]) const orgSelectKeys = ref([]);
const auditSelectKeys = ref([]) const auditSelectKeys = ref([]);
const screenHeight = ref(document.body.clientHeight) const screenHeight = ref(document.body.clientHeight);
const stuRowSelection = computed(() => ({ const stuRowSelection = computed(() => ({
columnWidth: 20, columnWidth: 20,
selectedRowKeys: stuSelectKeys.value, selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange, onChange: onStuSelectChange,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
})) }));
const orgRowSelection = computed(() => ({ const orgRowSelection = computed(() => ({
columnWidth: 20, columnWidth: 20,
selectedRowKeys: orgSelectKeys.value, selectedRowKeys: orgSelectKeys.value,
onChange: onOrgSelectChange, onChange: onOrgSelectChange,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
})) }));
const stuPagination = computed(() => ({ const stuPagination = computed(() => ({
total: stuTotal.value, total: stuTotal.value,
showSizeChanger: false, showSizeChanger: false,
current: stuPageNo.value, current: stuPageNo.value,
pageSize: stuPageSize.value, pageSize: stuPageSize.value,
onChange: changePagination onChange: changePagination,
})) }));
const auditPagination = computed(() => ({ const auditPagination = computed(() => ({
total: audiTotal.value, total: audiTotal.value,
showSizeChanger: false, showSizeChanger: false,
current: audiPageNo.value, current: audiPageNo.value,
pageSize: audiPageSize.value, pageSize: audiPageSize.value,
onChange: auditChangePagination onChange: auditChangePagination,
})) }));
const auditRowSelection = computed(() => ({ const auditRowSelection = computed(() => ({
columnWidth: 20, columnWidth: 20,
selectedRowKeys: auditSelectKeys.value, selectedRowKeys: auditSelectKeys.value,
onChange: onAuditSelectChange, onChange: onAuditSelectChange,
preserveSelectedRowKeys: true, preserveSelectedRowKeys: true,
})) }));
const closeDrawer = () => { const closeDrawer = () => {
visiable.value = false visiable.value = false;
}; };
const openDrawer = () => { const openDrawer = () => {
visiable.value = true visiable.value = true;
}; };
//获取组织树 //获取组织树
const treeData = computed(() => { const treeData = computed(() => {
return store.state.orgtreeList ? store.state.orgtreeList : []; return store.state.orgtreeList ? store.state.orgtreeList : [];
}); });
function onSearchStu() { function onSearchStu() {
nameSearch.value.page = 1 nameSearch.value.page = 1;
searchStu() searchStu();
} }
function stuStuOrgSelect(e) { function stuStuOrgSelect(e) {
nameSearch.value.departId = e.join('') nameSearch.value.departId = e.join("");
searchStu() searchStu();
} }
function stuDel(i) { function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id) stuSelectKeys.value = stuSelectKeys.value.filter(
selectsData.value.studentList.splice(i, 1) (e) => e !== selectsData.value.studentList[i].id
);
selectsData.value.studentList.splice(i, 1);
} }
// function orgDel(i) { // function orgDel(i) {
// orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id) // orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
// selectsData.value.deptList.splice(i, 1) // selectsData.value.deptList.splice(i, 1)
// } // }
function AuditDel(i) { function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id) auditSelectKeys.value = auditSelectKeys.value.filter(
selectsData.value.groupList.splice(i, 1) (e) => e !== selectsData.value.groupList[i].id
);
selectsData.value.groupList.splice(i, 1);
} }
// function orgSelect(key, obj) { // function orgSelect(key, obj) {
// console.log(obj) // console.log(obj)
//request(ORG_CHILD_LIST, {orgId: null}).then(res => { //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
//console.log(res.result) //console.log(res.result)
//}) //})
//} //}
function onStuSelectChange(e, l) { function onStuSelectChange(e, l) {
stuSelectKeys.value = e stuSelectKeys.value = e;
selectsData.value.studentList = l selectsData.value.studentList = l;
} }
function onOrgSelectChange(e, l) { function onOrgSelectChange(e, l) {
orgRowSelection.value = e orgRowSelection.value = e;
selectsData.value.deptList = l.selectedNodes selectsData.value.deptList = l.selectedNodes;
} }
function onAuditSelectChange(e, l) { function onAuditSelectChange(e, l) {
auditSelectKeys.value = e auditSelectKeys.value = e;
selectsData.value.groupList = l selectsData.value.groupList = l;
} }
// const stuDepartmentSelect = (e) => { // const stuDepartmentSelect = (e) => {
// nameSearch.value.orgId = e.join('') // nameSearch.value.orgId = e.join('')
// searchStu() // searchStu()
// }; // };
//分页获取学员 //分页获取学员
const changePagination = (page) => { const changePagination = (page) => {
nameSearch.value.page = page; nameSearch.value.page = page;
searchStu() searchStu();
}; };
const auditChangePagination = (page) => { const auditChangePagination = (page) => {
audienceName.value.page = page; audienceName.value.page = page;
searchAudi() searchAudi();
}; };
//重置 //重置
const resetStu = () => { const resetStu = () => {
deleteDepSelect(); deleteDepSelect();
nameSearch.value = {keyword: '', page: 1, pageSize: 10} nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
}; };
//清空选择部门信息 //清空选择部门信息
const deleteDepSelect = () => { const deleteDepSelect = () => {
stuSelectKeys.value = [] stuSelectKeys.value = [];
}; };
//重置组织 //重置组织
// const resetOrg = () => { // const resetOrg = () => {
// searchOrgName.value = {keyword: '', page: 1, pageSize: 10} // searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
// }; // };
//重置受众 //重置受众
const resetAudienceInfo = () => { const resetAudienceInfo = () => {
audienceName.value = {keyword: '', page: 1, pageSize: 10} audienceName.value = { keyword: "", page: 1, pageSize: 10 };
}; };
//全部清除 //全部清除
// const deleteAll = () => { // const deleteAll = () => {
// selectsData.value = { // selectsData.value = {
@@ -588,57 +600,52 @@ const resetAudienceInfo = () => {
//确定添加授权 //确定添加授权
const submitAuth = () => { const submitAuth = () => {
if (props.type === 2) { if (props.type === 2) {
stageVisible.value = true stageVisible.value = true;
} else { } else {
handleStageOk() handleStageOk();
} }
}; };
function handleStageOk() { function handleStageOk() {
stageVisible.value = false stageVisible.value = false;
visiable.value = false visiable.value = false;
emit('finash', false) emit("finash", false);
saveStu({ saveStu({
targetId: props.id, targetId: props.id,
type: props.type, type: props.type,
deptIds: selectsData.value.deptList?.map(e => e.id), deptIds: selectsData.value.deptList?.map((e) => e.id),
stageId: selectsData.value.stageId, stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map(e => e.id), groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList studentList: selectsData.value.studentList,
}).then(() => { }).then(() => {
emit('finash', true) emit("finash", true);
}) });
} }
watch(visiable, () => { watch(visiable, () => {
stuSelectKeys.value = [] stuSelectKeys.value = [];
orgSelectKeys.value = [] orgSelectKeys.value = [];
auditSelectKeys.value = [] auditSelectKeys.value = [];
stuData.value = [] stuData.value = [];
audienceName.value.keyword = '' audienceName.value.keyword = "";
audienceName.value.page = 1 audienceName.value.page = 1;
audienceName.value.pageSize = 10 audienceName.value.pageSize = 10;
selectsData.value = { selectsData.value = {
stageId: '', stageId: "",
studentList: [], studentList: [],
deptList: [], deptList: [],
groupList: [] groupList: [],
} };
searchAudi() searchAudi();
}) });
</script> </script>
<style lang="scss"> <style lang="scss">
.CommonStudent { .CommonStudent {
.ant-btn-primary { .ant-btn-primary {
background-color: #4ea6ff !important; background-color: #4ea6ff !important;
} }
.cus-select { .cus-select {
height: 40px; height: 40px;
border-radius: 8px; border-radius: 8px;
} }
.tableBox .ant-table-row .ant-table-cell { .tableBox .ant-table-row .ant-table-cell {
height: 48px; height: 48px;
font-size: 14px; font-size: 14px;
@@ -647,37 +654,30 @@ watch(visiable, () => {
line-height: 29px; line-height: 29px;
padding: 0px; padding: 0px;
} }
.tableBox .ant-table-thead tr th { .tableBox .ant-table-thead tr th {
font-size: 14px; font-size: 14px;
} }
.ant-tabs-tabpane { .ant-tabs-tabpane {
height: 100%; height: 100%;
} }
.ant-tabs { .ant-tabs {
overflow: visible; overflow: visible;
} }
}
.right1 { .right1 {
border-left: 1px solid #f2f6fe; border-left: 1px solid #f2f6fe;
width: 100%; width: 100%;
margin-left: 20px; margin-left: 20px;
.onerow { .onerow {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-right: 40px; margin-right: 40px;
flex-wrap: wrap; flex-wrap: wrap;
width: 100%; width: 100%;
.onleft { .onleft {
display: flex; display: flex;
text-align: center; text-align: center;
.already { .already {
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 16px; font-size: 16px;
@@ -686,20 +686,17 @@ watch(visiable, () => {
white-space: nowrap; white-space: nowrap;
// margin-bottom: 20px; // margin-bottom: 20px;
} }
.count { .count {
color: #4ea6ff; color: #4ea6ff;
font-size: 16px; font-size: 16px;
margin: 0 6px; margin: 0 6px;
} }
.peo { .peo {
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
} }
} }
.clbox { .clbox {
margin-right: 50px; margin-right: 50px;
display: flex; display: flex;
@@ -710,7 +707,6 @@ watch(visiable, () => {
height: 32px; height: 32px;
border-radius: 4px; border-radius: 4px;
background: #4ea6ff; background: #4ea6ff;
.colose { .colose {
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -721,25 +717,21 @@ watch(visiable, () => {
background-size: 100%; background-size: 100%;
margin-right: 4px; margin-right: 4px;
} }
.allclear { .allclear {
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
font-size: 14px; font-size: 14px;
} }
} }
} }
.selecteds { .selecteds {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-left: 32px; margin-left: 32px;
.person { .person {
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
border-top: 1px solid #f2f6fe; border-top: 1px solid #f2f6fe;
} }
.chose { .chose {
width: 64px; width: 64px;
height: 24px; height: 24px;
@@ -753,7 +745,6 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1); color: rgba(56, 139, 225, 1);
font-size: 12px; font-size: 12px;
position: relative; position: relative;
.ch { .ch {
position: absolute; position: absolute;
width: 18px; width: 18px;
@@ -763,14 +754,12 @@ watch(visiable, () => {
top: -8px; top: -8px;
} }
} }
.ifsw { .ifsw {
display: flex; display: flex;
align-items: end; align-items: end;
justify-content: center; justify-content: center;
color: #4ea6ff; color: #4ea6ff;
} }
.sw { .sw {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -780,13 +769,11 @@ watch(visiable, () => {
margin-top: 23px; margin-top: 23px;
margin-left: 10px; margin-left: 10px;
} }
.dept { .dept {
width: 100%; width: 100%;
margin-top: 30px; margin-top: 30px;
border-top: 1px solid #f2f6fe; border-top: 1px solid #f2f6fe;
} }
.chose1 { .chose1 {
//width: 90px; //width: 90px;
height: 24px; height: 24px;
@@ -800,13 +787,11 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1); color: rgba(56, 139, 225, 1);
font-size: 12px; font-size: 12px;
position: relative; position: relative;
.span { .span {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.ch1 { .ch1 {
position: absolute; position: absolute;
width: 18px; width: 18px;
@@ -816,13 +801,11 @@ watch(visiable, () => {
top: -8px; top: -8px;
} }
} }
.group { .group {
width: 100%; width: 100%;
margin-top: 30px; margin-top: 30px;
border-top: 1px solid #f2f6fe; border-top: 1px solid #f2f6fe;
} }
.chose2 { .chose2 {
//width: 120px; //width: 120px;
height: 24px; height: 24px;
@@ -836,13 +819,11 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1); color: rgba(56, 139, 225, 1);
font-size: 12px; font-size: 12px;
position: relative; position: relative;
.span { .span {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.ch2 { .ch2 {
position: absolute; position: absolute;
width: 18px; width: 18px;
@@ -853,6 +834,5 @@ watch(visiable, () => {
} }
} }
} }
}
} }
</style> </style>

View File

@@ -63,12 +63,12 @@
批量删除 批量删除
</a-button> </a-button>
</a-col> </a-col>
<a-col :span="1.5" v-if="type == 2"> <!-- <a-col :span="1.5" v-if="type == 2">
<a-button class="cus-btn white" @click="showChangeModal"> <a-button class="cus-btn white" @click="showChangeModal">
<template #icon></template> <template #icon></template>
批量调整关卡 批量调整关卡
</a-button> </a-button>
</a-col> </a-col> -->
</a-row> </a-row>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<a-table <a-table
@@ -259,10 +259,10 @@ function submitCall(flag) {
} }
//调整关卡 //调整关卡
const visiblene = ref(false); // const visiblene = ref(false);
const showChangeModal = () => { // const showChangeModal = () => {
visiblene.value = true; // visiblene.value = true;
}; // };
</script> </script>
<style> <style>
.studentopea1 { .studentopea1 {