@@ -38,7 +33,7 @@
-
-
diff --git a/src/views/pageFour/index.vue b/src/views/pageFour/index.vue
index 317f8f8..3b32efe 100644
--- a/src/views/pageFour/index.vue
+++ b/src/views/pageFour/index.vue
@@ -44,7 +44,6 @@
重要通知
-
@@ -75,7 +74,7 @@
- {{ item.BOOKRECNO }}次
+ {{ item.TOTALNUM }}次
@@ -92,7 +91,7 @@
-
-
diff --git a/src/views/pageOne/index.vue b/src/views/pageOne/index.vue
index 31de7fd..d19ec1f 100644
--- a/src/views/pageOne/index.vue
+++ b/src/views/pageOne/index.vue
@@ -8,7 +8,7 @@
@@ -23,7 +23,7 @@
- -
+
-
{{ item.name }}
{{ item.value }}人
@@ -165,6 +165,7 @@ export default {
name: 'PageOne',
data() {
return {
+ intervalLeft: null,
isDataLoaded: false,
pageOneVisitBase: '0', // 本年到馆基础数
wecharQrCodeSrc: null,
@@ -173,31 +174,11 @@ export default {
listData2: [],
defaultImg: 'this.src="' + require('@/assets/images/book_03.png') + '"',
leftData: [],
- progressdata: [
- {
- name: '今日到馆',
- value: 2300,
- type: 1
- },
- {
- name: '本月到馆',
- value: 5630,
- type: 2
- },
- {
- name: '昨日到馆',
- value: 1269,
- type: 3
- },
- {
- name: '上月到馆',
- value: 6457,
- type: 4
- }
- ],
+ progressData: [],
hotTagData: [],
middleData: [],
tagList: [],
+ // 热门搜索的
radius: 160,
dtr: Math.PI / 180,
d: 200,
@@ -261,18 +242,16 @@ export default {
}
},
async created() {
- this.getHotSearch()
this.getInitData()
- this.getNewBook()
this.getMiddleAllData()
+ this.getHotSearch()
+ this.getNewBook()
},
beforeDestroy() {
- clearTimeout(this.timer2)
+ clearInterval(this.intervalLeft)
+ this.intervalLeft = null
},
mounted() {
- // setTimeout(() => {
- // this.$parent.autoPagination(2)
- // }, 8000)
},
methods: {
getInitData() {
@@ -284,9 +263,152 @@ export default {
const result = JSON.parse(res.data)
this.pageOneVisitBase = result.visitBase
this.wecharQrCodeSrc = linkSrc + '/downloadFile' + result.wecharQrCode
- this.initDataPreview()
+ this.initLeftPreview(result)
+ // this.intervalLeft = setInterval(() => {
+ // this.getInitData()
+ // }, 10000)
})
},
+ initLeftPreview(result) {
+ this.progressData = []
+ this.leftData = []
+ // 本年到馆/12个月=月基数
+ // 月基数/当月天数（28、29、30、31）= 日基数
+ // 昨日到馆=日基数+日随机数（-20到50之间）
+ // 上月到馆=月基数+月随机数（-100到200之间）
+ // 图书馆营业时间（8:00-18:00共10小时）
+ // 8:00-9:00 算第1个小时、9:00-10:00算第2个小时、以此类推
+ // 日基数/10小时=小时基数
+ // 今日到馆=小时基数 * 第N小时+小时随机数（-5到10之间）
+ // 本月到馆=月基数 * （当前月的日期dd/当前月的天数）+ 月随机数（-100到200之间）
+ // 本年累计=月基数*月份+月随机数（-100到200之间）
+
+ // 昨日到馆、上月到馆存一个缓存！当前第一次计算好之后就不变了！
+
+ // visitBase 本年累计人次
+ // visitBaseCheck 是否直接显示 0false 1true
+
+ // lastYearVisitBase 去年累计人次
+
+ // todayVisitBase 今日人次
+ // todayVisitBaseCheck 是否显示
+
+ // yesterdayVisitBase 昨天人次
+ // yesterdayVisitBaseCheck 是否显示
+
+ // thisMonthVisitBase 本月人次
+ // thisMonthVisitBaseCheck 是否显示
+
+ // lastMonthVisitBase 上个月人次
+ // lastMonthVisitBaseCheck 是否显示
+
+ const baseTotal = this.pageOneVisitBase // 本年到馆人数
+ console.log('假设本年到馆人数', baseTotal)
+
+ const monthBase = Math.floor(baseTotal / 12) // 月基数
+ console.log('月基数', monthBase)
+
+ const now = new Date()
+ const year = now.getFullYear() // 当前年份
+ const month = now.getMonth() + 1 // 当前月份
+ const daysInMonth = new Date(year, month, 0).getDate() // 当月天数
+ console.log('当月天数', daysInMonth)
+
+ const dayBase = Math.floor(baseTotal / daysInMonth) // 日基数
+ console.log('日基数', dayBase)
+
+ let yesterdayCount = 0
+ if (result.yesterdayVisitBaseCheck === '1') {
+ yesterdayCount = result.yesterdayVisitBase
+ } else {
+ const randomDay = Math.floor(Math.random() * (50 - (-20) + 1)) + (-20) // 日随机数（-20到50之间）
+ yesterdayCount = localStorage.getItem('yesterdayCountCache') ? localStorage.getItem('yesterdayCountCache') : dayBase + randomDay // 昨日到馆
+ }
+ console.log('昨日到馆', yesterdayCount)
+
+ const randomMonth = Math.floor(Math.random() * (200 - (-100) + 1)) + (-100) // 月随机数（-100到200之间）
+ let lastMonthCount = 0
+ if (result.lastMonthVisitBaseCheck === '1') {
+ lastMonthCount = result.lastMonthVisitBase
+ } else {
+ lastMonthCount = localStorage.getItem('lastMonthCountCache') ? localStorage.getItem('lastMonthCountCache') : monthBase + randomMonth
+ }
+ console.log('上月到馆', lastMonthCount)
+
+ const hourBase = Math.floor(dayBase / 10) // 小时基数
+ console.log('小时基数', hourBase)
+
+ const openTime = 8 // 开门时间
+ const closeTime = 18 // 结束时间
+ const currentHour = now.getHours() // 当前时间点
+ let todayCount = 0
+ if (result.todayVisitBaseCheck === '1') {
+ todayCount = result.todayVisitBase
+ } else {
+ if (currentHour < openTime || currentHour >= closeTime) {
+ console.log('当前时间不在图书馆营业时间内')
+ } else {
+ const N = currentHour - openTime
+ console.log('第N个小时', N)
+ const randomHour = Math.floor(Math.random() * (10 - (-5) + 1)) + (-5) // 小时随机数（-5到10之间）
+ todayCount = Math.floor(hourBase * N + randomHour) // 今日到馆
+ }
+ }
+ console.log('今日到馆', todayCount)
+
+ let nowMonthCount = 0
+ if (result.thisMonthVisitBaseCheck === '1') {
+ nowMonthCount = result.thisMonthVisitBase
+ } else {
+ nowMonthCount = Math.floor(monthBase * (now.getDate() / daysInMonth) + randomMonth) // 本月到馆
+ }
+ console.log('本月到馆', nowMonthCount)
+
+ const nowYearCount = Math.floor(monthBase * month + randomMonth) // 本年累计
+ console.log('本年累计', nowYearCount)
+
+ this.progressData.push(
+ {
+ name: '今日到馆',
+ value: todayCount,
+ type: 1
+ },
+ {
+ name: '本月到馆',
+ value: nowMonthCount,
+ type: 2
+ },
+ {
+ name: '昨日到馆',
+ value: yesterdayCount,
+ type: 3
+ },
+ {
+ name: '上月到馆',
+ value: lastMonthCount,
+ type: 4
+ }
+ )
+
+ this.leftData.push({
+ id: 'allTotal',
+ name: '本年累计到馆',
+ value: this.$parent.formatter(nowYearCount),
+ valueArr: this.$parent.formatter(nowYearCount).split('')
+ },
+ {
+ id: 'lastYearTotal',
+ name: '去年累计到馆',
+ value: this.$parent.formatter(result.lastYearVisitBase),
+ valueArr: this.$parent.formatter(result.lastYearVisitBase).split('')
+ })
+
+ this.$parent.timedRefresh(this.leftData, 'left')
+
+ localStorage.setItem('yesterdayCountCache', yesterdayCount)
+ localStorage.setItem('lastMonthCountCache', lastMonthCount)
+ },
+
// 热门搜索
getHotSearch() {
const params = {
@@ -333,7 +455,6 @@ export default {
valueArr: this.$parent.formatter(lendingTotal).toString().split('')
}
)
- console.log('this.middleData', this.middleData)
this.$parent.timedRefresh(this.middleData, 'middle')
// setTimeout(() => {
// this.$parent.timedRefresh(this.middleData, 'middle')
@@ -346,8 +467,8 @@ export default {
getLibBookTotal() {
const params = {
'libcode': 'LSJDFG,LJPFG,DCDFG,QYTSG,SJLFG,XMDFG,FXLFG,QLQFG,SEDSG,MZZFG,GYTZFG,KJSKCFG,JBTZFG,SKTZFG,XJZFG,PSZFG,DZQZFG,WXJDFG,CHJDFG,BSZFG,BZHFG',
- 'starttime': this.getFormattedDate(new Date(), -1),
- 'endtime': this.getFormattedDate(new Date())
+ 'starttime': '2000-01-01',
+ 'endtime': '2034-01-01'
}
return FetchLibBookTotal(params).then(res => {
const result = JSON.parse(res.data)
@@ -422,20 +543,35 @@ export default {
FetchNewBook(params).then(res => {
// 图片地址格式 http://192.168.99.67:8080/downloadFile/qytsg/ae281b90-b100-4541-9379-3e104854652c.png
const linkSrc = process.env.VUE_APP_BASE_API
- this.newList = res.data.map((item, index) => {
+
+ // res.data.push({
+ // 'nbName': '222',
+ // 'nbRecno': '',
+ // 'isbn': '9787545559804',
+ // 'nbImgPath': '',
+ // 'nbExplain': '',
+ // 'nbAuthor': '',
+ // 'updateTime': '2024-07-05T05:22:33.307+0000',
+ // 'updater': 'f8ccafbb791cb89e017968aae4470000',
+ // 'rownum': 1,
+ // 'nbBooktype': '',
+ // 'nbPublisher': '',
+ // 'libcode': 'FTZN',
+ // 'sortmark': '',
+ // 'createTime': '2024-07-05T05:22:33.307+0000',
+ // 'creater': 'f8ccafbb791cb89e017968aae4470000',
+ // 'nbId': '4028e3c39080e175019081581b1c008f',
+ // 'nbPublisherdate': ''
+ // })
+
+ this.newList = res.data.filter((item) => {
if (item.nbImgPath) {
item.nbImgPath = linkSrc + '/downloadFile' + item.nbImgPath
+ return true
} else {
- // 网络地址请求 http://8.130.135.212:19000/MarcByIsbn?sIsbn=9787545559804
- // axios.get('http://8.130.135.212:19000/MarcByIsbn?sIsbn=' + item.isbn)
- // .then(response => {
- // console.log(response)
- // })
- // .catch(error => {
- // console.error('There was an error!', error)
- // })
+ // '没有nbImgPath/srcurl/base64，去掉这项数据
+ return false
}
- return item
})
const halfLength = Math.ceil(this.newList.length / 2)
@@ -444,48 +580,22 @@ export default {
})
},
getType1Value() {
- const type1Item = this.progressdata.find(item => item.type === 1)
+ const type1Item = this.progressData.find(item => item.type === 1)
return type1Item ? type1Item.value : 0
},
getType2Value() {
- const type2Item = this.progressdata.find(item => item.type === 2)
+ const type2Item = this.progressData.find(item => item.type === 2)
return type2Item ? type2Item.value : 0
},
getType3Value() {
- const type3Item = this.progressdata.find(item => item.type === 3)
+ const type3Item = this.progressData.find(item => item.type === 3)
return type3Item ? type3Item.value : 0
},
getType4Value() {
- const type4Item = this.progressdata.find(item => item.type === 4)
+ const type4Item = this.progressData.find(item => item.type === 4)
return type4Item ? type4Item.value : 0
},
- async initDataPreview() {
- // 数据概览
- const previewData = {
- 'code': 0,
- 'data': {
- 'allUserOpenNumCount': 68
- },
- 'message': 'success'
- }
- if (previewData.code !== 0) return
- this.leftData = []
- this.leftData.push({
- id: 'allTotal',
- name: '本年累计到馆',
- value: this.$parent.formatter(this.pageOneVisitBase),
- valueArr: this.$parent.formatter(this.pageOneVisitBase).split('')
- }, {
- id: 'currentNum',
- name: '当前在馆人数',
- value: this.$parent.formatter(previewData.data.allUserOpenNumCount),
- valueArr: this.$parent.formatter(previewData.data.allUserOpenNumCount).split('')
- })
- this.$parent.timedRefresh(this.leftData, 'left')
- // setTimeout(() => {
- // this.$parent.timedRefresh(this.leftData, 'left')
- // }, 1000)
- },
+
// 以下生成云标签部分
// 三角函数角度计算
sineCosine(a, b, c) {
@@ -767,7 +877,7 @@ export default {
ul{
display: flex;
height: 2rem;
- overflow: hidden;
+ // overflow: hidden;
li{
width: 1.375rem;
height: 2rem;
@@ -781,8 +891,8 @@ export default {
.book-img{
width: 1.375rem;
height: 2rem;
- background: url('~@/assets/images/book_03.png') no-repeat center center;
- background-size: contain;
+ // background: url('~@/assets/images/book_03.png') no-repeat center center;
+ // background-size: contain;
display: flex;
align-items: center;
overflow: hidden;
diff --git a/src/views/pageThree/index.vue b/src/views/pageThree/index.vue
index 67483cd..990d662 100644
--- a/src/views/pageThree/index.vue
+++ b/src/views/pageThree/index.vue
@@ -96,13 +96,13 @@
@@ -110,15 +110,15 @@