diff --git a/src/views/reportform/chargeRate.vue b/src/views/reportform/chargeRate.vue
index adcc333..c3e4e59 100644
--- a/src/views/reportform/chargeRate.vue
+++ b/src/views/reportform/chargeRate.vue
@@ -12,87 +12,64 @@
 					/>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="起始日期">
+			<el-form-item label="年份">
         <el-date-picker v-model="queryParams.startDate"
-                        type="month"
-                        value-format="yyyy-MM"
+                        type="year"
+                        value-format="yyyy"
                         placeholder="请选择"
-                        clearable
-                        size="small"/>
-      </el-form-item>
-			<el-form-item label="结束日期">
-        <el-date-picker v-model="queryParams.endDate"
-                        type="month"
-                        value-format="yyyy-MM"
-                        placeholder="请选择"
-                        clearable
                         size="small"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-		<div class="clearfix">
-			<span>园区物业费收费率</span>
-			<span class="fr">数据统计时间：{{currentDate}}</span>
-		</div>
-    <el-table v-loading="loading" :data="dataList" border>
-			<el-table-column prop="cidname" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="totalhouseholds" label="总户数(个)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="constructionarea" label="建筑面积(㎡)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="unitprice" label="单价(元/㎡·月)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="start_date" label="起始日期" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="end_date" label="结束日期" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="length_date" label="收费周期" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="expect_money" label="预计物业费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="receivable_money" label="实际缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="percent" label="收费率(%)" :show-overflow-tooltip="true">
-				<template slot-scope="scope">
-          <span>{{ (scope.row.percent*10000/100).toFixed(1) }}%</span>
-        </template>
-			</el-table-column>
-    </el-table>
-		<div style="margin-top:50px;" class="clearfix">
-			<span>楼栋物业费收费率</span>
-			<span class="fr">数据统计时间：{{currentDate}}</span>
-		</div>
-		<el-table
-			v-loading="loading"
-			:data="dataBuildList"
-			border
-			max-height="300"
-			ref="table">
-			<el-table-column prop="buildingname" label="楼号" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="totalhouseholds" label="总户数(个)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="constructionarea" label="建筑面积(㎡)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="unitprice" label="单价(元/㎡·月)" :show-overflow-tooltip="true">
-				<template slot-scope="scope">
-          <span v-if="scope.row.cid === -1"></span>
-					<span v-else>{{ scope.row.unitprice }}</span>
-        </template>
-			</el-table-column>
-			<el-table-column prop="start_date" label="起始日期" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="end_date" label="结束日期" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="length_date" label="收费周期" :show-overflow-tooltip="true">
-				<template slot-scope="scope">
-          <span v-if="scope.row.cid === -1"></span>
-					<span v-else>{{ scope.row.length_date }}</span>
-        </template>
-			</el-table-column>
-			<el-table-column prop="expect_money" label="预计缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="receivable_money" label="实际缴费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
-			<el-table-column prop="percent" label="收费率(%)" :show-overflow-tooltip="true">
-				<template slot-scope="scope">
-          <span>{{ (scope.row.percent*10000/100).toFixed(1) }}%</span>
-        </template>
-			</el-table-column>
-			<el-table-column prop="difference_value" label="差值(%)" :show-overflow-tooltip="true">
-				<template slot-scope="scope">
-					<span v-if="scope.row.cid === -1"></span>
-          <span v-else>{{ (scope.row.difference_value*10000/100).toFixed(1) }}%</span>
-        </template>
-			</el-table-column>
-    </el-table>
+		<el-tabs v-model="activeName" type="card">
+			<el-tab-pane label="园区物业费基本信息" name="first">
+				<el-table v-loading="loading" :data="dataList" border max-height="600">
+					<el-table-column prop="cidname" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="totalhouseholds" label="总户数(个)" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="constructionarea" label="建筑面积(㎡)" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="unitprice" label="单价(元/㎡·月)" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="expect_money" label="预计全年物业费金额(万元)" :show-overflow-tooltip="true"></el-table-column>
+				</el-table>
+			</el-tab-pane>
+			<el-tab-pane label="园区物业费收费率" name="second">
+				<el-table v-loading="loading" :data="dataParkList" border max-height="600">
+					<el-table-column prop="name" label="月份" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="one" label="1月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="two" label="2月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="three" label="3月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="four" label="4月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="five" label="5月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="six" label="6月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="seven" label="7月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="eight" label="8月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="nine" label="9月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="ten" label="10月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="eleven" label="11月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="twelve" label="12月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="all" label="合计" :show-overflow-tooltip="true"></el-table-column>
+				</el-table>
+			</el-tab-pane>
+			<el-tab-pane label="楼栋物业费收费率" name="third">
+				<el-table v-loading="loading" :data="dataBuildList" border max-height="600">
+					<el-table-column prop="name" label="月份" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="one" label="1月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="two" label="2月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="three" label="3月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="four" label="4月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="five" label="5月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="six" label="6月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="seven" label="7月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="eight" label="8月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="nine" label="9月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="ten" label="10月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="eleven" label="11月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="twelve" label="12月" :show-overflow-tooltip="true"></el-table-column>
+					<el-table-column prop="all" label="合计" :show-overflow-tooltip="true"></el-table-column>
+				</el-table>
+			</el-tab-pane>
+		</el-tabs>
   </div>
 </template>
 
@@ -100,75 +77,45 @@
 import { propertyFeeData } from '@/api/reportform'
 import moment from 'moment'
 export default {
-  name: 'ExpireReport',
+  name: 'ChangeRate',
   data() {
     return {
 			cidList:JSON.parse(localStorage.cid) || [], // 园区列表
-			role:localStorage.role,
-      // 数据列表
-      dataList: [],
-			dataBuildList: [],
-      // 遍历表头
-      // headers: [],
-			// headersBuild: [],
-      // 遮罩层
-      loading: true,
-      // 总条数
-      total: 0,
-      // 查询参数
-      queryParams: {
+			role:localStorage.role, // 角色
+			activeName: 'first', // 选项卡绑定值
+      dataList: [], //园区物业费基本信息
+			dataParkList: [], //园区物业费收费率
+			dataBuildList: [], //楼栋物业费收费率
+      loading: true, // 遮罩层
+      total: 0, // 总条数
+      queryParams: { // 查询参数
 				cid: undefined,
-				startDate: moment().subtract(1,'M').format('YYYY-MM'),
-				endDate: moment().format('YYYY-MM'),
+				startDate: moment().format('YYYY'),
       },
-			currentDate: moment().format('YYYY-MM-DD')
+			currentDate: moment().format('YYYY-MM-DD'), // 当前日期
     }
   },
   created() {
     this.getList()
   },
   methods: {
-    /** 查询角色列表 */
+    // 查询角色列表
     getList() {
       this.loading = true
-      propertyFeeData(this.queryParams).then(
-        response => {
-          this.dataList = response.data.cat_arr
-					this.dataBuildList = response.data.build_arr
-          // this.headers = [
-					// 	'cidname',
-					// 	'totalhouseholds',
-					// 	'constructionarea',
-					// 	'unitprice',
-					// 	'start_date',
-					// 	'end_date',
-					// 	'length_date',
-					// 	'expect_money',
-					// 	'receivable_money',
-					// 	'percent'
-					// ]
-					// this.headersBuild = [
-						// 'buildingname',
-						// 'totalhouseholds',
-						// 'constructionarea',
-						// 'unitprice',
-						// 'start_date',
-						// 'end_date',
-						// 'length_date',
-						// 'expect_money',
-						// 'receivable_money',
-						// 'percent',
-					// 	'difference_value'
-					// ]
-          this.loading = false
-        }
-      )
+      propertyFeeData(this.queryParams).then(({code, data}) => {
+				if (code == 200) {
+					this.dataList = data['build_arr'] || []
+					this.dataParkList = data['park_statistics'] || []
+					this.dataBuildList = data['building_statistics'] || []
+				}
+        this.loading = false
+      })
     },
-    /** 搜索按钮操作 */
+    // 搜索按钮操作
     handleQuery() {
-			if (!this.queryParams.startDate || !this.queryParams.endDate) {
+			if (!this.queryParams.startDate) {
         this.$message({
-          message: '请选择开始日期和结束日期',
+          message: '请选择年份',
           type: 'error'
         })
         return