From dfa4963877ff30eab3822ff15e2971f6bb769f85 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Sat, 8 Oct 2022 14:18:20 +0800
Subject: [PATCH] zx

---
 pages/insight/pages/brandInsight/brandDataList/index.js   | 2 +-
 pages/insight/pages/brandInsight/brandDataList/index.wxml | 8 ++++----
 pages/insight/pages/brandInsight/brandDataList/index.wxss | 1 +
 pages/insight/pages/eventInsight/evDatalist/index.js      | 2 +-
 pages/insight/pages/eventInsight/evDatalist/index.wxml    | 8 ++++----
 pages/insight/pages/eventInsight/evDatalist/index.wxss    | 1 -
 pages/insight/pages/modalInsight/modalDataList/index.js   | 2 +-
 pages/insight/pages/modalInsight/modalDataList/index.wxml | 8 ++++----
 pages/insight/pages/modalInsight/modalDataList/index.wxss | 1 +
 pages/insight/pages/themeList/index.js                    | 2 +-
 pages/insight/pages/themeList/index.wxml                  | 2 +-
 11 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js
index 4f638c4..8ae31bc 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.js
+++ b/pages/insight/pages/brandInsight/brandDataList/index.js
@@ -273,7 +273,7 @@ Page({
             sField: JSON.stringify(sField), //导出字段
             sFileName: "事件数据" + date, //文件名称
             sCheckedIds: this.data.result.join(',') || '', //数据id
-            iNum: this.data.result.length, //导出条数
+            iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
             iTimeType: this.data.iTimeType, //0发布时间 1入库时间
         }, (res) => {
             if (res.Code == 1) {
diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml
index 2c65264..70a2af2 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxml
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml
@@ -70,13 +70,13 @@
         </view>
     </van-checkbox-group>
     <view class="tdl-footer" style="display: flex;justify-content: flex-start;">
-        <view style="margin-top: 3%">
+        <view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
             <van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
                 <van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
             </van-checkbox-group>
         </view>
-        <view style="width: 75%;margin-left: 24rpx;">
-            <van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
+        <view style="margin-left: 36%;">
+            <van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
         </view>
     </view>
     <van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@@ -84,7 +84,7 @@
             <view>文件名称</view>
             <view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
             <view>导出数量</view>
-            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
+            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
             <view>导出字段</view>
             <view class="filter" >
                 <view wx:for="{{reportOption}}" wx:key="index">
diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxss b/pages/insight/pages/brandInsight/brandDataList/index.wxss
index c5629d7..e44606e 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxss
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxss
@@ -69,6 +69,7 @@
     background: #FFF;
     width: 100%;
     padding: 16rpx 0rpx 24rpx 0rpx;
+    margin-left: -32rpx;
     /* margin-left: 16rpx; */
 }
 /* 按钮 */
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.js b/pages/insight/pages/eventInsight/evDatalist/index.js
index 05cb235..bcd9a71 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.js
+++ b/pages/insight/pages/eventInsight/evDatalist/index.js
@@ -260,7 +260,7 @@ Component({
                 sField: JSON.stringify(sField), //导出字段
                 sFileName: "事件数据" + date, //文件名称
                 sCheckedIds: this.data.result.join(',') || '', //数据id
-                iNum: this.data.result.length, //导出条数
+                iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
                 iTimeType: this.data.iTimeType, //0发布时间 1入库时间
             }, (res) => {
                 if (res.Code == 1) {
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml
index c2ed93e..418889e 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.wxml
+++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml
@@ -73,13 +73,13 @@
         <van-button custom-class="bottom-button" bind:click="loadMore">点击加载更多</van-button>
     </view>
     <view class="tdl-footer" style="display: flex;justify-content: flex-start;">
-        <view style="margin-top: 3%">
+        <view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
             <van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
                 <van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
             </van-checkbox-group>
         </view>
-        <view style="width: 75%;margin-left: 24rpx;">
-            <van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
+        <view style="margin-left: 36%;">
+            <van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
         </view>
     </view>
     <van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@@ -87,7 +87,7 @@
             <view>文件名称</view>
             <view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
             <view>导出数量</view>
-            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
+            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
             <view>导出字段</view>
             <view class="filter" >
                 <view wx:for="{{reportOption}}" wx:key="index">
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxss b/pages/insight/pages/eventInsight/evDatalist/index.wxss
index 97a346b..cc6d913 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.wxss
+++ b/pages/insight/pages/eventInsight/evDatalist/index.wxss
@@ -74,7 +74,6 @@
     background: #FFF;
     width: 100%;
     padding: 16rpx 0rpx 24rpx 0rpx;
-    margin-left: 64rpx;
 }
 /* 按钮 */
 .theme-add-btn {
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js
index 64bb654..42aeae0 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.js
+++ b/pages/insight/pages/modalInsight/modalDataList/index.js
@@ -276,7 +276,7 @@ Page({
             sField: JSON.stringify(sField), //导出字段
             sFileName: "事件数据" + date, //文件名称
             sCheckedIds: this.data.result.join(',') || '', //数据id
-            iNum: this.data.result.length, //导出条数
+            iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
             iTimeType: this.data.iTimeType, //0发布时间 1入库时间
         }, (res) => {
             if (res.Code == 1) {
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml
index 2c65264..70a2af2 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.wxml
+++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml
@@ -70,13 +70,13 @@
         </view>
     </van-checkbox-group>
     <view class="tdl-footer" style="display: flex;justify-content: flex-start;">
-        <view style="margin-top: 3%">
+        <view style="width: 20%;margin-top: 3%;margin-left: 64rpx">
             <van-checkbox-group value="{{ isSelectAll }}" bind:change="changeSelectAll">
                 <van-checkbox name="0" shape="square" class="van-checkbox">全选</van-checkbox>
             </van-checkbox-group>
         </view>
-        <view style="width: 75%;margin-left: 24rpx;">
-            <van-button bind:click="openReport" custom-style="width: 45%" color="#0084FF" class="theme-add-btn" plain>生成数据</van-button>
+        <view style="margin-left: 36%;">
+            <van-button bind:click="openReport" color="#0084FF" custom-style="width: 120%" class="theme-add-btn" plain>生成数据</van-button>
         </view>
     </view>
     <van-dialog use-slot title="导出选项" show="{{reportShow}}" bind:confirm="report" show-cancel-button>
@@ -84,7 +84,7 @@
             <view>文件名称</view>
             <view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
             <view>导出数量</view>
-            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
+            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
             <view>导出字段</view>
             <view class="filter" >
                 <view wx:for="{{reportOption}}" wx:key="index">
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxss b/pages/insight/pages/modalInsight/modalDataList/index.wxss
index 319a6b7..da4034d 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.wxss
+++ b/pages/insight/pages/modalInsight/modalDataList/index.wxss
@@ -69,6 +69,7 @@
     background: #FFF;
     width: 100%;
     padding: 16rpx 0rpx 24rpx 0rpx;
+    margin-left: -32rpx;
     /* margin-left: 16rpx; */
 }
 /* 按钮 */
diff --git a/pages/insight/pages/themeList/index.js b/pages/insight/pages/themeList/index.js
index eb4922a..4d51cc1 100644
--- a/pages/insight/pages/themeList/index.js
+++ b/pages/insight/pages/themeList/index.js
@@ -378,7 +378,7 @@ Page({
             sField: JSON.stringify(sField), //导出字段
             sFileName: "主题数据" + date, //文件名称
             sCheckedIds: this.data.result.join(',') || '', //数据id
-            iNum: this.data.result.length, //导出条数
+            iNum: this.data.result.length == 0 ? this.data.total : this.data.result.length, //导出条数
             iTimeType: this.data.iTimeType, //0发布时间 1入库时间
         }, (res) => {
             if (res.Code == 1) {
diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml
index 334fc34..d87ab79 100644
--- a/pages/insight/pages/themeList/index.wxml
+++ b/pages/insight/pages/themeList/index.wxml
@@ -119,7 +119,7 @@
             <view>文件名称</view>
             <view style="color:#999999;font-size: 14px;margin:24rpx">{{fileName}}</view>
             <view>导出数量</view>
-            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length}}</span> 条数据，以xlsx格式导出</view>
+            <view style="color:#999999;margin: 24rpx;font-size: 14px;">共导出 <span style="color: #0084FF">{{result.length == 0 ? total : result.length}}</span> 条数据，以xlsx格式导出</view>
             <view>导出字段</view>
             <view class="filter" >
                 <view wx:for="{{reportOption}}" wx:key="index">