From 137be4e2d3c0e0ed9a44e7e3e423765a7f45385f Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Thu, 28 Aug 2025 10:27:18 +0800
Subject: [PATCH] 树木历史
---
pages/work/index.vue | 2 +-
static/images/work/itmeHometree.png | Bin 0 -> 889 bytes
subPackages/treePage/editTreeIfo.vue | 36 ++++++++++++++++++------------------
subPackages/treePage/treeFiles.vue | 2 +-
subPackages/treePage/treeInfo.vue | 76 ++++++++++++++++------------------------------------------------------------
subPackages/treePage/treeLog.vue | 14 ++++----------
6 files changed, 40 insertions(+), 90 deletions(-)
create mode 100644 static/images/work/itmeHometree.png
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 10d8271..ba0865f 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -58,7 +58,7 @@
人员管理
-
+
一树一档案
diff --git a/static/images/work/itmeHometree.png b/static/images/work/itmeHometree.png
new file mode 100644
index 0000000..9f0bcc9
Binary files /dev/null and b/static/images/work/itmeHometree.png differ
diff --git a/subPackages/treePage/editTreeIfo.vue b/subPackages/treePage/editTreeIfo.vue
index 66b9d91..e7824d3 100644
--- a/subPackages/treePage/editTreeIfo.vue
+++ b/subPackages/treePage/editTreeIfo.vue
@@ -317,13 +317,8 @@ export default {
treeId: {
immediate: true,
handler(newVal, oldVal) {
- if (newVal !== oldVal) {
- treeLevelReq().then(res => {
- this.treeLevelData = res.data
- })
- treeOwnership().then(res => {
- this.treeOwnershipData = res.data
- })
+ if (newVal && newVal !== oldVal) {
+
this.treeDetailQuery(newVal)
}
}
@@ -341,16 +336,22 @@ export default {
treeDetailQuery(newVal) {
treeDetailReq(newVal).then(res => {
this.formData = res.data
- const option = this.treeOwnershipData.find(item => item.dictValue === this.formData.oldtreeownership);
- const optiontreelevel = this.treeLevelData.find(item => item.dictValue === this.formData.treelevel);
- if (option) {
- this.formData.oldtreeownership = option.dictValue;
- this.formData.oldtreeownershipText = option.dictLabel;
- }
- if (optiontreelevel) {
- this.formData.treelevel = optiontreelevel.dictValue;
- this.formData.treeleveltext = optiontreelevel.dictLabel;
- }
+ treeLevelReq().then(res => {
+ this.treeLevelData = res.data
+ const optiontreelevel = this.treeLevelData.find(item => item.dictValue === this.formData.treelevel);
+ if (optiontreelevel) {
+ this.formData.treelevel = optiontreelevel.dictValue;
+ this.formData.treeleveltext = optiontreelevel.dictLabel;
+ }
+ })
+ treeOwnership().then(res => {
+ this.treeOwnershipData = res.data
+ const option = this.treeOwnershipData.find(item => item.dictValue === this.formData.oldtreeownership);
+ if (option) {
+ this.formData.oldtreeownership = option.dictValue;
+ this.formData.oldtreeownershipText = option.dictLabel;
+ }
+ })
this.formData.treeImgListFile = res.data.treeImgList.map(imgUrl => {
return imgUrl.startsWith(OSSURL)
? imgUrl.slice(OSSURL.length)
@@ -372,7 +373,6 @@ export default {
handleComplete(e) {
if (e.status == 1) {
console.log(e)
-
this.formData.treeImgListFile = e.imgArr
this.formData.treeImgList = e.imgArr.map(item => OSSURL + item);
console.log(this.formData.treeImgList)
diff --git a/subPackages/treePage/treeFiles.vue b/subPackages/treePage/treeFiles.vue
index 99d78eb..460af76 100644
--- a/subPackages/treePage/treeFiles.vue
+++ b/subPackages/treePage/treeFiles.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/subPackages/treePage/treeInfo.vue b/subPackages/treePage/treeInfo.vue
index d51bf05..16285ab 100644
--- a/subPackages/treePage/treeInfo.vue
+++ b/subPackages/treePage/treeInfo.vue
@@ -43,26 +43,28 @@
- {{ formData.latitude }}
+ {{ formData.longitude }}
+
- {{ formData.longitude }}
+ {{ formData.latitude }}
+
{
- // console.log(data) // {data: 123, title: "A页面"，source: 1, content: "点个赞点个赞，求求了"}
- // console.log('4123')
- // this.formData =data
- // })
- this.formData = {
- "searchEntities": null,
- "createBy": null,
- "createTime": null,
- "updateBy": null,
- "updateTime": null,
- "remark": null,
- "beginTime": null,
- "endTime": null,
- "exportType": null,
- "params": {},
- "id": 22,
- "treeid": 28,
- "treenumber": "daf23b62-d295-4131-b15d-fca6259d251f",
- "latinname": "3",
- "treetype": "312名称",
- "treeheight": "31",
- "canopy": null,
- "dbh": "312",
- "growthvigor": null,
- "treelevel": "treeLevel-2",
- "longitude": "116.422014",
- "latitude": "39.901119",
- "location": null,
- "maintainunit": null,
- "managedutyunit": "单位12321",
- "street": null,
- "oldtreeownership": "oldTreeOwnership-6",
- "datastate": null,
- "estimationtreeage": "12",
- "canopyeastwest": "4",
- "canopysouthnorth": "11",
- "weekday": "55",
- "growlocation": "北京市东城区崇文门东大街北京明城墙遗址公园内(西侧)",
- "growthenvironment": "123",
- "treephotoone": "https://test.jichengshanshui.com.cn:28310/yuanlin/alioss/yl/images/2025/08/27/0564bc2272e08f791946b2eab1f5c9e0.jpeg",
- "treephototwo": null,
- "treephotothree": null,
- "treephotofour": null,
- "treephotofive": null,
- "treeImgList": ["https://test.jichengshanshui.com.cn:28310/yuanlin/alioss/yl/images/2025/08/27/0564bc2272e08f791946b2eab1f5c9e0.jpeg"],
- "deleted": 0,
- "createby": "严家齐",
- "updateby": "严家齐",
- "createtime": "2025-08-27 15:01:48",
- "updatetime": "2025-08-27 15:01:48"
- }
+ const eventChannel = this.getOpenerEventChannel();
+ // eventChannel.on监听，获取上一页面通过eventChannel事件传送的数据
+ eventChannel.on('pageDataTreeInfo', data=> {
+ console.log(data) // {data: 123, title: "A页面"，source: 1, content: "点个赞点个赞，求求了"}
+ console.log('4123')
+ this.formData =data
+ })
+
treeLevelReq().then(res => {
this.treeLevelData = res.data
const optiontreelevel = this.treeLevelData.find(item => item.dictValue === this.formData.treelevel);
diff --git a/subPackages/treePage/treeLog.vue b/subPackages/treePage/treeLog.vue
index 4595bd7..2d67fc7 100644
--- a/subPackages/treePage/treeLog.vue
+++ b/subPackages/treePage/treeLog.vue
@@ -12,11 +12,11 @@
{{ i.updatetime.substring(0, 10) }}
- 
高度：{{ i.treeheight }} 米
- 
胸径：{{ i.dbh }} 厘米
@@ -70,14 +70,8 @@ export default {
})
},
todetailPage(i) {
- let dataString = JSON.stringify(i)
- // uni.navigateTo({
- // url: 'subPackages/treePage/treeDetail?data=' + encodeURIComponent(dataString)
- // })
-
-
- // uni.$tui.href(`/subPackages/treePage/treeInfo?data=${dataString}`)
-
+ console.log(i)
+ console.log(i)
uni.navigateTo({
url: `/subPackages/treePage/treeInfo`,
success: function(res) {
--
libgit2 0.21.4