diff --git a/src/components/tools/DynamicNotice.vue b/src/components/tools/DynamicNotice.vue index 95483ce..61af919 100644 --- a/src/components/tools/DynamicNotice.vue +++ b/src/components/tools/DynamicNotice.vue @@ -23,11 +23,16 @@ export default { let path = this.path.replace('@comp', '') // @views/incomePayments重复导致找不到组件 path = path.replace('@views/incomePayments', '') + if (path && path.includes('financialManagement')) { + path = path.replaceAll('@views/financialManagement', '') + } // 这么写 是因未用数据库的路径拿不到 组件 实例 if (path && path.includes('AuditModal')) { - return resolve => require([`@views/incomePayments${ path }.vue`], resolve) + return resolve => require([`@views/incomePayments${path}.vue`], resolve) + } else if (path && path.includes('AuditProofModule')) { + return resolve => require([`@views/financialManagement${path}.vue`], resolve) } else { - return resolve => require([`@/components${ path }.vue`], resolve) + return resolve => require([`@/components${path}.vue`], resolve) } } }, diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 71936fb..55b6f46 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -1,132 +1,133 @@ @@ -134,9 +135,13 @@ import * as echarts from 'echarts' import { homePageStatistics, homePageDataStatistics } from '../../api/incomePaymentsApi' +import UserAnnouncementList from '@views/system/UserAnnouncementList' + export default { name: 'Analysis', - components: {}, + components: { + UserAnnouncementList + }, data() { return { // 数据统计数据 @@ -204,15 +209,15 @@ export default { } }, created() { - this.initDataStaticsData() + // this.initDataStaticsData() }, mounted() { - this.getStatisticsData().then(() => { - this.initPersonalStatisticsEcharts() - this.initDepartStatisticsEcharts() - this.initWorkingGroupStatisticsEcharts() - this.initCompanyStatisticsEcharts() - }) + // this.getStatisticsData().then(() => { + // this.initPersonalStatisticsEcharts() + // this.initDepartStatisticsEcharts() + // this.initWorkingGroupStatisticsEcharts() + // this.initCompanyStatisticsEcharts() + // }) }, methods: { getStatisticsData() { diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 7949513..d6892aa 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -3,7 +3,7 @@ -
+
@@ -102,6 +102,14 @@ import {Bus} from '@comp/tools/Bus' export default { name: 'UserAnnouncementList', mixins: [JeroListMixin, RangeDateMixin], + props:{ + // 是否是首页的组件 首页的不展示查询条件并且 只是展示已读 + isShowSeach:{ + type:Boolean, + required:false, + default:false + } + }, components: { DynamicNotice, ShowAnnouncement, @@ -112,6 +120,7 @@ export default { return { description: '系统通告表管理页面', queryParam: {}, + disableMixinCreated:true, // 管理端消息提醒类型 noticeTypeList: [ { @@ -203,6 +212,13 @@ export default { } }, created() { + // 首页的只展示未读消息 + if(this.isShowSeach){ + this.filters.readFlag = '0' + this.loadData(1) + }else { + this.loadData(1) + } Bus.$on('header-notice-change', () => { this.loadData() })