大屏及电子税务局页面样式修改

@@ -9,7 +9,7 @@
 .ypt {
     position: relative;
     height: 100%;
-    padding-top: 10px;
+    padding-top: 42px;
     font-size: 0;
     z-index: 10;
 }
@@ -29,8 +29,8 @@
     max-width: 475px;
     max-height: 403px;
     background-size: auto;
-    background-position: center;
-    /*margin-left: 12px;*/
+    /*background-position: center;*/
+    padding-left: 12px;
     margin-right: 2px;
 }
 .ypt .item.active{

@@ -40,7 +40,7 @@
     color:#4fc9fc;
 }
 .declare-today{
-    margin-top:30px;
+    margin-top:24px;
 }
 .declare-title{
     color: #fff;

@@ -29,10 +29,11 @@
     top: -10px;
 }
 .declare-report .grid-content.rate-container{
-    background-image: url("/vue3/src/assets/images/digitalDp/icon-rate.png");
+    /*background-image: url("/vue3/src/assets/images/digitalDp/icon-rate.png");
     background-repeat: no-repeat;
+
+    background-position: center top;*/
     height: 156px;
-    background-position: center top;
 }
 .declare-report .rate-container .rate-num{
     margin-top:10px;

@@ -37,12 +37,12 @@ body{font-size: 15px;}
 
 }
 .flex-data{
-    width:58%;
+    width:56%;
 }
 .flex-cloud{
-    width:42%
+    width:44%
  }
-.left-top{height:550px;}
+.left-top{height:523px;}
 .flex-declare{
     width:330px;
     /*max-width: 323px;*/
@@ -57,7 +57,7 @@ body{font-size: 15px;}
 
 .declare-chart{
     display: flex;
-    height: 550px;
+    height: 523px;
 
 }
 .declare-lineChart{
@@ -227,4 +227,11 @@ body{font-size: 15px;}
 .lineChart,.barChart{
     background-image: url("/vue3/src/assets/images/zjdp/img-bg.png");
     background-position: center;
-}
\ No newline at end of file
+}
+.statistics-container .container-title,.performance-container .container-title{
+    margin: 10px 0 15px 0;
+}
+.asset-container .container-title{
+    position: relative;
+    top: 14px;
+}

@@ -183,6 +183,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        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>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'

 <div class="com-container">
-    <div class="com-chart" id="volume_ref"></div>
+    <div class="com-chart" id="volume_ref" ></div>
     <div class="busniess-box-title">
         <img :style="comtitleImgStyle" src="./src/assets/images/digitalDp/title-volume.png" class="busniess-title-img"> <!-- bor1_6 -->
 <!--        <span :style="comtitleTextStyle" class="busniess-title-size">本月业务量</span>-->

@@ -136,8 +136,8 @@ export default {
             const seriesArr = this.allData.map((item, index) => {
                 const dataArr = []
                 let colorData=[];
-                // if(item.data && item.data.length>0){
-                if(item.data ){
+                if(item.data && item.data.length>0){
+                // if(item.data ){
                     item.data.map(inner => {
                         dataArr.push({
                             name: inner.name,
@@ -165,16 +165,18 @@ export default {
                     radius: ['28%', '42%'],
                     center: centerArr[index],
                     color:colorData,
-                    minAngle: 15,//最小角度
-                    startAngle:120, //起始角度
+                    // minAngle: 15,//最小角度
+                    // startAngle:110, //起始角度
                     itemStyle: {
                         borderRadius: 2,
                         borderWidth: 2
                     },
+                    // left:20,
                     label: {
-                        position: 'outer',
-                        alignTo: 'labelLine',
-                        formatter: '{c}',
+                        // position: 'outer',
+                        // alignTo: 'labelLine',
+                        formatter: '{c}个',
+                        padding:[10,-20,5,10],
                         color:'#ffffff'
                     },
                     data: dataArr

@@ -77,7 +77,7 @@ export default {
             var params = {
                 resId: that.resId1,
                 kpiIds: that.kpiIds,
-                subResId: 'vmem',
+                subResId: 'cpu',
                 startTime:'',
                 endTime:'',
                 access_token:localStorage.getItem("access_token")
@@ -107,7 +107,7 @@ export default {
             var params = {
                 resId: that.resId,
                 kpiIds: that.kpiIds,
-                subResId: 'vmem',
+                subResId: 'cpu',
                 startTime:'',
                 endTime:'',
                 access_token:localStorage.getItem("access_token")
@@ -224,6 +224,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        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>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'

@@ -129,9 +129,10 @@ export default {
             //x轴数据
             let xAxisDataLength=seriesData.length;
             let xAxisData=[];
-            for(let i=1;i<=xAxisDataLength;i++){
+           /* for(let i=1;i<=xAxisDataLength;i++){
                 xAxisData.push(i)
-            }
+            }*/
+            xAxisData=timeArr;
             this.optionData = {
                 title: {
                     text: ''

@@ -34,7 +34,7 @@ export default {
                         {
                             name:'89.12.97.3',
                             datas:[1,1,1,1,1,1,1,1],
-                            flag:'vmem'
+                            flag:'cpu'
                         }
                     ]
                 }
@@ -71,7 +71,7 @@ export default {
             var params = {
                 resId: that.resId1,
                 kpiIds: that.kpiIds,
-                subResId: 'vmem',
+                subResId: 'cpu',
                 startTime:'',
                 endTime:'',
                 access_token:localStorage.getItem("access_token")
@@ -99,7 +99,7 @@ export default {
             var params = {
                 resId: that.resId,
                 kpiIds: that.kpiIds,
-                subResId: 'vmem',
+                subResId: 'cpu',
                 startTime:'',
                 endTime:'',
                 access_token:localStorage.getItem("access_token")
@@ -209,6 +209,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        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>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'

@@ -5,7 +5,7 @@
 
     </div>
     <div class="ypt">
-        <el-carousel direction="vertical" :autoplay="true" indicator-position="none" >
+        <el-carousel direction="vertical" :autoplay="true" indicator-position="none" interval="4000" >
             <el-carousel-item v-for="(item,index) in cloudData" :key="index">
                 <div class="item swiper-slide" >
                     <div class="ui_base u_p3d">

@@ -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;
                     }
 

@@ -46,10 +46,6 @@ export default {
                     proxy.startInterval();
                 }
             })
-            $.get(proxy.domainName +proxy.apiUrl1+accessToken,function (res){
-
-            })
-
         })
         const startInterval=()=>{
             if (proxy.timer) {

@@ -48,14 +48,14 @@ export default {
         const colorArr1 = [
             'rgba(151,213,244, 0.8)',
             'rgba(239,224,167, 0.8)',
-            'rgba(229,171,209, 0.8)',
+            'rgba(119,250,162, 0.8)',
             'rgba(151,170,255, 0.8)'
         ]
         //   全透明的颜色值
         const colorArr2 = [
             'rgba(151,213,244, 0)',
             'rgba(239,224,167, 0)',
-            'rgba(229,171,209, 0)',
+            'rgba(119,250,162, 0)',
             'rgba(151,170,255, 0)'
         ]
 
@@ -153,7 +153,7 @@ export default {
                         areaStyle: {
                             // color:'rgba(151,213,244,0.4)',
                             normal:{
-                                color:new echarts.graphic.LinearGradient(0, 0, 0, .6, [{ //关键在这里, 设置面积渐变
+                                color:new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ //关键在这里, 设置面积渐变
                                     offset: 0,
                                     color: colorArr1[index] //这里是我设置的渐变的颜色从线条颜色变为透明
                                 }, {
@@ -187,6 +187,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        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>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'
@@ -196,7 +203,7 @@ export default {
                 legend: {
                     data: proxy.legendData,
                     itemHeight:0,//图例圆圈大小设置
-                    y:'7px',
+                    y:'0px',
                     textStyle: {
                         color: '#ffffff',
                         fontsize:"12px"
@@ -204,10 +211,10 @@ export default {
 
                 },
                 grid: {
-                    top:'2%',
+                    top:'10%',
                     left: '3%',
                     right: '4%',
-                    bottom: '30%',
+                    bottom: '20%',
                     containLabel: true,
                 },
                 xAxis: {