Commit 5897d2f2 authored by leon's avatar leon

fix:fix when not set maxCount

parent 06f09782
// 请求的本域名 // 请求的本域名
const baseUrl = 'https://api.charleskeith.cn/api' // 正式环境 const baseUrl = 'https://api.charleskeith.cn/api' // 正式环境
// const reportUrl = 'http://192.168.138.55:8081/api' // 测试环境 // const reportUrl = 'http://192.168.138.55:8081/api' // 测试环境
const reportUrl = 'http://47.101.191.49:8083/api' // 外网测试环境 // const reportUrl = 'http://47.101.191.49:8083/api' // 外网测试环境
const reportUrl = 'https://api.charleskeith.cn/api' // 正式环境
const install = (Vue, vm) => { const install = (Vue, vm) => {
let getHttp = (url, params, config) => vm.$http.get(url, { params }, config) let getHttp = (url, params, config) => vm.$http.get(url, { params }, config)
let postHttp = (url, params, config) => vm.$http.post(url, params, config) let postHttp = (url, params, config) => vm.$http.post(url, params, config)
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
if (this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) { if (this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100 count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100
} }
if (count > this.elementInfo.option.dataset.maxCount) { if (this.elementInfo.option.dataset.maxCount != null && count > this.elementInfo.option.dataset.maxCount) {
this.elementInfo.option.dataset.show = false this.elementInfo.option.dataset.show = false
} }
lastCount = count lastCount = count
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
...that.elementInfo.option.bar, ...that.elementInfo.option.bar,
label: { label: {
...that.elementInfo.option.dataset, ...that.elementInfo.option.dataset,
formatter: val => { formatter: val => {
return that.$u.common.converFunction(that.elementInfo.option.dataset return that.$u.common.converFunction(that.elementInfo.option.dataset
.formatter, val) .formatter, val)
} }
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
...item, ...item,
...config ...config
} }
}) })
return newData return newData
}, },
/** /**
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) { if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100 count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100
} }
if(count > this.elementInfo.option.dataset.maxCount) { if (this.elementInfo.option.dataset.maxCount != null && count > this.elementInfo.option.dataset.maxCount) {
this.elementInfo.option.dataset.show = false this.elementInfo.option.dataset.show = false
} }
lastCount = count lastCount = count
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) { if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100 count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100
} }
if(count > this.elementInfo.option.dataset.maxCount) { if (this.elementInfo.option.dataset.maxCount != null && count > this.elementInfo.option.dataset.maxCount) {
this.elementInfo.option.dataset.show = false this.elementInfo.option.dataset.show = false
} }
lastCount = count lastCount = count
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) { if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100 count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100
} }
if(count > this.elementInfo.option.dataset.maxCount) { if (this.elementInfo.option.dataset.maxCount != null && count > this.elementInfo.option.dataset.maxCount) {
this.elementInfo.option.dataset.show = false this.elementInfo.option.dataset.show = false
} }
lastCount = count lastCount = count
......
...@@ -104,9 +104,9 @@ ...@@ -104,9 +104,9 @@
// detail页面也会监听这两个事件,所有index页面需要在onShow里面增加监听,在onHide里面移除监听 // detail页面也会监听这两个事件,所有index页面需要在onShow里面增加监听,在onHide里面移除监听
onShow() { onShow() {
const that = this const that = this
if(uni.getStorageSync('reportInfo')) { // if(uni.getStorageSync('reportInfo')) {
this.reportInfo = JSON.parse(uni.getStorageSync('reportInfo')) // this.reportInfo = JSON.parse(uni.getStorageSync('reportInfo'))
} // }
/** /**
* 组件交互 - 参数 * 组件交互 - 参数
*/ */
......
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