diff --git a/pages/data/index.vue b/pages/data/index.vue index 7be9b34..53d0a6f 100644 --- a/pages/data/index.vue +++ b/pages/data/index.vue @@ -208,9 +208,7 @@ export default { this.getServerData(); } }) - }, 300) - - + }, 500) } } }; diff --git a/pages/index.vue b/pages/index.vue index aa42331..9312fe7 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -527,7 +527,7 @@ export default { if (response.code === 200) { this.$modal.msgSuccess("大棚重命名成功!"); this.getListData(); // 刷新列表 - this.$refs.renameAgri.close(); // 关闭弹窗 + this.closeWindow() // 关闭弹窗 } else { this.$modal.msgError("大棚重命名失败!"); } diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index ad3d418..f07a7e4 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -297,7 +297,7 @@ const cfu = { show: true, position: "bottom", float: "center", - padding: 20, + padding: 10, margin: 10, backgroundColor: "rgb(248,241,241)", borderColor: "#2d56d8", @@ -306,11 +306,11 @@ const cfu = { fontColor: "#666666", lineHeight: 32, hiddenColor: "#CECECE", - itemGap: 40, + itemGap: 20, // 关键:开启自动换行(uCharts 2.x+ 支持) wrap: true, // 控制每行显示数量(比如每行4个,8个系列分两行) - itemWidth: 80, + itemWidth: 2, }, extra: { line: { diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js index f78bde5..aa8166c 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js @@ -489,15 +489,7 @@ function dataCombineStack(series, len) { function getTouches(touches, opts, e) { let x, y; - if (touches.clientX) { - if (opts.rotate) { - y = opts.height - touches.clientX * opts.pix; - x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix; - } else { - x = touches.clientX * opts.pix; - y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix; - } - } else { + if (touches.x) { if (opts.rotate) { y = opts.height - touches.x * opts.pix; x = touches.y * opts.pix; @@ -505,6 +497,14 @@ function getTouches(touches, opts, e) { x = touches.x * opts.pix; y = touches.y * opts.pix; } + } else { + if (opts.rotate) { + y = opts.height - touches.clientX * opts.pix; + x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix; + } else { + x = touches.clientX * opts.pix; + y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pix / 2) * (opts.pix - 1)) * opts.pix; + } } return { x: x, diff --git a/utils/share.js b/utils/share.js index f3432d5..ae4628a 100644 --- a/utils/share.js +++ b/utils/share.js @@ -5,15 +5,17 @@ export default { //分享到微信好友 onShareAppMessage(res) { return { - title: '小策技术,为您的农业提供智能服务,欢迎咨询!', - path: `/pages/index` + title: '小策技术,为您的农业提供智能服务,欢迎前来咨询!', + path: `/pages/login`, + imageUrl: 'https://img.xiaoces.com/photos/logo200.png' } }, //分享到朋友圈 onShareTimeline() { return { - title: '小策技术,为您的农业提供智能服务,欢迎咨询!', - path: `/pages/index` + title: '小策技术,为您的农业提供智能服务,欢迎前来咨询!', + path: `/pages/login`, + imageUrl: 'https://img.xiaoces.com/photos/logo200.png' } }, } \ No newline at end of file