From a1da87253c48c65b4a12d7f7d5850dd3f730be87 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Wed, 20 Jul 2022 08:54:01 +0800
Subject: [PATCH] 首页添加农场选择
---
src/views/wel/index.vue | 48 +++++++++++++++++++++---
src/views/wel/land.vue | 29 ++++++++++++++
2 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 6b249e4..56b3a00 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -2,8 +2,18 @@
<div class="home">
<div class="left">
<div class="farm-info">
- <div class="farm-title">农场概览</div>
- <div class="statis">
+ <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">
<div class="echarts-statis">
<el-progress
type="circle"
@@ -175,6 +185,7 @@
import { getFarmingCount, getFarmingStatis } from "@/api/farm/farmingrecord"
import { selectCount } from "@/api/land/land"
import { StockCount } from "@/api/stock/stock"
+import {getFarmList} from "@/api/farm/farm";
import recovery from "./recovery.vue"
import land from "./land.vue"
import plant from "./plant.vue"
@@ -195,6 +206,8 @@
stockList: [],
isFarmingDetail: false,
landInfo: {},
+ farm:{id:11},
+ farmList:[],
customColor: "#5ABF78",
total: 0,
farmingCount: 0,
@@ -213,7 +226,11 @@
computed: {
...mapGetters(["userInfo"]),
},
- created () {
+ created () {
+ //初始化农场信息
+ let farmId = parseInt(this.userInfo.farmId)
+ this.farm.id = farmId
+ this.initData(this.userInfo.tenant_id);
//地块使用率统计
this.getCountStatis()
//采收列表
@@ -224,7 +241,25 @@
this.getFarmingStatis()
this.StockCount()
},
- methods: {
+ methods: {
+ //获取农场信息
+ initData(tenantId) {
+ const data = {
+ deptId:this.userInfo.dept_id
+ }
+ getFarmList(data).then(res => {
+ this.farmList = this.farmList.concat(res.data.data)
+ });
+ },
+ //农场下拉框change事件
+ farmChange(data) {
+ this.farm.id = data
+ //更新农场数据
+ //农场概览
+ this.getCountStatis ()
+ //当前农场种养品种
+ this.onLoad()
+ },
//本年农事操作记录
getFarmingCount () {
var that = this
@@ -253,7 +288,8 @@
//地块使用率统计
getCountStatis () {
var that = this
- selectCount(this.userInfo.farmId).then((res) => {
+ console.log('this.farm.id:',this.farm.id)
+ selectCount(this.farm.id).then((res) => {
var data = res.data.data
that.landInfo = data
})
@@ -267,7 +303,7 @@
status: 1,
}
params['tenantId'] = this.userInfo.tenant_id
- params['farmId'] = this.userInfo.farmId
+ params['farmId'] = this.farm.id
getList(1, 10, Object.assign(params)).then((res) => {
const data = res.data.data
this.farmPlanList = data.records
diff --git a/src/views/wel/land.vue b/src/views/wel/land.vue
index e34ea83..a29b8a8 100644
--- a/src/views/wel/land.vue
+++ b/src/views/wel/land.vue
@@ -27,6 +27,7 @@
import { getStrainList } from "@/api/farmplant/strain";
import {add} from "@/api/land/land";
import getMapDataInThere from "./getMapDataInThere.vue";
+import {getFarmList} from "@/api/farm/farm";
export default {
components: {
getMapDataInThere
@@ -47,6 +48,22 @@
required: true,
message: "请输入地块名称",
trigger: "blur"
+ }]
+ },
+ {
+ label: "所属农场",
+ prop: "farmId",
+ type: "tree",
+ dicData: [],
+ props: {
+ label: "farmName",
+ value:"id"
+ },
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择所属农场",
+ trigger: "click"
}]
},
{
@@ -94,7 +111,19 @@
computed: {
...mapGetters(["userInfo", "permission", "polygons"]),
},
+ mounted() {
+ this.initData(this.userInfo.tenant_id);
+ },
methods: {
+ initData(tenantId) {
+ const data = {
+ deptId:this.userInfo.dept_id
+ }
+ getFarmList(data).then(res => {
+ const column = this.findObject(this.option.column, "farmId");
+ column.dicData = res.data.data;
+ });
+ },
//初始化
init() {
//计算当前时间
--
Gitblit v1.9.3