Compare commits

..

No commits in common. "dc8d178882ca4e201cbbe16122e7119bc1454b4b" and "2b4777998c086fb86ddccf61ddbbf4b9b43c8bb5" have entirely different histories.

View File

@ -53,6 +53,11 @@
class="el-icon-arrow-down el-icon--right"></i></div> class="el-icon-arrow-down el-icon--right"></i></div>
<el-dropdown-menu slot="dropdown" > <el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in amountList" :key="index" :command="item">{{item}} </el-dropdown-item> <el-dropdown-item v-for="(item,index) in amountList" :key="index" :command="item">{{item}} </el-dropdown-item>
<!-- <el-dropdown-item>昨日 </el-dropdown-item>-->
<!-- <el-dropdown-item>本周 </el-dropdown-item>-->
<!-- <el-dropdown-item>本月 </el-dropdown-item>-->
<!-- <el-dropdown-item>本季度</el-dropdown-item>-->
<!-- <el-dropdown-item>本年 </el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<div class="h-anniu" :class="{'q-anniu' : dataTimeShow == true}" @click="dataTimeShow = true"> 自定义 <div class="h-anniu" :class="{'q-anniu' : dataTimeShow == true}" @click="dataTimeShow = true"> 自定义
@ -866,6 +871,7 @@ export default {
xAxis: [ xAxis: [
{ {
type: 'category', type: 'category',
// data: ['广1', '广2', '广3', '广4', '广5', '广6', '广7'],
data: showTimes, data: showTimes,
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
@ -876,6 +882,9 @@ export default {
{ {
type: 'value', type: 'value',
name: '金额(元)', name: '金额(元)',
// min: 0,
// max: 10000,
// interval: 2000,
axisLabel: { axisLabel: {
formatter: '{value}' formatter: '{value}'
} }