Merge branch 'dev' of http://218.59.175.43:3000/zhangzl/rongxin.nongjing.expo into dev

src/views/capital/comps/right/bottom/1/index.html

@@ -4,5 +4,5 @@ element-loading-text="拼命加载中"
 element-loading-spinner="el-icon-loading"
 element-loading-background="rgba(0, 0, 0, 0.1)"
 >
-  <ScrollTable v-if="isLoad" :data="data" :headers="['部门名称', '收入金额', '排名']"></ScrollTable>
+  <ScrollTable v-if="isLoad" :data="data" :headers="['部门名称', '支出金额', '排名']"></ScrollTable>
 </Pannel>

src/views/property/comps/left/bottom/3/index.html

@@ -1,5 +1,5 @@
 
-<Pannel title="资产长期闲置预警" height="305" flexIble
+<Pannel title="资产闲置预警" height="305" flexIble
   v-loading="!isLoad"
   element-loading-text="拼命加载中"
   element-loading-spinner="el-icon-loading"