@@ -87,6 +89,7 @@ import { swiper, swiperSlide } from 'vue-awesome-swiper'
import 'swiper/dist/css/swiper.css'
export default {
+ name: 'Map',
components: {
swiper, swiperSlide
},
@@ -140,7 +143,10 @@ export default {
{ id: 9, num: 70, name: '胡1' },
{ id: 10, num: 60, name: '胡图图' }
],
- rankingWithPercentage: []
+ rankingWithPercentage: [],
+ timer: null,
+ position: 0,
+ speed: 2 // 滚动速度，可根据需要调整
}
},
computed: {
@@ -151,6 +157,7 @@ export default {
beforeDestroy() {
clearTimeout(this.timeTicket)
window.removeEventListener('resize', this.resize)
+ this.stopScrolling()
},
created() {
this.libInfoData = libJsonData
@@ -164,8 +171,39 @@ export default {
window.addEventListener('resize', debounce(this.resize, 2000)) // 使用事件捕获，由外层向内
}, 300)
this.rankingDataComputed()
+ this.startScrolling()
},
methods: {
+ escapeHtml(str) {
+ var arrEntities = {
+ 'lt': '<',
+ 'gt': '>',
+ 'nbsp': ' ',
+ 'amp': '&',
+ 'quot': '"'
+ }
+ return str.replace(/&(lt|gt|nbsp|amp|quot|pre);/ig, function(all, t) {
+ return arrEntities[t]
+ })
+ },
+ startScrolling() {
+ this.timer = setInterval(() => {
+ this.position -= this.speed
+ // 当文字完全滚出容器时，重置位置
+ const containerHeight = document.getElementsByClassName('scroll-container')[0].offsetHeight
+ const contentHeight = this.$refs.marquee.offsetHeight
+ if (contentHeight <= containerHeight) {
+ this.position = 20
+ } else if (Math.abs(this.position) >= contentHeight) {
+ this.position = containerHeight
+ }
+ }, 40)
+ },
+ stopScrolling() {
+ if (this.timer) {
+ clearInterval(this.timer)
+ }
+ },
rankingDataComputed() {
const firstPlaceNum = this.rankingData[0].num
this.rankingWithPercentage = this.rankingData.map(item => {
@@ -182,8 +220,6 @@ export default {
const percentage = (item.num / firstPlaceNum) * 100
return { ...item, percentage }
})
-
- console.log(this.rankingWithPercentage)
},
initChart() {
this.$echarts.registerMap('qiyang', mapJson) // 注册map
@@ -194,10 +230,10 @@ export default {
mapImg.src = require('../../assets/images/map-bg2.png')
var XAData = [
- [{ name: '陶铸图书馆' }, { name: '陶铸图书馆', value: '陶铸' }],
- [{ name: '陶铸图书馆' }, { name: '龙山街道分馆', value: '龙山街道' }],
- [{ name: '陶铸图书馆' }, { name: '黎家坪分馆', value: '黎家坪' }],
- [{ name: '陶铸图书馆' }, { name: '大村甸分馆', value: '大村甸' }],
+ [{ name: '陶铸图书馆' }, { name: '陶铸图书馆', value: '陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸陶铸' }],
+ [{ name: '陶铸图书馆' }, { name: '龙山街道分馆', value: '龙山街道龙山街道龙山街道龙山街道龙山街道龙山街道' }],
+ [{ name: '陶铸图书馆' }, { name: '黎家坪分馆', value: '龙山街道龙山街道龙山街道龙山街道龙山街道龙山街道' }],
+ [{ name: '陶铸图书馆' }, { name: '大村甸分馆', value: '龙山街道龙山街道龙山街道龙山街道龙山街道' }],
[{ name: '陶铸图书馆' }, { name: '邵家岭自助馆', value: '邵家岭' }],
[{ name: '陶铸图书馆' }, { name: '下马渡分馆', value: '下马渡' }],
[{ name: '陶铸图书馆' }, { name: '复兴路自助馆', value: '复兴路' }],
@@ -345,12 +381,12 @@ export default {
padding: [0, 0, 0, 0],
backgroundColor: null,
position: function(point, params, dom, rect, size) {
- console.log('point', point)
- console.log('params', params)
- console.log('dom', dom)
- console.log('rect', rect)
- console.log('size', size)
- return [point[0] + 15, point[1] - 144]
+ // console.log('point', point)
+ // console.log('params', params)
+ // console.log('dom', dom)
+ // console.log('rect', rect)
+ // console.log('size', size)
+ return [point[0] + 14, point[1] - 164]
},
formatter: (params, ticket, callback) => {
if (params.seriesType === 'effectScatter') {
@@ -472,7 +508,7 @@ export default {
repeat: 'repeat'
}, // 每个图层的背景色，根据需要来调，由亮变暗，下面的几个颜色也一样
borderColor: '#9ffcff',
- borderWidth: 5,
+ borderWidth: 3,
shadowColor: '#4cd4eb',
shadowOffsetX: 0,
shadowOffsetY: 0,
@@ -613,7 +649,6 @@ export default {
// adcode: item.properties.adcode
// }
// })
-
// 散点数据
// const scatterData = libJsonData
// const scatterData = mapData.map((item) => {
@@ -628,7 +663,6 @@ export default {
// // adcode: item.adcode,
// }
// })
-
// const updateOption = {
// series: [
// {
@@ -644,9 +678,12 @@ export default {
// }
this.len = this.seriesData[0].data.length // 此处设置的是需要轮播的次数
+ console.log('this.len', this.seriesData[0].data)
// this.myChart.setOption(updateOption)
this.libIndex = this.count % this.len
this.libCurrent = this.libInfoData[this.libIndex]
+ console.log('this.libIndex', this.libIndex)
+ console.log('this.libCurrent', this.libCurrent)
this.initSwiper()
this.updatePageWithData()
this.autohover()
@@ -707,7 +744,7 @@ export default {
const shuffledLibImg = this.libImg.slice().sort(() => Math.random() - 0.5) // 随机打乱数组顺序
this.displayedImages = shuffledLibImg.slice(0, displayCount)
- this.currentIndex = 0
+ this.currentIndex = 20
this.swiperKey += 1
if (this.displayedImages.length === 1) {
@@ -715,6 +752,8 @@ export default {
this.count++
this.libIndex = this.count % this.len
this.libCurrent = this.libInfoData[this.libIndex]
+ console.log('updatePageWithData-libIndex', this.libIndex)
+ console.log('updatePageWithData-libCurrent', this.libCurrent)
this.updatePageWithData()
this.autohover()
}, 5000)
@@ -756,22 +795,20 @@ export default {
},
on: {
slideChangeTransitionEnd() {
- // if (_self.isPage2) {
- // _self.$refs.mySwiper.swiper.update()
- // _self.$refs.mySwiper.swiper.autoplay.start()
- // } else {
- // _self.$refs.mySwiper.swiper.autoplay.stop()
- // }
_self.currentIndex = this.activeIndex
if (_self.currentIndex === _self.displayedImages.length - 1) {
setTimeout(() => {
if (_self.count === _self.libInfoData.length - 1) {
_self.count = 0
+ _self.$parent.autoPagination(2)
} else {
_self.count++
}
_self.libIndex = _self.count % _self.len
_self.libCurrent = _self.libInfoData[_self.libIndex]
+ console.log('_self.count', _self.count)
+ console.log('_self.libIndex', _self.libIndex)
+ console.log('_self.libCurrent', _self.libCurrent)
_self.updatePageWithData()
_self.autohover()
_self.currentIndex = 0
diff --git a/src/views/newBookRecommend/index.vue b/src/views/newBookRecommend/index.vue
deleted file mode 100644
index b6c5dee..0000000
--- a/src/views/newBookRecommend/index.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
图书推荐
-
-
-
-
-
-
![]()
-
-
-
{{ item.nbName }}
-
{{ item.nbAuthor }}
-
-
-
-
-
-
-
-
-
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
deleted file mode 100644
index 29ae541..0000000
--- a/src/views/notice/index.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/pageFour/index.vue b/src/views/pageFour/index.vue
new file mode 100644
index 0000000..509da9e
--- /dev/null
+++ b/src/views/pageFour/index.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
{{ slideData[videoIndex].title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pageFour/module/video.vue b/src/views/pageFour/module/video.vue
new file mode 100644
index 0000000..a8dd2fc
--- /dev/null
+++ b/src/views/pageFour/module/video.vue
@@ -0,0 +1,289 @@
+
+
+
{{ slideData[beginValue].title }}
+
+
+
+
+
+
diff --git a/src/views/newBookRecommend/data.json b/src/views/pageOne/data.json
similarity index 100%
rename from src/views/newBookRecommend/data.json
rename to src/views/pageOne/data.json
diff --git a/src/views/pageOne/index.vue b/src/views/pageOne/index.vue
index e81e7e7..e3c39ad 100644
--- a/src/views/pageOne/index.vue
+++ b/src/views/pageOne/index.vue
@@ -32,7 +32,18 @@
+