Commit 058e3afc by tangjiale

测试实际项目

parent f38bdb73
{
"env":"dev",
"monk":"https://tsocket.xiaobentiyu.cn",
"pigsy":"https://tiyuadmin.youchengzhang.cn",
"other":"https://tiyuadmin.youchengzhang.cn"
}
......@@ -43,10 +43,10 @@ module.exports = {
extendRoutes (routes) {
return [
...routes,
// {
// path: '/csScreen/:type(\\d+)/',
// component: '~/ssr/csScreen/type.js'
// },
{
path: '/csScreen/:type(\\d+)/',
component: '~/ssr/csScreen/type.js'
},
];
}
},
......
......@@ -36,7 +36,9 @@
props:{
list:{
type:Array,
default:[]
default:function() {
return []
}
},
stateNum:{
type:Object,
......
......@@ -17,7 +17,8 @@
</div>
<div class="center">
<!--视频轮播播放-->
<centerVideo :type="type" v-if="dataObj.banner && dataObj.banner.length" :list="dataObj.banner" :stateNum="dataObj.statistics"></centerVideo>
<!-- :list="dataObj.banner" -->
<centerVideo :type="type" v-if="dataObj.banner && dataObj.banner.length" :stateNum="dataObj.statistics"></centerVideo>
<center-a v-if="dataObj.xxOption && dataObj.xxOption.length" :xxOption="dataObj.xxOption"></center-a>
......@@ -48,8 +49,6 @@
import rightB from './components/right-b-ctn'
import rightC from './components/right-c-ctn'
import screen from '../services/screenService'
export default {
name: "screen",
components:{
......@@ -69,6 +68,8 @@
async asyncData ({app,query,params,redirect,returnData}) {
let {type = 2} = params
let dataObj = await app.$service.screen.handleScreenData(app,type)
// console.log('回调结果',dataObj)
return returnData({
dataObj,
type:type
......@@ -76,7 +77,8 @@
},
async mounted(){
this.localBanner = this.dataObj.banner || []
console.log(this.dataObj)
this.localBanner = this.dataObj.banner.list || []
......
......@@ -3,7 +3,7 @@
* @eMail: 932055106@qq.com
* @Date: 2022-06-24 16:07:59
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-03-17 16:43:15
* @LastEditTime: 2024-05-29 11:13:07
*/
import Vue from 'vue'
......@@ -11,6 +11,7 @@ import qs from 'qs';
import util from '@/plugins/utils/tools'
import IndexService from '../services/index.js'
import ScreenService from '../services/screenService'
const CONTENT_TYPE_MAP = {
'json': 'application/json',
......@@ -137,6 +138,7 @@ export default ({app:{ $axios, redirect, router, store}},inject) => {
}
apiModules.index = IndexService(sendTo)
apiModules.screen = ScreenService(sendTo)
inject('service',apiModules)
}
......@@ -15,6 +15,7 @@ export default sendTo => ({
//根据外部传入的ctx对象,赋值给本地serve文件
async handleScreenData(app,type = 2){
let areaCode = {
2:'430103000000', //天心区
3:'430104000000', //岳麓区
......@@ -26,30 +27,32 @@ export default sendTo => ({
}
regionCode = areaCode[type] || '430104000000'
let banner = await queryVideoBanner()
let year = queryYearList()
let schoolTop = getSchoolSpeedTopList()
let studentTop = getStudentSpeedTopList()
let statistics = getSportSchoolSum()
let statisticsObj = queryStatistics()
let banner = this.queryVideoBanner()
let year = this.queryYearList()
let schoolTop = this.getSchoolSpeedTopList()
let studentTop = this.getStudentSpeedTopList()
let statistics = this.getSportSchoolSum()
let statisticsObj = this.queryStatistics()
//小学周统计
let xxWeekRank = querySchoolJoin(1,1)
let xxMonthRank = querySchoolJoin(2,1)
let xxWeekRank = this.querySchoolJoin(1,1)
let xxMonthRank = this.querySchoolJoin(2,1)
//中学统计
let zxWeekRank = querySchoolJoin(1,2)
let zxMonthRank = querySchoolJoin(2,2)
let zxWeekRank = this.querySchoolJoin(1,2)
let zxMonthRank = this.querySchoolJoin(2,2)
let arr = await Promise.all([banner,year,schoolTop,studentTop,statistics,xxWeekRank,xxMonthRank,zxWeekRank,zxMonthRank,statisticsObj])
let xxOption = handleXxOption(arr[5] || [],arr[6] || [])
let zxOption = handleZxOption(arr[7] || [],arr[8] || [])
let xxOption = this.handleXxOption(arr[5] || [],arr[6] || [])
let zxOption = this.handleZxOption(arr[7] || [],arr[8] || [])
return {
banner:arr[0] || [],
year:arr[1] || [],
schoolTop:chunkArr((arr[2] || []),5),
studentTop:chunkArr((arr[3] || []),5),
schoolTop:this.chunkArr((arr[2] || []),5),
studentTop:this.chunkArr((arr[3] || []),5),
statistics:arr[4] || {},
xxOption:xxOption,
zxOption:zxOption,
......@@ -60,7 +63,6 @@ export default sendTo => ({
//中间banner图
queryVideoBanner(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getMidUrl',
data:{regionCode:regionCode}
}).then(res => {
......@@ -71,7 +73,6 @@ export default sendTo => ({
//年级分布
async queryYearList(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getGradeJoinList',
data:{regionCode:regionCode}
}).then(res => {
......@@ -96,7 +97,6 @@ export default sendTo => ({
//学校TOP10排行
async getSchoolSpeedTopList(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getSchoolSpeedTopList',
data:{regionCode:regionCode}
}).then(res => {
......@@ -107,7 +107,6 @@ export default sendTo => ({
//学生TOP20排行
async getStudentSpeedTopList(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getStudentSpeedTopList',
data:{regionCode:regionCode}
}).then(res => {
......@@ -118,7 +117,6 @@ export default sendTo => ({
//学生运动参与总览
async getSportSchoolSum(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getSportSchoolSum',
data:{regionCode:regionCode}
}).then(res => {
......@@ -128,7 +126,6 @@ export default sendTo => ({
//云赛PK 设备数据
async queryStatistics(){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/statistics',
data:{regionCode:regionCode}
}).then(res => {
......@@ -141,7 +138,6 @@ export default sendTo => ({
//学校平均参与率
async querySchoolJoin(dateType,studyStep){
return sendTo({
domainKey: 'other',
url: '/sport/new/screen/getSchoolAvgJoinRate',
data:{ regionCode:regionCode,dateType,studyStep}
}).then(res => {
......@@ -153,11 +149,11 @@ export default sendTo => ({
let list = [
{
title:'学校运动参与率周排行榜(中学)',
rankList:arr1.length ? chunkArr(arr1,5) : [],
rankList:arr1.length ? this.chunkArr(arr1,5) : [],
},
{
title:'学校运动参与率月排行榜(中学)',
rankList:arr2.length ? chunkArr(arr2,5) : [],
rankList:arr2.length ? this.chunkArr(arr2,5) : [],
}
]
return list
......@@ -171,12 +167,12 @@ export default sendTo => ({
{
title:'学校运动参与率周排行榜(小学)',
topFive:arr1.length ? arr1.slice(0,5) : [],
rankList:lastArr1.length ? chunkArr(lastArr1,5) : [],
rankList:lastArr1.length ? this.chunkArr(lastArr1,5) : [],
},
{
title:'学校运动参与率月排行榜(小学)',
topFive:arr2.length ? arr2.slice(0,5) : [],
rankList:lastArr2.length ? chunkArr(lastArr2,5) : [],
rankList:lastArr2.length ? this.chunkArr(lastArr2,5) : [],
}
]
return list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment