From e720c869e76ecd844f2e0facedce2bb8acdf547b Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Tue, 7 Dec 2021 19:44:12 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iSwitchBrand/index.vue    |  3 +--
 src/lycomponents/iSwitchModel/index.vue    |  5 ++--
 src/mixins/index.js                        | 28 ++++++++++++----------
 src/views/IndustryDataExport/getApiData.js |  2 +-
 src/views/IndustryDataExport/index.vue     |  8 +++----
 src/views/IndustryDataExport/tableEvent.js | 19 ++++++++++++---
 6 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/lycomponents/iSwitchBrand/index.vue b/src/lycomponents/iSwitchBrand/index.vue
index 47ad4aa..aeddf23 100644
--- a/src/lycomponents/iSwitchBrand/index.vue
+++ b/src/lycomponents/iSwitchBrand/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-15 09:16:31
- * @LastEditTime: 2021-11-22 13:51:16
+ * @LastEditTime: 2021-12-07 19:10:36
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/lycomponents/iSwitchBrand/index.vue
@@ -131,7 +131,6 @@ export default {
                 length = arr.length;
             for (let i = 0; i < length; i++) {
                 if (arr[i] === id) {
-                    console.log(111)
                     newArr[0] = arr[i];
                 } else {
                     newArr[index++] = arr[i];
diff --git a/src/lycomponents/iSwitchModel/index.vue b/src/lycomponents/iSwitchModel/index.vue
index 739cdc0..403f64d 100644
--- a/src/lycomponents/iSwitchModel/index.vue
+++ b/src/lycomponents/iSwitchModel/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-15 09:16:31
- * @LastEditTime: 2021-11-21 14:58:52
+ * @LastEditTime: 2021-12-07 19:10:42
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/lycomponents/iSwitchBrand/index.vue
@@ -149,8 +149,7 @@ export default {
                 newArr = [],
                 length = arr.length;
             for (let i = 0; i < length; i++) {
-                if (arr[i] === id) {
-                    console.log(111)
+                if (arr[i] === id) {  
                     newArr[0] = arr[i];
                 } else {
                     newArr[index++] = arr[i];
diff --git a/src/mixins/index.js b/src/mixins/index.js
index 5764f65..58426b1 100644
--- a/src/mixins/index.js
+++ b/src/mixins/index.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 13:56:13
- * @LastEditTime: 2021-11-26 10:27:50
+ * @LastEditTime: 2021-12-07 19:42:47
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/mixins/index.js
@@ -201,18 +201,20 @@ export default {
                 doStr(str, n) {
                     let totalCount = 0;
                     let txt = "";
-                    for (var i = 0; i < str.length; i++) {
-                        let c = str.charCodeAt(i);
-                        if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
-                            totalCount++;
-                        } else {
-                            totalCount += 2;
-                        }
-                        if (totalCount <= n) {
-                            txt += str[i];
-                        } else {
-                            txt += '...';
-                            return txt
+                    if (str) {
+                        for (var i = 0; i < str.length; i++) {
+                            let c = str.charCodeAt(i);
+                            if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
+                                totalCount++;
+                            } else {
+                                totalCount += 2;
+                            }
+                            if (totalCount <= n) {
+                                txt += str[i];
+                            } else {
+                                txt += '...';
+                                return txt
+                            }
                         }
                     }
                     return txt;
diff --git a/src/views/IndustryDataExport/getApiData.js b/src/views/IndustryDataExport/getApiData.js
index 4726b81..7bb4b09 100644
--- a/src/views/IndustryDataExport/getApiData.js
+++ b/src/views/IndustryDataExport/getApiData.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-27 15:26:21
- * @LastEditTime: 2021-11-21 16:23:53
+ * @LastEditTime: 2021-12-07 19:26:11
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/getApiData.js
diff --git a/src/views/IndustryDataExport/index.vue b/src/views/IndustryDataExport/index.vue
index d14f678..24fe77e 100644
--- a/src/views/IndustryDataExport/index.vue
+++ b/src/views/IndustryDataExport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-11 14:11:04
- * @LastEditTime: 2021-11-21 16:10:55
+ * @LastEditTime: 2021-12-07 19:40:16
  * @LastEditors: Please set LastEditors
  * @Description: 行业数据导出
  * @FilePath: /data-show/src/views/IndustryDataExport/index.vue
@@ -38,7 +38,7 @@
                 </div>
                 <div class="ide-d2">
                     <span class="s1" v-if="!form.token">共计<span class="ss1">{{totalNum}}</span>条数据</span>
-                    <span class="s1" v-if="form.token">共计<span class="ss1">{{totalNum}}</span>条数据，已选中<span class="ss1">{{tableAll ? totalNum : secIds.length}}</span>条数据</span>
+                    <span class="s1" v-if="form.token">共计<span class="ss1">{{totalNum}}</span>条数据，已选中<span class="ss1">{{tableAll ? totalNum : sk.length}}</span>条数据</span>
                     <a-button type="primary" v-if="form.token" @click="handlerExport" v-has="btnUrl">导出数据</a-button>
                 </div>
                 <v-table ref="rtable" :row-selection="rowSelection" :columns="columns" :data="tbData" :loading="tableLoading" :pagination="pagination" @change="handlerPage">
@@ -67,7 +67,7 @@
                         <a-checkbox-group v-model="checkedIds" :options="plainOptions4" @change="fileTypeChange" />
                     </a-form-item>
                     <a-form-item label="导出条数">
-                        <span style="color: #63aecc; font-size: 14px">{{secIds.length}}条</span>
+                        <span style="color: #63aecc; font-size: 14px">{{execlForm.iNum}}条</span>
                     </a-form-item>
                 </a-form>
             </div>
@@ -177,7 +177,7 @@ export default {
                 action: "toExcel",
                 sFileName: "",
                 sCheckedIds: "",
-                iNum: "",
+                iNum: 0,
                 sField: "",
             },
             btnUrl: ""
diff --git a/src/views/IndustryDataExport/tableEvent.js b/src/views/IndustryDataExport/tableEvent.js
index 6bb4ba2..6b734cb 100644
--- a/src/views/IndustryDataExport/tableEvent.js
+++ b/src/views/IndustryDataExport/tableEvent.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-27 15:29:37
- * @LastEditTime: 2021-12-03 18:31:19
+ * @LastEditTime: 2021-12-07 19:38:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/tableEvent.js
@@ -28,6 +28,9 @@ export function rowSelection() {
             selectedRowKeys: this.sk,
             onSelectAll: () => {
                 this.tableAll = !this.tableAll;
+                if(!this.tableAll) {
+                    this.sk = []
+                }
             },
         }
     }
@@ -99,6 +102,8 @@ export default {
         }
         this.form.iPageIndex = 1;
         this.pagination.current = 1;
+        this.sk = [];
+        this.tableAll = false;
         Promise.all([this.getList(), this.getTable()]).then(() => {
             this.noClick = false;
         });
@@ -123,8 +128,8 @@ export default {
             } else {
                 this.execlForm.sFileName = this.form.sBrand + this.form.sSeriesName + this.getDatetimeSs();
             }
-            this.execlForm.sCheckedIds = this.tableAll ? '' : this.secIds.toString();
-            this.execlForm.iNum = this.tableAll ? this.totalNum : this.secIds.length;
+            this.execlForm.sCheckedIds = this.tableAll ? '' : this.sk.toString();
+            this.execlForm.iNum = this.tableAll ? this.totalNum : this.sk.length;
             this.modalObj.visible = true;
         })
     },
@@ -184,6 +189,8 @@ export default {
     handlerTime(n) {
         let ele = this.timesSel[n];
         this.form.sTimeType = ele.key;
+        this.sk = [];
+        this.tableAll = false;
         if (ele.key != this.selVal) {
             this.getTable();
             this.getList();
@@ -194,6 +201,8 @@ export default {
         this.form.sStartTime = val[0];
         this.form.sEndTime = val[1];
         this.selectPriceDate = "";
+        this.sk = [];
+        this.tableAll = false;
         this.getTable();
         this.getList();
     },
@@ -250,6 +259,8 @@ export default {
         this.form.sQuDao = this.quDao.toString();
         this.form.iPageIndex = 1;
         this.pagination.current = 1;
+        this.sk = [];
+        this.tableAll = false;
         Promise.all([this.getList(), this.getTable()]).then(() => {
             this.noClick = false;
         });
@@ -269,6 +280,8 @@ export default {
         this.doFormQS(this.qingGan);
         this.form.iPageIndex = 1;
         this.pagination.current = 1;
+        this.sk = [];
+        this.tableAll = false;
         Promise.all([this.getList(), this.getTable()]).then(() => {
             this.noClick = false;
         });