|
@@ -2,51 +2,51 @@ import * as echarts from '../../ec-canvas/echarts';
|
|
|
var Api = require('../../utils/api.js');
|
|
|
var wxRequest = require('../../utils/wxRequest.js')
|
|
|
var app = getApp()
|
|
|
-function initChart(canvas, width, height, dpr, data) {
|
|
|
- const chart = echarts.init(canvas, null, {
|
|
|
- width: width,
|
|
|
- height: height,
|
|
|
- devicePixelRatio: dpr // new
|
|
|
- });
|
|
|
- canvas.setChart(chart);
|
|
|
+// function initChart(canvas, width, height, dpr, data) {
|
|
|
+// const chart = echarts.init(canvas, null, {
|
|
|
+// width: width,
|
|
|
+// height: height,
|
|
|
+// devicePixelRatio: dpr // new
|
|
|
+// });
|
|
|
+// canvas.setChart(chart);
|
|
|
|
|
|
- var option = {
|
|
|
- xAxis : {
|
|
|
- type : 'category',
|
|
|
- splitNumber: 2,
|
|
|
- scale: true,
|
|
|
- show:false,
|
|
|
- splitLine:{
|
|
|
- show:false
|
|
|
- }
|
|
|
- },
|
|
|
- yAxis : {
|
|
|
- type : 'value',
|
|
|
- splitNumber: 2,
|
|
|
- scale: true,
|
|
|
- show:false,
|
|
|
- splitLine:{
|
|
|
- show:false
|
|
|
- }
|
|
|
- },
|
|
|
+// var option = {
|
|
|
+// xAxis : {
|
|
|
+// type : 'category',
|
|
|
+// splitNumber: 2,
|
|
|
+// scale: true,
|
|
|
+// show:false,
|
|
|
+// splitLine:{
|
|
|
+// show:false
|
|
|
+// }
|
|
|
+// },
|
|
|
+// yAxis : {
|
|
|
+// type : 'value',
|
|
|
+// splitNumber: 2,
|
|
|
+// scale: true,
|
|
|
+// show:false,
|
|
|
+// splitLine:{
|
|
|
+// show:false
|
|
|
+// }
|
|
|
+// },
|
|
|
|
|
|
- series: [{
|
|
|
- type: 'line',
|
|
|
- smooth: true,
|
|
|
- symbol: 'none',
|
|
|
- lineStyle: {
|
|
|
- color: '#D81E06',
|
|
|
- },
|
|
|
- data:data,
|
|
|
- areaStyle: {
|
|
|
- color: '#D81E06',
|
|
|
- },
|
|
|
- }]
|
|
|
- };
|
|
|
+// series: [{
|
|
|
+// type: 'line',
|
|
|
+// smooth: true,
|
|
|
+// symbol: 'none',
|
|
|
+// lineStyle: {
|
|
|
+// color: '#D81E06',
|
|
|
+// },
|
|
|
+// data:data,
|
|
|
+// areaStyle: {
|
|
|
+// color: '#D81E06',
|
|
|
+// },
|
|
|
+// }]
|
|
|
+// };
|
|
|
|
|
|
- chart.setOption(option);
|
|
|
- return chart;
|
|
|
-}
|
|
|
+// chart.setOption(option);
|
|
|
+// return chart;
|
|
|
+// }
|
|
|
|
|
|
Page({
|
|
|
|
|
@@ -56,9 +56,9 @@ Page({
|
|
|
winHeight: 0,
|
|
|
// tab切换
|
|
|
currentTab: 0,
|
|
|
- ec: {
|
|
|
- onInit: initChart
|
|
|
- },
|
|
|
+ // ec: {
|
|
|
+ // onInit: initChart
|
|
|
+ // },
|
|
|
realData:[
|
|
|
// {
|
|
|
// title:'BK0422',
|
|
@@ -201,6 +201,7 @@ Page({
|
|
|
getinclast.then((res)=>{
|
|
|
// console.log(res)
|
|
|
wx.hideLoading()
|
|
|
+ wx.stopPullDownRefresh()
|
|
|
if(res.statusCode==200){
|
|
|
that.setData({
|
|
|
realData:res.data.data
|
|
@@ -215,6 +216,7 @@ Page({
|
|
|
wx.showLoading({title: '加载中…'})
|
|
|
getinclast.then((res)=>{
|
|
|
wx.hideLoading()
|
|
|
+ wx.stopPullDownRefresh()
|
|
|
// console.log(res)
|
|
|
if(res.statusCode==200){
|
|
|
that.setData({
|
|
@@ -230,6 +232,7 @@ Page({
|
|
|
wx.showLoading({title: '加载中…'})
|
|
|
getinclast.then((res)=>{
|
|
|
wx.hideLoading()
|
|
|
+ wx.stopPullDownRefresh()
|
|
|
// console.log(res)
|
|
|
if(res.statusCode==200){
|
|
|
that.setData({
|