Authored by 鲁尚清

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

@@ -185,8 +185,14 @@ export default { @@ -185,8 +185,14 @@ export default {
185 borderColor:"#333", 185 borderColor:"#333",
186 formatter:function(params){ 186 formatter:function(params){
187 let str='<div>'+params[0].name+'</div>'; 187 let str='<div>'+params[0].name+'</div>';
  188 + let unit='%';
188 for(let i=0;i<params.length;i++){ 189 for(let i=0;i<params.length;i++){
189 - 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>" 190 + if(i==0 || i==3){
  191 + unit="个"
  192 + }else{
  193 + unit="%"
  194 + }
  195 + 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>"
190 } 196 }
191 return str 197 return str
192 }, 198 },
@@ -67,7 +67,7 @@ export default { @@ -67,7 +67,7 @@ export default {
67 align:'left' 67 align:'left'
68 }, 68 },
69 formatter: function(params) { 69 formatter: function(params) {
70 - var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+''; 70 + var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+'';
71 return res; 71 return res;
72 } 72 }
73 73
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="machine-video"> 28 <div class="machine-video">
29 <el-row> 29 <el-row>
30 <el-col class="video-item" :span="24" > 30 <el-col class="video-item" :span="24" >
31 - <iframe :src="'/zjdp/video.html?type='+dialogMachineName+'&access_token='+accessToken" frameborder="0"></iframe> 31 + <iframe style="width:1100px;height:720px;" :src="'/zjdp/video.html?type='+dialogMachineName+'&access_token='+accessToken" frameborder="0"></iframe>
32 </el-col> 32 </el-col>
33 </el-row> 33 </el-row>
34 </div> 34 </div>
@@ -67,7 +67,7 @@ export default { @@ -67,7 +67,7 @@ export default {
67 align:'left' 67 align:'left'
68 }, 68 },
69 formatter: function(params) { 69 formatter: function(params) {
70 - var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+''; 70 + var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+'';
71 return res; 71 return res;
72 } 72 }
73 73
@@ -189,8 +189,14 @@ export default { @@ -189,8 +189,14 @@ export default {
189 borderColor:"#333", 189 borderColor:"#333",
190 formatter:function(params){ 190 formatter:function(params){
191 let str='<div>'+params[0].name+'</div>'; 191 let str='<div>'+params[0].name+'</div>';
  192 + let unit='%';
192 for(let i=0;i<params.length;i++){ 193 for(let i=0;i<params.length;i++){
193 - 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>" 194 + if(i==0 || i==3){
  195 + unit="个"
  196 + }else{
  197 + unit="%"
  198 + }
  199 + 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>"
194 } 200 }
195 return str 201 return str
196 }, 202 },