Browse Source

更改颜色

gcz 3 years ago
parent
commit
5b71b635b2
2 changed files with 36 additions and 14 deletions
  1. 5 4
      src/components/pickerAddr.vue
  2. 31 10
      src/views/index.vue

+ 5 - 4
src/components/pickerAddr.vue

@@ -1,5 +1,5 @@
 <!--
- * @LastEditors: wangcc
+ * @LastEditors: gcz
 -->
 <template>
   <div class="pickerAddr u-flex">
@@ -97,6 +97,7 @@ export default {
 
 <style lang='scss' scoped>
 .pickerAddr {
+  color: var(--main-color);
   text-align: right;
   margin-bottom: 1vh;
   .select-wrap:not(:last-of-type) {
@@ -105,9 +106,9 @@ export default {
   .el-select {
     width: 8vw;
     /deep/ .el-input__inner {
-      color: rgba(255, 255, 255, 1);
-      background: rgba(38, 80, 179, 0.5);
-      border: 2px solid rgba(38, 80, 179, 1);
+      color: var(--main-color);
+      background: transparent;
+      border: 1px solid var(--main-color);
       &::-webkit-input-placeholder {
         color: #eee;
       }

+ 31 - 10
src/views/index.vue

@@ -95,6 +95,7 @@
   import page2Char2Schema from '../dataSchema/page2Char2Schema';
   import page6Char1Schema from '../dataSchema/page6Char1Schema';
   
+  
 
   // import { provinceAndCityData, regionData, provinceAndCityDataPlus, regionDataPlus, CodeToText, TextToCode } from 'element-china-area-data';
   export default {
@@ -165,7 +166,7 @@
     },
     mounted(){
       setInterval(() => {
-        this.getPageData();    
+        this.getPageData();
       }, 111115000);      
     },
     watch: {
@@ -174,6 +175,24 @@
            debounce(this.xiaobansearch, 500, false)
           }
       },
+      '$store.state.addr.vuexSelectCity'(val) {
+        console.log('this.$store.state.addr',this.$store.state.addr);
+        console.log('vuexSelectCity',val);
+        this.getPageData();
+         
+      },
+      '$store.state.addr.vuexSelectDistrict'(val) {
+        console.log('this.$store.state.addr',this.$store.state.addr);
+        console.log('vuexSelectDistrict',val);
+        this.getPageData();
+         
+      },
+      '$store.state.addr.vuexSelectStreet'(val) {
+        console.log('this.$store.state.addr',this.$store.state.addr);
+        console.log('vuexSelectStreet',val);
+        this.getPageData();
+         
+      },
     },
     methods: {
       addrChange(value){
@@ -209,10 +228,11 @@
       },
       getPage1echarts01(){
         let param = {
-          cityId:this.vuexSelectCity,
-          countyId:this.vuexSelectDistrict,
-          townId:this.vuexSelectStreet,
+          cityId:this.$store.state.addr.vuexSelectCity.value,
+          countyId:this.$store.state.addr.vuexSelectDistrict.value,
+          townId:this.$store.state.addr.vuexSelectStreet.value,
         }
+        console.log('cityId',param.cityId);
         page1echarts01(param).then(res=>{
           this.page1Char1.xAxis.data = res.data.map(item => {
             return item.name
@@ -228,10 +248,11 @@
       },
       getPage1echarts02(){
         let param = {
-          cityId:this.vuexSelectCity,
-          countyId:this.vuexSelectDistrict,
-          townId:this.vuexSelectStreet,
+          cityId:this.$store.state.addr.vuexSelectCity.value,
+          countyId:this.$store.state.addr.vuexSelectDistrict.value,
+          townId:this.$store.state.addr.vuexSelectStreet.value,
         }
+        console.log('cityId',param.cityId);
         page1echarts02(param).then(res=>{
           this.page1Char2.xAxis.data = res.data.map(item => {
             return item.name
@@ -274,7 +295,7 @@
       getPage2echarts01(){
         let param = {
           smallNumber:this.xiaobaninput,
-          cityId:this.vuexSelectCity,
+          cityId:this.$store.state.addr.vuexSelectCity,
           countyId:this.vuexSelectDistrict,
           townId:this.vuexSelectStreet,
         }
@@ -291,7 +312,7 @@
       getPage2echarts02(){
         let param = {
           smallNumber:this.xiaobaninput,
-          cityId:this.vuexSelectCity,
+          cityId:this.$store.state.addr.vuexSelectCity,
           countyId:this.vuexSelectDistrict,
           townId:this.vuexSelectStreet,
         }
@@ -406,7 +427,7 @@
       },
        getPage6echarts01(){
         let param = {
-          cityId:this.vuexSelectCity,
+          cityId:this.$store.state.addr.vuexSelectCity,
           countyId:this.vuexSelectDistrict,
           townId:this.vuexSelectStreet,
         }