筛选

lottery/bigJxs.html

@@ -638,6 +638,15 @@
     justify-content: center;
   }
 
+  /* 提升弹框层级，避免被 echarts 遮挡 */
+  .van-overlay {
+    z-index: 2999 !important;
+  }
+
+  .van-popup {
+    z-index: 3000 !important;
+  }
+
   /* 层级筛选样式 */
   .hierarchy_title {
     display: flex;
@@ -726,6 +735,9 @@
     border-top: 1px solid #f0f2f5;
   }
 
+  .hierarchy_actions .van-button {
+    border-radius: 10px;
+  }
   .hierarchy_actions .van-button + .van-button {
     margin-left: 8px;
   }
@@ -1386,6 +1398,9 @@
         contentRankData: [], // 运营任务-素材排行榜
         loading: false,
         pageDate: [], // 日期范围
+        tenancyIds: [],
+        tenancyOutletIds: [],
+        departmentIds: [],
       }
     },
     created() {
@@ -1422,9 +1437,10 @@
     },
     methods: {
       handleHierarchyChange (departmentIds, outletIds, tenancyIds) {
-        console.log('departmentIds', departmentIds)
-        console.log('outletIds', outletIds)
-        console.log('tenancyIds', tenancyIds)
+        this.tenancyIds = tenancyIds
+        this.tenancyOutletIds = outletIds
+        this.departmentIds = departmentIds
+        this.requestData()
       },
       // 初始化
       initialization() {
@@ -1651,8 +1667,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/clientIndicators`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : []
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
           }),
           headers: {
             'Content-Type': 'application/json',
@@ -1844,8 +1861,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/trend`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -2105,8 +2123,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/stepStatistic`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
           }),
           headers: {
             'Content-Type': 'application/json',
@@ -2135,8 +2154,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/intentRank`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
           }),
           headers: {
             'Content-Type': 'application/json',
@@ -2240,8 +2260,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/buyRank`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
           }),
           headers: {
             'Content-Type': 'application/json',
@@ -2385,8 +2406,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/chatIndicators`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3011,8 +3033,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/wordCloudMap`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3533,7 +3556,7 @@
           method: 'post',
           body: JSON.stringify({
             outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            departmentIds: this.departmentIds || [],
             startTime: this.memberStartTime,
             endTime: this.memberEndTime,
             page: this.currentPage,
@@ -3565,7 +3588,7 @@
           method: 'post',
           body: JSON.stringify({
             outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            departmentIds: this.departmentIds || [],
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3593,8 +3616,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/outletCount`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3623,8 +3647,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/taskCompletePercent`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3735,8 +3760,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/interact`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),
@@ -3848,8 +3874,9 @@
         fetch(this.httpUrl + `/scrm/v1/dw-dealer/m/contentRank`, {
           method: 'post',
           body: JSON.stringify({
-            outletId: this.outletId,
-            departmentIds: this.deptId ? [this.deptId] : [],
+            tenancyIds: this.tenancyIds,
+            tenancyOutletIds: this.tenancyOutletIds,
+            departmentIds: this.departmentIds,
             startTime: this.pageStartTime,
             endTime: this.pageEndTime,
           }),

lottery/js/hierarchyFilter.js

@@ -47,7 +47,7 @@ var hierarchy_tpl = `
       </div>
       <div class="hierarchy_actions">
         <van-button size="small" @click="handleClear">重置</van-button>
-        <van-button size="small" type="primary" @click="handleConfirm">确定</van-button>
+        <van-button size="small" type="info" @click="handleConfirm">确定</van-button>
       </div>
     </van-popup>
   </div>