From b8ef6f8946de7dc00d9711eb6ba9d1aefe24cde1 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 31 Aug 2022 11:09:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web
---
src/page/index/top/top-search2.vue | 135 ++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 63 deletions(-)
diff --git a/src/page/index/top/top-search2.vue b/src/page/index/top/top-search2.vue
index a71fafc..8642f57 100644
--- a/src/page/index/top/top-search2.vue
+++ b/src/page/index/top/top-search2.vue
@@ -1,86 +1,95 @@
<template>
- <el-select class="top-search" v-model="farm.id" placeholder="请选择所属农场" filterable @change="farmChange">
+ <el-select
+ class="top-search"
+ v-model="farm.id"
+ placeholder="请选择所属农场"
+ filterable
+ @change="farmChange"
+ >
<el-option
v-for="item in farmList"
:key="item.id"
:label="item.farmName"
- :value="item.id">
+ :value="item.id"
+ >
</el-option>
</el-select>
</template>
<script>
- import config from "../sidebar/config.js";
- import {mapGetters} from "vuex";
- import {getFarmList} from "@/api/farm/farm";
+import config from "../sidebar/config.js";
+import { mapGetters } from "vuex";
+import { getFarmList } from "@/api/farm/farm";
- export default {
- data() {
- return {
- config: config,
- value: "",
- farm:{id:11},
- farmList:[]
- };
- },
- created() {
- 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 )
- })
- },
- computed: {
- ...mapGetters(['userInfo', '$farmId'])
- },
- methods: {
+export default {
+ name: "top-search",
+ data() {
+ return {
+ config: config,
+ value: "",
+ farm: { id: 11 },
+ farmList: [],
+ };
+ },
+ created() {
+ this.$EventBus.$on("setFarmId", this.farmChange);
- farmChange(data) {
- this.farm.id = data
- this.$store.commit("SET_FARMID", data)
- }
+ 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);
+ });
+ },
+ computed: {
+ ...mapGetters(["userInfo", "$farmId"]),
+ },
+ methods: {
+ farmChange(data) {
+ this.farm.id = data;
+ this.$store.commit("SET_FARMID", data);
+ },
+ },
+};
</script>
<style lang="scss">
- .my-autocomplete {
- li {
- line-height: normal;
- padding: 7px;
+.my-autocomplete {
+ li {
+ line-height: normal;
+ padding: 7px;
- .icon {
- margin-right: 5px;
- display: inline-block;
- vertical-align: middle;
- }
+ .icon {
+ margin-right: 5px;
+ display: inline-block;
+ vertical-align: middle;
+ }
- .name {
- display: inline-block;
- text-overflow: ellipsis;
- overflow: hidden;
- vertical-align: middle;
- }
+ .name {
+ display: inline-block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ vertical-align: middle;
+ }
- .addr {
- padding-top: 5px;
- width: 100%;
- font-size: 12px;
- color: #b4b4b4;
- }
+ .addr {
+ padding-top: 5px;
+ width: 100%;
+ font-size: 12px;
+ color: #b4b4b4;
+ }
- .highlighted .addr {
- color: #ddd;
- }
+ .highlighted .addr {
+ color: #ddd;
}
}
+}
</style>
--
Gitblit v1.9.3