feat:修改版本

This commit is contained in:
lixg
2022-12-20 18:36:55 +08:00
parent af79536c22
commit 48af0a81be
3 changed files with 520 additions and 457 deletions

View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.19------------");
console.log("版本0.9.20------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-20 17:00:37
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-20 17:08:12
* @LastEditTime: 2022-12-20 17:59:40
* @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -25,7 +25,7 @@
</div>
<div class="mid">
<div class="inher">
<div class="cur">当前关卡关卡2</div>
<!-- <div class="cur">当前关卡关卡2</div> -->
<div class="select">
<a-select
v-model:value="curLevel"

View File

@@ -1,7 +1,7 @@
<!-- eslint-disable vue/no-parsing-error -->
<!-- eslint-disable vue/require-v-for-key -->
<template>
<div>
<div class="CommonStudent">
<a-drawer
:visible="visiable"
class="drawerStyle ProjCheckship"
@@ -11,7 +11,7 @@
<div class="drawerMain" id="ProjCheckship">
<div class="header">
<div class="headerTitle">
{{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
{{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
@@ -19,8 +19,10 @@
@click="closeDrawer"
/>
</div>
<div style="width:100%;display: grid;grid-template-columns: 750px auto;">
<div class="tabs" style="min-height:800px;" >
<div
style="width: 100%; display: grid; grid-template-columns: 750px auto"
>
<div class="tabs" style="min-height: 800px">
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane :key="1" tab="快速选人">
<div :style="{ height: screenHeight - 235 + 'px' }">
@@ -31,18 +33,35 @@
style="width: 270px; height: 40px; border-radius: 8px"
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>
<SearchOutlined/>
<SearchOutlined />
</template>
搜索
</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>
</div>
<div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
<div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}" style="border: 1px solid #f0f0f0; ;">
<div class="tree" style="margin: 10px 4px 220px 10px;">
<div
class="chooseLeft"
style="display: grid; grid-template-columns: 250px auto"
>
<div
:style="{
height: screenHeight - 180 + 'px',
overflowY: 'auto',
}"
style="border: 1px solid #f0f0f0"
>
<div class="tree" style="margin: 10px 4px 220px 10px">
<a-tree
allow-clear
tree-default-expand-all
@@ -58,7 +77,13 @@
</a-tree>
</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
:columns="stuColumns"
:data-source="stuData"
@@ -72,9 +97,7 @@
</div>
</a-tab-pane>
<a-tab-pane :key="2" tab="添加组织">
<div
:style="{ height: screenHeight - 235 + 'px' }"
>
<div :style="{ height: screenHeight - 235 + 'px' }">
<div class="tab2">
<a-form-item label="组织:">
<a-input
@@ -82,13 +105,21 @@
style="width: 230px; height: 40px; border-radius: 8px"
placeholder="请输入组织"
/>
<a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
<a-button
type="primary"
@click="searchOrg"
style="margin-left: 20px; border-radius: 4px"
>
<template #icon>
<SearchOutlined/>
<SearchOutlined />
</template>
搜索
</a-button>
<a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
<a-button
@click="resetOrg"
style="margin-left: 20px; border-radius: 4px"
>重置</a-button
>
</a-form-item>
</div>
<div class="boeTree">
@@ -110,9 +141,7 @@
</div>
</a-tab-pane>
<a-tab-pane :key="3" tab="受众关联">
<div
:style="{ height: screenHeight - 235 + 'px' }"
>
<div :style="{ height: screenHeight - 235 + 'px' }">
<div>
<a-form-item label="受众名称:">
<a-input
@@ -120,13 +149,21 @@
style="width: 260px; height: 40px; border-radius: 8px"
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>
<SearchOutlined/>
<SearchOutlined />
</template>
搜索
</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>
</div>
<div class="tableBox tabb">
@@ -148,9 +185,7 @@
<div class="onerow">
<div class="onleft">
<div class="already">已选</div>
</div>
</div>
<div
class="selecteds"
@@ -158,75 +193,90 @@
style="overflow-y: auto"
>
<div class="person">快速选人</div>
<div v-for="(item,i) in selectsData.studentList" >
<div v-if="i<11">
<div v-for="(item, i) in selectsData.studentList">
<div v-if="i < 11">
<div class="chose">
{{ item.realName }}
<div class="ch" @click="stuDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if ="person">
<div v-if="person">
<div class="chose">
{{ item.realName }}
<div class="ch" @click="stuDel(i)"></div>
</div>
</div>
</div>
</div>
<div v-if="!person && selectsData.studentList.length >10" class="ifsw"><div @click="person = !person" class=sw>查看更多></div></div>
<div v-if="person && selectsData.studentList.length >10" class="ifsw" ><div @click="person = !person" class="sw"> 收起&lt; </div></div>
<div
v-if="!person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="“sw”">查看更多></div>
</div>
<div
v-if="person && selectsData.studentList.length > 10"
class="ifsw"
>
<div @click="person = !person" class="sw">收起&lt;</div>
</div>
<!--组织-->
<div class="dept">添加组织</div>
<div v-for="(item,i) in selectsData.deptList" >
<div v-if="i<11">
<div v-for="(item, i) in selectsData.deptList">
<div v-if="i < 11">
<div class="chose1">
<div class="span"> {{ item.name }}</div>
<div class="span">{{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if ="dept">
<div v-if="dept">
<div class="chose1">
<div class="span"> {{ item.name }}</div>
<div class="span">{{ item.name }}</div>
<div class="ch1" @click="orgDel(i)"></div>
</div>
</div>
</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>
<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 class="group">受众关联</div>
<div v-for="(item,i) in selectsData.groupList" >
<div v-if="i<11">
<div v-for="(item, i) in selectsData.groupList">
<div v-if="i < 11">
<div class="chose2">
<div class="span"> {{ item.audienceName }}</div>
<div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
<div v-else>
<div v-if ="group">
<div v-if="group">
<div class="chose2">
<div class="span"> {{ item.audienceName }}</div>
<div class="span">{{ item.audienceName }}</div>
<div class="ch2" @click="AuditDel(i)"></div>
</div>
</div>
</div>
</div>
<div v-if="!group && selectsData.groupList.length >10" class="ifsw"><div @click="group = !group" class=sw>查看更多></div></div>
<div v-if="group && selectsData.groupList >10" class="ifsw" ><div @click="group = !group" class="sw"> 收起&lt; </div></div>
<div
v-if="!group && selectsData.groupList.length > 10"
class="ifsw"
>
<div @click="group = !group" class="“sw”">查看更多></div>
</div>
<div v-if="group && selectsData.groupList > 10" class="ifsw">
<div @click="group = !group" class="sw">收起&lt;</div>
</div>
</div>
</div>
<!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
@@ -274,66 +324,74 @@
<slot></slot>
</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>
{{ type === 1 ? '选择阶段' : '选择关卡' }}
<a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
className="cus-select">
<a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
item.name || '默认'
}}
{{ type === 1 ? "选择阶段" : "选择关卡" }}
<a-select
style="width: 150px"
:placeholder="type === 1 ? '选择阶段' : '选择关卡'"
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>
</div>
</a-modal>
</template>
<script setup>
import {computed, defineEmits, defineProps, ref, watch} from "vue";
import {useStore} from "vuex";
import {useBoeApi, useBoeApiPage} from "@/api/request";
import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
import {saveStu} from "@/api/index1";
import { computed, defineEmits, defineProps, ref, watch } from "vue";
import { useStore } from "vuex";
import { useBoeApi, useBoeApiPage } from "@/api/request";
import { AUDIENCE_LIST, ORG_LIST, USER_LIST } from "@/api/ThirdApi";
import { saveStu } from "@/api/index1";
const store = useStore();
const emit = defineEmits({})
const emit = defineEmits({});
const props = defineProps({
type: Number,
id: String,
stage: {
type: Array,
default: () => []
}
})
const person =ref(false)
const dept =ref(false)
const group =ref(false)
const visiable = ref(false)
const activeKey = ref(1)
const stageVisible = ref(false)
default: () => [],
},
});
const person = ref(false);
const dept = ref(false);
const group = ref(false);
const visiable = ref(false);
const activeKey = ref(1);
const stageVisible = ref(false);
const selectsData = ref({
stageId: '',
stageId: "",
studentList: [],
deptList: [],
groupList: []
})
groupList: [],
});
const nameSearch = ref({
keyword: '',
keyword: "",
departId: null,
page: 1,
pageSize: 10
})
pageSize: 10,
});
const audienceName = ref({
keyword: '',
keyword: "",
page: 1,
pageSize: 10
})
pageSize: 10,
});
const searchOrgName = ref({
keyword: '',
keyword: "",
page: 1,
pageSize: 10
})
pageSize: 10,
});
const stageIds = computed(() => props.stage)
const stageIds = computed(() => props.stage);
const {
data: stuData,
@@ -341,18 +399,18 @@ const {
page: stuPageNo,
pageSize: stuPageSize,
loading: stuLoading,
total: stuTotal
total: stuTotal,
} = useBoeApiPage(USER_LIST, nameSearch.value, {
init: false,
result: res => res.result.userInfoList,
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
result: (res) => res.result.userInfoList,
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
const {
data: orgData,
fetch: searchOrg,
} = useBoeApi(ORG_LIST, searchOrgName.value)
const { data: orgData, fetch: searchOrg } = useBoeApi(
ORG_LIST,
searchOrgName.value
);
const {
data: audiData,
@@ -360,13 +418,14 @@ const {
page: audiPageNo,
pageSize: audiPageSize,
loading: audiLoading,
total: audiTotal
total: audiTotal,
} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
init: true,
result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
totalPage: res => res.result.totalPage,
total: res => res.result.totalElement
})
result: (res) =>
res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
totalPage: (res) => res.result.totalPage,
total: (res) => res.result.totalElement,
});
const stuColumns = ref([
{
@@ -405,15 +464,16 @@ const stuColumns = ref([
className: "h",
ellipsis: true,
},
])
const audiColums = ref([{
]);
const audiColums = ref([
{
title: "id",
dataIndex: "id",
key: "id",
width: 35,
align: "center",
className: "h",
},
},
{
title: "受众名称",
dataIndex: "audienceName",
@@ -439,52 +499,52 @@ const audiColums = ref([{
align: "center",
className: "h",
},
])
const stuSelectKeys = ref([])
const orgSelectKeys = ref([])
const auditSelectKeys = ref([])
const screenHeight = ref(document.body.clientHeight)
]);
const stuSelectKeys = ref([]);
const orgSelectKeys = ref([]);
const auditSelectKeys = ref([]);
const screenHeight = ref(document.body.clientHeight);
const stuRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: stuSelectKeys.value,
onChange: onStuSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const orgRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: orgSelectKeys.value,
onChange: onOrgSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const stuPagination = computed(() => ({
total: stuTotal.value,
showSizeChanger: false,
current: stuPageNo.value,
pageSize: stuPageSize.value,
onChange: changePagination
}))
onChange: changePagination,
}));
const auditPagination = computed(() => ({
total: audiTotal.value,
showSizeChanger: false,
current: audiPageNo.value,
pageSize: audiPageSize.value,
onChange: auditChangePagination
}))
onChange: auditChangePagination,
}));
const auditRowSelection = computed(() => ({
columnWidth: 20,
selectedRowKeys: auditSelectKeys.value,
onChange: onAuditSelectChange,
preserveSelectedRowKeys: true,
}))
}));
const closeDrawer = () => {
visiable.value = false
visiable.value = false;
};
const openDrawer = () => {
visiable.value = true
visiable.value = true;
};
//获取组织树
const treeData = computed(() => {
@@ -492,51 +552,56 @@ const treeData = computed(() => {
});
function onSearchStu() {
nameSearch.value.page = 1
searchStu()
nameSearch.value.page = 1;
searchStu();
}
function stuStuOrgSelect(e) {
nameSearch.value.departId = e.join('')
searchStu()
nameSearch.value.departId = e.join("");
searchStu();
}
function stuDel(i) {
stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
selectsData.value.studentList.splice(i, 1)
stuSelectKeys.value = stuSelectKeys.value.filter(
(e) => e !== selectsData.value.studentList[i].id
);
selectsData.value.studentList.splice(i, 1);
}
function orgDel(i) {
orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
selectsData.value.deptList.splice(i, 1)
orgSelectKeys.value = orgSelectKeys.value.filter(
(e) => e !== selectsData.value.deptList[i].id
);
selectsData.value.deptList.splice(i, 1);
}
function AuditDel(i) {
auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
selectsData.value.groupList.splice(i, 1)
auditSelectKeys.value = auditSelectKeys.value.filter(
(e) => e !== selectsData.value.groupList[i].id
);
selectsData.value.groupList.splice(i, 1);
}
// function orgSelect(key, obj) {
// console.log(obj)
//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
//console.log(res.result)
//})
//}
// console.log(obj)
//request(ORG_CHILD_LIST, {orgId: null}).then(res => {
//console.log(res.result)
//})
//}
function onStuSelectChange(e, l) {
stuSelectKeys.value = e
selectsData.value.studentList = l
stuSelectKeys.value = e;
selectsData.value.studentList = l;
}
function onOrgSelectChange(e, l) {
orgRowSelection.value = e
selectsData.value.deptList = l.selectedNodes
orgRowSelection.value = e;
selectsData.value.deptList = l.selectedNodes;
}
function onAuditSelectChange(e, l) {
auditSelectKeys.value = e
selectsData.value.groupList = l
auditSelectKeys.value = e;
selectsData.value.groupList = l;
}
// const stuDepartmentSelect = (e) => {
@@ -547,32 +612,32 @@ function onAuditSelectChange(e, l) {
//分页获取学员
const changePagination = (page) => {
nameSearch.value.page = page;
searchStu()
searchStu();
};
const auditChangePagination = (page) => {
audienceName.value.page = page;
searchAudi()
searchAudi();
};
//重置
const resetStu = () => {
deleteDepSelect();
nameSearch.value = {keyword: '', page: 1, pageSize: 10}
nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
};
//清空选择部门信息
const deleteDepSelect = () => {
stuSelectKeys.value = []
stuSelectKeys.value = [];
};
//重置组织
const resetOrg = () => {
searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
};
//重置受众
const resetAudienceInfo = () => {
audienceName.value = {keyword: '', page: 1, pageSize: 10}
audienceName.value = { keyword: "", page: 1, pageSize: 10 };
};
//全部清除
@@ -586,70 +651,69 @@ const resetAudienceInfo = () => {
//确定添加授权
const submitAuth = () => {
if (props.type === 2) {
stageVisible.value = true
stageVisible.value = true;
} else {
handleStageOk()
handleStageOk();
}
};
function handleStageOk() {
stageVisible.value = false
visiable.value = false
emit('finash', false)
stageVisible.value = false;
visiable.value = false;
emit("finash", false);
saveStu({
targetId: props.id,
type: props.type,
deptIds: selectsData.value.deptList?.map(e => e.id),
deptIds: selectsData.value.deptList?.map((e) => e.id),
stageId: selectsData.value.stageId,
groupIds: selectsData.value.groupList?.map(e => e.id),
studentList: selectsData.value.studentList
groupIds: selectsData.value.groupList?.map((e) => e.id),
studentList: selectsData.value.studentList,
}).then(() => {
emit('finash', true)
})
emit("finash", true);
});
}
watch(visiable, () => {
stuSelectKeys.value = []
orgSelectKeys.value = []
auditSelectKeys.value = []
stuData.value = []
stuSelectKeys.value = [];
orgSelectKeys.value = [];
auditSelectKeys.value = [];
stuData.value = [];
selectsData.value = {
stageId: '',
stageId: "",
studentList: [],
deptList: [],
groupList: []
}
})
groupList: [],
};
});
</script>
<style lang="scss">
.ant-btn-primary {
.CommonStudent {
.ant-btn-primary {
background-color: #4ea6ff !important;
}
}
.cus-select {
.cus-select {
height: 40px;
border-radius: 8px;
}
.tableBox .ant-table-row .ant-table-cell {
}
.tableBox .ant-table-row .ant-table-cell {
height: 48px;
font-size: 12px;
font-size: 14px;
font-weight: 400;
color: #4F5156;
color: #4f5156;
line-height: 29px;
padding: 0px;
}
.tableBox .ant-table-thead tr th {
font-size: 12px;
}
.ant-tabs-tabpane{
}
.tableBox .ant-table-thead tr th {
font-size: 14px;
}
.ant-tabs-tabpane {
height: 100%;
}
.ant-tabs{
overflow:visible;
}
.right1 {
}
.ant-tabs {
overflow: visible;
}
.right1 {
border-left: 1px solid #f2f6fe;
width: 100%;
margin-left: 20px;
@@ -714,8 +778,8 @@ watch(visiable, () => {
display: flex;
flex-wrap: wrap;
margin-left: 32px;
.person{
width:100%;
.person {
width: 100%;
margin-top: 20px;
border-top: 1px solid #f2f6fe;
}
@@ -741,23 +805,23 @@ watch(visiable, () => {
top: -8px;
}
}
.ifsw{
display:flex;
align-items:end;
.ifsw {
display: flex;
align-items: end;
justify-content: center;
color:#4ea6ff;
color: #4ea6ff;
}
.sw{
display:flex;
align-items:center;
.sw {
display: flex;
align-items: center;
justify-content: center;
text-align: justify;
color:#4ea6ff;
color: #4ea6ff;
margin-top: 23px;
margin-left:10px;
margin-left: 10px;
}
.dept{
width:100%;
.dept {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
@@ -774,10 +838,10 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span{
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch1 {
position: absolute;
@@ -787,10 +851,9 @@ watch(visiable, () => {
right: -8px;
top: -8px;
}
}
.group{
width:100%;
.group {
width: 100%;
margin-top: 30px;
border-top: 1px solid #f2f6fe;
}
@@ -807,10 +870,10 @@ watch(visiable, () => {
color: rgba(56, 139, 225, 1);
font-size: 12px;
position: relative;
.span{
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
.span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ch2 {
position: absolute;
@@ -820,8 +883,8 @@ watch(visiable, () => {
right: -8px;
top: -8px;
}
}
}
}
}
</style>