Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

2020-10-20 17:50:32 +08:00 · 2020-10-20 17:50:32 +08:00 · 12bcbdb02b
commit 12bcbdb02b
parent 8843ad6394 50426cbb7a
2 changed files with 2 additions and 1 deletions
--- a/src/jmapNew/theme/aus_00/utils.js
+++ b/src/jmapNew/theme/aus_00/utils.js
@ -33,6 +33,7 @@ export function createSeriesModel(opt, lineStyle={}, itemStyle={}) {
 		showAllSymbol: opt.showAllSymbol||'auto',
 		lineStyle: lineStyle,
 		itemStyle: itemStyle,
+		animation: false,
 		markPoint: {
 			symbol: 'roundRect',
 			symbolSize: 1,
--- a/src/views/planMonitor/editToolAUS/schedule.vue
+++ b/src/views/planMonitor/editToolAUS/schedule.vue
@ -146,7 +146,7 @@ export default {
                dataZoom: [
                    {
                        type: 'inside',
-                        zoomOnMouseWheel : 'ctrl',
+                        zoomOnMouseWheel : true,
                        moveOnMouseMove : 'ctrl',
                    },
                    {