From 999a85f35b8b2f36fd754bb8a474f07e8876ef8a Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 27 Oct 2023 18:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E6=88=B7=E7=9B=B8=E5=85=B3=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/animal.js | 7 +-
api/chick.js | 2 +-
components/animal/detailCard.vue | 184 +
components/animal/farmersCard.vue | 79 +
components/aquatic/pondCard.vue | 114 +
components/index/chick.vue | 8 +-
components/index/cultivation.vue | 11 +-
components/index/fishing.vue | 5 +-
components/myTable/index.vue | 11 +-
components/plant/landInfo.vue | 1 -
components/poultry/detailCard.vue | 185 +
components/poultry/farmersCard.vue | 80 +
node_modules/.vite/deps/_metadata.json | 6 +-
pages.json | 8 +
pages/aquatic/detail.vue | 54 +-
pages/aquatic/imgList.vue | 7 +-
pages/detail/plant.vue | 26 +-
pages/feedIng/SingleDetail.vue | 15 +-
pages/feedIng/allRecordTable.vue | 84 +
pages/feedIng/allRecording.vue | 17 +-
pages/feedIng/feedDetail.vue | 43 +-
pages/feedIng/feedList.vue | 8 +-
pages/feedIng/histroyFeed.vue | 35 +-
pages/growRecord/index.vue | 420 +-
pages/poultry/SingleDetail.vue | 6 +-
pages/poultry/feedDetail.vue | 6 +-
pages/poultry/feedList.vue | 14 +-
pages/records/index.vue | 19 +-
.../dist/dev/app-plus/app-config-service.js | 4 +-
unpackage/dist/dev/app-plus/app-service.js | 7208 +++++++++--------
unpackage/dist/dev/app-plus/manifest.json | 2 +-
.../dist/dev/app-plus/pages/index/index.css | 72 +
32 files changed, 5299 insertions(+), 3442 deletions(-)
create mode 100644 components/animal/detailCard.vue
create mode 100644 components/animal/farmersCard.vue
create mode 100644 components/aquatic/pondCard.vue
create mode 100644 components/poultry/detailCard.vue
create mode 100644 components/poultry/farmersCard.vue
create mode 100644 pages/feedIng/allRecordTable.vue
diff --git a/api/animal.js b/api/animal.js
index 6655a2d..0f56c4c 100644
--- a/api/animal.js
+++ b/api/animal.js
@@ -17,4 +17,9 @@ export const animalPicListAPI = (data) => syhttp.get('/AnimalBreed/animalPicList
// 上传动物图片
export const addAnimalPicAPI = (data) => syhttp.post('/AnimalBreed/addAnimalPic', data)
// 更新动物饲养状态
-export const animalStatusAPI = (data) => syhttp.post('/AnimalBreed/animalStatus', data)
\ No newline at end of file
+export const animalStatusAPI = (data) => syhttp.post('/AnimalBreed/animalStatus', data)
+// 动物历史养殖记录列表
+export const animalChangeListAPI = (data) => syhttp.get('/AnimalBreed/animalChangeList', data)
+// 标记为出栏
+//
+export const animalSellAPI = (data) => syhttp.post('/AnimalBreed/animalSell', data)
\ No newline at end of file
diff --git a/api/chick.js b/api/chick.js
index 34634a0..a723da0 100644
--- a/api/chick.js
+++ b/api/chick.js
@@ -11,7 +11,7 @@ export const addAnimalAPI = (data) => syhttp.post('/PoultryBreed/addPoultry', da
// 操作列表
export const actionsAPI = (data) => syhttp.get('/user/actions', data)
// 操作列表
-export const animalInfoAPI = (data) => syhttp.get('/AnimalBreed/animalInfo', data)
+export const animalInfoAPI = (data) => syhttp.get('/PoultryBreed/poultryInfo', data)
// 图片列表
export const animalPicListAPI = (data) => syhttp.get('/PoultryBreed/poultryPicList', data)
// 上传动物图片
diff --git a/components/animal/detailCard.vue b/components/animal/detailCard.vue
new file mode 100644
index 0000000..fd8b413
--- /dev/null
+++ b/components/animal/detailCard.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+ 刷新时间:{{dateFn()}}
+
+
+ 查看历史条件
+
+
+
+ 上传新的种植情况
+
+
+
+
+
+
+ 溯源码: {{animal_detail.animal_code}}
+
+
+
+
+ 养殖品种: {{animal_detail.animal_kind}}
+
+
+ 年龄: {{animal_detail.animal_age}}
+
+
+
+
+ 养殖类型: {{animal_detail.animal_breed}}
+
+
+ 体重:{{animal_detail.animal_weight}}
+
+
+
+
+
+
+
+
+ 当前养殖状态
+
+
+ 健康
+
+
+ 怀孕中
+
+
+ 可出栏
+
+
+ 生病隔离中
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/animal/farmersCard.vue b/components/animal/farmersCard.vue
new file mode 100644
index 0000000..712b88a
--- /dev/null
+++ b/components/animal/farmersCard.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+ 农户名称: {{userInfo.name}}
+
+
+
+
+ 种养殖类型: 养殖户
+
+
+ 养殖头数: {{userInfo.animal_detail.total_count}}头
+
+
+
+
+ 土地面积:{{userInfo.total_land_area}}亩
+
+
+ 公: {{userInfo.animal_detail.male_count}}头
+
+
+
+
+ 养殖种类: {{userInfo.animal_detail.kind[0]}},{{userInfo.animal_detail.kind[1]}}
+
+
+ 母: {{userInfo.animal_detail.maternal_count}}头
+
+
+
+
+ 具体种类: {{userInfo.animal_detail.breed[0]}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/aquatic/pondCard.vue b/components/aquatic/pondCard.vue
new file mode 100644
index 0000000..75614ba
--- /dev/null
+++ b/components/aquatic/pondCard.vue
@@ -0,0 +1,114 @@
+
+
+
+
+ 农户名称: ???
+
+
+
+ 溯源码: {{headData.source_code}}
+
+
+
+
+
+ 种养殖类型: 养殖户
+
+
+ 养殖数量: {{headData.total_num}}
+
+
+
+
+ 土地面积: 20亩
+
+
+ 草鱼鱼苗: 的划分等级
+
+
+
+
+ 养殖种类: {{headData.kind[0]}},{{headData.kind[1]}},{{headData.kind[2]}}
+
+
+ 鲫鱼鱼苗: 的划分等级
+
+
+
+
+
+ 具体种类: {{headData.breed[0]}},{{headData.breed[1]}},{{headData.breed[2]}}
+
+
+
+ 添加水产养殖
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/index/chick.vue b/components/index/chick.vue
index 7d2c187..e4d0f0a 100644
--- a/components/index/chick.vue
+++ b/components/index/chick.vue
@@ -1,6 +1,6 @@
-
+
+
@@ -90,7 +91,7 @@
{{index}}
-
+
更新{{index.slice(0,-2)}}
@@ -158,6 +159,7 @@
reactive
} from "vue"
import myTable from "@/components/myTable/index.vue"
+ import farmersCard from "@/components/poultry/farmersCard.vue"
import {
onLoad
} from "@dcloudio/uni-app"
diff --git a/components/index/cultivation.vue b/components/index/cultivation.vue
index e57f98a..5af203a 100644
--- a/components/index/cultivation.vue
+++ b/components/index/cultivation.vue
@@ -1,6 +1,6 @@
-
+
+
@@ -87,11 +88,12 @@
{{index}}
-
+
更新{{index.slice(0,-2)}}
-
+ >
@@ -151,6 +153,7 @@
animalEnvDataAPI,
actionsAPI
} from "@/api/animal.js"
+ import farmersCard from "@/components/animal/farmersCard.vue"
const props = defineProps({
userInfo: Object
})
diff --git a/components/index/fishing.vue b/components/index/fishing.vue
index 14aa0ac..907a9a0 100644
--- a/components/index/fishing.vue
+++ b/components/index/fishing.vue
@@ -10,7 +10,10 @@
农户名称: {{userInfo.name}}
- 种养殖类型: 种植户
+ 种养殖类型: 养殖户
+
+
+
土地面积: {{userInfo.total_land_area}}亩
diff --git a/components/myTable/index.vue b/components/myTable/index.vue
index 18a16f0..0859555 100644
--- a/components/myTable/index.vue
+++ b/components/myTable/index.vue
@@ -46,11 +46,18 @@
}
const objFn = (obj) => {
- for (const [key, value] of Object.entries(JSON.parse(obj))) {
- return (`${key}: ${value}`);
+ if (typeof(obj) == 'object') {
+ for (const [key, value] of Object.entries((obj))) {
+ return (`${key}: ${value}`);
+ }
+ } else {
+ for (const [key, value] of Object.entries(JSON.parse(obj))) {
+ return (`${key}: ${value}`);
+ }
}
+
}
diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue
index bc165de..eb03505 100644
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@@ -74,7 +74,6 @@
})
}
}, {
- // 页面加载会先执行一次
immediate: true
})
diff --git a/components/poultry/detailCard.vue b/components/poultry/detailCard.vue
new file mode 100644
index 0000000..92eace6
--- /dev/null
+++ b/components/poultry/detailCard.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+ 刷新时间:{{dateFn()}}
+
+
+ 查看历史条件
+
+
+
+ 上传新的种植情况
+
+
+
+
+
+
+ 溯源码: {{animal_detail.code}}
+
+
+
+
+ 养殖品种: {{animal_detail.kind}}
+
+
+ 年龄: {{animal_detail.age}}
+
+
+
+
+ 养殖类型: {{animal_detail.breed}}
+
+
+ 体重:{{animal_detail.weight}}
+
+
+
+
+
+
+
+
+ 当前养殖状态
+
+
+ 健康
+
+
+ 怀孕中
+
+
+ 可出栏
+
+
+ 生病隔离中
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/poultry/farmersCard.vue b/components/poultry/farmersCard.vue
new file mode 100644
index 0000000..e87c012
--- /dev/null
+++ b/components/poultry/farmersCard.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+ 农户名称: {{userInfo.name}}
+
+
+
+
+ 种养殖类型: 养殖户
+
+
+ 养殖头数: {{userInfo.poultry_detail.total_count}}头
+
+
+
+
+ 土地面积:{{userInfo.total_land_area}}亩
+
+
+ 公: {{userInfo.poultry_detail.male_count}}头
+
+
+
+
+ 养殖种类: {{userInfo.poultry_detail.kind[0]}},{{userInfo.poultry_detail.kind[1]}}
+
+
+ 母: {{userInfo.poultry_detail.maternal_count}}头
+
+
+
+
+ 具体种类: {{userInfo.poultry_detail.breed[0]}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json
index 33a3dee..b604ee4 100644
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@@ -1,11 +1,11 @@
{
- "hash": "a1d62a80",
- "browserHash": "90e08141",
+ "hash": "25035236",
+ "browserHash": "1466e902",
"optimized": {
"uview-plus": {
"src": "../../uview-plus/index.js",
"file": "uview-plus.js",
- "fileHash": "b7892bb7",
+ "fileHash": "a0f19e5d",
"needsInterop": false
}
},
diff --git a/pages.json b/pages.json
index da6e15b..6d0e16a 100644
--- a/pages.json
+++ b/pages.json
@@ -113,6 +113,14 @@
"navigationBarBackgroundColor": "#F4F4F4",
"navigationBarTextStyle": "black"
}
+ }, {
+ "path": "pages/feedIng/allRecordTable",
+ "style": {
+ "navigationBarTitleText": "记录列表",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#F4F4F4",
+ "navigationBarTextStyle": "black"
+ }
}, {
"path": "pages/feedIng/allFeed",
"style": {
diff --git a/pages/aquatic/detail.vue b/pages/aquatic/detail.vue
index 68d285d..64e5287 100644
--- a/pages/aquatic/detail.vue
+++ b/pages/aquatic/detail.vue
@@ -14,62 +14,13 @@
上传新的种植情况
-
-
-
- 农户名称: 1号土地
-
-
- 溯源码: 1号土地
-
-
-
-
- 农户名称: 土豆
-
-
- 溯源码: 的划分等级
-
-
-
-
- 种养殖类别: 20亩
-
-
- 养殖数量: 的划分等级
-
-
-
-
- 土地面积: 20亩
-
-
- 草鱼鱼苗: 的划分等级
-
-
-
-
- 养殖种类: 20亩
-
-
- 鲫鱼鱼苗: 的划分等级
-
-
-
-
- 具体种类: 20亩
-
-
-
- 添加水产养殖
-
-
+
{{index}}
-
+
更新{{index.slice(0,-2)}}
@@ -157,6 +108,7 @@
} from "@/api/aquatic.js"
import myTable from "@/components/myTable/index.vue"
import imgCard from "@/components/imgCard.vue"
+ import pondCard from "@/components/aquatic/pondCard.vue"
import {
onLoad
} from "@dcloudio/uni-app"
diff --git a/pages/aquatic/imgList.vue b/pages/aquatic/imgList.vue
index 7686aee..04423e0 100644
--- a/pages/aquatic/imgList.vue
+++ b/pages/aquatic/imgList.vue
@@ -44,8 +44,8 @@
-->
-
-
+
+
-
+
+
-
+
@@ -293,14 +294,13 @@
}
}
- const actionList = reactive({})
- actionsAPI({
- type: 1
- }).then(res => {
- for (let key in res.data) {
- actionList[key] = (res.data)[key]
- }
- })
+ // actionsAPI({
+ // type: 1
+ // }).then(res => {
+ // for (let key in res.data) {
+ // actionList[key] = (res.data)[key]
+ // }
+ // })
\ No newline at end of file
diff --git a/pages/feedIng/allRecording.vue b/pages/feedIng/allRecording.vue
index 30d1cef..7d331d1 100644
--- a/pages/feedIng/allRecording.vue
+++ b/pages/feedIng/allRecording.vue
@@ -1,6 +1,6 @@
-
+
+
饲养记录
@@ -50,6 +50,17 @@
\ No newline at end of file
diff --git a/pages/poultry/SingleDetail.vue b/pages/poultry/SingleDetail.vue
index 0acc736..6bbe18a 100644
--- a/pages/poultry/SingleDetail.vue
+++ b/pages/poultry/SingleDetail.vue
@@ -1,6 +1,6 @@
-
+
+
饲养记录
@@ -67,6 +68,7 @@