From 912994d10fd30dd73f08781777eb794b5ea5eaa9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 08 Jul 2022 14:10:40 +0800
Subject: [PATCH] 大屏接口对接
---
package-lock.json | 16 ++++----
src/views/manage/index.vue | 47 +++++------------------
2 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f97ceaa..e82edb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1947,7 +1947,7 @@
},
"ansi-styles": {
"version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
@@ -1957,7 +1957,7 @@
},
"chalk": {
"version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
@@ -1968,7 +1968,7 @@
},
"color-convert": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
@@ -1978,21 +1978,21 @@
},
"color-name": {
"version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
@@ -2013,7 +2013,7 @@
},
"supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
@@ -2023,7 +2023,7 @@
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index 3a11efb..bd593a6 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -214,44 +214,16 @@
</div>
<div class="lists-box">
- <div>
+ <div v-for="(item,index) in farminList" :key="index">
<div class="t-border"></div>
<div class="t-item">
- <div>施肥</div>
- <div>2022-06-31</div>
+ <div>{{item.typeName}}</div>
+ <div>{{item.time}}</div>
</div>
<div class="b-item">
<div>水稻</div>
- <div>林术</div>
- <div>株良镇田南村5号地块</div>
- </div>
- <div class="b-border"></div>
- </div>
-
- <div>
- <div class="t-border"></div>
- <div class="t-item">
- <div>施肥</div>
- <div>2022-06-31</div>
- </div>
- <div class="b-item">
- <div>水稻</div>
- <div>王刚</div>
- <div>株良镇田南村3号地块</div>
- </div>
- <div class="b-border"></div>
- </div>
-
- <div>
- <div class="t-border"></div>
- <div class="t-item">
- <div>施肥</div>
- <div>2022-06-31</div>
- </div>
- <div class="b-item">
- <div>玉米</div>
- <div>李建国</div>
- <div>株良镇田南村1号地块</div>
+ <div>管理员</div>
+ <div>{{item.landName}}</div>
</div>
<div class="b-border"></div>
</div>
@@ -298,6 +270,8 @@
salaNumQN: [],
// 统计任务总数
taskNum: [],
+ // 农事记录
+ farminList: [],
nzOrNcp: 'ncp',
trpOrNcp: 'trp'
}
@@ -876,11 +850,12 @@
// 农事记录
farmingRecords () {
var params = {}
- params.codes = '000000'
+ params.tenantId = '000000'
params.deptId = '1123598813738675201'
- params.year = '2022'
+ params.current = '1'
+ params.size = '3'
farmingRecords(Object.assign(params)).then((res) => {
-
+ this.farminList = res.data.data.records
})
}
}
--
Gitblit v1.9.3