Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

src/components/echarts.vue

@@ -105,12 +105,12 @@ export default {
       this.myChart.setOption(this.option);
     },
     resizeChar(charUuid){
-      console.log('charUuid',charUuid);
+      // console.log('charUuid',charUuid);
       this.myChart = echarts.init(document.getElementById(charUuid));
       let obj = this.$refs.wrap;
       let h = window.getComputedStyle(obj).height;
       this.myChart.resize({height:h.slice(0, -2)-48+'px'})
-      console.log('this.myChart h',h);
+      // console.log('this.myChart h',h);
 
     }
   },

src/components/header.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-06-14 18:11:54
  * @LastEditors: gcz
- * @LastEditTime: 2022-07-01 09:45:10
+ * @LastEditTime: 2022-07-14 17:58:27
  * @FilePath: \castgroup_bigscreen\src\components\header.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -39,6 +39,15 @@ import timeFormat from '@/utils/timeFormat'
             }, 1000);
         },
         mounted(){
+            window.onresize = () =>{
+                let clientHeight = document.documentElement.clientHeight;
+                let windowHeight = window.screen.height;
+                if(clientHeight==windowHeight){
+                    this.isFull=true
+                }else{
+                    this.isFull=false
+                }
+            };
             window.WIDGET = {
             CONFIG: {
                 modules: '01234',
@@ -69,6 +78,7 @@ import timeFormat from '@/utils/timeFormat'
         },
         methods: {
             toggleFullScreen(){
+                console.log('document.documentElement.requestFullscreen',document.documentElement.requestFullscreen);
                 // alternative standard method
                 if (!document.fullscreenElement &&
                     !document.mozFullScreenElement && !document.webkitFullscreenElement && !document.msFullscreenElement) { // current working methods