[chg]: add alldatacount

static/css/page.css

@@ -98,6 +98,10 @@ html, body, #app {
   margin: 8px 0;
 }
 
+.result-page span:last-of-type {
+  padding: 0 5px;
+}
+
 .result-progress-wrapper::after,
 .result-progress-wrapper::before {
   content: '';
@@ -123,7 +127,8 @@ html, body, #app {
   margin-bottom: 4px;
   position: relative;
   border-radius: 100px;
-  box-shadow: 0px 0px 2px 0 rgba(0,0,0,1);
+  /* box-shadow: 0px 0px 2px 0 rgba(0,0,0,1); */
+  background-color: #ebeef5;
   overflow: hidden;
 }
 
@@ -133,6 +138,7 @@ html, body, #app {
   left: 0;
   top: 0;
   height: 100%;
+  color: #fff;
   background: #409EFF;
   border-radius: inherit;
   text-align: right;

static/index.html

@@ -924,9 +924,29 @@
           <div class="result-header">结果展示</div>
           <el-scrollbar ref="scrollbarRef" wrap-class="scrollbar-wrapper">
             <div id="showDiv" class="result-content" v-show="showDiv">
+              <div class="result-item">
+                <!-- /{{ item.totalNum }}条 -->
+                <div class="result-page">
+                  <span>共1页</span>
+                  <span>总处理条数 : 200条</span>
+                </div>
+                <div class="result-progress-wrapper">
+                  <span class="result-progress-left">执行进度 : </span>
+                  <div class="result-progress-right">
+                    <div class="result-progress">
+                      <div class="result-progress__inner" :style="{ width: '80%' }">
+                        <div class="result-progress__text">80%</div>
+                      </div>
+                    </div>
+                    <span>第1条/共1条</span>
+                    <span class="pagination-page">第3页</span>
+                  </div>
+                </div>
+              </div>
+              <!--  -->
               <div class="result-item" v-for="item in results" :key="item.id">
                 <!-- /{{ item.totalNum }}条 -->
-                <div class="result-page">共计 : {{ item.totalPage }} 页</div>
+                <div class="result-page">共计 : {{ item.totalPage }} 页 {{ item.totalNum }}条</div>
                 <div class="result-progress-wrapper">
                   <span class="result-progress-left">执行进度 : </span>
                   <div class="result-progress-right">
@@ -1966,15 +1986,15 @@
           resObj.mallNames = mallNames
           resObj.status = status
           resObj.progress = self.floatToPercent(stepCount)
-          // resObj.totalNum = 0
+          resObj.totalNum = 0
           resObj.totalPage = 0
           resObj.current = 0
           resObj.curPageSize = 0
           resObj.currentPage = 0
           resObj.scheduleType = scheduleType
           if (counter) {
-            // dataNum dateMallNum step totalData totalDate totalMall totalMallDateProduct
-            // resObj.totalNum = counter.dateMallNum
+            // dataNum dateMallNum step totalData totalDate totalMall totalMallDateProduct allDataCount
+            resObj.totalNum = counter.allDataCount
             resObj.totalPage = counter.totalMallDateProduct
             resObj.current = counter.dataNum
             resObj.curPageSize = counter.totalData
@@ -1987,7 +2007,7 @@
                 //
                 item.progress = self.floatToPercent(stepCount)
                 if (counter) {
-                  // item.totalNum = counter.dateMallNum
+                  item.totalNum = counter.allDataCount
                   item.totalPage = counter.totalMallDateProduct
                   item.current = counter.dataNum
                   item.curPageSize = counter.totalData