Merge branch 'master' into message

src/views/ReceivingRecords/index.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
-      <div class="app-titel" v-if="orgType != 3">
+      <div class="app-titel" v-if="orgType != 3" style="margin-bottom:10px">
         <div class="label">项目选择：</div>
         <div style="margin-left: 8px">
           <el-select

src/views/houseData/analyse.vue

@@ -76,13 +76,13 @@
               margin-right: 20px;
               cursor: pointer;
             ">
-            <div :class="{ colostyle: tabFlag == 1 }" style="margin-right: 10px" @click="tabClick1(1)">
+            <div :class="{ colostyle: tabFlag == 1 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick1(1)">
               达标
               <el-tooltip effect="light" content="选择的月份，项目的平均执行率≥项目的目标执行率;" placement="bottom-end">
                 <i class="pop"></i>
               </el-tooltip>
             </div>
-            <div :class="{ colostyle: tabFlag == 2 }" @click="tabClick1(2)">
+            <div :class="{ colostyle: tabFlag == 2 }" style="display: flex;align-items: center;" @click="tabClick1(2)">
               未达标
               <el-tooltip effect="light" content="选择的月份，平均执行率<目标执行率为不达标；" placement="bottom-end">
                 <i class="pop"></i>
@@ -136,19 +136,19 @@
               margin-right: 20px;
               cursor: pointer;
             ">
-            <div :class="{ colostyle: tabFlag2 == 0 }" style="margin-right: 10px" @click="tabClick2(0)">
+            <div :class="{ colostyle: tabFlag2 == 0 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick2(0)">
               不变
               <el-tooltip effect="light" content="项目选择月份平均执行率=项目的上月的平均执行率;" placement="bottom-end">
                 <i class="pop"></i>
               </el-tooltip>
             </div>
-            <div :class="{ colostyle: tabFlag2 == 1 }" style="margin-right: 10px" @click="tabClick2(1)">
+            <div :class="{ colostyle: tabFlag2 == 1 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick2(1)">
               上升
               <el-tooltip effect="light" content="项目选择月份平均执行率>项目的上月的平均执行率;" placement="bottom-end">
                <i class="pop"></i>
               </el-tooltip>
             </div>
-            <div :class="{ colostyle: tabFlag2 == 2 }" @click="tabClick2(2)">
+            <div :class="{ colostyle: tabFlag2 == 2 }" style="display: flex;align-items: center;" @click="tabClick2(2)">
               下降
               <el-tooltip effect="light" content="项目选择月份平均执行率<项目的上月的平均执行率;" placement="bottom-end">
                 <i class="pop"></i>
@@ -192,9 +192,9 @@
       </div>
       <el-table :data="tableData" @selection-change="handleSelectionChange" stripe style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="houseName" label="项目名称" align="center">
+        <el-table-column prop="houseName" label="项目名称" width="120" align="center">
         </el-table-column>
-        <el-table-column label="地区" align="center">
+        <el-table-column label="地区" align="center" width="120">
           <template slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.provinceName + '-' + row.cityName"
               placement="top-start">
@@ -1076,6 +1076,9 @@ export default {
     margin-right: 15px;
     background: #ffffff;
     border-radius: 4px;
+    &:nth-child(even){
+      margin-right: 0;
+    }
 
     .title {
       width: 100%;

src/views/houseData/count.vue

@@ -81,7 +81,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="fromdata.currentPage"
-          :page-sizes="[10, 30, 50]"
+          :page-sizes="[10,20, 30, 40,50,100]"
           :page-size="fromdata.size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="fromdata.total"
@@ -169,7 +169,7 @@
           @size-change="handleSizeChange111"
           @current-change="handleCurrentChange111"
           :current-page="erfromdata.currentPage"
-          :page-sizes="[10, 30, 50]"
+          :page-sizes="[10, 20,30, 40,50,100]"
           :page-size="erfromdata.size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="erfromdata.total"
@@ -192,7 +192,7 @@ export default {
          operationStaffId:'',
          currentPage:1,
          total:0,
-         size:30,
+         size:10,
          startDate:'',
          endDate:''
       },
@@ -203,7 +203,7 @@ export default {
         statime:'',
         endtime:'',
         total:0,
-        size:30,
+        size:10,
         currentPage:1,
         operationTypeid:''
       },