From 641a27dc6db3f68bbfa7f640511a8e7dc3431448 Mon Sep 17 00:00:00 2001
From: liuyongli <1598631486@qq.com>
Date: Fri, 15 Jul 2022 10:25:21 +0800
Subject: [PATCH] no message

---
 components/indexCom/barometerChild/index.js | 23 +++++++++++++-----
 components/indexCom/soundChild/index.js     | 26 +++++++--------------
 package-lock.json                           | 14 +++++------
 package.json                                |  2 +-
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/components/indexCom/barometerChild/index.js b/components/indexCom/barometerChild/index.js
index 899aee9..155850f 100644
--- a/components/indexCom/barometerChild/index.js
+++ b/components/indexCom/barometerChild/index.js
@@ -1,4 +1,5 @@
 import brokenLine from "../../option/stackingLineOption"
+import moment from "moment"
 
 // const dName=['正面', '中性','负面']
 const dName=[]
@@ -8,14 +9,16 @@ const dValue=[]
 //     [200, 382, 661, 34, 909, 1308, 150],
 //     [20, 32, 41, 354, 90, 130, 10],
 // ]
-    const dColor=['#FF4852','#FF6E25','#FFBF00']
-    const data=['00:00', '04:00', '08:00', '12:00', '16:00', '20:00', '24:00']
+const dColor=['#FF4852','#FF6E25','#FFBF00']
+ // const data=['00:00', '04:00', '08:00', '12:00', '16:00', '20:00', '24:00']
+const data = []
     const app = getApp()
 Component({
     data: {
         showChart: true,
         positiveOption:brokenLine(dName,dValue,dColor,data),
         negativeOption: brokenLine(dName,dValue,dColor,data),
+        Time:moment().format("YYYY-MM-DD HH:mm:ss"),
 
     },
     onShow() {
@@ -26,11 +29,19 @@ Component({
             app.globalData.request({action: 'getAffections0528',sType:'Home' ,sTimeType:34,}).then(res => {
                 let arr = []
                 res.forEach(ele => {
-                let obj = {
-                    dValue:ele,
-                    dName:ele.Time
+                    let ol = {
+                        data:ele.Time
                     }
-                    arr.push(obj)
+                    ele.Data.forEach(val =>{
+                        let obj = {
+                            dName:val.key,
+                            dValue:val.value,
+                            // data:
+                            }
+                            arr.push(obj)
+                    })
+                    arr.push(ol)
+
                 })
                 this.setData({
                     positiveOption:arr,
diff --git a/components/indexCom/soundChild/index.js b/components/indexCom/soundChild/index.js
index 9451f13..cf567b5 100644
--- a/components/indexCom/soundChild/index.js
+++ b/components/indexCom/soundChild/index.js
@@ -30,29 +30,21 @@ Component({
         attached() {
             app.globalData.request({action: 'getHomeBrandSourceType0528', sType: 'Home', sTimeType: 34, sQueryType: 2}).then(res => {
                 const arr = []
-                // const da = data.da
-                // res.forEach(ele =>{
-                //     let ol = {
-                //         data:ds.key
-                //     }
-                //     arr.push(ol)
-                // })
                 res.forEach(ele => {
-                    let obj = {
-                        ds: ele.value,
-                        dx: ele.key,
-                        // data:ele.value[i].key
-                    }
-                    arr.push(obj)
+                    // ele.value.forEach(val =>{
+                    //     let obj = {
+                    //         // dx:ele.key,
+                    //         ds:val.value,
+                    //         data:val.key
+                    //         }
+                    //         arr.push(obj)
+                    // })
+
                 })
                 this.setData({
                     brandOption: arr,
-                    // ds:ol
                 })
                 console.log('111',arr)
-                console.log('222',obj)
-                console.log('333',e)
-                // console.log(data)
             })
         },
     },
diff --git a/package-lock.json b/package-lock.json
index 0f44048..11c1f14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vant/weapp": "^1.10.3",
         "miniprogram-sm-crypto": "^0.3.8",
-        "moment": "^2.29.3"
+        "moment": "^2.29.4"
       }
     },
     "node_modules/@vant/weapp": {
@@ -33,9 +33,9 @@
       }
     },
     "node_modules/moment": {
-      "version": "2.29.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
-      "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==",
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
       "engines": {
         "node": "*"
       }
@@ -61,9 +61,9 @@
       }
     },
     "moment": {
-      "version": "2.29.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
-      "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     }
   }
 }
diff --git a/package.json b/package.json
index 859e8f0..9378de1 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,6 @@
   "dependencies": {
     "@vant/weapp": "^1.10.3",
     "miniprogram-sm-crypto": "^0.3.8",
-    "moment": "^2.29.3"
+    "moment": "^2.29.4"
   }
 }