m

shuzhixiangzheng/src/App.vue

@@ -24,21 +24,21 @@ export default {
       (reuslt) => {}
     );
     // SZZSQSY_httpGet(
-    //   "大中社区",
+    //   "台山社区",
     //   (result) => {
-    //     console.log("大中社区", result);
+    //     console.log("台山社区", result);
     //     this.$store.commit("setDaZhongdata", result.data);
     //   },
     //   (result) => {}
     // );
-    SZZXQ_httpGet(
-      "金湖国际",
-      (result) => {
-        this.$store.commit("setJinghuguoji", result.data);
-        // console.log("金湖国际",result);
-      },
-      (result) => {}
-    );
+    // SZZXQ_httpGet(
+    //   "金湖国际",
+    //   (result) => {
+    //     this.$store.commit("setJinghuguoji", result.data);
+    //     // console.log("金湖国际",result);
+    //   },
+    //   (result) => {}
+    // );
   },
 };
 </script>

shuzhixiangzheng/src/assets/api/Map.js

@@ -219,7 +219,6 @@ class Map{
                 if(w.name=="西门社区")
                 {
                     height=50;
-                    console.log(this._viewer)
                     this._viewer.camera.flyTo({
                         destination:Cesium.Cartesian3.fromDegrees(116.21536139714668,29.735710683444914,210.11715193973072),
                         orientation:{
@@ -252,7 +251,6 @@ class Map{
                     scale:1
                 }
             });
-            console.log(this._viewer)
             }
         });
         // debugger

shuzhixiangzheng/src/components/DaZhongPage.vue

@@ -159,7 +159,7 @@
           this.$store.getters.getDaZhongdata.data
         ) {
           this.dataAll=this.$store.getters.getDaZhongdata.data
-          console.log('--------',this.dataAll);
+         // console.log('--------',this.dataAll);
           clearInterval(clear);
         }
       }, 500);
@@ -231,8 +231,7 @@
       clickjinghuguojiShowFun() {
         this.leftPng_url = left1Png;
         this.rightPng_url = right1Png;
-        console.log(333)
-       
+
         SZZXQ_httpGet("金湖国际",result=>{
             console.log("金湖国际",result)
             this.dataAll=result.data.data;

shuzhixiangzheng/src/components/MainPage.vue

@@ -114,7 +114,6 @@
         SZZSQSY_httpGet(
           name,
           (result) => {
-            console.log('sssssssssssssssssssssssss', name, result);
             this.$store.commit("setDaZhongdata", result.data);
             //this.$store.commit("setSzdata", result.data);
           },
@@ -131,12 +130,18 @@
           window.cesiumMap.addEntity();
         }, 100);
 
-        this.$router.replace("/daZhong");
+        this.$router.replace({
+          path:"/daZhong",
+          query:{imgName:name}
+        });
       },
       toZheji(name) {
         this.changeData(name);
         window.cesiumMap.addGaode();
-        this.$router.replace("/zheJi");
+        this.$router.replace({
+          path:"/zheJi",
+          query:{imgName:name}
+        });
       },
       toXiMen(name) {
         this.changeData(name);
@@ -146,12 +151,18 @@
             id: "click_5",
           },
         });
-        this.$router.replace("/ximen");
+        this.$router.replace({
+          path:"/ximen",
+          query:{imgName:name}
+        });
       },
       toOther(name) {
         this.changeData(name);
         window.cesiumMap.addGaode();
-        this.$router.replace("/other");
+        this.$router.replace({
+          path:"/other",
+          query:{imgName:name}
+        });
       },
     },
   };

shuzhixiangzheng/src/components/MainPageChild/VaccinationPage.vue

@@ -46,7 +46,7 @@ export default {
     };
   },
   mounted() {
-    console.log('-------',this.vaccin);
+   
   },
   methods: {},
 };

shuzhixiangzheng/src/components/OtherChilds/LeftPage.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="leftPage">
-    <img id="dazhong_img" src="../../assets/png/dazhong.png" />
+    <!-- <img id="dazhong_img" src="../../assets/png/dazhong.png" /> -->
+    <img id="dazhong_img" v-if='imgSrc' :src="require('@/assets/png/location/'+imgSrc+'.png')" />
     <div id="viewPage_f">
       <ViewPage :szdata="dataAll.index"></ViewPage>
     </div>
@@ -22,6 +23,8 @@
   import PepoleStatus from "../OtherChilds/PepoleStatus.vue";
   import Dezhizhaihai from "./Dezhizhaihai.vue";
   import PopulationStructure from "./PopulationStructure.vue";
+  
+  
   export default {
     props: ["dataAll", 'isShow'],
     name: "",
@@ -33,9 +36,12 @@
     },
     data() {
       return {
+        imgSrc:''
       };
     },
     mounted() {
+      let temp =this.$route.query.imgName
+      if(temp) this.imgSrc=temp
     //   console.log('拿到数据', this.dataAll);
     //   this.showDZ = localStorage.getItem('showDZ')
     //   console.log("this.showDZ", this.showDZ)

shuzhixiangzheng/src/components/OtherChilds/PepoleStatus.vue

@@ -27,6 +27,7 @@
     },
     watch:{   
       pdata(newVal,oldVal) {
+        
         this.init(newVal);
       }
     },

shuzhixiangzheng/src/components/OtherChilds/PopulationStructure.vue

@@ -18,7 +18,7 @@
     },
     mounted() {
       let clear = setInterval(() => {
-        console.log("this.data", this.psdata)
+       // console.log("this.data", this.psdata)
         if (this.psdata) {
           this.init()
           clearInterval(clear)
@@ -45,8 +45,8 @@
         shadowYData.push(this.psdata.filter(d => d.name == "60-80岁")[0].total);
         shadowYData.push(this.psdata.filter(d => d.name == "80岁以上")[0].total);
 
-        console.log("this.yData", this.yData)
-        console.log(this.shadowYData)
+        // console.log("this.yData", this.yData)
+        // console.log(this.shadowYData)
 
         //#0D53CC
         var color = "#19dfdd";

shuzhixiangzheng/src/components/OtherPage.vue

@@ -94,7 +94,7 @@
           this.$store.getters.getDaZhongdata.data
         ) {
           this.dataAll=this.$store.getters.getDaZhongdata.data
-          console.log('--------',this.dataAll);
+        //  console.log('--------',this.dataAll);
           clearInterval(clear);
         }
       }, 500);

shuzhixiangzheng/src/components/Utils/ThreeDCharts1.vue

@@ -97,7 +97,7 @@ export default {
         document.getElementById("cityGreenLand-charts1")
       );
       // 传入数据生成 option
-      console.log('++++++++++++++++',this.optionData);
+     // console.log('++++++++++++++++',this.optionData);
       this.option = this.getPie3D(this.optionData, 0.8);
       myChart.setOption(this.option);
       //是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
@@ -133,8 +133,7 @@ export default {
           (result) => result.name == params.seriesName
         );
         if (num.length != 0) {
-          console.log(num[0].value);
-          console.log();
+
           document.getElementById("number_1").innerText = num[0].value + "%";
         }
       });

shuzhixiangzheng/src/components/Utils/ThreeDCharts3.vue

@@ -34,11 +34,14 @@
       }
     },
     watch:{   
-      working(newVal,oldVal) {
+      tdata(newVal,oldVal) {
         this.initData();
       }
     },
     mounted() {
+     
+
+
      this.initData();
     },
     methods: {

shuzhixiangzheng/src/components/Utils/ThreeDCharts4.vue

@@ -70,6 +70,7 @@
     },
     watch:{   
       working(newVal,oldVal) {
+       // console.log("working",newVal)
         this.initData()
       }
     },
@@ -179,7 +180,7 @@
           // 	false, false, k, series[i].pieData.value);
           series[i].parametricEquation = this.getParametricEquation(series[i].pieData.startRatio, series[i].pieData
             .endRatio,
-            false, false, k, 20);
+            false, false, k, 10);
           startValue = endValue;
           let bfb = that.fomatFloat(series[i].pieData.value / sumValue, 4);
           legendData.push({

shuzhixiangzheng/src/components/Utils/ThreeDCharts5.vue

@@ -70,8 +70,8 @@
     methods: {
       //数据匹配
       initData() {
-        if (this.education instanceof Array) {
-          console.log("this.education",this.education)
+        if (this.education instanceof Array&& this.education.length==6) {
+      //    console.log("this.education",this.education)
           this.optionData.filter(result => result.name == '文盲')[0].value = +this.education.filter(result => result
             .name ==
             '文盲')[0].rate;
@@ -88,9 +88,15 @@
           this.optionData.filter(result => result.name == '专科')[0].value = +this.education.filter(result => result
             .name ==
             '专科')[0].rate;
+        }else{
+         // this.optionData.filter(result => result.name == '文盲')[0].value =parseFloat(getd("婴儿")) +parseFloat(getd("一年级"))+parseFloat(getd("幼儿园"))
         }
         this.init();
       },
+      getd(name){
+       return this.education.filter(result => result
+            .name ==name)[0].rate
+      },
       init() {
         //构建3d饼状图
         let myChart = echarts.init(document.getElementById('cityGreenLand-charts4'));

shuzhixiangzheng/src/components/XiMenPage.vue

@@ -42,7 +42,7 @@
           this.$store.getters.getDaZhongdata.data
         ) {
           this.dataAll=this.$store.getters.getDaZhongdata.data
-          console.log('--------',this.dataAll);
+        //  console.log('--------',this.dataAll);
           clearInterval(clear);
         }
       }, 500);

shuzhixiangzheng/src/components/ZheJiPage.vue

@@ -121,7 +121,7 @@ export default {
           this.$store.getters.getDaZhongdata.data
         ) {
           this.dataAll=this.$store.getters.getDaZhongdata.data
-          console.log('--------',this.dataAll);
+       //   console.log('--------',this.dataAll);
           clearInterval(clear);
         }
       }, 500);