Merge branch 'blueBranch' into allTestUrgent

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -30,36 +30,40 @@
         </el-option>
       </el-select>
     </div>
-    <div class="inline-16">
-      <el-checkbox v-model="unfinish" true-label="0" false-label="1" @change="dataParam.content.where.unfinish = unfinish;projectParam.content.where.unfinish = unfinish;getProportionOfFileModel()">{{$t(`包含失败、结案项目`)}}</el-checkbox>
-    </div>
-    <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
-      <el-button-group>
-        <el-button size="small" :type="dataParam.content.dateType==99?'primary':''" @click="dataChange(99)">{{$t(`全部`)}}</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)">{{$t(`近一年`)}}</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==2?'primary':''" @click="dataChange(2)">{{$t(`近九个月`)}}</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==3?'primary':''" @click="dataChange(3)">{{$t(`近六个月`)}}</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==4?'primary':''" @click="dataChange(4)">{{$t(`近三个月`)}}</el-button>
-      </el-button-group>
-    </div>
-    <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
-      <el-date-picker
-          size="small"
-          v-model="dateSelect"
-          @change="dateChange"
-          type="daterange"
-          :clearable="false"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          :range-separator="$t('至')"
-         :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')">
-      </el-date-picker>
-    </div>
     <div>
       <el-row>
         <el-col :xs="15" :sm="15" :md="15" :lg="15" :xl="14">
-          <p class="title">{{$t(`销售漏斗图`)}}</p>
+          <div>
+            <div class="title inline-16">
+              {{$t(`销售漏斗图`)}}
+            </div>
+            <div class="inline-16">
+              <el-checkbox v-model="unfinish" true-label="0" false-label="1" @change="dataParam.content.where.unfinish = unfinish;projectParam.content.where.unfinish = unfinish;getProportionOfFileModel()">{{$t(`包含失败、结案项目`)}}</el-checkbox>
+            </div>
+            <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
+              <el-button-group>
+                <el-button size="small" :type="dataParam.content.dateType==99?'primary':''" @click="dataChange(99)">{{$t(`全部`)}}</el-button>
+                <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)">{{$t(`近一年`)}}</el-button>
+                <el-button size="small" :type="dataParam.content.dateType==2?'primary':''" @click="dataChange(2)">{{$t(`近九个月`)}}</el-button>
+                <el-button size="small" :type="dataParam.content.dateType==3?'primary':''" @click="dataChange(3)">{{$t(`近六个月`)}}</el-button>
+                <el-button size="small" :type="dataParam.content.dateType==4?'primary':''" @click="dataChange(4)">{{$t(`近三个月`)}}</el-button>
+              </el-button-group>
+            </div>
+            <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
+              <el-date-picker
+                  size="small"
+                  v-model="dateSelect"
+                  @change="dateChange"
+                  type="daterange"
+                  :clearable="false"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  :range-separator="$t('至')"
+                  :start-placeholder="$t('开始日期')"
+                  :end-placeholder="$t('结束日期')">
+              </el-date-picker>
+            </div>
+          </div>
           <div class="re-panel">
             <div id="containerFunnel" style="height: calc(60vh)"></div>
           </div>