From 79afdee6dc5976fccd05c616c224fd23c2d39dc8 Mon Sep 17 00:00:00 2001 From: dengbw Date: Wed, 31 May 2023 11:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=9B=A2=E9=98=9F=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login/index.js | 2 +- src/api/sylive/activity/index.js | 8 +++++--- .../components/level-table.vue | 16 +++++++++------- .../sylive/groups/components/gro-edit.vue | 13 ++----------- src/views/sylive/groups/index.vue | 19 ------------------- .../components/operation-record-detail.vue | 2 +- 6 files changed, 18 insertions(+), 42 deletions(-) diff --git a/src/api/login/index.js b/src/api/login/index.js index 02c911aa..d63a214a 100644 --- a/src/api/login/index.js +++ b/src/api/login/index.js @@ -29,7 +29,7 @@ export async function getCaptcha() { * 获取手机验证码 */ export async function getCode(params) { - const res = await request.get('/login/code/', { + const res = await request.get('/login/code', { params }); if (res.data.code === 0) { diff --git a/src/api/sylive/activity/index.js b/src/api/sylive/activity/index.js index 8f337707..6b0ee458 100644 --- a/src/api/sylive/activity/index.js +++ b/src/api/sylive/activity/index.js @@ -76,10 +76,12 @@ export async function updateActivity(data) { /** * 复制活动 - * @param id 活动id + * @param activityId 活动id */ -export async function copyActivity(id) { - const res = await request.get('/sylive/activity/copy/' + id); +export async function copyActivity(activityId) { + const res = await request.get('/sylive/activity/copy', { + params: { activityId } + }); if (res.data.code === 0) { return res.data.message; } diff --git a/src/views/sylive/groups-statistics/components/level-table.vue b/src/views/sylive/groups-statistics/components/level-table.vue index 36efb70c..e17be9ae 100644 --- a/src/views/sylive/groups-statistics/components/level-table.vue +++ b/src/views/sylive/groups-statistics/components/level-table.vue @@ -299,13 +299,15 @@ return; } this.activityId = activityId; - if (!this.itemId && this.data.goods[0]) { - this.itemId = this.data.goods[0]['value']; - } - this.getStatisticsStackedArea(); - if (this.$refs.table) { - this.$refs.table.reload({ page: 1 }); - } + setTimeout(() => { + if (!this.itemId && this.data.goods[0]) { + this.itemId = this.data.goods[0]['value']; + } + this.getStatisticsStackedArea(); + if (this.$refs.table) { + this.$refs.table.reload({ page: 1 }); + } + }, 1300); }, immediate: true } diff --git a/src/views/sylive/groups/components/gro-edit.vue b/src/views/sylive/groups/components/gro-edit.vue index b54f6abd..8aa31a0a 100644 --- a/src/views/sylive/groups/components/gro-edit.vue +++ b/src/views/sylive/groups/components/gro-edit.vue @@ -41,22 +41,13 @@ - - - 机构 - 团队 - - - + - + @@ -97,7 +96,6 @@ exportGroupsConsultant } from '@/api/sylive/groups'; import { listOrganizations } from '@/api/institution/organization'; - import { listTeams } from '@/api/institution/team'; import { listDictionaries } from '@/api/system/dictionary'; import { utils, writeFile } from 'xlsx'; const ROUTE_PATH = '/sylive/groups'; @@ -115,8 +113,6 @@ current: null, // 机构数据 organizationList: [], - // 团队数据 - teamList: [], // 统计类型数据 statisticsTypeList: [], // 是否显示表单弹窗 @@ -131,7 +127,6 @@ }, created() { this.organizationQuery(); - this.teamQuery(); this.statisticsTypeQuery(); }, methods: { @@ -172,20 +167,6 @@ this.$message.error(e.message); }); }, - /* 查询团队 */ - teamQuery() { - listTeams({ unTeamType: 3 }) - .then((list) => { - this.teamList = this.$util.toTreeData({ - data: list, - idField: 'teamId', - parentIdField: 'parentId' - }); - }) - .catch((e) => { - this.$message.error(e.message); - }); - }, /* 查询统计类型 */ statisticsTypeQuery() { listDictionaries({ dictCode: 'groups_level' }) diff --git a/src/views/system/operation-record/components/operation-record-detail.vue b/src/views/system/operation-record/components/operation-record-detail.vue index 69582fb8..0340ad36 100644 --- a/src/views/system/operation-record/components/operation-record-detail.vue +++ b/src/views/system/operation-record/components/operation-record-detail.vue @@ -82,7 +82,7 @@ {{ data.url }} - +
{{ data.method }}