From 326458bf729fffe8f2454fa3ea067e69d4127f15 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Mon, 1 Nov 2021 19:16:39 +0800
Subject: [PATCH] cxw-010203

---
 src/components/v-pagination/index.vue         |  4 +-
 src/views/BrandInsight/keyMedia/opt.js        |  4 +-
 .../rearWingPropagationSituation/opt.js       |  6 +-
 src/views/Index/barometer/index.vue           | 58 ++++++++++++-------
 src/views/Index/barometer/opt.js              | 18 +++---
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/components/v-pagination/index.vue b/src/components/v-pagination/index.vue
index 7b1dfec..237b77b 100644
--- a/src/components/v-pagination/index.vue
+++ b/src/components/v-pagination/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-09 16:08:39
- * @LastEditTime: 2021-10-21 12:47:48
+ * @LastEditTime: 2021-11-01 19:14:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/components/v-pagination/index.vue
@@ -56,7 +56,7 @@ export default {
     methods: {
         // 初始化数据
         comitPages() {
-            this.pages = Math.floor(this.data.length / this.sizes);
+            this.pages = Math.ceil(this.data.length / this.sizes);
             if (this.pages) {
                 this.doDatas();
             }
diff --git a/src/views/BrandInsight/keyMedia/opt.js b/src/views/BrandInsight/keyMedia/opt.js
index e05cc6d..7d548ef 100644
--- a/src/views/BrandInsight/keyMedia/opt.js
+++ b/src/views/BrandInsight/keyMedia/opt.js
@@ -3,7 +3,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 12:38:34
- * @LastEditTime: 2021-10-29 19:04:32
+ * @LastEditTime: 2021-11-01 19:02:50
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/tailInsight/opt.js
@@ -68,7 +68,7 @@ export default function createOpt(dy = [], ds = []) {
                     color: '#010B19'
                 }, {
                     offset: 1,
-                    color: '#51bc91'
+                    color: '#63AECC'
                 }]),
             }
         ]
diff --git a/src/views/BrandInsight/rearWingPropagationSituation/opt.js b/src/views/BrandInsight/rearWingPropagationSituation/opt.js
index 774c0e7..241e3a3 100644
--- a/src/views/BrandInsight/rearWingPropagationSituation/opt.js
+++ b/src/views/BrandInsight/rearWingPropagationSituation/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 16:40:53
- * @LastEditTime: 2021-10-29 19:00:40
+ * @LastEditTime: 2021-11-01 19:02:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/forumCommunicationTrend/opt.js
@@ -72,11 +72,11 @@ export default function createOpt(dx=[], ds = []) {
             {
                 data: ds,
                 type: 'line',
-                color: "#51bc91",
+                color: "#63AECC",
                 areaStyle: {normal: {
                     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                             offset: 0,
-                            color: '#51bc91'
+                            color: '#63AECC'
                         }, {
                             offset: 1,
                             color: 'rgba(0,0,0,0)'
diff --git a/src/views/Index/barometer/index.vue b/src/views/Index/barometer/index.vue
index 487ddfb..e9e291b 100644
--- a/src/views/Index/barometer/index.vue
+++ b/src/views/Index/barometer/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-09 11:28:39
- * @LastEditTime: 2021-11-01 09:09:17
+ * @LastEditTime: 2021-11-01 19:10:58
  * @LastEditors: Please set LastEditors
  * @Description: 晴雨表
  * @FilePath: /data-show/src/views/Index/barometer/index.vue
@@ -9,7 +9,8 @@
 <template>
     <div class="bm-outter" v-loading="load">
         <v-label-div title="晴雨表">
-            <div>
+            <div class="tis">
+                <v-pagination :data="pdata" :style="{marginRight: '0.8rem', marginTop: '0.4rem'}" @change="handlerData"></v-pagination>
                 <v-tab-group :btns="['正负调性', '负面等级']" @change="handlerChange"></v-tab-group>
             </div>
         </v-label-div>
@@ -29,6 +30,7 @@ export default {
         return {
             load: false,
             opt: {},
+            pdata: [],
         };
     },
     created() {
@@ -47,16 +49,12 @@ export default {
         getData1() {
             this.load = true;
             getAffections0528(this.getCommTime).then((res) => {
-                let data = res.data;
-                let dx = [];
-                let ds = [];
+                let data = res.data || [];
+                let arr = [];
                 data.forEach((ele) => {
-                    let Time = ele.Time;
-                    let Data = ele.Data;
-                    dx.push(Time);
-                    ds.push(Data);
+                    arr.push(ele);
                 });
-                this.opt = createOpt(dx, ds);
+                this.pdata = arr;
                 this.load = false;
             });
         },
@@ -65,18 +63,26 @@ export default {
             this.load = true;
             getCrisisTime(this.getCommTime).then((res) => {
                 let data = res.data;
-                let dx = [];
-                let ds = [];
+                let arr = [];
                 data.forEach((ele) => {
-                    let Time = ele.Time;
-                    let Data = ele.Data;
-                    dx.push(Time);
-                    ds.push(Data);
+                    arr.push(ele);
                 });
-                this.opt = createOpt(dx, ds);
+                this.pdata = arr;
                 this.load = false;
             });
         },
+        // 获取分页数据
+        handlerData(arr) {
+            let dx = [];
+            let ds = [];
+            arr.forEach((ele) => {
+                let key = ele.Time;
+                let value = ele.Data;
+                dx.push(key);
+                ds.push(value);
+            });
+            this.opt = createOpt(dx, ds);
+        },
         // 获取echars 点击的数据
         clickEchars(data) {
             let series = [];
@@ -97,18 +103,26 @@ export default {
                     .subtract(3, "days")
                     .format("YYYY-MM-DD HH:mm:ss");
             } else if (this.getCommTime.sTimeType == 3) {
-              startTime = moment(endTime)
+                startTime = moment(endTime)
                     .subtract(7, "days")
                     .format("YYYY-MM-DD HH:mm:ss");
             } else {
-              startTime = moment(endTime)
+                startTime = moment(endTime)
                     .subtract(30, "days")
                     .format("YYYY-MM-DD HH:mm:ss");
             }
             let sTimeType = 4;
             this.$router.push({
                 path: "/industryDataExport",
-                query: { startTime, endTime, series, sTimeType, action: 'getListHome', sType: 'Home', title: "行业数据" },
+                query: {
+                    startTime,
+                    endTime,
+                    series,
+                    sTimeType,
+                    action: "getListHome",
+                    sType: "Home",
+                    title: "行业数据",
+                },
             });
         },
     },
@@ -128,4 +142,8 @@ export default {
         height: calc(100% - 48px);
     }
 }
+.tis {
+    display: flex;
+    justify-items: flex-end;
+}
 </style>
diff --git a/src/views/Index/barometer/opt.js b/src/views/Index/barometer/opt.js
index 518f572..6c570de 100644
--- a/src/views/Index/barometer/opt.js
+++ b/src/views/Index/barometer/opt.js
@@ -2,7 +2,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 11:38:06
- * @LastEditTime: 2021-10-29 21:50:44
+ * @LastEditTime: 2021-11-01 19:15:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/barometer/opt.js
@@ -61,14 +61,14 @@ export default function createOpt(dx = [], ds = []) {
             top: 46,
             containLabel: true
         },
-        dataZoom: [{
-            type: 'inside', //1平移 缩放
-            throttle: '50', //设置触发视图刷新的频率。单位为毫秒（ms）。
-            minValueSpan: 6, //用于限制窗口大小的最小值,在类目轴上可以设置为 5 表示 5 个类目
-            start: 1, //数据窗口范围的起始百分比 范围是：0 ~ 100。表示 0% ~ 100%。
-            end: 50, //数据窗口范围的结束百分比。范围是：0 ~ 100。
-            zoomLock: true, //如果设置为 true 则锁定选择区域的大小，也就是说，只能平移，不能缩放。
-        }],
+        // dataZoom: [{
+        //     type: 'inside', //1平移 缩放
+        //     throttle: '50', //设置触发视图刷新的频率。单位为毫秒（ms）。
+        //     minValueSpan: 6, //用于限制窗口大小的最小值,在类目轴上可以设置为 5 表示 5 个类目
+        //     start: 1, //数据窗口范围的起始百分比 范围是：0 ~ 100。表示 0% ~ 100%。
+        //     end: 50, //数据窗口范围的结束百分比。范围是：0 ~ 100。
+        //     zoomLock: true, //如果设置为 true 则锁定选择区域的大小，也就是说，只能平移，不能缩放。
+        // }],
         tooltip: {
             trigger: "axis",
             backgroundColor: "#08182F",