Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/anji-plus-re…

…port into master-500-dev-lushangqing

+<!--
+-->
 <template>
 <template>
-  <div>
-    <div :id="id" :style="styleObj"></div>
+  <div :style="styleObj">
+    <div :id="id" style="width: 100%;height: 100%;padding: 10px"></div>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -30,8 +32,8 @@ export default {
             return (
             return (
               params.seriesName +
               params.seriesName +
               '<br/>' + params.name + ' ' + params.value[2] + ' :<br/>' +
               '<br/>' + params.name + ' ' + params.value[2] + ' :<br/>' +
-              '最大' + params.value[2] + ': ' + params.value[3] + '% ' + '<br/>' +
-              '最小' + params.value[2] + ': ' + params.value[4] + '% ' + '<br/>' +
+              // '最大' + params.value[2] + ': ' + params.value[3] + '% ' + '<br/>' +
+              // '最小' + params.value[2] + ': ' + params.value[4] + '% ' + '<br/>' +
               '平均' + params.value[2] + ': ' + params.value[5] + '% ' + '<br/>'
               '平均' + params.value[2] + ': ' + params.value[5] + '% ' + '<br/>'
             );
             );
           },
           },
@@ -135,6 +137,11 @@ export default {
   computed: {
   computed: {
     styleObj() {
     styleObj() {
       const allStyle = this.optionsPosition;
       const allStyle = this.optionsPosition;
+      let maxWidth = window.innerWidth;
+      console.log(maxWidth,allStyle.width)
+      if( allStyle.width > maxWidth){
+        allStyle.width = maxWidth;
+      }
       return {
       return {
         width: allStyle.width + "px",
         width: allStyle.width + "px",
         height: allStyle.height + "px"
         height: allStyle.height + "px"