|
|
@@ -1,20 +1,20 @@
|
|
|
<template>
|
|
|
<view class="content">
|
|
|
<cu-custom bgColor="bg-blacks" :isBack="false">
|
|
|
- <block slot="right">
|
|
|
+ <block slot="right">
|
|
|
<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-left: 2%;" @tap="openDrawer"></image>
|
|
|
</block>
|
|
|
- <block slot="right">
|
|
|
- <view class="icon cuIcon-notice text-white" v-if="badge != 0" style="margin-left: -70%;">
|
|
|
- <view class="cu-tag looknumber" style="margin-top: -2%;">
|
|
|
- <block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
|
|
|
- </view>
|
|
|
+ <block slot="right">
|
|
|
+ <view class="icon cuIcon-notice text-white" v-if="badge != 0" style="margin-left: -70%;">
|
|
|
+ <view class="cu-tag looknumber" style="margin-top: -2%;">
|
|
|
+ <block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
</block>
|
|
|
<block slot="right">
|
|
|
-
|
|
|
+
|
|
|
</block>
|
|
|
- <block slot="content">{{address}}</block>
|
|
|
+ <block slot="content">{{address}}</block>
|
|
|
<block slot="right">
|
|
|
<view class="plus" @tap="showModal" data-target="viewModal">+</view>
|
|
|
</block>
|
|
|
@@ -35,10 +35,10 @@
|
|
|
@click="weatherFromeighttofifteendays()">8~15天</view>
|
|
|
<view :class="[weatherFortydaysbutton?'weatherFortydayswhite':'weatherFortydays']" @click="weatherFortydays()">40天</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<!--风场选项卡-->
|
|
|
<view class="windStationNameAndChoice">
|
|
|
-
|
|
|
+
|
|
|
<view class="windStationName"></view>
|
|
|
<!--<view class="windStationName">{{ windStationName }}</view>
|
|
|
<view class="windStationChoice"><a @click="showCenterVisible = true">其他ㅤ〉</a></view>-->
|
|
|
@@ -409,9 +409,9 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition class="scrollUcharts" @touchstart="topblock" @scroll="uChartsScrollEvent"
|
|
|
- :scroll-into-view="'uCharts-'+mainCur">
|
|
|
- <view class="qiun-charts" >
|
|
|
+ <scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition class="scrollUcharts" @touchstart="topblock"
|
|
|
+ @scroll="uChartsScrollEvent" :scroll-into-view="'uCharts-'+mainCur">
|
|
|
+ <view class="qiun-charts">
|
|
|
<canvas canvas-id="canvasLineA" id="canvasLineA" class="charts"></canvas>
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
@@ -420,10 +420,10 @@
|
|
|
</view>
|
|
|
<div>
|
|
|
|
|
|
- <scroll-view scroll-y scroll-with-animation :scroll-top=scrollpositiontmp class="scrollList" :style="{'height': scrollHeight }" @touchstart="bottomblock"
|
|
|
- @scroll="listScrollEvent">
|
|
|
+ <scroll-view scroll-y scroll-with-animation :scroll-top=scrollpositiontmp class="scrollList" :style="{'height': scrollHeight }"
|
|
|
+ @touchstart="bottomblock" @scroll="listScrollEvent">
|
|
|
<weatherCalendarCardList8_15 ref="weatherCalendarCardList8_15"></weatherCalendarCardList8_15>
|
|
|
-
|
|
|
+
|
|
|
</scroll-view>
|
|
|
|
|
|
</div>
|
|
|
@@ -446,8 +446,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view @tap="topblock_40">
|
|
|
- <scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition_uCharts class="scrollUcharts40" @touchstart="topblock_40" @scroll="uChartsScrollEvent40"
|
|
|
- :scroll-into-view="'uCharts-'+mainCur40">
|
|
|
+ <scroll-view scroll-x scroll-with-animation :scroll-left=scrollposition_uCharts class="scrollUcharts40"
|
|
|
+ @touchstart="topblock_40" @scroll="uChartsScrollEvent40" :scroll-into-view="'uCharts-'+mainCur40">
|
|
|
<view class="qiun-charts40">
|
|
|
<canvas canvas-id="canvasLineA40" id="canvasLineA40" class="charts40"></canvas>
|
|
|
</view>
|
|
|
@@ -457,7 +457,7 @@
|
|
|
</view>
|
|
|
<view @tap="topbottom_40">
|
|
|
<scroll-view scroll-y scroll-with-animation :scroll-top=scrollposition_list class="scrollList40" :style="{'height': scrollListHeight40 }"
|
|
|
- @scroll="listScrollEvent40" @touchstart="bottomblock_40" >
|
|
|
+ @scroll="listScrollEvent40" @touchstart="bottomblock_40">
|
|
|
<weatherCalendarCardList40 ref="weatherCalendarCardList40"></weatherCalendarCardList40>
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
@@ -491,11 +491,11 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- userid:'',
|
|
|
- name:[],
|
|
|
- windId:[],
|
|
|
- socketTaskHourId:'',
|
|
|
- outThreeLineDrawerIsShow:false,
|
|
|
+ userid: '',
|
|
|
+ name: [],
|
|
|
+ windId: [],
|
|
|
+ socketTaskHourId: '',
|
|
|
+ outThreeLineDrawerIsShow: false,
|
|
|
badge: 22,
|
|
|
modalName: null,
|
|
|
inconList: ["form", "favor", "question", "edit"],
|
|
|
@@ -513,7 +513,7 @@
|
|
|
spopupWrapperHeight: "",
|
|
|
windStationListHeight: '',
|
|
|
drawerList: [],
|
|
|
- leftNavigationtitle:'预测功能分组',
|
|
|
+ leftNavigationtitle: '预测功能分组',
|
|
|
plusDrawerList: [],
|
|
|
utils: utils,
|
|
|
margintop: '',
|
|
|
@@ -657,11 +657,11 @@
|
|
|
windowWidth: "",
|
|
|
windowHeight: "",
|
|
|
windowWidth7: "",
|
|
|
- windowHeight7:"",
|
|
|
+ windowHeight7: "",
|
|
|
windowWidth8_15: "",
|
|
|
- windowHeight8_15:"",
|
|
|
+ windowHeight8_15: "",
|
|
|
windowWidth40: "",
|
|
|
- windowHeight40:"",
|
|
|
+ windowHeight40: "",
|
|
|
ziHeight: '',
|
|
|
fontSize: '',
|
|
|
xianHeight: '',
|
|
|
@@ -813,22 +813,22 @@
|
|
|
xianHeight7: '',
|
|
|
nightmarginleft7: '',
|
|
|
socketTask7: '',
|
|
|
- userCanviewthewindfarm:[],
|
|
|
- permissionsInformation:[],
|
|
|
- timer:null
|
|
|
+ userCanviewthewindfarm: [],
|
|
|
+ permissionsInformation: [],
|
|
|
+ timer: null
|
|
|
}
|
|
|
},
|
|
|
created: function() {
|
|
|
// this.pushWindPowerStationNameToSessionStorage("麻黄山");
|
|
|
this.viewUserid();
|
|
|
this.monitoringAuthority();
|
|
|
-
|
|
|
+
|
|
|
this.address = this.dataprocessing.getWindPowerStationName();
|
|
|
-
|
|
|
- this.FDC=this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
this.$nextTick(function() {
|
|
|
this.getWeatherDataToday();
|
|
|
this.getWeatherData7();
|
|
|
@@ -837,106 +837,109 @@
|
|
|
this.cHeight = uni.upx2px(350);
|
|
|
this.cWidth40 = uni.upx2px(5000);
|
|
|
this.cHeight40 = uni.upx2px(350);
|
|
|
-
|
|
|
- this.windStation =this.dataprocessing.getWindPowerStationNameByNames(this.address);
|
|
|
+
|
|
|
+ this.windStation = this.dataprocessing.getWindPowerStationNameByNames(this.address);
|
|
|
this.windStationName = this.windStation[0].replace('风电场', '');
|
|
|
-
|
|
|
+
|
|
|
this.windStationListHeight = this.windStation.length * 50 + 40 + 'px';
|
|
|
this.spopupWrapperHeight = this.windStation.length * 50 + 90 + 'px';
|
|
|
this.windowWidth = uni.getSystemInfoSync().windowWidth;
|
|
|
this.windowHeight = uni.getSystemInfoSync().windowHeight;
|
|
|
if (this.windowWidth >= 768) {
|
|
|
- this.margintop="60px";
|
|
|
- this.margintopThree="80px";
|
|
|
- this.messageTop="10px";
|
|
|
- this.fontSize="18px";
|
|
|
- this.xianHeight="168px";
|
|
|
- this.marginleftBiao="50px";
|
|
|
+ this.margintop = "60px";
|
|
|
+ this.margintopThree = "80px";
|
|
|
+ this.messageTop = "10px";
|
|
|
+ this.fontSize = "18px";
|
|
|
+ this.xianHeight = "168px";
|
|
|
+ this.marginleftBiao = "50px";
|
|
|
} else {
|
|
|
- this.margintop="3.5%";
|
|
|
- this.margintopThree="3.5%";
|
|
|
- this.fontSize="14px";
|
|
|
- this.xianHeight="85%";
|
|
|
- this.marginleftBiao="26px";
|
|
|
+ this.margintop = "3.5%";
|
|
|
+ this.margintopThree = "3.5%";
|
|
|
+ this.fontSize = "14px";
|
|
|
+ this.xianHeight = "85%";
|
|
|
+ this.marginleftBiao = "26px";
|
|
|
}
|
|
|
this.heightToday = parseInt(uni.getSystemInfoSync().windowHeight - 440) + "px";
|
|
|
this.widthToday = parseInt(uni.getSystemInfoSync().windowWidth) + "px";
|
|
|
-
|
|
|
+
|
|
|
this.windowWidth7 = uni.getSystemInfoSync().windowWidth;
|
|
|
this.windowHeight7 = uni.getSystemInfoSync().windowHeight;
|
|
|
- if(this.windowWidth7>=768){
|
|
|
- this.margintop7="60px";
|
|
|
- this.margintopThree7="80px";
|
|
|
- this.messageTop7="10px";
|
|
|
- this.fontSize7="18px";
|
|
|
- this.xianHeight7="168px";
|
|
|
- this.nightmarginleft7="20px";
|
|
|
- }else{
|
|
|
- this.margintop7="3.5%";
|
|
|
- this.margintopThree7="3.5%";
|
|
|
- this.fontSize7="14px";
|
|
|
- this.xianHeight7="85%";
|
|
|
- this.nightmarginleft7="20px";
|
|
|
+ if (this.windowWidth7 >= 768) {
|
|
|
+ this.margintop7 = "60px";
|
|
|
+ this.margintopThree7 = "80px";
|
|
|
+ this.messageTop7 = "10px";
|
|
|
+ this.fontSize7 = "18px";
|
|
|
+ this.xianHeight7 = "168px";
|
|
|
+ this.nightmarginleft7 = "20px";
|
|
|
+ } else {
|
|
|
+ this.margintop7 = "3.5%";
|
|
|
+ this.margintopThree7 = "3.5%";
|
|
|
+ this.fontSize7 = "14px";
|
|
|
+ this.xianHeight7 = "85%";
|
|
|
+ this.nightmarginleft7 = "20px";
|
|
|
}
|
|
|
this.height7 = parseInt(uni.getSystemInfoSync().windowHeight - 440) + "px";
|
|
|
this.width7 = parseInt(uni.getSystemInfoSync().windowWidth) + "px";
|
|
|
-
|
|
|
+
|
|
|
this.windowWidth8_15 = uni.getSystemInfoSync().windowWidth;
|
|
|
this.windowHeight8_15 = uni.getSystemInfoSync().windowHeight;
|
|
|
- if(this.windowWidth8_15>=768){
|
|
|
- this.width="99";
|
|
|
- this.choiceFontSize="22px";
|
|
|
- this.choiceMarginTop="27.5px";
|
|
|
- this.xAxisFontSize=18;
|
|
|
- this.seriesTextSize=18;
|
|
|
- this.cardWidth=100;
|
|
|
- this.cardHeight=130;
|
|
|
- this.scrollHeight=(this.windowHeight8_15-550)+"px";
|
|
|
- }
|
|
|
- else{
|
|
|
- this.width="100";
|
|
|
- this.choiceFontSize="15px";
|
|
|
- this.choiceMarginTop="0";
|
|
|
- this.xAxisFontSize=12;
|
|
|
- this.seriesTextSize=12;
|
|
|
- this.cardWidth=100;
|
|
|
- this.cardHeight=100;
|
|
|
- this.scrollHeight=(this.windowHeight8_15-360)+"px";
|
|
|
+ if (this.windowWidth8_15 >= 768) {
|
|
|
+ this.width = "99";
|
|
|
+ this.choiceFontSize = "22px";
|
|
|
+ this.choiceMarginTop = "27.5px";
|
|
|
+ this.xAxisFontSize = 18;
|
|
|
+ this.seriesTextSize = 18;
|
|
|
+ this.cardWidth = 100;
|
|
|
+ this.cardHeight = 130;
|
|
|
+ this.scrollHeight = (this.windowHeight8_15 - 550) + "px";
|
|
|
+ } else {
|
|
|
+ this.width = "100";
|
|
|
+ this.choiceFontSize = "15px";
|
|
|
+ this.choiceMarginTop = "0";
|
|
|
+ this.xAxisFontSize = 12;
|
|
|
+ this.seriesTextSize = 12;
|
|
|
+ this.cardWidth = 100;
|
|
|
+ this.cardHeight = 100;
|
|
|
+ this.scrollHeight = (this.windowHeight8_15 - 360) + "px";
|
|
|
}
|
|
|
this.windowWidth40 = uni.getSystemInfoSync().windowWidth;
|
|
|
this.windowHeight40 = uni.getSystemInfoSync().windowHeight;
|
|
|
- if(this.windowWidth40>=768){
|
|
|
- this.choiceFontSize40="22px";
|
|
|
- this.choiceMarginTop40="27.5px";
|
|
|
- this.xAxisFontSize40=18;
|
|
|
- this.seriesTextSize40=18;
|
|
|
- this.cardWidth40=100;
|
|
|
- this.cardHeight40=130;
|
|
|
- this.scrollListHeight40=(this.windowHeight40-550)+"px";
|
|
|
- }else{
|
|
|
- this.choiceFontSize40="15px";
|
|
|
- this.choiceMarginTop40="0";
|
|
|
- this.xAxisFontSize40=12;
|
|
|
- this.seriesTextSize40=12;
|
|
|
- this.cardWidth40=100;
|
|
|
- this.cardHeight40=100;
|
|
|
- this.scrollListHeight40=(this.windowHeight40-360)+"px";
|
|
|
+ if (this.windowWidth40 >= 768) {
|
|
|
+ this.choiceFontSize40 = "22px";
|
|
|
+ this.choiceMarginTop40 = "27.5px";
|
|
|
+ this.xAxisFontSize40 = 18;
|
|
|
+ this.seriesTextSize40 = 18;
|
|
|
+ this.cardWidth40 = 100;
|
|
|
+ this.cardHeight40 = 130;
|
|
|
+ this.scrollListHeight40 = (this.windowHeight40 - 550) + "px";
|
|
|
+ } else {
|
|
|
+ this.choiceFontSize40 = "15px";
|
|
|
+ this.choiceMarginTop40 = "0";
|
|
|
+ this.xAxisFontSize40 = 12;
|
|
|
+ this.seriesTextSize40 = 12;
|
|
|
+ this.cardWidth40 = 100;
|
|
|
+ this.cardHeight40 = 100;
|
|
|
+ this.scrollListHeight40 = (this.windowHeight40 - 360) + "px";
|
|
|
}
|
|
|
},
|
|
|
- onShow() {
|
|
|
-
|
|
|
- this.address = this.dataprocessing.getWindPowerStationName();
|
|
|
-
|
|
|
- this.FDC=this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
|
|
|
-
|
|
|
+ onShow: function() {
|
|
|
|
|
|
+ this.viewUserid();
|
|
|
+ this.monitoringAuthority();
|
|
|
|
|
|
this.getWeatherData();
|
|
|
this.getWeatherDataToday();
|
|
|
this.getWeatherData7();
|
|
|
},
|
|
|
onLoad: function() {
|
|
|
- this.address = this.getWindPowerStationNameToSessionStorage();
|
|
|
+ this.address = this.dataprocessing.getWindPowerStationName();
|
|
|
+
|
|
|
+ this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(this.address);
|
|
|
+
|
|
|
+
|
|
|
+ this.viewUserid();
|
|
|
+ this.monitoringAuthority();
|
|
|
+
|
|
|
this.cWidth = uni.upx2px(2000);
|
|
|
this.cHeight = uni.upx2px(350);
|
|
|
this.getServerData();
|
|
|
@@ -950,26 +953,26 @@
|
|
|
this.hideModal();
|
|
|
},
|
|
|
computed: {
|
|
|
- backStageIp: function() {
|
|
|
- return this.$store.state.wholeSituationBackStageIp;
|
|
|
- },
|
|
|
- backStagePort: function() {
|
|
|
- return this.$store.state.wholeSituationBackStagePort;
|
|
|
- },
|
|
|
- windpowerstationNameToId: function() {
|
|
|
- return this.$store.state.windpowerstationNameToId;
|
|
|
- }
|
|
|
- },
|
|
|
+ backStageIp: function() {
|
|
|
+ return this.$store.state.wholeSituationBackStageIp;
|
|
|
+ },
|
|
|
+ backStagePort: function() {
|
|
|
+ return this.$store.state.wholeSituationBackStagePort;
|
|
|
+ },
|
|
|
+ windpowerstationNameToId: function() {
|
|
|
+ return this.$store.state.windpowerstationNameToId;
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
viewUserid: function() {
|
|
|
- this.plusDrawerList=uni.getStorageSync('plusList_we');
|
|
|
+ this.plusDrawerList = uni.getStorageSync('plusList_we');
|
|
|
},
|
|
|
monitoringAuthority: function() {
|
|
|
- this.drawerList=uni.getStorageSync('leftlist3');
|
|
|
+ this.drawerList = uni.getStorageSync('leftlist3');
|
|
|
},
|
|
|
openDrawer: function() {
|
|
|
- this.outThreeLineDrawerIsShow=true;
|
|
|
- this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList,this.leftNavigationtitle);
|
|
|
+ this.outThreeLineDrawerIsShow = true;
|
|
|
+ this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList, this.leftNavigationtitle);
|
|
|
},
|
|
|
closeDrawer: function() {
|
|
|
this.drawerIsShow = false;
|
|
|
@@ -1001,8 +1004,8 @@
|
|
|
_this.choiceIndex = -1;
|
|
|
_this.cardCur = index;
|
|
|
}, 1000);
|
|
|
-
|
|
|
- this.FDC =this.dataprocessing.getWindPowerStationNameByWeatherId(item);
|
|
|
+
|
|
|
+ this.FDC = this.dataprocessing.getWindPowerStationNameByWeatherId(item);
|
|
|
|
|
|
this.dataprocessing.putWindPowerStationId(this.FDC);
|
|
|
//uni.setStorageSync('windPowerStationId',this.FDC);
|
|
|
@@ -1115,9 +1118,8 @@
|
|
|
//console.log("收到服务器内容：" + res.data);
|
|
|
_this.weatherProphetDataAll_17Hour = res.data;
|
|
|
_this.weatherProphetDataAll_17Hour = JSON.parse(res.data);
|
|
|
-
|
|
|
- if(_this.weatherProphetDataAll_17Hour.length!=0)
|
|
|
- {
|
|
|
+
|
|
|
+ if (_this.weatherProphetDataAll_17Hour.length != 0) {
|
|
|
_this.weatherProphetData_17Hour = [];
|
|
|
//判断风场id 40天
|
|
|
for (let i1 = 0; i1 < _this.weatherProphetDataAll_17Hour.length; i1++) {
|
|
|
@@ -1129,7 +1131,7 @@
|
|
|
// console.log(_this.weatherProphetData_17Hour)
|
|
|
_this.$nextTick(function() {
|
|
|
if (_this.$refs.thermometerCard == undefined) {
|
|
|
-
|
|
|
+
|
|
|
} else {
|
|
|
_this.$refs.thermometerCard.getHourWeatherData("90", "260", _this.weatherProphetData_17Hour, _this.weatherProphetData_1);
|
|
|
}
|
|
|
@@ -1588,72 +1590,72 @@
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- topblock(){
|
|
|
+ topblock() {
|
|
|
this.block = "top";
|
|
|
},
|
|
|
- bottomblock(){
|
|
|
+ bottomblock() {
|
|
|
this.block = "bottom";
|
|
|
},
|
|
|
- topblock_40(){
|
|
|
+ topblock_40() {
|
|
|
this.block_40 = "top";
|
|
|
},
|
|
|
- bottomblock_40(){
|
|
|
+ bottomblock_40() {
|
|
|
this.block_40 = "bottom";
|
|
|
},
|
|
|
uChartsScrollEvent(e) {
|
|
|
//this.topblock();
|
|
|
- if(this.block=="top"){
|
|
|
- this.scrollpositiontmp = e.detail.scrollLeft;
|
|
|
- }
|
|
|
-
|
|
|
+ if (this.block == "top") {
|
|
|
+ this.scrollpositiontmp = e.detail.scrollLeft;
|
|
|
+ }
|
|
|
+
|
|
|
// let scrollposition2 = scrollposition*0.98;
|
|
|
},
|
|
|
listScrollEvent(e) {
|
|
|
//this.bottomblock();
|
|
|
- if(this.block=="bottom"){
|
|
|
- this.scrollposition = e.detail.scrollTop;
|
|
|
+ if (this.block == "bottom") {
|
|
|
+ this.scrollposition = e.detail.scrollTop;
|
|
|
}
|
|
|
},
|
|
|
uChartsScrollEvent40(e) {
|
|
|
- if(this.block_40=="top"){
|
|
|
- // this.scrollposition_uCharts = e.detail.scrollLeft;
|
|
|
- if (e.detail.scrollLeft < 237) {
|
|
|
- this.scrollposition_list = 0;
|
|
|
- } else if (e.detail.scrollLeft < 487 && e.detail.scrollLeft > 237) {
|
|
|
- this.scrollposition_list = 104;
|
|
|
- } else if (e.detail.scrollLeft < 737 && e.detail.scrollLeft > 487) {
|
|
|
- this.scrollposition_list = 208;
|
|
|
- } else if (e.detail.scrollLeft < 987 && e.detail.scrollLeft > 737) {
|
|
|
- this.scrollposition_list = 312;
|
|
|
- } else if (e.detail.scrollLeft < 1237 && e.detail.scrollLeft > 987) {
|
|
|
- this.scrollposition_list = 416;
|
|
|
- } else if (e.detail.scrollLeft < 1487 && e.detail.scrollLeft > 1237) {
|
|
|
- this.scrollposition_list = 520;
|
|
|
- } else if (e.detail.scrollLeft < 1737 && e.detail.scrollLeft > 1487) {
|
|
|
- this.scrollposition_list = 624;
|
|
|
- } else if (e.detail.scrollLeft > 1737) {
|
|
|
- this.scrollposition_list = 656;
|
|
|
- }
|
|
|
+ if (this.block_40 == "top") {
|
|
|
+ // this.scrollposition_uCharts = e.detail.scrollLeft;
|
|
|
+ if (e.detail.scrollLeft < 237) {
|
|
|
+ this.scrollposition_list = 0;
|
|
|
+ } else if (e.detail.scrollLeft < 487 && e.detail.scrollLeft > 237) {
|
|
|
+ this.scrollposition_list = 104;
|
|
|
+ } else if (e.detail.scrollLeft < 737 && e.detail.scrollLeft > 487) {
|
|
|
+ this.scrollposition_list = 208;
|
|
|
+ } else if (e.detail.scrollLeft < 987 && e.detail.scrollLeft > 737) {
|
|
|
+ this.scrollposition_list = 312;
|
|
|
+ } else if (e.detail.scrollLeft < 1237 && e.detail.scrollLeft > 987) {
|
|
|
+ this.scrollposition_list = 416;
|
|
|
+ } else if (e.detail.scrollLeft < 1487 && e.detail.scrollLeft > 1237) {
|
|
|
+ this.scrollposition_list = 520;
|
|
|
+ } else if (e.detail.scrollLeft < 1737 && e.detail.scrollLeft > 1487) {
|
|
|
+ this.scrollposition_list = 624;
|
|
|
+ } else if (e.detail.scrollLeft > 1737) {
|
|
|
+ this.scrollposition_list = 656;
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
listScrollEvent40(e) {
|
|
|
- if(this.block_40=="bottom"){
|
|
|
- // this.scrollposition_list = e.detail.scrollTop;
|
|
|
- if (e.detail.scrollTop < 104) {
|
|
|
- this.scrollposition_uCharts = 0;
|
|
|
- } else if (e.detail.scrollTop < 208 && e.detail.scrollTop > 104) {
|
|
|
- this.scrollposition_uCharts = 237;
|
|
|
- } else if (e.detail.scrollTop < 312 && e.detail.scrollTop > 208) {
|
|
|
- this.scrollposition_uCharts = 487;
|
|
|
- } else if (e.detail.scrollTop < 416 && e.detail.scrollTop > 312) {
|
|
|
- this.scrollposition_uCharts = 737;
|
|
|
- } else if (e.detail.scrollTop < 520 && e.detail.scrollTop > 416) {
|
|
|
- this.scrollposition_uCharts = 987;
|
|
|
- } else if (e.detail.scrollTop < 624 && e.detail.scrollTop > 520) {
|
|
|
- this.scrollposition_uCharts = 1237;
|
|
|
- } else if (e.detail.scrollTop < 656 && e.detail.scrollTop > 624) {
|
|
|
- this.scrollposition_uCharts = 1487;
|
|
|
- }
|
|
|
+ if (this.block_40 == "bottom") {
|
|
|
+ // this.scrollposition_list = e.detail.scrollTop;
|
|
|
+ if (e.detail.scrollTop < 104) {
|
|
|
+ this.scrollposition_uCharts = 0;
|
|
|
+ } else if (e.detail.scrollTop < 208 && e.detail.scrollTop > 104) {
|
|
|
+ this.scrollposition_uCharts = 237;
|
|
|
+ } else if (e.detail.scrollTop < 312 && e.detail.scrollTop > 208) {
|
|
|
+ this.scrollposition_uCharts = 487;
|
|
|
+ } else if (e.detail.scrollTop < 416 && e.detail.scrollTop > 312) {
|
|
|
+ this.scrollposition_uCharts = 737;
|
|
|
+ } else if (e.detail.scrollTop < 520 && e.detail.scrollTop > 416) {
|
|
|
+ this.scrollposition_uCharts = 987;
|
|
|
+ } else if (e.detail.scrollTop < 624 && e.detail.scrollTop > 520) {
|
|
|
+ this.scrollposition_uCharts = 1237;
|
|
|
+ } else if (e.detail.scrollTop < 656 && e.detail.scrollTop > 624) {
|
|
|
+ this.scrollposition_uCharts = 1487;
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
changeTap: function(item) {
|
|
|
@@ -1733,14 +1735,17 @@
|
|
|
overflow-x: hidden;
|
|
|
overflow-y: hidden;
|
|
|
}
|
|
|
+
|
|
|
.notice {
|
|
|
width: 50px;
|
|
|
height: 45px;
|
|
|
float: left;
|
|
|
}
|
|
|
- .icon{
|
|
|
+
|
|
|
+ .icon {
|
|
|
font-size: 40upx;
|
|
|
}
|
|
|
+
|
|
|
.plus {
|
|
|
width: 30px;
|
|
|
height: 45px;
|
|
|
@@ -1751,7 +1756,7 @@
|
|
|
text-align: right;
|
|
|
margin-right: 2.5%;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage {
|
|
|
position: fixed;
|
|
|
width: 100vw;
|
|
|
@@ -1760,14 +1765,14 @@
|
|
|
background-color: #1f1f1f;
|
|
|
transition: all 0.4s;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage.show {
|
|
|
transform: scale(0.9, 0.9);
|
|
|
left: 85vw;
|
|
|
box-shadow: 0 0 60upx rgba(0, 0, 0, 0.2);
|
|
|
transform-origin: 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerWindow {
|
|
|
position: absolute;
|
|
|
width: 85vw;
|
|
|
@@ -1780,13 +1785,13 @@
|
|
|
transition: all 0.4s;
|
|
|
padding: 100upx 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerWindow.show {
|
|
|
transform: scale(1, 1) translateX(0%);
|
|
|
opacity: 1;
|
|
|
pointer-events: all;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerClose {
|
|
|
position: absolute;
|
|
|
width: 40vw;
|
|
|
@@ -1805,14 +1810,14 @@
|
|
|
pointer-events: none;
|
|
|
transition: all 0.4s;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerClose.show {
|
|
|
opacity: 1;
|
|
|
pointer-events: all;
|
|
|
width: 15vw;
|
|
|
color: #fff;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .cu-bar.tabbar .action button.cuIcon {
|
|
|
width: 64upx;
|
|
|
height: 64upx;
|
|
|
@@ -1820,20 +1825,20 @@
|
|
|
margin: 0;
|
|
|
display: inline-block;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .cu-bar.tabbar .action .cu-avatar {
|
|
|
margin: 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .nav {
|
|
|
flex: 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .nav .cu-item.cur {
|
|
|
border-bottom: 0;
|
|
|
position: relative;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .nav .cu-item.cur::after {
|
|
|
content: '';
|
|
|
width: 10upx;
|
|
|
@@ -1846,7 +1851,7 @@
|
|
|
right: 0;
|
|
|
margin: auto;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.DrawerPage .cu-bar.tabbar .action {
|
|
|
flex: initial;
|
|
|
}
|
|
|
@@ -2062,7 +2067,7 @@
|
|
|
|
|
|
.scrollList {
|
|
|
height: 750upx;
|
|
|
- margin-top: 40upx ;
|
|
|
+ margin-top: 40upx;
|
|
|
}
|
|
|
|
|
|
.cardContenter40 {
|
|
|
@@ -2273,7 +2278,7 @@
|
|
|
color: #333333;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
.weatherDetails {
|
|
|
margin-top: 0%;
|
|
|
@@ -2325,7 +2330,7 @@
|
|
|
border-right-color: #19B5BC;
|
|
|
}
|
|
|
|
|
|
-/* .scrollList {
|
|
|
+ /* .scrollList {
|
|
|
// height:20%;
|
|
|
height: 130px;
|
|
|
width: 95%;
|
|
|
@@ -2577,4 +2582,4 @@
|
|
|
width: 100%;
|
|
|
margin-left: -15px;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
