Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhny_web

guoshilong

2022-08-12 c6a2875daf7935bc03360c16efac5d04be405b60

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhny_web

 src/page/index/top/top-search2.vue

@@ -24,22 +24,20 @@
      };
    },
    created() {

      getFarmList().then(res => {
      let ids = ''
      if (!this.userInfo.role_name === "administrator") {
        ids = this.userInfo.farmId
      }
      let params = {
        ids : ids
      }
      getFarmList(params).then(res => {
        this.farmList = res.data.data
      })
      this.$nextTick(() => {
        this.farm.id = parseInt(this.userInfo.farmId.split(',')[0])
        this.$store.commit("SET_FARMID", this.farm.id )
      })
    },

    watch: {
      // 'farm.id':{
      //   handler (newName, oldName) {
      //     console.log('obj.a changed',newName,oldName)
      //   }
      // }
    },
    computed: {
      ...mapGetters(['userInfo', '$farmId'])