[chg]: changed api parameter

index.html

@@ -926,7 +926,8 @@
           <el-scrollbar ref="scrollbarRef" wrap-class="scrollbar-wrapper">
           <el-scrollbar ref="scrollbarRef" wrap-class="scrollbar-wrapper">
             <div id="showDiv" class="result-content" v-show="showDiv">
             <div id="showDiv" class="result-content" v-show="showDiv">
               <div class="result-item" v-for="item in results" :key="item.id">
               <div class="result-item" v-for="item in results" :key="item.id">
-                <div class="result-page">共计 : {{ item.totalPage }} 页/{{ item.totalNum }}条</div>
+                <!-- /{{ item.totalNum }}条 -->
+                <div class="result-page">共计 : {{ item.totalPage }} 页</div>
                 <div class="result-progress-wrapper">
                 <div class="result-progress-wrapper">
                   <span class="result-progress-left">执行进度 : </span>
                   <span class="result-progress-left">执行进度 : </span>
                   <div class="result-progress-right">
                   <div class="result-progress-right">
@@ -1857,7 +1858,8 @@
             startDate: dateVal + ' 00:00:00',
             startDate: dateVal + ' 00:00:00',
             endDate: dateVal + ' 23:59:59',
             endDate: dateVal + ' 23:59:59',
             mallIds: mallVal || null,
             mallIds: mallVal || null,
-            scheduleType: scheduleType
+            scheduleType: scheduleType,
+            featureType: dateFormat === 'revisitFeature' ? type : null
           }
           }
           var socketParameter = {
           var socketParameter = {
             scheduleType: scheduleType,
             scheduleType: scheduleType,
@@ -1940,7 +1942,8 @@
             startDate: dateVal + ' 00:00:00',
             startDate: dateVal + ' 00:00:00',
             endDate: dateVal + ' 23:59:59',
             endDate: dateVal + ' 23:59:59',
             mallIds: mallVal || null,
             mallIds: mallVal || null,
-            scheduleType: scheduleType
+            scheduleType: scheduleType,
+            featureType: type
           }
           }
           // this.openWebSock(scheduleType, '/mall/feature', parameter);
           // this.openWebSock(scheduleType, '/mall/feature', parameter);
           var socketParameter = {
           var socketParameter = {
@@ -2043,14 +2046,14 @@
           resObj.mallNames = mallNames
           resObj.mallNames = mallNames
           resObj.status = status
           resObj.status = status
           resObj.progress = self.floatToPercent(stepCount)
           resObj.progress = self.floatToPercent(stepCount)
-          resObj.totalNum = 0
+          // resObj.totalNum = 0
           resObj.totalPage = 0
           resObj.totalPage = 0
           resObj.current = 0
           resObj.current = 0
           resObj.curPageSize = 0
           resObj.curPageSize = 0
           resObj.scheduleType = scheduleType
           resObj.scheduleType = scheduleType
           if (counter) {
           if (counter) {
             // dataNum dateMallNum step totalData totalDate totalMall totalMallDateProduct
             // dataNum dateMallNum step totalData totalDate totalMall totalMallDateProduct
-            resObj.totalNum = counter.dateMallNum
+            // resObj.totalNum = counter.dateMallNum
             resObj.totalPage = counter.totalMallDateProduct
             resObj.totalPage = counter.totalMallDateProduct
             resObj.current = counter.dateMallNum
             resObj.current = counter.dateMallNum
             resObj.curPageSize = counter.dataNum
             resObj.curPageSize = counter.dataNum
@@ -2063,7 +2066,7 @@
                 item.progress = self.floatToPercent(stepCount)
                 item.progress = self.floatToPercent(stepCount)
                 if (counter) {
                 if (counter) {
                   // item.totalNum = counter.dateMallNum
                   // item.totalNum = counter.dateMallNum
-                  // item.totalPage = counter.totalMallDateProduct
+                  item.totalPage = counter.totalMallDateProduct
                   item.current = counter.dataNum
                   item.current = counter.dataNum
                   item.curPageSize = counter.totalData
                   item.curPageSize = counter.totalData
                 }
                 }