LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【开发】 消息修改 及首页消息

Browse Source
This commit is contained in:
fengachen
2021-12-20 15:49:10 +08:00
parent 08b3ef0317
commit 883f433c8c
3 changed files with 156 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/tools/DynamicNotice.vue
+7 -2
View File
@@ -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)
}
}
},
src/views/dashboard/Analysis.vue
+132 -127
View File
@@ -1,132 +1,133 @@
<template>
<div style="min-width: 1100px">
<div class="page-top">
<!-- 工作区-->
<a-card :bordered="false" class="workspace">
<!-- 标题-->
<div class="home-part-title"><img src="@/assets/imgs/icon/icon_workspace.png"/>工作区</div>
<div class="divider"></div>
<!-- <div class="page-top">-->
<!-- &lt;!&ndash; 工作区&ndash;&gt;-->
<!-- <a-card :bordered="false" class="workspace">-->
<!-- &lt;!&ndash; 标题&ndash;&gt;-->
<!-- <div class="home-part-title"><img src="@/assets/imgs/icon/icon_workspace.png"/>工作区</div>-->
<!-- <div class="divider"></div>-->
<div class="workspace-container">
<div class="workspace-item" @click="workspaceJump('/projectManagement/InternationalSeminar')">
<img src="@/assets/imgs/homePage/international-symposium.png"/>
<div class="workspace-item-text">国际研讨会</div>
</div>
<div class="workspace-item" @click="workspaceJump('/businessManagement/BusinessManagement')">
<img src="@/assets/imgs/homePage/company-management.png"/>
<div class="workspace-item-text">单位/开票信息审核</div>
</div>
<div class="workspace-item" @click="workspaceJump('/projectManagement/GeneralProjectManagement')">
<img src="@/assets/imgs/homePage/general-project.png"/>
<div class="workspace-item-text">普通项目</div>
</div>
<div class="workspace-item" @click="workspaceJump('/projectManagement/WorkingGroupProjectManagement')">
<img src="@/assets/imgs/homePage/working-group-project.png"/>
<div class="workspace-item-text">工作组项目</div>
</div>
<div class="workspace-item" @click="workspaceJump('/projectManagement/OtherMeeting')">
<img src="@/assets/imgs/homePage/other-meeting.png"/>
<div class="workspace-item-text">其他会议</div>
</div>
<div class="workspace-item" @click="workspaceJump('/contractManagement/RevenueContractList')">
<img src="@/assets/imgs/homePage/income-contract.png"/>
<div class="workspace-item-text">收入合同</div>
</div>
<div class="workspace-item" @click="workspaceJump('/projectManagement/CommitteeMaintenance')">
<img src="@/assets/imgs/homePage/committee-maintenance.png"/>
<div class="workspace-item-text">分标委维护</div>
</div>
</div>
<!-- <div class="workspace-container">-->
<!-- <div class="workspace-item" @click="workspaceJump('/projectManagement/InternationalSeminar')">-->
<!-- <img src="@/assets/imgs/homePage/international-symposium.png"/>-->
<!-- <div class="workspace-item-text">国际研讨会</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/businessManagement/BusinessManagement')">-->
<!-- <img src="@/assets/imgs/homePage/company-management.png"/>-->
<!-- <div class="workspace-item-text">单位/开票信息审核</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/projectManagement/GeneralProjectManagement')">-->
<!-- <img src="@/assets/imgs/homePage/general-project.png"/>-->
<!-- <div class="workspace-item-text">普通项目</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/projectManagement/WorkingGroupProjectManagement')">-->
<!-- <img src="@/assets/imgs/homePage/working-group-project.png"/>-->
<!-- <div class="workspace-item-text">工作组项目</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/projectManagement/OtherMeeting')">-->
<!-- <img src="@/assets/imgs/homePage/other-meeting.png"/>-->
<!-- <div class="workspace-item-text">其他会议</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/contractManagement/RevenueContractList')">-->
<!-- <img src="@/assets/imgs/homePage/income-contract.png"/>-->
<!-- <div class="workspace-item-text">收入合同</div>-->
<!-- </div>-->
<!-- <div class="workspace-item" @click="workspaceJump('/projectManagement/CommitteeMaintenance')">-->
<!-- <img src="@/assets/imgs/homePage/committee-maintenance.png"/>-->
<!-- <div class="workspace-item-text">分标委维护</div>-->
<!-- </div>-->
<!-- </div>-->
</a-card>
<!-- </a-card>-->
<!-- 数据统计-->
<a-card :bordered="false" class="data-statistics">
<!-- 标题-->
<div class="home-part-title"><img src="@/assets/imgs/icon/icon_data_statistics.png"/>数据统计</div>
<div class="divider"></div>
<!-- &lt;!&ndash; 数据统计&ndash;&gt;-->
<!-- <a-card :bordered="false" class="data-statistics">-->
<!-- &lt;!&ndash; 标题&ndash;&gt;-->
<!-- <div class="home-part-title"><img src="@/assets/imgs/icon/icon_data_statistics.png"/>数据统计</div>-->
<!-- <div class="divider"></div>-->
<div class="data-statistics-container">
<div class="data-statistics-item bg-payment">
<div class="item-left">
本月新增收款项
</div>
<a-tooltip>
<template slot="title">{{ statisticsData.nowMonthAddAmount }}</template>
<div class="item-right">{{ statisticsData.nowMonthShowAddAmount }}</div>
</a-tooltip>
</div>
<!-- <div class="data-statistics-container">-->
<!-- <div class="data-statistics-item bg-payment">-->
<!-- <div class="item-left">-->
<!-- 本月新增收款项-->
<!-- </div>-->
<!-- <a-tooltip>-->
<!-- <template slot="title">{{ statisticsData.nowMonthAddAmount }}</template>-->
<!-- <div class="item-right">{{ statisticsData.nowMonthShowAddAmount }}</div>-->
<!-- </a-tooltip>-->
<!-- </div>-->
<div class="data-statistics-item bg-account">
<div class="item-left">
本月到账(万元)
</div>
<a-tooltip>
<template slot="title">{{ statisticsData.nowMonthAmount }}</template>
<div class="item-right">{{ statisticsData.nowMonthShowAmount }}</div>
</a-tooltip>
</div>
<!-- <div class="data-statistics-item bg-account">-->
<!-- <div class="item-left">-->
<!-- 本月到账(万元)-->
<!-- </div>-->
<!-- <a-tooltip>-->
<!-- <template slot="title">{{ statisticsData.nowMonthAmount }}</template>-->
<!-- <div class="item-right">{{ statisticsData.nowMonthShowAmount }}</div>-->
<!-- </a-tooltip>-->
<!-- </div>-->
<div class="data-statistics-item bg-mail">
<div class="item-left">
本月邮寄项
</div>
<a-tooltip>
<template slot="title">{{ statisticsData.nowMonthMail }}</template>
<div class="item-right">{{ statisticsData.nowMonthShowMail }}</div>
</a-tooltip>
</div>
</div>
</a-card>
</div>
<!-- <div class="data-statistics-item bg-mail">-->
<!-- <div class="item-left">-->
<!-- 本月邮寄项-->
<!-- </div>-->
<!-- <a-tooltip>-->
<!-- <template slot="title">{{ statisticsData.nowMonthMail }}</template>-->
<!-- <div class="item-right">{{ statisticsData.nowMonthShowMail }}</div>-->
<!-- </a-tooltip>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-card>-->
<!-- </div>-->
<div>
<!-- 统计报表-->
<a-card :bordered="false" class="statistical-reports">
<!-- 标题-->
<div class="home-part-title"><img src="@/assets/imgs/icon/icon_home_report.png"/>统计报表</div>
<div class="divider"></div>
<!-- <div>-->
<!-- &lt;!&ndash; 统计报表&ndash;&gt;-->
<!-- <a-card :bordered="false" class="statistical-reports">-->
<!-- &lt;!&ndash; 标题&ndash;&gt;-->
<!-- <div class="home-part-title"><img src="@/assets/imgs/icon/icon_home_report.png"/>统计报表</div>-->
<!-- <div class="divider"></div>-->
<div class="statistical-reports-container">
<!-- 个人统计and科室统计-->
<div class="container-box">
<!-- 个人统计-->
<div class="container-item">
<div class="container-item-title">个人统计（前10）</div>
<template v-if="personalData.length > 0">
<div class="container-item-echarts" id="personalStatistics"></div>
</template>
<a-empty v-else/>
</div>
<div class="container-item">
<div class="container-item-title">科室统计（前10）</div>
<template v-if="departData.length > 0">
<div class="container-item-echarts" id="departStatistics"></div>
</template>
<a-empty v-else/>
</div>
</div>
<!-- 工作组统计and企业统计-->
<div class="container-box">
<!-- 个人统计-->
<div class="container-item">
<div class="container-item-title">工作组统计（前10）</div>
<template v-if="workingGroupData.length > 0">
<div class="container-item-echarts" id="workingGroupStatistics"></div>
</template>
<a-empty v-else/>
</div>
<div class="container-item">
<div class="container-item-title">企业统计（前10）</div>
<template v-if="companyData.length > 0">
<div class="container-item-echarts" id="companyStatistics"></div>
</template>
<a-empty v-else/>
</div>
</div>
</div>
</a-card>
</div>
<!-- <div class="statistical-reports-container">-->
<!-- &lt;!&ndash; 个人统计and科室统计&ndash;&gt;-->
<!-- <div class="container-box">-->
<!-- &lt;!&ndash; 个人统计&ndash;&gt;-->
<!-- <div class="container-item">-->
<!-- <div class="container-item-title">个人统计（前10）</div>-->
<!-- <template v-if="personalData.length > 0">-->
<!-- <div class="container-item-echarts" id="personalStatistics"></div>-->
<!-- </template>-->
<!-- <a-empty v-else/>-->
<!-- </div>-->
<!-- <div class="container-item">-->
<!-- <div class="container-item-title">科室统计（前10）</div>-->
<!-- <template v-if="departData.length > 0">-->
<!-- <div class="container-item-echarts" id="departStatistics"></div>-->
<!-- </template>-->
<!-- <a-empty v-else/>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; 工作组统计and企业统计&ndash;&gt;-->
<!-- <div class="container-box">-->
<!-- &lt;!&ndash; 个人统计&ndash;&gt;-->
<!-- <div class="container-item">-->
<!-- <div class="container-item-title">工作组统计（前10）</div>-->
<!-- <template v-if="workingGroupData.length > 0">-->
<!-- <div class="container-item-echarts" id="workingGroupStatistics"></div>-->
<!-- </template>-->
<!-- <a-empty v-else/>-->
<!-- </div>-->
<!-- <div class="container-item">-->
<!-- <div class="container-item-title">企业统计（前10）</div>-->
<!-- <template v-if="companyData.length > 0">-->
<!-- <div class="container-item-echarts" id="companyStatistics"></div>-->
<!-- </template>-->
<!-- <a-empty v-else/>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-card>-->
<!-- </div>-->
<user-announcement-list :is-show-seach="true"></user-announcement-list>
</div>
</template>
@@ -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() {
src/views/system/UserAnnouncementList.vue
+17 -1
View File
@@ -3,7 +3,7 @@
<page-header-title :img-for-icon="IconImg"></page-header-title>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<div class="table-page-search-wrapper" v-show="!isShowSeach">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
@@ -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()
})