From ec878e2303ee6f1a38b945a6edb57c9c08631f3f Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 14 Oct 2024 08:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E5=8D=9A=E5=8E=BB=E9=99=A4=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E5=B1=95=E7=A4=BA=E3=80=81=E5=A4=84=E7=90=86=E6=9C=89?=
 =?UTF-8?q?=E5=AE=B3=E4=BF=A1=E6=81=AF=E6=95=B0=E9=87=8F=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E6=AF=8D=E8=B0=83=E5=B0=8F=E3=80=81=E7=BD=91=E7=BB=9C=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=AE=98=E7=9A=84=E6=A4=8D=E7=89=A9=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=5F2=E3=80=81=E8=88=86=E6=83=85=E8=B5=B0=E5=8A=BF=E5=9B=BE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=917=E5=A4=A9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ecosphere/components/componentLeft.vue    |  8 +++--
 .../ecosphere/components/componentRight.vue   |  6 ++--
 .../components/componentLeft.vue              |  4 +--
 .../sentiment/components/componentLeft.vue    | 34 ++++++++++++-------
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/privateOrder/ecosphere/components/componentLeft.vue b/src/views/privateOrder/ecosphere/components/componentLeft.vue
index 8febb88..82b9c00 100644
--- a/src/views/privateOrder/ecosphere/components/componentLeft.vue
+++ b/src/views/privateOrder/ecosphere/components/componentLeft.vue
@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览左侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2023-11-01 09:29:08
+ * @LastEditTime: 2024-10-12 15:30:55
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentLeft.vue
 -->
 <template>
@@ -765,7 +765,9 @@ export default {
           this.total = res.total;
         })
       } else if (val === "微博") {
-        this.tableHeader = ["账号名称", "认证", "地区"];
+        // this.tableHeader = ["账号名称", "认证", "地区"];
+        // 2024/10/12让去掉地区显示
+        this.tableHeader = ["账号名称", "认证"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
         listWb({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
@@ -773,7 +775,7 @@ export default {
             let obj = {};
             obj["账号名称"] = item.zhName;
             obj["认证"] = item.approve;
-            obj["地区"] = item.areaId;
+            // obj["地区"] = item.areaId;
             this.tableData.push(obj);
           });
           this.total = res.total;
diff --git a/src/views/privateOrder/ecosphere/components/componentRight.vue b/src/views/privateOrder/ecosphere/components/componentRight.vue
index a172a38..2670e9c 100644
--- a/src/views/privateOrder/ecosphere/components/componentRight.vue
+++ b/src/views/privateOrder/ecosphere/components/componentRight.vue
@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览右侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2024-10-11 11:57:43
+ * @LastEditTime: 2024-10-12 15:34:23
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -63,10 +63,10 @@
               >
                 <span>{{ item.num }}</span>
                 <div class="processBox">
-                  <!-- 分母是为了数据展示好看 要求这样 -->
+                  <!-- 分母是为了数据展示好看 要求这样 2024/10/12之前分母是25000 今天甲方提要求进度条的占比分布改小一点，这个太大看不出差距了 -->
                   <div
                     class="process"
-                    :style="{ width: (item.num / 25000) * 251 + 'px' }"
+                    :style="{ width: (item.num / 2500) * 251 + 'px' }"
                   ></div>
                   <div class="dark"></div>
                 </div>
diff --git a/src/views/privateOrder/positiveEnergy/components/componentLeft.vue b/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
index 9a2e0e3..04846da 100644
--- a/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
+++ b/src/views/privateOrder/positiveEnergy/components/componentLeft.vue
@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2024-10-11 18:24:20
+ * @LastEditTime: 2024-10-12 18:30:55
  * @Description:
 -->
 <template>
@@ -536,7 +536,7 @@ export default {
           // { name: '职务_1', value: 'duty1' },
           { name: '负责科室', value: 'fzks' },
           { name: '网络安全官', value: 'fzr3' },
-          { name: '职务_2', value: 'duty3' },
+          { name: '职务', value: 'duty3' },
           { name: '电话', value: 'tel' }
         ]
         this.total = res.total
diff --git a/src/views/privateOrder/sentiment/components/componentLeft.vue b/src/views/privateOrder/sentiment/components/componentLeft.vue
index 6fecfe8..fe8cd26 100644
--- a/src/views/privateOrder/sentiment/components/componentLeft.vue
+++ b/src/views/privateOrder/sentiment/components/componentLeft.vue
@@ -355,11 +355,11 @@ export default {
         areaId: 1,
       },
       //将敏感和非敏感区分开来
-      positiveOpinion: [],
-      negativeOpinion: [],
+      positiveOpinion: [0,0,0,0,0,0,0],
+      negativeOpinion: [0,0,0,0,0,0,0],
       allDate: [],
       date: [],
-      newDate: [],
+      newDate: [this.$moment(this.$moment().subtract(7, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(6, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(5, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(4, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(3, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(2, "d")).format("MM-DD"),this.$moment(this.$moment().subtract(1, "d")).format("MM-DD"),],
       dtsx: {},
       //========
       listTotal: 0,
@@ -444,20 +444,28 @@ export default {
         params: {},
       };
       let date = this.$moment().subtract(7, "d");
+      let datetwo = this.$moment().subtract(1, "d");
       from.params.beginDateTime = this.$moment(date).format("YYYY-MM-DD");
-      from.params.endDateTime = this.$moment().format("YYYY-MM-DD");
+      from.params.endDateTime = this.$moment(datetwo).format("YYYY-MM-DD");
       listYqzs(from).then((res) => {
         this.allDate = res.rows;
         //已经排序过的数组
-        this.allDate.sort(function (a, b) {
-          return new Date(a.dateTime) - new Date(b.dateTime);
-        });
-        this.allDate.forEach((value) => {
-          //把日期存储起来
-          this.newDate.push(this.$moment(value.dateTime).format("MM-DD"));
-          this.positiveOpinion.push(value.count1);
-          this.negativeOpinion.push(value.count2);
-        });
+        // this.allDate.sort(function (a, b) {
+        //   return new Date(a.dateTime) - new Date(b.dateTime);
+        // });
+        this.allDate.forEach((value)=>{
+          const index = this.newDate.indexOf(this.$moment(value.dateTime).format("MM-DD"));
+          if (index !== -1) {
+            this.positiveOpinion[index] = value.count1; // 将 count1 赋值给对应的下标
+            this.negativeOpinion[index] = value.count2; // 将 count2 赋值给对应的下标
+          }
+        })
+        // this.allDate.forEach((value) => {
+        //   //把日期存储起来
+        //   this.newDate.push(this.$moment(value.dateTime).format("MM-DD"));
+        //   this.positiveOpinion.push(value.count1);
+        //   this.negativeOpinion.push(value.count2);
+        // });
         this.lineBox();
       });
     },