m

shuzhixiangzheng/src/components/DaZhongPage.vue

@@ -114,7 +114,7 @@
   import housePng from "../assets/png/house.png"
   import house1Png from "../assets/png/house1.png"
   import {
-    jinghuguoji_httpGet
+    jinghuguoji_httpGet,SZZXQ_httpGet
   } from "../assets/api/loadData.js"
   import LeftPage from "./OtherChilds/LeftPage.vue"
   import RightPage from "./OtherChilds/RightPage.vue"
@@ -156,7 +156,7 @@
       let clear = setInterval(() => {
         if (
           this.$store.getters.getDaZhongdata.code === 10000 &&
-          this.$store.getters.getDaZhongdata.data.index
+          this.$store.getters.getDaZhongdata.data
         ) {
           this.dataAll=this.$store.getters.getDaZhongdata.data
           console.log('--------',this.dataAll);
@@ -232,6 +232,10 @@
         this.leftPng_url = left1Png;
         this.rightPng_url = right1Png;
         console.log(333)
+        SZZXQ_httpGet("金湖国际",result=>{
+            console.log("金湖国际",result)
+            this.dataAll=result.data.data;
+        },result=>{})
      //  this.$store.commit("setShowDZ", false);
         //  localStorage.setItem('showDZ',false)
         this.isShow=false

shuzhixiangzheng/src/components/MainPageChild/ViewPage.vue

@@ -57,7 +57,10 @@ export default {
     };
   },
   mounted() {
-
+    setInterval(() => {
+      console.log('----------------------------------',this.szdata);
+    }, 100);
+    
   },
   methods: {},
 };

shuzhixiangzheng/src/components/OtherChilds/LeftPage.vue

@@ -12,7 +12,7 @@
     </template>
     <template v-else>
       <img id="populationStructure_img" src="../../assets/png/renkoujieguo.png" />
-      <PopulationStructure></PopulationStructure>
+      <PopulationStructure :data='dataAll.structure'></PopulationStructure>
     </template>
   </div>
 </template>
@@ -39,6 +39,9 @@
     //   console.log('拿到数据', this.dataAll);
     //   this.showDZ = localStorage.getItem('showDZ')
     //   console.log("this.showDZ", this.showDZ)
+      setInterval(() => {
+        console.log(this.dataAll.structure)
+      }, 1000);
     },
     methods: {},
   };

shuzhixiangzheng/src/components/OtherChilds/PepoleStatus.vue

@@ -65,7 +65,7 @@
   .czrk_num {
     position: absolute;
     left: 18%;
-    top: 15%;
+    top: 12%;
     color: rgb(250, 207, 44);
     font-size: 25px;
     font-weight: bold;
@@ -82,7 +82,7 @@
   .ldrk_num {
     position: absolute;
     left: 70%;
-    top: 15%;
+    top: 12%;
     font-size: 25px;
     color: rgb(250, 207, 44);
     font-weight: bold;

shuzhixiangzheng/src/components/OtherChilds/PopulationStructure.vue

@@ -8,6 +8,7 @@
   <script>
     import echarts from 'echarts'
     export default {
+        props: ["data1"],
       name: 'populationStructure',
       components: {
       },
@@ -17,14 +18,38 @@
         }
       },
       mounted() {
+          setInterval(() => {
+            console.log("this.data1",this.data1)
+          }, 500);
+          
+        if(this.data1){
         this.init()
+    }
+      },
+      watch:{
+
       },
       methods: {
         init(){
             var myChart = echarts.init(document.getElementById('pop'));
 		var xData = ["18以下", "18-60","60-80","80以上"];
-		var yData = [50, 87.3,30,70];
-		var shadowYData=[100,100,100,100];
+		var yData = [];
+		var shadowYData=[];
+        
+            this.data.map(c=>{
+                this.yData[0]=this.data.filter(d=>d.name=="18岁以下")[0].male;
+                this.yData[1]=this.data.filter(d=>d.name=="18-60岁")[0].male;
+                this.yData[2]=this.data.filter(d=>d.name=="60-80岁")[0].male;
+                this.yData[3]=this.data.filter(d=>d.name=="80岁以上")[0].male;
+
+                this.shadowYData[0]=this.data.filter(d=>d.name=="18岁以下")[0].total;
+                this.shadowYData[1]=this.data.filter(d=>d.name=="18-60岁")[0].total;
+                this.shadowYData[2]=this.data.filter(d=>d.name=="60-80岁")[0].total;
+                this.shadowYData[3]=this.data.filter(d=>d.name=="80岁以上")[0].total;
+            });
+            console.log("this.yData",this.yData)
+            console.log(this.shadowYData)
+      
         //#0D53CC
 		var color="#19dfdd";
 		var shadowColor="#0b5767";  
@@ -86,17 +111,17 @@
 					symbolOffset: [0, -6],
 					symbolPosition: 'end',
 					z: 12,
-					"label": {
-						"normal": {
-							"show": true,
-							"position": "top",
-							fontSize: 14,
-							color: color,
-							formatter:function(params,index){
-								return params.value+"%";
-							}
-						}
-					},
+					// "label": {
+					// 	"normal": {
+					// 		"show": true,
+					// 		"position": "top",
+					// 		fontSize: 14,
+					// 		color: color,
+					// 		formatter:function(params,index){
+					// 			return params.value+"%";
+					// 		}
+					// 	}
+					// },
 					color: "#2DB1EF",
 					data: yData
 				},