Merge branch 'master-v32-lushangqing' into 'master'

大屏及电子税务局页面样式修改，iframe指定宽高，echart提示文本单位修改



See merge request !58

@@ -185,8 +185,14 @@ export default {
                     borderColor:"#333",
                     formatter:function(params){
                         let str='<div>'+params[0].name+'</div>';
+                        let unit='%';
                         for(let i=0;i<params.length;i++){
-                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+"个</span></div>"
+                            if(i==0 || i==3){
+                                unit="个"
+                            }else{
+                                unit="%"
+                            }
+                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+unit+"</span></div>"
                         }
                         return str
                     },

@@ -67,7 +67,7 @@ export default {
                         align:'left'
                     },
                     formatter: function(params) {
-                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+'个';
+                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+' 次';
                         return res;
                     }
 

@@ -28,7 +28,7 @@
         <div class="machine-video">
             <el-row>
                 <el-col class="video-item" :span="24" >
-                    <iframe :src="'/zjdp/video.html?type='+dialogMachineName+'&access_token='+accessToken" frameborder="0"></iframe>
+                    <iframe style="width:1100px;height:720px;" :src="'/zjdp/video.html?type='+dialogMachineName+'&access_token='+accessToken" frameborder="0"></iframe>
                 </el-col>
             </el-row>
         </div>

@@ -67,7 +67,7 @@ export default {
                         align:'left'
                     },
                     formatter: function(params) {
-                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+'个';
+                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+' 次';
                         return res;
                     }
 

@@ -189,8 +189,14 @@ export default {
                     borderColor:"#333",
                     formatter:function(params){
                         let str='<div>'+params[0].name+'</div>';
+                        let unit='%';
                         for(let i=0;i<params.length;i++){
-                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+"个</span></div>"
+                            if(i==0 || i==3){
+                                unit="个"
+                            }else{
+                                unit="%"
+                            }
+                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+unit+"</span></div>"
                         }
                         return str
                     },