Skip to content

夏新然 / appweb

Go to a project
Commit 8a39b869 by 夏新然
Options

表格高度和头部bug

1 parent a27253e9
Inline Side-by-side
Showing 16 changed files with 558 additions and 35 deletions
components/header.vue
<template>
<view>
<div :style="{ height: navheight + 'px',background:'#0069FF'}" ></div>
<view style="position: fixed;width: 100%;z-index: 9;">
<view :style="{ height: navheight + 'px',background:'#0069FF'}" ></view>
<view class="indexNav">
<text class="left" @tap="lClick">{{leftText}}</text>
<image :src="leftImgSrc" class="lImg" @tap="lClick"></image>
......@@ -8,8 +9,11 @@
<span class="right" @tap="rClick">{{rightText}}</span>
<image :src="rightImgSrc" class="rImg" @tap="rClick"></image>
</view>
</view>
<view class="blanks">
</view>
<view :style="{ height: navheight + 'px'}" >
</view>
</view>
</template>
......
pages/analysis/condition.vue
......@@ -33,6 +33,19 @@
<span class="selectItem">{{dateText}}</span>
<image class="rArrow" src="../../static/analysis/rArrow.png" mode="widthFix"></image>
</div>
<div v-show="showList['date']['week2']">
<div class="conditionItem" @tap="dateShow">
<span class="cTitle">开始日期</span>
<span class="selectItem">{{dateText}}</span>
<image class="rArrow" src="../../static/analysis/rArrow.png" mode="widthFix"></image>
</div>
<div class="conditionItem" @tap="dateShow2">
<span class="cTitle">结束日期</span>
<span class="selectItem">{{dateText2}}</span>
<image class="rArrow" src="../../static/analysis/rArrow.png" mode="widthFix"></image>
</div>
</div>
</div>
<div class="handleContent" v-show="activeType=='gate'">
<div class="conditionItem" @tap="goObjList" v-show="showList['gate']['obj']">
......@@ -131,6 +144,19 @@
<span v-show="showList['date']['year']" :class="{'activeDateType':currentDateType=='year'}" @tap="dateClick('year')">年</span>
</div>
</awesome-picker>
<awesome-picker
ref="picker2"
:data="dateData"
:textConfirm="picker.textConfirm"
:colorConfirm="picker.colorConfirm"
:textCancel="picker.textCancel"
:colorCancel="picker.colorCancel"
:anchor="currentDate"
@confirm="date2Confirm">
<div class="typeBox">
<span v-show="showList['date']['week2']" class="activeDateType" @tap="dateClick('week')">周</span>
</div>
</awesome-picker>
</div>
</template>
......@@ -169,7 +195,9 @@
currentYear:[],
currentDay:[],
date:'',
date2:'',
dateText:'',
dateText2:'',
accountText:'',
oneAccountText:'',
oneAccountId:'',
......@@ -418,6 +446,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
this.oneGateText=res.data.data[0].name;
this.oneGateId=res.data.data[0].id;
this.gateText=res.data.data[0].name;
......@@ -444,6 +477,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
this.oneGateText=res.data.data[0].name;
this.oneGateId=res.data.data[0].id;
}
......@@ -463,6 +501,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
this.oneFloorText=res.data.data[0].name;
this.oneFloorId=res.data.data[0].id;
this.floorText=res.data.data[0].name;
......@@ -490,6 +533,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
this.storeText=res.data.data[0].name;
this.oneStoreText=res.data.data[0].name;
var storeidArr=[];
......@@ -515,6 +563,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
this.oneStoreText=res.data.data[0].name;
}
})
......@@ -553,6 +606,11 @@
},
method:'GET',
success:(res) =>{
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
if(res.data.data[0]){
this.eventText=res.data.data[0].name;
this.eventidArr=[];
......@@ -648,6 +706,10 @@
urls='actObjReport/actObjReport'
}
break;
case 8:{
urls='weekReport/weekReport'
}
break;
}
uni.navigateTo({
url:urls+"?types="+this.activeType,
......@@ -729,6 +791,9 @@
dateShow(){
this.$refs.picker.show();
},
dateShow2(){
this.$refs.picker2.show();
},
dateClick(val){
this.currentDateType=val;
this.currentDateType2=val;
......@@ -846,6 +911,18 @@
complete: (res) => {
}
})
uni.getStorage({
key:'selectDate2',
success:(res)=> {
if(res.data.indexOf(',')!=-1){
this.dateText2=res.data.split(',')[0]+'至'+res.data.split(',')[1];
}else{
this.dateText2=res.data
}
},
complete: (res) => {
}
})
},
dateConfirm(item){
this.currentDateType2=this.currentDateType;
......@@ -859,6 +936,9 @@
this.handleYearConfirm(item)
}
},
date2Confirm(item){
this.handleWeek2Confirm(item)
},
handleDayConfirm(item){
var year =1999+item[0].index;
var month=item[1].index+1;
......@@ -930,6 +1010,59 @@
data:JSON.stringify(item)
})
},
handleWeek2Confirm(item){
var year =1999+item[0].index;
var month=item[1].index+1;
month=month>9?month:'0'+month;
var d = new Date();
// 该月第一天
d.setFullYear(year, month-1, 1);
var w1 = d.getDay();
// 该月天数
d.setFullYear(year, month, 0);
var dd = d.getDate();
// 第一个周一
let week1;
//当月第一周有几天
week1=7 - w1+1;
var from='',to='';
if(item[2].index==0){
from=year+"-"+month+"-01";
var toDay=week1>9?week1:'0'+week1;
to=year+'-'+month+'-'+toDay
}else{
var fromDay=week1+7*(item[2].index-1)+1;
var toDay=week1+7*item[2].index;
if(fromDay>dd){
for(var i=(item[2].index-1);i>=0;i--){
fromDay=week1+7*(i-1);
toDay=week1+7*i;
if(fromDay<=dd){
if(toDay>dd){
toDay=dd;
}
break;
}
}
}else if(fromDay<=dd&&toDay>dd){
toDay=dd;
}
fromDay=fromDay>9?fromDay:'0'+fromDay;
toDay=toDay>9?toDay:'0'+toDay;
from=year+"-"+month+"-"+fromDay;
to=year+"-"+month+"-"+toDay;
}
this.date2=from+','+to;
this.dateText2=from+'至'+to;
uni.setStorage({
key:'selectDate2',
data:this.date2
})
uni.setStorage({
key:'currentWeek2',
data:JSON.stringify(item)
})
},
handleMonthConfirm(item){
var year =1999+item[0].index;
var month=item[1].index+1;
......@@ -999,6 +1132,11 @@
this.eventText='';
this.eventidArr=[];
}
var idArr=[this.oneAccountId];
uni.setStorage({
key:'selectAccountIdArr',
data:JSON.stringify(idArr)
})
uni.setStorage({
key:'eventIdArr',
data:JSON.stringify(this.eventidArr)
......
pages/analysis/holidayReport/holidayReport.vue
......@@ -9,7 +9,7 @@
:table-data="tableData2"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<circlebar :chart-data="chartData.HolidayEffect" bind-id='HolidayEffect'></circlebar>
<v-table v-if="columns.length>0"
......@@ -19,7 +19,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/index.vue
......@@ -251,6 +251,51 @@
}
}
},
// {
// text:"周中周末对比分析",
// iconSrc:week,
// rArrow:arrow,
// src:'weekReport/weekReport',
// showList:{
// gateTab:true,
// mall:{
// obj:false,
// oneMall:true,
// moreMall:false,
// event:false
// },
// gate:{
// obj:false,
// oneMall:true,
// moreMall:false,
// oneGate:true,
// moreGate:false
// },
// floor:{
// obj:false,
// oneMall:true,
// moreMall:false,
// oneFloor:true,
// moreFloor:false
// },
// area:{
// obj:false,
// oneMall:true,
// moreMall:false,
// oneFloor:true,
// moreFloor:false,
// oneStore:true,
// moreStore:false
// },
// date:{
// day:false,
// week:true,
// month:false,
// year:false,
// week2:true
// }
// }
// },
{
text:"节假日活动对比",
iconSrc:active,
......@@ -339,19 +384,11 @@
}
}
}
// ,{
// text:"同环比分析",
// iconSrc:yoy,
// rArrow:arrow
// },{
// {
// text:"主力店铺同环比",
// iconSrc:mainStore,
// rArrow:arrow
// },{
// text:"周中周末对比分析",
// iconSrc:week,
// rArrow:arrow
// },{
// text:"天气分析",
// iconSrc:weather,
// rArrow:arrow
......
pages/analysis/inoutReport/inoutDayReport.vue
......@@ -14,7 +14,7 @@
row-hover-color="#eee"
:title-rows="titleRows"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/rankReport/rankDayReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/rankReport/rankWeekReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/staticReport/staticDayReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/staticReport/staticMonthReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/staticReport/staticWeekReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/staticReport/staticYearReport.vue
......@@ -14,7 +14,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/weekReport/weekReport.vue 0 → 100644
<template>
<div>
<headerComp :leftImgSrc="leftImg" :title="titleStr" :rightImgSrc="rightImg" @leftClick="backFun" @rightClick="conditionFun"></headerComp>
<div style="height: 18.11upx;"></div>
<circlebar :chart-data="chartData.HolidayEffect" bind-id='HolidayEffect'></circlebar>
</div>
</template>
<script>
import headerComp from '../../../components/header'
import backArrow from '../../../static/header/backArrow.png'
import other from '../../../static/header/other.png'
import circlebar from '../../../components/circleBarChart'
export default{
data(){
return{
titleStr:'周中周末对比分析',
leftImg:backArrow,
rightImg:other,
atoken:'',
keyArr:[],
chartIds:'',
reportType:'mall',
accountId:[],
orgIds:'',
date:'',
date2:'',
isDay:true,
isHour:false,
isMin:false,
chartDatas:{},
chartDatas2:{},
chartData:{},
tableData:[],
tableData2:[],
columns:[],
columns2:[],
gateId:[],
floorId:[],
storeId:[]
}
},
onLoad: function (option) {
if(option.types){
this.reportType=option.types;
}
uni.getStorage({
key:'atoken',
success:(res)=>{
this.atoken=res.data;
}
})
uni.getStorage({
key:'accountList',
success:(res)=>{
if(res.data){
var list=JSON.parse(res.data);
list.forEach((item,index)=>{
if(index==0){
this.accountId.push(item.id)
}
})
}
}
})
uni.getStorage({
key:'selectAccountIdArr',
success:(res)=> {
this.accountId=JSON.parse(res.data);
},
complete: (res) => {
}
})
uni.getStorage({
key:'selectGateIdArr',
success:(res)=> {
this.gateId=JSON.parse(res.data);
},
complete: (res) => {
}
})
uni.getStorage({
key:'selectFloorIdArr',
success:(res)=> {
this.floorId=JSON.parse(res.data);
},
complete: (res) => {
}
})
uni.getStorage({
key:'selectStoreIdArr',
success:(res)=> {
this.storeId=JSON.parse(res.data);
},
complete: (res) => {
}
})
var currentWeek=[]
uni.getStorage({
key:'currentWeek',
success:(res)=> {
currentWeek=JSON.parse(res.data);
},
complete: (res) => {
}
})
var a1=0,a2=0,a3=0;
if(currentWeek[0].index){
a1=currentWeek[0].index;
a2=currentWeek[1].index;
a3=currentWeek[2].index;
}else{
a1=currentWeek[0];
a2=currentWeek[1];
a3=currentWeek[2];
}
var year =1999+a1;
var month=a2+1;
month=month>9?month:'0'+month;
var d = new Date();
// 该月第一天
d.setFullYear(year, month-1, 1);
var w1 = d.getDay();
// 该月天数
d.setFullYear(year, month, 0);
var dd = d.getDate();
// 第一个周一
let week1;
//当月第一周有几天
week1=7 - w1+1;
var from='',to='';
if(a3==0){
from=year+"-"+month+"-01";
var toDay=week1>9?week1:'0'+week1;
to=year+'-'+month+'-'+toDay
}else{
var fromDay=week1+7*(a3-1)+1;
var toDay=week1+7*a3;
if(fromDay>dd){
for(var i=(a3-1);i>=0;i--){
fromDay=week1+7*(i-1);
toDay=week1+7*i;
if(fromDay<=dd){
if(toDay>dd){
toDay=dd;
}
break;
}
}
}else if(fromDay<=dd&&toDay>dd){
toDay=dd;
}
fromDay=fromDay>9?fromDay:'0'+fromDay;
toDay=toDay>9?toDay:'0'+toDay;
from=year+"-"+month+"-"+fromDay;
to=year+"-"+month+"-"+toDay;
}
this.date=from+','+to;
this.date2=from+','+to;
uni.getStorage({
key:'selectDate',
success:(res)=> {
if(res.data.indexOf(',')!=-1){
this.date=res.data;
}else{
uni.setStorage({
key:'selectDate',
data:this.date
})
}
},
complete: (res) => {
}
})
uni.getStorage({
key:'selectDate2',
success:(res)=> {
if(res.data.indexOf(',')!=-1){
this.date2=res.data;
}else{
uni.setStorage({
key:'selectDate2',
data:this.date2
})
}
},
complete: (res) => {
}
})
this.getReportKey();
},
computed: {
i18n() {
return this.$t("index")
}
},
components:{
headerComp,circlebar
},
methods: {
backFun(){
uni.reLaunch({
url:"../index",
})
},
conditionFun(){
uni.setStorage({
key:'backUrl',
data:8
})
uni.navigateTo({
url:'../condition'
})
},
getReportKey(){
var report='holidayeEvent';
this.keyArr=['HolidayEvent','HolidayDetail','HolidayEffect'];
uni.showLoading({
title: '加载中'
});
uni.request({
url:window.url+'/reportCharts',
data:{
report:report,
_t:Date.parse(new Date())/1000
},
header: {
'Authorization': this.atoken //自定义请求头信息
},
method:'GET',
success:(res) =>{
this.chartIds='';
res.data.data.forEach(item=>{
if(this.keyArr.indexOf(item.key)!='-1'){
this.chartIds+=item.id+','
}
})
this.chartIds=this.chartIds.substring(0,this.chartIds.length-1);
this.getChartData();
}
})
},
setTabelData(){
this.columns=[];
this.tableData=[];
this.chartDatas.xaxis.data.forEach((item,index)=>{
if(index==0){
this.columns.push( {field: item, title:item, width: 100, titleAlign: 'center',columnAlign:'center',isResize:true,isFrozen: true})
}else{
this.columns.push( {field: item, title:item, width: 80, titleAlign: 'center',columnAlign:'center',isResize:true})
}
})
this.chartDatas.series.forEach((item,index)=>{
var obj={}
item.data.forEach((item,index)=>{
obj[this.chartDatas.xaxis.data[index]]=item;
})
this.tableData.push(obj)
})
this.columns2=[];
this.tableData2=[];
this.chartDatas2.xaxis.data.forEach((item,index)=>{
if(index==0){
this.columns2.push( {field: item, title:item, width: 100, titleAlign: 'center',columnAlign:'center',isResize:true,isFrozen: true})
}else{
this.columns2.push( {field: item, title:item, width: 80, titleAlign: 'center',columnAlign:'center',isResize:true})
}
})
this.chartDatas2.series.forEach((item,index)=>{
var obj={}
item.data.forEach((item,index)=>{
obj[this.chartDatas2.xaxis.data[index]]=item;
})
this.tableData2.push(obj)
})
},
getChartData(){
this.orgIds=''
var data={}
var url=window.url+'/report/holidayeEvent/mall';
if(this.reportType=='mall'){
this.orgIds=this.accountId[0]
url=window.url+'/report/holidayeEvent/mall';
data={
orgIds:this.orgIds,
startDate:this.date.split(',')[0],
endDate:this.date.split(',')[1],
chartIds:this.chartIds,
kpiType:'TRAFFIC',
_t:Date.parse(new Date())/1000
}
}
uni.request({
url:url,
header: {
'Authorization': this.atoken //自定义请求头信息
},
data:data,
method:'GET',
success:(res) =>{
uni.hideLoading()
var datas=res.data.data;
this.chartData=datas.body;
this.chartDatas=datas.body.HolidayDetail;
this.chartDatas2=datas.body.HolidayEvent
this.setTabelData()
}
})
}
},
}
</script>
<style>
.selectBox{
width: 646.73upx;
height: 61.59upx;
font-size:21.74upx;
line-height: 61.59upx;
display: flex;
flex-direction: row;
margin: 0 auto;
margin-bottom: 18.11upx;
}
.sItem{
flex: 1;
background:#FFFFFF;
text-align: center;
cursor: pointer;
border-right:1px solid #DBDBDB ;
}
.sItem:last-of-type{
border-right:none
}
.checkedItem{
background: #0069FF;
color: #FFFFFF;
border: #0069FF;
}
</style>
pages/analysis/yoyReport/yoyDayReport.vue
......@@ -9,7 +9,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns2.length>0&&objId=='one'"
is-horizontal-resize
......@@ -18,7 +18,7 @@
:table-data="tableData2"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns3.length>0&&objId=='one'"
is-horizontal-resize
......@@ -27,7 +27,7 @@
:table-data="tableData3"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns4.length>0&&objId=='more'"
is-horizontal-resize
......@@ -36,7 +36,7 @@
:table-data="tableData4"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/yoyReport/yoyMonthReport.vue
......@@ -9,7 +9,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns2.length>0&&objId=='one'"
is-horizontal-resize
......@@ -18,7 +18,7 @@
:table-data="tableData2"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns3.length>0&&objId=='one'"
is-horizontal-resize
......@@ -27,7 +27,7 @@
:table-data="tableData3"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns4.length>0&&objId=='more'"
is-horizontal-resize
......@@ -36,7 +36,7 @@
:table-data="tableData4"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/yoyReport/yoyWeekReport.vue
......@@ -9,7 +9,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns2.length>0&&objId=='one'"
is-horizontal-resize
......@@ -18,7 +18,7 @@
:table-data="tableData2"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns3.length>0&&objId=='one'"
is-horizontal-resize
......@@ -27,7 +27,7 @@
:table-data="tableData3"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns4.length>0&&objId=='more'"
is-horizontal-resize
......@@ -36,7 +36,7 @@
:table-data="tableData4"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
pages/analysis/yoyReport/yoyYearReport.vue
......@@ -9,7 +9,7 @@
:table-data="tableData"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns2.length>0&&objId=='one'"
is-horizontal-resize
......@@ -18,7 +18,7 @@
:table-data="tableData2"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns3.length>0&&objId=='one'"
is-horizontal-resize
......@@ -27,7 +27,7 @@
:table-data="tableData3"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
<v-table v-if="columns4.length>0&&objId=='more'"
is-horizontal-resize
......@@ -36,7 +36,7 @@
:table-data="tableData4"
row-hover-color="#eee"
row-click-color="#edf7ff"
:height='800'
:height='600'
></v-table>
</div>
</template>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!