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

Merge branch '250213-prod-master_1202-gx-copy' into test20250220

Browse Source
This commit is contained in:
gengxin
2025-02-25 14:43:20 +08:00
parent 870f110a78 c90dfbfb82
commit 0b149118d0
2 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/growthpath/GrowthFaceStu.vue
View File

@@ -513,13 +513,15 @@ watch(
() => { () => {
coursePlanIndex.value = 0; coursePlanIndex.value = 0;
params.value.pid = data.value[coursePlanIndex.value]?.id || 0; params.value.pid = data.value[coursePlanIndex.value]?.id || 0;
if (data.value[coursePlanIndex.value].type !== 4) { if (
data.value[coursePlanIndex.value] &&
data.value[coursePlanIndex.value].type !== 4
) {
columns.value = [...columns2]; columns.value = [...columns2];
} else { } else {
columns.value = [...columns2, ...columns1]; columns.value = [...columns2, ...columns1];
} }
tableRef.value.fetch(); tableRef.value.fetch();
console.log(1111111);
} }
); );
@@ -599,6 +601,7 @@ const batchSignAll = () => {
}) })
.then((res) => { .then((res) => {
message.success("签到成功"); message.success("签到成功");
tableRef.value.fetch();
}) })
.catch((err) => { .catch((err) => {
message.error("签到失败"); message.error("签到失败");
@@ -671,7 +674,7 @@ function afterVisibleChange(bool) {
function resetStudentPage() { function resetStudentPage() {
tableRef.value.reset({ tableRef.value.reset({
pid: data.value[coursePlanIndex.value]?.id, pid: data.value[coursePlanIndex.value]?.id,
type: 18, type: 3,
}); });
} }

58
src/views/growthpath/PathManage.vue
View File

@@ -402,18 +402,20 @@
<DownOutlined /> <DownOutlined />
</a> </a>
<template #overlay> <template #overlay>
<a-menu @click="handleMenuClickpg"> <div style="height: 200px; overflow: auto">
<template <a-menu @click="handleMenuClickpg">
v-for="(item, index) in qrCodeItemspg" <template
:key="index" v-for="(item, index) in qrCodeItemspg"
> :key="index"
<a-menu-item> >
<div> <a-menu-item>
<p>{{ item.name }}</p> <div>
</div> <p>{{ item.name }}</p>
</a-menu-item> </div>
</template> </a-menu-item>
</a-menu> </template>
</a-menu>
</div>
</template> </template>
</a-dropdown> </a-dropdown>
</div> </div>
@@ -443,18 +445,20 @@
<DownOutlined /> <DownOutlined />
</a> </a>
<template #overlay v-if="qrCodeItems.length > 0"> <template #overlay v-if="qrCodeItems.length > 0">
<a-menu @click="handleMenuClick"> <div style="height: 200px; overflow: auto">
<template <a-menu @click="handleMenuClick">
v-for="(item, index) in qrCodeItems" <template
:key="index" v-for="(item, index) in qrCodeItems"
> :key="index"
<a-menu-item> >
<div> <a-menu-item>
<p>{{ item.name }}</p> <div>
</div> <p>{{ item.name }}</p>
</a-menu-item> </div>
</template> </a-menu-item>
</a-menu> </template>
</a-menu>
</div>
</template> </template>
</a-dropdown> </a-dropdown>
</div> </div>
@@ -528,7 +532,9 @@
<template <template
v-if=" v-if="
element.taskType != 3 && element.taskType != 2 && checkMenu('growthQRCode') element.taskType != 3 &&
element.taskType != 2 &&
checkMenu('growthQRCode')
" "
> >
<div <div
@@ -2117,7 +2123,7 @@ export default {
.taskSyllabus { .taskSyllabus {
// flex: 1; // flex: 1;
overflow-x: auto; overflow-x: auto;
min-height: 400px;
.ant-collapse { .ant-collapse {
border: 0px; border: 0px;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);