فهرست منبع

修改echarts样式

朱鑫波 4 سال پیش
والد
کامیت
e73b8a92e8

+ 0 - 1
src/views/modules/stockWatch/modules/keep-manage/keep-manage-data.js

@@ -85,7 +85,6 @@ class keepPersonServer {
                 align: 'center',
                 width: 100,
                 fixed: 'left',
-                sorter: () => {},
             },
             {
                 title: '花费',

+ 34 - 28
src/views/modules/stockWatch/modules/keep-manage/keep-manage.vue

@@ -37,7 +37,9 @@
                             <span class="no-person">NO.{{personData.rank||'-'}}</span>
                         </h2>
                         <div class="header-left-title">
-                            <span>今日消耗:</span>
+                            <span>
+                                今日消耗:
+                            </span>
                             <span class="left-title-radio" v-if="personData && personData.grew < 0">
                                 <img class="title-radio-img" src="@/assets/up.png" alt="">
                                 {{ personData.grew ? personData.grew + '%' : '-' }}
@@ -47,6 +49,12 @@
                                 <img class="title-radio-img" src="@/assets/down.png" alt="">
                                 {{personData.grew ? personData.grew + '%':'-'}}
                             </span>
+                            <a-tooltip class="">
+                                <template slot="title">
+                                截止此时今日与昨日的花费同比
+                                </template>
+                                <a-icon type="question-circle" />
+                            </a-tooltip>
                         </div>
                         <h1><span v-if="personData">{{personData.charge | decimalsHandle}}</span><span v-else>-</span></h1>
                         <div class="header-left-title-else">
@@ -80,12 +88,6 @@
                                 {{personData.grew ? personData.grew + '%':'-'}}
                                 <img class="title-radio-img" src="@/assets/down.png" alt="">
                             </span>
-                            <a-tooltip>
-                                <template slot="title">
-                                本周与上周的消耗环比
-                                </template>
-                                <a-icon type="question-circle" />
-                            </a-tooltip>
                         </div>
                     </a-card>
                 </a-col>
@@ -640,9 +642,10 @@ export default {
             let option = {
                 tooltip: {
                     trigger: 'axis',
+                    
                 },
                 grid:{
-                    x: '6%',
+                    x: this.clientWidth>1100?'6%':'8%',
                     width: '90%',
                     y: '12%',
                     bottom: '25px',
@@ -650,27 +653,30 @@ export default {
 
                 },
                 xAxis: [{
-                    
-                type: 'category',
-                data: data.map(item => {
-                                return item.time
-                            }), 
-                axisLine: {
-                    lineStyle: {
-                        color: '#ddd'
-                    }
-                },
-                axisTick: {
-                    show: false
-                },
-                axisLabel: {
-                    interval: 0,
-                    textStyle: {
-                        color: '#c56790'
+                    data: data.map(item => {
+                        if(this.checkDisabled) {
+                            return (item.time > 10 ? item.time: '0' + item.time)+ ':00'
+                        }
+                        else {
+                            return item.time
+                        }
+                        
+                    }), 
+                    axisLine: {
+                        lineStyle: {
+                            color: '#ddd'
+                        }
                     },
-                    margin: 15
-                },
-                boundaryGap: false
+                    axisTick: {
+                        show: true
+                    },
+                    axisLabel: {
+                        show:true,
+                        textStyle: {
+                            color: '#c56790'
+                        },
+                    },
+                    boundaryGap: true
                     
       
                 }],