wyl

components/indexCom/atlasChild/index.js

@@ -57,7 +57,6 @@ const app=getApp()
                 this.setData({
                     HotWords:limit1
                 })
-              
              }) 
         }, 
         // 正面 

components/indexCom/portraitChild/index.js

@@ -17,49 +17,82 @@ Component({
     },
     lifetimes:{
         attached(){
-            app.globalData.request({action: 'getSexOrAttestationOrRegionHome0528',sType:'Home' ,sTimeType: 34}).then(res => {
+            let sTimeType = wx.getStorageSync("sTimeType") || 34;
-               const sex=res.sex
+            let sStartTime = wx.getStorageSync("sStartTime") || '';
-               const attestation=res.attestation
+            let sEndTime = wx.getStorageSync("sEndTime") || '';
-               const sexList=[]
+            this.getData(sTimeType, sStartTime, sEndTime);
-               const attestationList=[]
+    },},
-               let sexSum=0
-               let attestationSum=0
-               const sexAccounted=[]
-               const attestationAccounted=[]
-               const region=[]
-                // res.forEach(ele => {
-                // })
-               for(let i=0;i<3;i++){
-                sexSum+=sex[i].value
-                attestationSum+=attestation[i].value
-               }
-               for(let i=0;i<3;i++){
-                sexAccounted.push(Math.round((sex[i].value/sexSum)*100))
-                attestationAccounted.push(Math.round((sex[i].value/attestationSum)*100))
-                sexList.push({name:sex[i].key,value:sex[i].value,color:color[i],accounted:sexAccounted[i]})
-                attestationList.push({name:attestation[i].key,value:attestation[i].value,color:color[i],accounted:attestationAccounted[i]})
-               }
-                console.log(sexList)
-                console.log(attestationList)
-                this.setData({
-                    sexList:sexList,
-                    attestationList:attestationList,
-                    sexOption:pieOption(color,sex),
-                    attestationOption:pieOption(color,attestation)
-                    // regionOption:pictographicOption(dRegion,dValue),
-                })
-
-            })
-        }
-    },
     methods: {
+        changeTime(e){
+            let sTimeType = e.detail.sTimeType;
+            let sStartTime = e.detail.sStartTime;
+            let sEndTime = e.detail.sEndTime;
+            this.getData(sTimeType, sStartTime, sEndTime);
+        },
+        getData(sTimeType, sStartTime, sEndTime){
+            wx.showToast({
+                title: '加载中',
+                icon: 'loading',
+                duration: 300000
+            }),
+            app.globalData.request({action: 'getSexOrAttestationOrRegionHome0528',sType:'Home',sTimeType:sTimeType,
+            sStartTime:sStartTime,
+            sEndTime:sEndTime}).then(res => {
+                const sex=res.sex
+                const attestation=res.attestation
+                const sexList=[]
+                const attestationList=[]
+                let sexSum=0
+                let attestationSum=0
+                const sexAccounted=[]
+                const attestationAccounted=[]
+                let regionSum=0
+                const rName1=[]
+                const rValue1=[]
+                const rName2=[]
+                const rValue2=[]
+                let pd=res.sex.length==1
+                 // res.forEach(ele => {
+                 // })
+                 for(let i=0;i<res.region.length;i++){
+                regionSum+=res.region[i].value
+                    console.log(regionSum)
+                 }
+                 for(let i=0;i<res.region.length/2;i++){
+                         rName1.push(res.region[i].key)
+                         rValue1.push(res.region[i].value)    
+                 }
+                 for(let i=res.region.length/2;i<res.region.length;i++){
+                     rName2.push(res.region[i].key)
+                     rValue2.push(res.region[i].value)    
+                 }
+                for(let i=0;i<3;i++){
+                 sexSum+=sex[i].value
+                 attestationSum+=attestation[i].value
+                }
+                for(let i=0;i<3;i++){
+                 sexAccounted.push(((sex[i].value/sexSum)*100).toFixed(2))
+                 attestationAccounted.push(((sex[i].value/attestationSum)*100).toFixed(2))
+                 sexList.push({name:sex[i].key,value:sex[i].value,color:color[i],accounted:sexAccounted[i]})
+                 attestationList.push({name:attestation[i].key,value:attestation[i].value,color:color[i],accounted:attestationAccounted[i]})
+                }
+                 this.setData({
+                     sexList:pd?[]:sexList,
+                     attestationList:pd?[]:attestationList,
+                     sexOption:pd?pieOption([],'#fff'):pieOption(color,sex),
+                     attestationOption:pd?pieOption():pieOption(color,attestation),
+                     regionOption1:pd?pictographicOption():pictographicOption(rName1,rValue1,regionSum),
+                     regionOption2:pd?pictographicOption():pictographicOption(rName2,rValue2,regionSum),
+                 })
+             })
+             setTimeout(() =>{
+                wx.hideToast();
+            },500) 
+         },
         priceSel(e){
-           
             this.setData({
-                intervalSel: e.currentTarget.dataset.index,
+                intervalSel: e.currentTarget.dataset.index, 
-               
             })
-        }
+        }  
-        
     }
-})
+    })

components/indexCom/portraitChild/index.wxml

@@ -56,10 +56,10 @@
         <view class="text">地区</view>
         <view class="echars">
             <view class="echars_view">
-                <c-echars showChart="{{showChart}}" canvasId="modelbar-canvas" chartId="modelbar" chartOption="{{regionOption}}" height="100%"></c-echars>
+                <c-echars showChart="{{showChart}}" canvasId="modelbar-canvas" chartId="modelbar" chartOption="{{regionOption1}}" height="100%"></c-echars>
             </view>
             <view class="echars_view">
-                <c-echars showChart="{{showChart}}" canvasId="modelbar-canvas" chartId="modelbar" chartOption="{{regionOption}}" height="100%"></c-echars>
+                <c-echars showChart="{{showChart}}" canvasId="modelbar-canvas" chartId="modelbar" chartOption="{{regionOption2}}" height="100%"></c-echars>
             </view>
         </view>
 

components/option/pictographicOption.js

@@ -1,5 +1,5 @@
 // 象形
-export default function pictographicOption(dRegion=[],dValue=[]){
+export default function pictographicOption(dRegion=[],dValue=[],dSum=0){
     return {
         tooltip: {
         },
@@ -41,7 +41,7 @@ export default function pictographicOption(dRegion=[],dValue=[]){
                     label: {
                         show: true,
                         formatter: function (params) {
-                            return ((params.value / 100) * 100).toFixed(1) + ' %';
+                            return ((params.value / dSum) * 100).toFixed(2) + ' %';
                             }, 
                 // position: 'right',
                 // offset: [20, 0],