diff --git a/src/config/route.js b/src/config/route.js index 428422ae..5ebee0ad 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -76,7 +76,7 @@ const routes = [ "meta": { "title": "驾驶舱2", "icon": "el-icon-position", - "perms": ["bigScreen"], + "perms": ["bigScreen2"], "fullpage": true, }, "component": "bigScreen/index_enm" diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index 010a7732..760dc487 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -141,18 +141,6 @@ export default { resizeTimeout: null, engine: null, loadedPercent: 0, - chart1: null, - chart2: null, - chart3: null, - chart4: null, - chart5: null, - chart6: null, - chart1Option: {}, - chart2Option: {}, - chart3Option: {}, - chart4Option: {}, - chart5Option: {}, - chart6Option: {}, } }, mounted() { @@ -191,7 +179,6 @@ export default { // 获取窗口的总高度 var windowHeight = window.innerHeight; var windowWidth = window.innerWidth; - var chartsHeight = window.innerWidth*1.8; // 获取目标元素 var left_main = document.getElementsByClassName('left_main')[0]; var left_other = document.getElementsByClassName('left_other')[0]; @@ -206,24 +193,34 @@ export default { right_main.style.width = '20%'; left_other.style.position = 'absolute'; left_other.style.width = '20%'; - left_other.style.height = (windowHeight - 220) + 'px';; right_other.style.position = 'absolute'; right_other.style.width = '20%'; - right_other.style.height = (windowHeight - 220) + 'px';; - model.style.height = (windowHeight - 60) + 'px'; + model.style.height = (windowHeight - 40) + 'px'; + var chartHeight = (windowHeight-350)/3 + 'px'; + var charts = document.getElementsByClassName('chart') + for(var i=0;i