@@ -82,7 +82,7 @@
- 档案门类
+ 公文统计
@@ -104,6 +104,7 @@ import PanelGroup from './dashboard/PanelGroup'
import catePie from '@/views/components/echarts/catePie.vue'
import typePie from '@/views/components/echarts/typePie.vue'
import serverProgress from '@/views/components/echarts/serverProgress.vue'
+import { FetchInitStatisBase, FetchDocumentTypeByTime, FetchDocumentByDocDepartment } from '@/api/system/documentArchives'
import { FetchMainData } from '@/api/archivesManage/library'
import { FetchSystemInfo } from '@/api/home/cpu/index'
import { mapGetters } from 'vuex'
@@ -120,10 +121,10 @@ export default {
data() {
return {
topObjectNum: {
- archivesNum: 0,
- caseNum: 0,
- documentNum: 0,
- fileNum: 0
+ documentTotal: 0,
+ notCirculate: 0,
+ circulateing: 0,
+ circulated: 0
},
archivesTotalNum: 0,
flowableData: [],
@@ -137,8 +138,7 @@ export default {
addArcivesData: {
addArcivesMaxCount: null,
addArcivesMonth: [],
- addArcivesNum: [],
- addArcivesNumFile: []
+ addArcivesNum: []
},
echartsTimer: null,
refreshtime: 10000,
@@ -156,8 +156,11 @@ export default {
])
},
created() {
- this.handleMainData()
+ this.getTopData()
this.getSystemInfo()
+ this.getDocumentTypeByTime()
+ this.getDocumentByDocDepartment()
+ // this.handleMainData()
// this.get()
},
mounted() {
@@ -211,94 +214,97 @@ export default {
toMoreProcess() {
this.$router.push({ path: '/user/center?activeIndex=2' })
},
- handleMainData() {
- const fondsAffiliation = []
- fondsAffiliation.push(this.user.fonds.id.toString())
- const params = {
- fondsAffiliations: fondsAffiliation
- }
- FetchMainData(params).then(data => {
+ getTopData() {
+ FetchInitStatisBase().then(data => {
this.topObjectNum = {
- archivesNum: data.archivesNum,
- caseNum: data.caseNum,
- documentNum: data.documentNum,
- fileNum: data.fileNum
+ notCirculate: data.notCirculate, // 未传阅数量
+ documentTotal: data.documentTotal, // 公文总数
+ circulateing: data.circulateing, // 传阅中
+ circulated: data.circulated // 已完成
}
- this.flowableData = data.flows
-
- // '标签', '装盒', '入库', '借阅', '开放', '实体', '审批'
- // "archivesTotalNum 总数 archivesTagNum 标签 installNum 已装盒 storageNum 入库 borrowNum 借阅 openNum 开放 entityNum 实体 approveNum 审批
- // 档案统计
- this.lendData.archivesTotalNum = data.archivesTotalNum
- this.lendData.otherData = [
- data.archivesTagNum, data.installNum, data.storageNum, data.borrowNum, data.openNum, data.entityNum, data.approveNum
- ]
-
- // 档案类别
+ })
+ },
+ getDocumentTypeByTime() {
+ FetchDocumentTypeByTime().then(data => {
let maxCount = 0
- data.statisNumJSON.archives.forEach(archive => {
+ data.forEach(archive => {
if (archive.count > maxCount) {
maxCount = archive.count
}
})
- data.statisNumJSON.singles.forEach(single => {
- if (single.count > maxCount) {
- maxCount = single.count
- }
- })
this.addArcivesData.addArcivesMaxCount = maxCount
- const currentDate = new Date() // 获取当前日期
- const currentYear = currentDate.getFullYear() // 获取当前年份
- const currentMonth = currentDate.getMonth() // 获取当前月份（从 0 到 11，所以要加 1）
+ // 获取当前日期信息
+ const currentDate = new Date()
+ const currentYear = currentDate.getFullYear()
+ const currentMonth = currentDate.getMonth() + 1 // 月份从1开始
+
+ // 生成包含本月的近12个月数据
+ const result = [] // 存储完整月份数据
+ const xResult = [] // 存储x轴标签
- let startYear = currentYear - 1 // 去年的年份
- let startMonth = currentMonth + 1 // 当前月份加上 1
+ for (let i = 11; i >= 0; i--) {
+ // 计算当前循环的年月（从当前月向前推i个月）
+ let year = currentYear
+ let month = currentMonth - i
- const result = [] // 存储每个年份和月份的组合
- const xResult = []
- while (startYear < currentYear || startMonth <= currentMonth) {
- xResult.push(startYear + '/' + startMonth)
- result.push({ year: startYear, month: startMonth, archivesCount: 0, singlesCount: 0 })
- // 计算下一个月份
- startMonth += 1
- if (startMonth > 12) {
- startYear += 1
- startMonth = 1
+ // 调整年月，如果月份小于等于0，减少年份并调整月份
+ while (month <= 0) {
+ month += 12
+ year -= 1
}
- }
- result.forEach(yearMonthObj => {
- data.statisNumJSON.archives.forEach(archive => {
- if (parseInt(archive.month) === yearMonthObj.month) {
- yearMonthObj.archivesCount = archive.count
- return
- }
- })
+ // 格式化月份为两位数字
+ const formattedMonth = month.toString().padStart(2, '0')
+
+ // 添加到x轴标签
+ xResult.push(`${year}/${month}`)
+
+ // 查找对应月份的数据（假设数据结构包含year和month字段）
+ const found = data.find(archive =>
+ archive.month === formattedMonth && (archive.year === undefined || parseInt(archive.year) === year)
+ )
- data.statisNumJSON.singles.forEach(single => {
- if (parseInt(single.month) === yearMonthObj.month) {
- yearMonthObj.singlesCount = single.count
- return
- }
+ // 添加到结果数组，有数据则使用，没有则为0
+ result.push({
+ year,
+ month,
+ archivesCount: found ? found.count : 0,
+ singlesCount: 0
})
- })
+ }
+ // 更新数据
this.addArcivesData.addArcivesMonth = xResult
- this.addArcivesData.addArcivesNum = result.map(function(obj) {
- return obj.archivesCount
- })
- this.addArcivesData.addArcivesNumFile = result.map(function(obj) {
- return obj.singlesCount
- })
+ this.addArcivesData.addArcivesNum = result.map(obj => obj.archivesCount)
+ })
+ },
+ getDocumentByDocDepartment() {
+ FetchDocumentByDocDepartment().then(data => {
+ this.typeData = data.map(item => ({
+ name: item.docDepartment,
+ value: item.count
+ }))
+ })
+ },
- // 档案类型
- for (const type in data.typeGroupBy) {
- if (data.typeGroupBy.hasOwnProperty(type)) {
- this.typeData.push({ name: type, value: data.typeGroupBy[type] })
- }
- }
+ handleMainData() {
+ const fondsAffiliation = []
+ fondsAffiliation.push(this.user.fonds.id.toString())
+ const params = {
+ fondsAffiliations: fondsAffiliation
+ }
+ FetchMainData(params).then(data => {
+ this.flowableData = data.flows
+
+ // '标签', '装盒', '入库', '借阅', '开放', '实体', '审批'
+ // "archivesTotalNum 总数 archivesTagNum 标签 installNum 已装盒 storageNum 入库 borrowNum 借阅 openNum 开放 entityNum 实体 approveNum 审批
+ // 档案统计
+ this.lendData.archivesTotalNum = data.archivesTotalNum
+ this.lendData.otherData = [
+ data.archivesTagNum, data.installNum, data.storageNum, data.borrowNum, data.openNum, data.entityNum, data.approveNum
+ ]
})
}
}