From 43fe6427977df84a599d0d901fc70b121d5f22b2 Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Fri, 3 Dec 2021 18:38:15 +0800
Subject: [PATCH] cxw-010203

---
 src/views/BrandInsight/titsopo/index.vue   | 29 +++++-----------------
 src/views/IndustryDataExport/tableEvent.js | 12 +++++----
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/views/BrandInsight/titsopo/index.vue b/src/views/BrandInsight/titsopo/index.vue
index b023def..b876117 100644
--- a/src/views/BrandInsight/titsopo/index.vue
+++ b/src/views/BrandInsight/titsopo/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 09:32:35
- * @LastEditTime: 2021-11-26 17:29:09
+ * @LastEditTime: 2021-12-03 18:23:20
  * @LastEditors: Please set LastEditors
  * @Description: 舆情传播趋势
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/index.vue
@@ -72,28 +72,11 @@ export default {
             let endTime = moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
             let cTime2 = this.getCtime2;
             let sTimeType = 34;
-            switch (cTime2.sTimeType) {
-                case 34:
-                    sTimeType = 34
-                    break;
-                case 23:
-                    sTimeType = 23
-                    break;
-                case 3:
-                    sTimeType = 3
-                    break;
-                case 20:
-                    sTimeType = 20
-                    break;
-                case 4:
-                    sTimeType = 4;
-                    startTime = cTime2.sStartTime;
-                    endTime = cTime2.sEndTime;
-                    break;
-                default:
-                    sTimeType = 34
-                    break;
-            }
+            sTimeType = cTime2.sTimeType 
+            if(cTime2.sTimeType == 4) {
+                  startTime = cTime2.sStartTime;
+                  endTime = cTime2.sEndTime;
+            } 
             this.$router.push({            
                 path: "/industryDataExport",
                 query: {
diff --git a/src/views/IndustryDataExport/tableEvent.js b/src/views/IndustryDataExport/tableEvent.js
index 2958e41..6b4ebf1 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-01 14:55:51
+ * @LastEditTime: 2021-12-03 18:31:19
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/tableEvent.js
@@ -73,12 +73,14 @@ export default {
             if (this.form.sStartTime && this.form.sEndTime) {
                 this.selTime = [this.form.sStartTime, this.form.sEndTime];
             }
-            if (this.form.sTimeType == 4) {
-                this.gValue = 4;
-            } else {
+            let x = this.timesSel.findIndex(ele => {
+                return ele.key == this.form.sTimeType;
+            })
+            if(x === -1) {
                 this.gValue = 0;
+            } else {
+                this.gValue = x; 
             }
-
             this.getList();
             this.getTable();
         });