diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index a57b82a..a78f1ff 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -147,7 +147,7 @@ export default { .income-sort { //margin-left: 8px; width: 49.6%; - min-width: 480px; + min-width: 600px; height: auto; background: #fff; } diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue index 4758114..126eaf6 100644 --- a/src/views/dashboard/IncomeSortEcharts.vue +++ b/src/views/dashboard/IncomeSortEcharts.vue @@ -10,12 +10,13 @@ tree-default-expand-all tree-node-filter-prop="title" @change="changeDepart" - style="width:30%" + style="width:20%" :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }" :treeData="treeDepartData" v-model="queryParam.departCode" placeholder="请选择部门"> +
{ + getAction(this.url.list, {type: typeEnum[this.activeIndex],departCode:this.queryParam.departCode,year:this.queryParam.year}).then(res => { if (res.success) { let dataSource = res.result this.initColumns(res.result) @@ -327,6 +332,7 @@ export default { position: relative; padding: 20px; box-sizing: border-box; + min-width: 650px; width: 100%; } @@ -410,4 +416,8 @@ export default { overflow: hidden; text-overflow: ellipsis; } +.year { + margin-left: 6px; + cursor: pointer; +} \ No newline at end of file