Merge branch 'redUrgent' into mergeBranch

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -35,7 +35,8 @@
     </div>
     <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
       <el-button-group>
-        <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)" >近一年</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==0?'primary':''" @click="dataChange(0)">全部</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)">近一年</el-button>
         <el-button size="small" :type="dataParam.content.dateType==2?'primary':''" @click="dataChange(2)">近九个月</el-button>
         <el-button size="small" :type="dataParam.content.dateType==3?'primary':''" @click="dataChange(3)">近六个月</el-button>
         <el-button size="small" :type="dataParam.content.dateType==4?'primary':''" @click="dataChange(4)">近三个月</el-button>
@@ -67,6 +68,7 @@
           <div>
             <p class="title">表格数据</p>
             <el-table
+                show-summary
                 :data="tableData"
                 style="width: 100%"
                 size="small"
@@ -232,7 +234,7 @@ export default {
         "content": {
           "type":0, // 0 按人搜素 1 按部门搜索
           "dataid":0, // 人员id或部门id
-          'dateType':1,
+          'dateType':0,
           "where": {
             "begindate": "",
             "begdate":"",
@@ -251,7 +253,7 @@ export default {
           "pageSize": 20,
           "type": '',
           "dataid": '',
-          "dateType": 1,
+          "dateType": 0,
           "sa_projstagemagid":'',
           "where": {
             "begdate":"",
@@ -392,6 +394,8 @@ export default {
         let startDate = new Date(currentDate.getFullYear(), currentDate.getMonth() - 3, currentDate.getDate() + 1); // 计算起始日期
         let endDate = currentDate; // 结束日期为当前日期
         this.dateSelect = [startDate.toISOString().split('T')[0],endDate.toISOString().split('T')[0]]
+      }else if (val == '0'){
+        this.dateSelect = []
       }
       this.getProportionOfFileModel()
     },
@@ -416,6 +420,8 @@ export default {
         let startDate = new Date(currentDate.getFullYear(), currentDate.getMonth() - 3, currentDate.getDate() + 1); // 计算起始日期
         let endDate = currentDate; // 结束日期为当前日期
         this.dateSelect = [startDate.toISOString().split('T')[0],endDate.toISOString().split('T')[0]]
+      }else if (val == '0'){
+        this.dateSelect = []
       }
     },
     dateChange(){
@@ -861,4 +867,11 @@ export default {
 .container{
  /* height:calc(100vh)*/
 }
+/*/deep/.el-table .cell {*/
+
+/*  font-size: 18px;*/
+/*}*/
+/deep/ .el-table--small {
+  font-size: 18px;
+}
 </style>