hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-12 04:16:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dongwu-develop' into develop

Browse Source 
# Conflicts:
#	src/App.vue
This commit is contained in:
BOE\10867418
2023-04-03 17:17:58 +08:00
parent bc8d68c836 25a8b57232
commit 6a94bb4979
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App.vue
View File

@@ -33,7 +33,10 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
console.log("版本2.3.7------------");
console.log("版本2.3.9------------");
// 监听关闭浏览器
let time1 = ref(0);

2
src/components/drawers/CommonHomework.vue
View File

@@ -5,7 +5,7 @@
<a-drawer :visible="visible" class="drawerStyle addhomeworkDrawer" width="800" placement="right">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">{{ info.workName ? "编辑" : "添加" }}任务</div>
<div class="headerTitle">{{ info?.workName ? "编辑" : "添加" }}任务</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"/>
</div>

19
src/components/student/CommonStudent.vue
View File

@@ -33,7 +33,7 @@
</div>
<div class="tableBox tabb">
<BaseTable ref="projectStuTableRef" :columns="projectStuColumns" :url="STUDENT_LIST"
:params="projectParams" v-model:selectedRows="projectSelectRows"
v-model:params="projectParams" v-model:selectedRows="projectSelectRows"
type="checkbox"></BaseTable>
</div>
</div>
@@ -76,7 +76,7 @@
border: 1px solid #f0f0f0;
">
<BaseTable ref="stuTableRef" :columns="stuColumns" :url="USER_LIST_PAGE" pageKey="page"
:request="useBoeApiUserInfoPage" :params="nameSearch"
:request="useBoeApiUserInfoPage" v-model:params="nameSearch"
v-model:selectedRows="stuSelectRows" type="checkbox"></BaseTable>
</div>
</div>
@@ -131,8 +131,8 @@
</a-form-item>
</div>
<div class="tableBox tabb">
<BaseTable ref="auditTableRef" :columns="audiColums" :url="AUDIENCE_LIST"
:request="useBoeApiAuditPage" :params="audienceName"
<BaseTable ref="auditTableRef" :columns="audiColums" :url="AUDIENCE_LIST" page-key="page"
:request="useBoeApiAuditPage" v-model:params="audienceName"
v-model:selectedRows="auditSelectRows" v-model:selectedRowKeys="auditSelectRowKeys"
type="checkbox"></BaseTable>
</div>
@@ -397,8 +397,6 @@ const stuTreeSelectKeys = ref([]);
const stuTreeExpandedKeys = ref([]);
const audienceName = ref({
keyword: "",
page: 1,
pageSize: 10,
});
const searchOrgName = ref({
keyword: "",
@@ -550,7 +548,7 @@ const closeDrawer = () => {
};
function searchAudi() {
auditTableRef.value.fetch();
auditTableRef.value.reset(audienceName.value);
}
function onLoadData(treeNode) {
@@ -579,8 +577,7 @@ const openDrawer = () => {
};
function onSearchStu() {
nameSearch.value.page = 1;
stuTableRef.value.fetch();
stuTableRef.value.reset(nameSearch.value);
}
function stuStuOrgSelect(e) {
@@ -617,7 +614,7 @@ const deleteDepSelect = () => {
};
//重置组织
const resetOrg = () => {
searchOrgName.value = { keyword: "", page: 1, pageSize: 10 };
searchOrgName.value = { keyword: "" };
};
//重置受众
const resetAudienceInfo = () => {
@@ -643,7 +640,7 @@ function handleDialogOk() {
}
function handleStageOk() {
if (props.type === 1 && props.groupId && props.groupMemberCount < projectSelectRows.value.length + stuSelectRows.value.length) {
if (props.type === 1 && props.groupId && (props.groupMemberCount < (props.groupMemberNumber * 1 + projectSelectRows.value.length + stuSelectRows.value.length))) {
return message.warning("添加小组学员超过最大值");
}
stageVisible.value = false;