From 072f6d897bffde4d6964e117d0366b5c3af63164 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 11 Aug 2022 15:28:43 +0800
Subject: [PATCH] 增加头部导航栏选择农场
---
src/views/wel/index.vue | 39 ++++++++----
src/store/modules/user.js | 4 +
src/router/views/index.js | 2
src/page/index/top/index.vue | 2
src/store/getters.js | 3
src/page/index/top/top-search2.vue | 88 +++++++++++++++++++++++++++++
6 files changed, 121 insertions(+), 17 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index e7cb475..f6a128b 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -124,7 +124,7 @@
import { fullscreenToggel, listenfullscreen } from "@/util/util"
import topLock from "./top-lock"
import topMenu from "./top-menu"
-import topSearch from "./top-search"
+import topSearch from "./top-search2"
import topTheme from "./top-theme"
import topLogs from "./top-logs"
import topColor from "./top-color"
diff --git a/src/page/index/top/top-search2.vue b/src/page/index/top/top-search2.vue
new file mode 100644
index 0000000..3e60515
--- /dev/null
+++ b/src/page/index/top/top-search2.vue
@@ -0,0 +1,88 @@
+<template>
+ <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">
+ </el-option>
+ </el-select>
+</template>
+
+<script>
+ 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() {
+
+ getFarmList().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'])
+ },
+ 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;
+
+ .icon {
+ margin-right: 5px;
+ display: inline-block;
+ 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;
+ }
+
+ .highlighted .addr {
+ color: #ddd;
+ }
+ }
+ }
+</style>
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8cb2bf4..ff1b708 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -349,4 +349,4 @@
}
]
},
-]
\ No newline at end of file
+]
diff --git a/src/store/getters.js b/src/store/getters.js
index 0f64d24..834a8ab 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,6 +16,7 @@
tagList: state => state.tags.tagList,
tagWel: state => state.tags.tagWel,
token: state => state.user.token,
+ $farmId: state => state.user.$farmId,
roles: state => state.user.roles,
permission: state => state.user.permission,
menu: state => state.user.menu,
@@ -29,4 +30,4 @@
polygons: state => state.common.polygons,
polygonsFarm: state => state.common.polygonsFarm,
}
-export default getters
\ No newline at end of file
+export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index faab908..857110c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,6 +43,7 @@
menuAll: getStore({name: 'menuAll'}) || [],
token: getStore({name: 'token'}) || '',
refreshToken: getStore({name: 'refreshToken'}) || '',
+ $farmId: 0
},
actions: {
//根据用户名登录
@@ -203,6 +204,9 @@
},
},
mutations: {
+ SET_FARMID(state, farmId) {
+ state.$farmId = farmId
+ },
SET_TOKEN: (state, token) => {
setToken(token);
state.token = token;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index bf366e8..5b8c355 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -3,16 +3,16 @@
<div class="left">
<div class="farm-info">
<div class="farm-title">农场概览</div>
- <div class="statis" style="padding-left: 50px">
- <el-select v-model="farm.id" placeholder="请选择所属农场" filterable @change="farmChange">
- <el-option
- v-for="item in farmList"
- :key="item.id"
- :label="item.farmName"
- :value="item.id">
- </el-option>
- </el-select>
- </div>
+<!-- <div class="statis" style="padding-left: 50px">-->
+<!-- <el-select v-model="farm.id" placeholder="请选择所属农场" filterable @change="farmChange">-->
+<!-- <el-option-->
+<!-- v-for="item in farmList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.farmName"-->
+<!-- :value="item.id">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
<div class="statis">
<div class="echarts-statis">
<el-progress
@@ -211,7 +211,7 @@
stockList: [],
isFarmingDetail: false,
landInfo: {},
- farm:{id:11},
+ farm:{},
farmList:[],
customColor: "#5ABF78",
total: 0,
@@ -230,12 +230,12 @@
}
},
computed: {
- ...mapGetters(["userInfo"]),
+ ...mapGetters(["userInfo","$farmId"]),
},
created () {
//初始化农场信息
- let farmId = parseInt(this.userInfo.farmId)
- this.farm.id = farmId
+ // let farmId = this.userInfo.$farmId
+ this.farm.id = this.$farmId
this.initData(this.userInfo.tenant_id);
//地块使用率统计
this.getCountStatis()
@@ -247,6 +247,17 @@
this.getFarmingStatis()
this.StockCount()
},
+ watch: {
+ '$farmId':{
+ handler (newName, oldName) {
+ this.farm.id = newName
+ //农场概览 地块使用率
+ this.getCountStatis ()
+ //当前农场种养品种
+ this.onLoad()
+ }
+ }
+ },
methods: {
//获取农场信息
initData(tenantId) {
--
Gitblit v1.9.3