溧水app、小程序代码————数据展示样式修改

lss_vue/index.html

@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <title>溧水</title>
-        <link rel="shortcut icon" type="image/x-icon" href="./cloud.ico" /> 
+        <link rel="shortcut icon" type="image/x-icon" href="./cloud.ico" />
         <style>
             .toolbar {
                 background: #fff!important;

lss_vue/src/views/assets/assets.vue

@@ -9,6 +9,7 @@
             <div class="btn_body">
                 <img v-on:click.stop="showList()" class="btn_img" src="../../assets/image/add.png">
                 <div class="btn_list" v-show="popupVisible">
+                    <!-- <div v-on:click="toTest()"><img src="../../assets/image/export.png">扫描二维码</div> -->
                     <div v-if="power.indexOf('registered_assets') > -1" v-on:click="register()"><img src="../../assets/image/register.png">登记资产</div>
                     <div v-on:click="exportExcel()"><img src="../../assets/image/export.png">导出报表</div>
                 </div>
@@ -220,6 +221,10 @@
                 this.$router.push("/assetsRegister");
             },
 
+            toTest() {
+                this.$router.push("/test");
+            },
+
             exportExcel() {
                 this.$indicator.open();
                 this.http.downloadFile(this.port.assets.listExcel, {

lss_vue/src/views/data/data.vue

@@ -60,7 +60,7 @@
                 <div class="echartsBox bottom">
                     <table class="tab1_table tab3_tbody_nowarp">
                         <thead>
-                            <tr><td colspan="3"><h3 style="padding:0;margin:0">电子证照类型</h3></td></tr>
+                            <tr><td colspan="3"><h4 style="padding:0;margin:0">电子证照类型</h4></td></tr>
                             <tr><td>部门名称</td><td>证照类型</td><td>数量</td></tr>
                         </thead>
                         <tbody>
@@ -80,7 +80,7 @@
                 <div class="echartsBox bottom">
                     <table class="tab1_table tab4_tbody">
                         <thead>
-                            <tr><td colspan="3"><h3 style="padding:0;margin:0">系统告警</h3></td></tr>
+                            <tr><td colspan="3"><h4 style="padding:0;margin:0">系统告警</h4></td></tr>
                             <tr><td>告警类型</td><td>数量（次）</td></tr>
                         </thead>
                         <tbody>
@@ -145,7 +145,10 @@
                     backgroundColor: '#fff',
                     title : {
                         text: '数据类型统计',
-                        x:'left'
+                        x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
                         trigger: 'item',
@@ -156,8 +159,9 @@
                         }
                     },
                     legend: {
-                        orient: 'vertical',
-                        x: 'right',
+                        orient: 'horizontal',
+                        x: 'center',
+                        y: '85%',
                         data: dataX,
                         textStyle:{
                             color:'#888',
@@ -233,9 +237,16 @@
                     title : {
                         text: '数据交换TOP5',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
-                        formatter: "{d}：{c}条"
+                        formatter: "{b}：{c}条"
+                    },
+                    grid: {
+                        top: "75px",
+                        left: '15%',
                     },
                     xAxis: {
                         axisTick:{
@@ -293,12 +304,17 @@
                     title : {
                         text: '各部门发布的资源数量',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
-                        formatter: "{d}：{c}个"
+                        formatter: "{b}：{c}个"
                     },
                     grid:{
-                        bottom: "100px"
+                        left: '15%',
+                        top: "75px",
+                        bottom: "125px"
                     },
                     dataZoom: [{
                         type: 'inside',
@@ -324,12 +340,13 @@
                         axisLine: {
                             show: false,
                         },
-                        axisLabel: {  
+                        axisLabel: { 
+                            fontSize: 10,
                             interval:0,  
                             rotate:40  
                         },
                         type: 'category',
-                        data: dataX
+                        data: dataX,
                     },
                     yAxis: {
                         axisTick:{
@@ -373,11 +390,15 @@
                     title : {
                         text: '各部门申请次数',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
-                        formatter: "{d}：{c}个"
+                        formatter: "{b}：{c}个"
                     },
                     grid:{
+                        top: "75px",
                         bottom: "100px"
                     },
                     dataZoom: [{
@@ -476,6 +497,9 @@
                     title : {
                         text: '数据来源',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {},
                     legend: {
@@ -498,6 +522,7 @@
                     grid: {
                         left: '15%',
                         right: '15%',
+                        top: "75px",
                         bottom: "100px"
                     },
                     dataZoom: [{
@@ -551,7 +576,7 @@
                             name: '单位：KB',
                             axisLabel: { 
                                 interval:0, 
-                                rotate:40 
+                                rotate:-40 
                             } 
                         },
                     ],
@@ -599,7 +624,10 @@
                     backgroundColor: '#fff',
                     title : {
                         text: '地理信息库图层分散',
-                        x:'left'
+                        x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
                         trigger: 'item',
@@ -610,8 +638,11 @@
                         }
                     },
                     legend: {
-                        orient: 'vertical',
-                        x: 'right',
+                        // orient: 'vertical',
+                        // x: 'right',
+                        orient: 'horizontal',
+                        x: 'center',
+                        y: '80%',
                         data: dataX,
                         textStyle:{
                             color:'#888',
@@ -688,6 +719,9 @@
                     title : {
                         text: '申请虚拟机数量',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
                         formatter: "{d}：{c}个"
@@ -748,6 +782,9 @@
                     title : {
                         text: '24H云平台CPU使用情况',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
                         formatter: "{b}：{c}%",
@@ -828,6 +865,9 @@
                     title : {
                         text: '24H云平台内存使用情况',
                         x:'left',
+                        textStyle:{
+                            fontSize: 16,
+                        }
                     },
                     tooltip: {
                         formatter: "{b}：{c}%",
@@ -941,16 +981,13 @@
         background: #fff;
         margin: 0.02rem 0 0.05rem 0;
         padding: 0.1rem 0.2rem;
-        font-size: 0.15rem;
-    }
-
-    .headMsg {
+        font-size: 0.14rem;
         line-height: 0.25rem;
     }
 
     .echarts {
         width: 100%;
-        height: 3rem;
+        height: 3.5rem;
         background: #fff;
         padding: 0.05rem;
         box-sizing:border-box;
@@ -994,10 +1031,17 @@
         white-space: nowrap;
     }
 
-    .tab3_tbody_nowarp tr td {
+    .tab1_table thead tr td {
+        font-size: 0.14rem;
+        height: 0.45rem;
+        line-height: 0.2rem;
+    }
+
+    .tab1_table tbody tr td {
         font-size: 0.12rem;
         height: 0.45rem;
         line-height: 0.2rem;
+        color: #666;
     }
 
     .tab3_tbody_nowarp tr td:nth-child(1) {
@@ -1014,6 +1058,10 @@
         white-space: unset;
     }
 
+    #tab3_chart2 {
+        height: 4.5rem;
+    }
+
     .top {
         margin-top:0.05rem;
     }