Merge branch 'master' of http://172.16.90.201:3000/castgroup_forest/castgroup_bigscreen

src/assets/scss/common.scss

@@ -24,6 +24,16 @@ body {
 .page-padding-left {
     padding-left: var(--padding-left);
 }
+
+//更改下拉框颜色
+// .el-select-dropdown.el-popper{
+//     background-color: #ff0;
+//     border-color: red;
+//     .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
+//         background-color: #F5F;
+//     }
+// }
+
 @mixin mbg($o) {
     background-color: rgba(0, 166, 208, $o);
 }

src/components/alarm.vue

@@ -43,7 +43,7 @@
 position: fixed;
     left: 0;
     right: 0;
-    top: calc( var(--header-height) + 24px);
+    top: calc( var(--header-height) + 34px + 40px );
 }
 .alarm {
      position: relative;

src/components/pickerAddr.vue

@@ -36,7 +36,7 @@
         ></el-option>
       </el-select>
     </div>
-    <div class="select-wrap">
+    <div class="select-wrap" @change="cityChange($event,'street')">
       乡：
       <el-select v-model="selectStreet" placeholder="请选择" >
         <el-option
@@ -79,7 +79,10 @@ export default {
     },
     '$store.state.addr.selectDistrict'(val) {
       this.selectDistrict = val
-    }
+    },
+    '$store.state.addr.selectStreet'(val) {
+      this.selectStreet = val
+    },
   },
   computed: {
     // 引入getters中的计算属性，需要在 computed 中引入
@@ -99,10 +102,13 @@ export default {
       'changeSelectStreet'
     ]),
     cityChange(val, level) {
+      console.log('level',level);
       if (level == 'city') {
         this.changeSelectCity({ value: val.value, label: val.label,areaId:val.areaId });
       } else if (level == 'district') {
         this.changeSelectDistrict({ value: val.value, label: val.label,areaId:val.areaId });
+      } else if (level == 'street') {
+        this.changeSelectStreet({ value: val.value, label: val.label,areaId:val.areaId });
       }
       console.log(val);
       this.parentId = val.value.substring(0, 6);

src/service/index.js

@@ -93,11 +93,11 @@ export const page6echarts01 = (data) =>
         prefixUrl: 'api2',
     })
 
-// export const page6numerical = () =>
-//     callApi({
-//         url: 'event/statis',
-//         prefixUrl: 'api2',
-//     })
+export const page6numerical = () =>
+    callApi({
+        url: 'event/statis',
+        prefixUrl: 'api2',
+    })
 
 // 树种
 export const page2echarts01 = (data) =>

src/store/addr/index.js

@@ -63,10 +63,17 @@ const addr = {
       console.log('searchArea', params)
       searchApi({ parentId: params.parentId }).then(res => {
         if (params.mapLevel == "city") {
+          console.log('111');
           commit("changeDistrictList", res.data);
+
+          commit("changeSelectDistrict", {});
+          commit("changeSelectStreet", {});
         } else if (params.mapLevel == "district") {
+          console.log('222');
           commit("changeStreetList", res.data);
+          commit("changeSelectStreet", {});
         } else {
+          console.log('333');
           commit("changeCityList", res.data);
         }
         commit("changeParentId", params)

src/views/index.vue

@@ -125,7 +125,6 @@
         scrollBoardKey:Date.now(),
         scrollBoardConfig:scrollBoardSchema,
         page1numerical:[
-          {name:'储蓄量',number:'2309',unit:'立方米'},
           {name:'储蓄量',number:'2309',unit:'立方米'},
           {name:'占地面积',number:'55.4',unit:'万亩'}
         ],
@@ -150,17 +149,10 @@
       };
     },
     created(){
-      //第一屏统计
-      page1numerical().then(res=>{
-        // console.log('res',res);
-        this.page1numerical = res.data;
-      }).catch(err=>{
-        console.log('echarts01 err',err);
-      })
-      this.getPage1echarts01();
-      this.getPage1echarts02();
+
+      this.getPageData();
+
       this.getRightScrollData();
-      this.getAlarmData();
 
       // this.getPage2echarts01();
       // this.getPage2echarts02();
@@ -177,20 +169,20 @@
           }
       },
       '$store.state.addr.selectCity'(val) {
-        console.log('this.$store.state.addr',this.$store.state.addr);
-        console.log('vuexSelectCity',val);
+        // console.log('this.$store.state.addr',this.$store.state.addr);
+        // console.log('vuexSelectCity',val);
         this.getPageData();
          
       },
       '$store.state.addr.selectDistrict'(val) {
-        console.log('this.$store.state.addr',this.$store.state.addr);
-        console.log('vuexSelectDistrict',val);
+        // console.log('this.$store.state.addr',this.$store.state.addr);
+        // console.log('vuexSelectDistrict',val);
         this.getPageData();
          
       },
       '$store.state.addr.selectStreet'(val) {
-        console.log('this.$store.state.addr',this.$store.state.addr);
-        console.log('vuexSelectStreet',val);
+        // console.log('this.$store.state.addr',this.$store.state.addr);
+        // console.log('vuexSelectStreet',val);
         this.getPageData();
          
       },
@@ -217,6 +209,7 @@
       },
       getPageData(){
         if(this.page==1){
+          this.getPage1numerical();
           this.getPage1echarts01();
           this.getPage1echarts02();
         }else if(this.page==2){
@@ -234,13 +227,21 @@
           this.getAlarmData();
         }
       },
+      getPage1numerical(){
+        page1numerical().then(res=>{
+          // console.log('res',res);
+          this.page1numerical = res.data;
+        }).catch(err=>{
+          console.log('echarts01 err',err);
+        })
+      },
       getPage1echarts01(){
         let param = {
           cityId:this.$store.state.addr.selectCity.areaId,
           countyId:this.$store.state.addr.selectDistrict.areaId,
           townId:this.$store.state.addr.vuexSelectStreet.areaId,
         }
-        console.log('cityId',param.cityId);
+        // console.log('cityId',param.cityId);
         page1echarts01(param).then(res=>{
           this.page1Char1.xAxis.data = res.data.map(item => {
             return item.name
@@ -260,7 +261,7 @@
           countyId:this.$store.state.addr.selectDistrict.areaId,
           townId:this.$store.state.addr.selectStreet.areaId,
         }
-        console.log('cityId',param.cityId);
+        // console.log('cityId',param.cityId);
         page1echarts02(param).then(res=>{
           this.page1Char2.xAxis.data = res.data.map(item => {
             return item.name