hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-24 10:12:54 +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-04 09:36:29 +08:00
parent b7a2cbecf8 7e4896797c
commit 1a5d88344a
5 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -34,8 +34,8 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
console.log("版本2.4.0------------");
console.log("版本2.3.9------------");
// 监听关闭浏览器

8
src/components/common/BaseTable.vue
View File

@@ -102,9 +102,9 @@ const changePagination = (e) => {
nextTick(onFetch);
};
function reset(v = {}) {
function reset(v) {
params.reset();
emit("update:params", { ...v });
v && emit("update:params", { ...v });
nextTick(onFetch);
}
@@ -115,11 +115,11 @@ function resetSelected() {
emit("update:selectedRows", []);
}
function clear(v = {}) {
function clear(v) {
rowSelectKeys.value = [];
selectsData.value = [];
params.reset();
emit("update:params", { ...v });
v && emit("update:params", { ...v });
emit("update:selectedRowKeys", []);
emit("update:selectedRows", []);
}

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

@@ -138,7 +138,7 @@ function confirm() {
function selectCourse(row) {
console.log(row);
if (!props.courseSyncFlag && !row.refId) {
if (!props.courseSyncFlag && row.refId != props.id) {
message.warning("请新建本项目在线课！");
return;
}

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

@@ -47,7 +47,7 @@
<a-button type="primary" @click="onSearchStu" style="margin-left: 20px; border-radius: 4px">
<template #icon>
<SearchOutlined/>
</template>
</template>
搜索
</a-button>
<a-button type="primary" @click="resetStu" style="margin-left: 20px; border-radius: 4px">重置
@@ -93,7 +93,7 @@
<template #icon>
<SearchOutlined/>
</template>
搜索
搜索
</a-button>
<a-button type="primary" @click="resetOrg" style="margin-left: 20px; border-radius: 4px">重置
</a-button>
@@ -122,8 +122,8 @@
<a-button type="primary" @click="searchAudi" style="margin-left: 20px; border-radius: 4px">
<template #icon>
<SearchOutlined/>
</template>
搜索
</template>
搜索
</a-button>
<a-button type="primary" @click="resetAudienceInfo" style="margin-left: 20px; border-radius: 4px">
重置
@@ -273,7 +273,8 @@
<div class="mid">
<div class="inher">
<div class="select">
<a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'" v-model:value="stageId" className="cus-select">
<a-select style="width: 400px" :placeholder="type === 1 ? '选择阶段' : '选择关卡'" v-model:value="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>
@@ -374,12 +375,12 @@ const member = ref(false);
const dept = ref(false);
const projectStuTableRef = ref();
const stuTableRef = ref();
const projectParams = ref({ pid: props.infoId, type: props.infoType, studentName:"" });
const projectParams = ref({ pid: props.infoId, type: props.infoType, studentName: "" });
const getProjectStu = () => projectStuTableRef.value.fetch();
const resetProjectStu = () => {
projectParams.value.studentName = "";
projectStuTableRef.value.reset()
projectStuTableRef.value.reset();
};
const person = ref(false);
@@ -604,7 +605,7 @@ function onOrgSelectChange(e, l) {
const resetStu = () => {
nameSearch.value.keyword = "";
stuTableRef.value.reset({ keyword: "", departId: null })
stuTableRef.value.reset({ keyword: "", departId: null });
};
//清空选择部门信息
const deleteDepSelect = () => {
@@ -619,7 +620,7 @@ const resetOrg = () => {
//重置受众
const resetAudienceInfo = () => {
audienceName.value.keyword = "";
auditTableRef.value.reset({ keyword: "" })
auditTableRef.value.reset({ keyword: "" });
};
//确定添加授权
@@ -680,25 +681,26 @@ watch(visiable, () => {
activeKey.value = props.isGroup ? 4 : 1;
projectParams.value.studentName = "";
nameSearch.value.keyword = "";
searchOrgName.value.keyword = "";
nameSearch.value.keyword = "";
searchOrgName.value.keyword = "";
audienceName.value.keyword = "";
if (!visiable.value) {
auditTableRef.value && auditTableRef.value.resetSelected() && auditTableRef.value.clear();
auditTableRef.value && auditTableRef.value.clear();
auditTableRef.value && auditTableRef.value.reset({ keyword: "" });
stuTableRef.value && stuTableRef.value.resetSelected() && stuTableRef.value.clear();
stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: null });
projectStuTableRef.value && projectStuTableRef.value.resetSelected() && projectStuTableRef.value.clear();
projectStuTableRef.value && projectStuTableRef.value.reset();
stuTableRef.value && stuTableRef.value.clear();
stuTableRef.value && stuTableRef.value.reset({ keyword: "", departId: null });
projectStuTableRef.value && projectStuTableRef.value.clear();
projectStuTableRef.value && projectStuTableRef.value.reset({ pid: props.infoId, type: props.infoType, studentName: "" });
}
});
</script>
<style lang="scss">
.CommonStudent > .ant-drawer-content-wrapper {
.CommonStudent > .ant-drawer-content-wrapper {
min-width: 1200px !important;
width: 1200px !important;
}
.CommonStudent {
.ant-btn-primary {
background-color: #4ea6ff !important;

2
src/views/learningpath/LevelAddDetail.vue
View File

@@ -141,7 +141,7 @@
<div class="mid">
<div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
<component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2"
:id="routerInfo.routerInfo?.id" :courseSyncFlag="routerInfo.routerInfo?.courseSyncFlag"
:id="routerInfo.routerInfo?.id" :courseSyncFlag="1"
v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList"
:chapter-list="routerInfo.chapterList">
<div class="itcon">