From b951d82752f7b24f3923308fa01ba430deb10c12 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 27 Aug 2025 17:26:19 +0800
Subject: [PATCH] 树木详情

---
 App.vue                               |   3 +++
 api/tree.js                           |   3 +++
 components/thorui/fui-css/firstui.css |   3 +++
 pages.json                            |  14 ++++++++------
 static/images/tree/tree-high.png      | Bin 0 -> 1003 bytes
 static/images/tree/treearound.png     | Bin 0 -> 927 bytes
 subPackages/treePage/addTree.vue      |  64 ++++++++++++++++++++++++++++------------------------------------
 subPackages/treePage/editTreeIfo.vue  |  77 ++++++++++++++++++++++++++++++++++-------------------------------------------
 subPackages/treePage/treeDetail.vue   |  72 +++++++++++++++++++++++-------------------------------------------------
 subPackages/treePage/treeFiles.vue    |  30 +++++++++++++++++-------------
 subPackages/treePage/treeInfo.vue     | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 subPackages/treePage/treeLog.vue      | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 subPackages/treePage/treeRecord.vue   |  87 +++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 13 files changed, 674 insertions(+), 195 deletions(-)
 create mode 100644 static/images/tree/tree-high.png
 create mode 100644 static/images/tree/treearound.png
 create mode 100644 subPackages/treePage/treeInfo.vue

diff --git a/App.vue b/App.vue
index 6bb7e7c..39fb5d4 100644
--- a/App.vue
+++ b/App.vue
@@ -19,5 +19,8 @@ page {
 	background-color: #F4F4F4;
   color: #666;
 }
+.cad-box-shadow{
+  box-shadow:0 0 10px rgba(0, 0, 0, 0.2);
+}
 @import './components/thorui/fui-css/firstui.scss';
 </style>
diff --git a/api/tree.js b/api/tree.js
index fb21980..b0ff0c9 100644
--- a/api/tree.js
+++ b/api/tree.js
@@ -14,6 +14,9 @@ export const treeDetailReq = (params) => request.get('/business/tree/'+params )
 // 修改树
 export const updateTree = (params) => request.put('/business/tree/',params )
 
+// 树更变记录
+export const treeLogReq = (params) => request.get('/gardentree/logs/list/',params )
+
 // 归属公司
 export const belongCompanyreq = (params) => request.get('/system/dict/data/type/belongCompanyId', params)
 
diff --git a/components/thorui/fui-css/firstui.css b/components/thorui/fui-css/firstui.css
index 803eb41..2d86efd 100644
--- a/components/thorui/fui-css/firstui.css
+++ b/components/thorui/fui-css/firstui.css
@@ -2640,4 +2640,7 @@
   /* #endif */
 }
 
+
+
+
 /*# sourceMappingURL=firstui.css.map */
diff --git a/pages.json b/pages.json
index c5147ec..2275960 100644
--- a/pages.json
+++ b/pages.json
@@ -298,18 +298,19 @@
 					}
 				},
 				{
-					"path": "treePage/editTree",
+					"path": "treePage/treeInfo",
 					"style": {
-						"navigationBarTitleText": "修改树木"
+						"navigationBarTitleText": "树木详情"
 					}
 				},
 				{
-					"path": "treePage/treeDeatil",
+					"path": "treePage/editTree",
 					"style": {
-						"navigationBarTitleText": "树木详情"
+						"navigationBarTitleText": "修改树木"
 					}
 				}
 
+
 			]
 		}
 	  ],
@@ -340,9 +341,10 @@
 		]
 	},
 	"globalStyle": {
-		"navigationBarTextStyle": "white",
+		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "园林养护",
-		"navigationBarBackgroundColor": "#577EE3"
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
 	},
 	"easycom": {
 		"autoscan": true,
diff --git a/static/images/tree/tree-high.png b/static/images/tree/tree-high.png
new file mode 100644
index 0000000..31aa6cb
Binary files /dev/null and b/static/images/tree/tree-high.png differ
diff --git a/static/images/tree/treearound.png b/static/images/tree/treearound.png
new file mode 100644
index 0000000..ff43597
Binary files /dev/null and b/static/images/tree/treearound.png differ
diff --git a/subPackages/treePage/addTree.vue b/subPackages/treePage/addTree.vue
index cbd70f4..1bd6177 100644
--- a/subPackages/treePage/addTree.vue
+++ b/subPackages/treePage/addTree.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-    <tui-form ref="form" :show-message="false" :model="formData">
+    <tui-form ref="form"  :show-message="false" :model="formData">
       <tui-form-item asterisk label="名称" prop="treetype">
         <tui-input padding="0" :borderBottom="false" placeholder="请输入名称" maxlength="30"
                    v-model="formData.treetype"></tui-input>
@@ -44,22 +44,22 @@
 
       <tui-col :span="12">
         <tui-form-item
-
-            label="纬度"
+            label="经度"
             class="location-form-item"
-
             prop="latitude"
         >
-          {{ formData.latitude }}
+          {{ formData.longitude }}
         </tui-form-item>
       </tui-col>
       <tui-col :span="12">
         <tui-form-item
-            label="经度"
+
+            label="纬度"
             class="location-form-item"
+
             prop="latitude"
         >
-          {{ formData.longitude }}
+          {{ formData.latitude }}
         </tui-form-item>
       </tui-col>
 
@@ -72,9 +72,9 @@
         <!--        <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled-->
         <!--                   backgroundColor="transparent" v-model="formData.managedutyunit"></tui-input>-->
       </tui-form-item>
-      <tui-form-item asterisk label="权属分类" arrow highlight prop="oldtreeownership" @click="pickerShow">
+      <tui-form-item asterisk label="权属分类" arrow highlight prop="oldtreeownershipText" @click="pickerShow">
         <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled
-                   backgroundColor="transparent" v-model="formData.oldtreeownership"></tui-input>
+                   backgroundColor="transparent" v-model="formData.oldtreeownershipText"></tui-input>
       </tui-form-item>
 
       <tui-form-item label="图片信息" asterisk prop="treeImgList">
@@ -93,19 +93,8 @@
           <!-- 自定义上传按钮 -->
           <view class="upload-btn">
             <tui-icon name="plus" size="32" color="#999"></tui-icon>
-
           </view>
-          <!-- 提示信息 -->
-          <!--        <view class="upload-tips">-->
-          <!--          最多上传3张图片，单张不超过5MB-->
-          <!--        </view>-->
-
-
         </tui-upload>
-        <!-- 提示信息 -->
-        <!--        <view class="upload-tips">-->
-        <!--          最多上传3张图片，单张不超过5MB-->
-        <!--        </view>-->
       </tui-form-item>
 
       <!-- 动画区域（初始隐藏） -->
@@ -126,9 +115,9 @@
             </tui-form-item>
           </tui-col>
           <tui-col :span="12">
-            <tui-form-item label="级别" arrow highlight prop="treelevel" @click="pickerLevelShow">
+            <tui-form-item label="级别" arrow highlight prop="treeleveltext" @click="pickerLevelShow">
               <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled
-                         backgroundColor="transparent" v-model="formData.treelevel"></tui-input>
+                         backgroundColor="transparent" v-model="formData.treeleveltext"></tui-input>
             </tui-form-item>
           </tui-col>
         </tui-row>
@@ -195,12 +184,13 @@
       >
         {{ isShow ? '- 隐藏区域' : '+ 显示区域' }}
       </tui-button>
+    </tui-form>
 
+    <view style="height: 60px;width: 100%"></view>
 
-      <view class="tui-btn__box">
-        <tui-button bold @click="submit">提交</tui-button>
-      </view>
-    </tui-form>
+    <view class="tui-btn__box">
+      <tui-button bold @click="submit">提交</tui-button>
+    </view>
     <tui-picker :show="show" :pickerData="treeOwnershipData" textField="dictLabel" valueField="dictValue"
                 @hide="pickerHide" @change="pickerChange">
     </tui-picker>
@@ -212,7 +202,7 @@
 </template>
 
 <script>
-import { uploadURL,OSSURL} from '@/config/app'
+import { uploadURL, OSSURL } from '@/config/app'
 import { treeOwnership, addTree, treeLevelReq } from "@/api/tree";
 const rules = [{
   name: "treetype",
@@ -254,7 +244,7 @@ const rules = [{
     rule: ["required"],
     msg: ["请选择权属单位"]
   }, {
-    name: "oldtreeownership",
+    name: "oldtreeownershipText",
     rule: ["required"],
     msg: ["请选择权属分类"]
   }, {
@@ -293,10 +283,12 @@ export default {
         dbh: '',
         //级别
         treelevel: '',
+        treeleveltext:'',
         //权属单位
         managedutyunit: '',
         //权属分类
         oldtreeownership: '',
+        oldtreeownershipText:'',
         latinname: '', // 拉丁名
         estimationtreeage: '', // 估测树龄
         canopysouthnorth: '', // 冠幅南北
@@ -313,8 +305,7 @@ export default {
       },
     }
   },
-  watch: {
-  },
+  watch: {},
   onReady() {
     //开启即时校验，开启后输入即校验【参数必传】，第一参数：是否开启；第二参数：校验规则
     // 开启即时校验，参数：是否开启、校验规则
@@ -329,7 +320,7 @@ export default {
     this.treeOwnership()
   },
   methods: {
-   // 权属分类
+    // 权属分类
     treeOwnership() {
       treeOwnership().then(res => {
         console.log(res)
@@ -347,12 +338,11 @@ export default {
         // this.formData.treeImgList.push(e.imgArr);
         console.log(e.imgArr[0])
         this.formData.treeImgListFile = e.imgArr
-        this.formData.treeImgList = e.imgArr.map(item=>OSSURL+item);
+        this.formData.treeImgList = e.imgArr.map(item => OSSURL + item);
         console.log(this.formData.treeImgList)
         // baseURL
         // 手动触发treeImgList字段的校验
         this.$refs.form.validateField("treeImgList");
-
       }
       // this.formData.treeImgList = e.imgArr;
       // 根据实际接口返回格式调整
@@ -364,7 +354,6 @@ export default {
       this.formData.treeImgList.splice(index, 1);
       this.formData.treeImgListFile.splice(index, 1);
       console.log(this.formData.treeImgList.length)
-
     },
     pickerShow() {
       this.show = true
@@ -374,7 +363,8 @@ export default {
     },
     pickerChange(e) {
       console.log(e)
-      this.formData.oldtreeownership = e.dictLabel
+      this.formData.oldtreeownership = e.dictValue
+      this.formData.oldtreeownershipText = e.dictLabel
     },
     pickerLevelShow() {
       this.levelshow = true
@@ -384,7 +374,9 @@ export default {
     },
     pickerLevelChange(e) {
       console.log(e)
-      this.formData.treelevel = e.dictLabel
+      this.formData.treelevel = e.dictValue
+      this.formData.treeleveltext = e.dictLabel
+
     },
     submit() {
       // 3. 打印提交时的数据
diff --git a/subPackages/treePage/editTreeIfo.vue b/subPackages/treePage/editTreeIfo.vue
index a5cf522..66b9d91 100644
--- a/subPackages/treePage/editTreeIfo.vue
+++ b/subPackages/treePage/editTreeIfo.vue
@@ -72,9 +72,9 @@
         <!--        <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled-->
         <!--                   backgroundColor="transparent" v-model="formData.managedutyunit"></tui-input>-->
       </tui-form-item>
-      <tui-form-item asterisk label="权属分类" arrow highlight prop="oldtreeownership" @click="pickerShow">
+      <tui-form-item asterisk label="权属分类" arrow highlight prop="oldtreeownershipText" @click="pickerShow">
         <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled
-                   backgroundColor="transparent" v-model="formData.oldtreeownership"></tui-input>
+                   backgroundColor="transparent" v-model="formData.oldtreeownershipText"></tui-input>
       </tui-form-item>
 
       <tui-form-item label="图片信息" asterisk prop="treeImgList">
@@ -126,9 +126,9 @@
             </tui-form-item>
           </tui-col>
           <tui-col :span="12">
-            <tui-form-item label="级别" arrow highlight prop="treelevel" @click="pickerLevelShow">
+            <tui-form-item label="级别" arrow highlight prop="treeleveltext" @click="pickerLevelShow">
               <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled
-                         backgroundColor="transparent" v-model="formData.treelevel"></tui-input>
+                         backgroundColor="transparent" v-model="formData.treeleveltext"></tui-input>
             </tui-form-item>
           </tui-col>
         </tui-row>
@@ -195,12 +195,11 @@
       >
         {{ isShow ? '- 隐藏区域' : '+ 显示区域' }}
       </tui-button>
-
-
-      <view class="tui-btn__box">
-        <tui-button bold @click="submit">提交</tui-button>
-      </view>
     </tui-form>
+    <view style="height: 60px;width: 100%"></view>
+    <view class="tui-btn__box">
+      <tui-button bold @click="submit">提交</tui-button>
+    </view>
     <tui-picker :show="show" :pickerData="treeOwnershipData" textField="dictLabel" valueField="dictValue"
                 @hide="pickerHide" @change="pickerChange">
     </tui-picker>
@@ -212,7 +211,7 @@
 </template>
 
 <script>
-import { uploadURL,OSSURL} from '@/config/app'
+import { uploadURL, OSSURL } from '@/config/app'
 import { treeOwnership, addTree, treeLevelReq, treeDetailReq, updateTree } from "@/api/tree";
 const rules = [{
   name: "treetype",
@@ -254,7 +253,7 @@ const rules = [{
     rule: ["required"],
     msg: ["请选择权属单位"]
   }, {
-    name: "oldtreeownership",
+    name: "oldtreeownershipText",
     rule: ["required"],
     msg: ["请选择权属分类"]
   }, {
@@ -273,7 +272,6 @@ export default {
       required: true
     }
   },
-
   data() {
     return {
       isShow: false,       // 控制区域显示/隐藏
@@ -293,10 +291,12 @@ export default {
         dbh: '',
         //级别
         treelevel: '',
+        treeleveltext: '',
         //权属单位
         managedutyunit: '',
         //权属分类
         oldtreeownership: '',
+        oldtreeownershipText: '',
         latinname: '', // 拉丁名
         estimationtreeage: '', // 估测树龄
         canopysouthnorth: '', // 冠幅南北
@@ -315,14 +315,15 @@ export default {
   },
   watch: {
     treeId: {
-      // immediate: true,
+      immediate: true,
       handler(newVal, oldVal) {
         if (newVal !== oldVal) {
           treeLevelReq().then(res => {
             this.treeLevelData = res.data
           })
-          // this.formData.road = options.roadId
-          this.treeOwnership()
+          treeOwnership().then(res => {
+            this.treeOwnershipData = res.data
+          })
           this.treeDetailQuery(newVal)
         }
       }
@@ -335,34 +336,28 @@ export default {
     // this.$refs.form && this.$refs.form.immediateValidate(true, rules)
   },
   onLoad(options) {
-
-
   },
   methods: {
-    treeDetailQuery(newVal){
-
-      treeDetailReq(newVal).then(res=>{
+    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;
+        }
         this.formData.treeImgListFile = res.data.treeImgList.map(imgUrl => {
           return imgUrl.startsWith(OSSURL)
               ? imgUrl.slice(OSSURL.length)
               : imgUrl;
         });
-
-
-        // this.formData.treeImgListFile = res.data.treeImgList.map(imgUrl => {
-        //   // 强制确保 imgUrl 是字符串类型
-        //   const urlStr = typeof imgUrl === 'string' ? imgUrl : '';
-        //   return {
-        //     url: urlStr  // 必须是字符串，不能是对象
-        //   };
-        // });
-        console.log('123'+newVal)
-        console.log(  this.formData.treeImgListFile)
       })
     },
-
     treeOwnership() {
       treeOwnership().then(res => {
         console.log(res)
@@ -377,19 +372,14 @@ export default {
     handleComplete(e) {
       if (e.status == 1) {
         console.log(e)
-        // this.formData.treeImgList.push(e.imgArr);
-        console.log(e.imgArr[0])
+
         this.formData.treeImgListFile = e.imgArr
-        this.formData.treeImgList = e.imgArr.map(item=>OSSURL+item);
+        this.formData.treeImgList = e.imgArr.map(item => OSSURL + item);
         console.log(this.formData.treeImgList)
         // baseURL
         // 手动触发treeImgList字段的校验
         this.$refs.form.validateField("treeImgList");
-
       }
-      // this.formData.treeImgList = e.imgArr;
-      // 根据实际接口返回格式调整
-      // this.currentFiles.push(e.data);
     },
     // 删除图片回调
     handleRemove(index) {
@@ -397,7 +387,6 @@ export default {
       this.formData.treeImgList.splice(index, 1);
       this.formData.treeImgListFile.splice(index, 1);
       console.log(this.formData.treeImgList.length)
-
     },
     pickerShow() {
       this.show = true
@@ -407,7 +396,8 @@ export default {
     },
     pickerChange(e) {
       console.log(e)
-      this.formData.oldtreeownership = e.dictLabel
+      this.formData.oldtreeownership = e.dictValue
+      this.formData.oldtreeownershipText = e.dictLabel
     },
     pickerLevelShow() {
       this.levelshow = true
@@ -417,7 +407,8 @@ export default {
     },
     pickerLevelChange(e) {
       console.log(e)
-      this.formData.treelevel = e.dictLabel
+      this.formData.treelevel = e.dictValue
+      this.formData.treeleveltext = e.dictLabel
     },
     submit() {
       // 3. 打印提交时的数据
diff --git a/subPackages/treePage/treeDetail.vue b/subPackages/treePage/treeDetail.vue
index fd4b65b..ae80582 100644
--- a/subPackages/treePage/treeDetail.vue
+++ b/subPackages/treePage/treeDetail.vue
@@ -1,61 +1,35 @@
-<script lang="ts">
-import {defineComponent} from 'vue'
+<template>
+  <view class="container">
 
-export default defineComponent({
-  name: "treeDetail"
-})
-</script>
+    <!--    <tui-no-data imgUrl="/static/images/nodata.png" v-if="rows.length==0">暂无数据</tui-no-data>-->
+    <view>123</view>
 
-<template>
-  <template>
-
-    <view class="container">
-      <tui-tab :tabs="tabs" scroll @change="tabChange"></tui-tab>
-
-
-      <view class="content-container">
-        <view v-if="currentName === '基本信息'">xiugai基本信息</view>
-
-        <treeLog v-if="currentName === '变更日志'" :logId="id" />
-      </view>
-    </view>
-
-  </template>
-  <script >
-  import treeLog from "./treeLog.vue";
-  export default {
-    components:{treeLog},
-    name: "editTree",
-    data(){
-      return{
-        tabs:['基本信息','变更日志',],
-        currentName:'基本信息',
-        id:''
-      }
-    },
-    onLoad(options){
-      this.id = options.id
-    },
-    methods:{
-      tabChange(i){
-        console.log(i.item.name)
-        this.currentName = i.item.name
-      }
-    }
-  }
-  </script>
+  </view>
 
+</template>
 
+<script>
+export default {
 
-  <style scoped>
-    .content-container{
-      padding-top: 20rpx;
+  data() {
+    return {
+      rows: [],
+      roadId: ''
     }
+  },
+  onLoad(options) {
+    let dataString = decodeURIComponent(options.data);
+    let data = JSON.parse(dataString);
+    console.log(data); // { key: 'value', otherKey: 123 }
+  },
+  methods: {
 
-  </style>
+  }
+}
+</script>
 
-</template>
 
 <style scoped>
 
+
 </style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeFiles.vue b/subPackages/treePage/treeFiles.vue
index 8e54312..99d78eb 100644
--- a/subPackages/treePage/treeFiles.vue
+++ b/subPackages/treePage/treeFiles.vue
@@ -38,22 +38,20 @@
           <!--          <tui-no-data imgUrl="/static/images/nodata.png">暂无数据</tui-no-data>-->
         </view>
         <view v-else>
-          <view v-for="i in roads" class="card-wrap" @click="toNewPage(i.roadId)">
+          <view v-for="i in roads" class="card-wrap cad-box-shadow" @click="toNewPage(i.roadId)">
 
             <p class="fs-flex__between">
-              <span>{{ i.roadName }}</span>
-              <span>{{ i.treeCount }}颗</span>
+              <span class="fs-ellipsis">{{ i.roadName }}</span>
+              <span class="treeCount  ">{{ i.treeCount }}颗</span>
             </p>
 
-            <p>已录入行道树：{{ i.recordedCount }}颗</p>
-
-            <p>起点：{{ i.startRemark }}</p>
-            <p>终点：{{ i.endRemark }}</p>
+            <p class="fs-ellipsis fs-my8">已录入行道树：{{ i.recordedCount }}颗</p>
+            <p class="fs-ellipsis fs-my8" style="color: #999">起点：{{ i.startRemark }}</p>
+            <p class="fs-ellipsis " style="color: #999">终点：{{ i.endRemark }}</p>
 
           </view>
         </view>
-
-
+        
       </view>
     </view>
 
@@ -110,10 +108,9 @@ export default {
     })
   },
   methods: {
-    toNewPage(params){
+    toNewPage(params) {
       console.log('123312')
       uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${params}`)
-
     },
     searchChange() {
       this.deptListQuery()
@@ -189,6 +186,7 @@ export default {
   height: 100%;
   background: #fff;
   padding-top: 20rpx;
+  overflow: hidden;
 }
 
 .teamsItem {
@@ -199,10 +197,10 @@ export default {
 }
 
 .card-wrap {
-  height: 200rpx;
+  //height: 200rpx;
   margin: 0 20rpx 20rpx 20rpx;
   padding: 20rpx;
-  box-shadow: 0 1rpx 2rpx 5rpx rgb(0, 0, 0, .3);
+
   border-radius: 10rpx;
 }
 
@@ -217,6 +215,12 @@ export default {
   }
 }
 
+.treeCount {
+  color: #5f5fe2;
+  min-width: 70px;
+  text-align: right;
+}
+
 </style>
 
 <style>
diff --git a/subPackages/treePage/treeInfo.vue b/subPackages/treePage/treeInfo.vue
new file mode 100644
index 0000000..d51bf05
--- /dev/null
+++ b/subPackages/treePage/treeInfo.vue
@@ -0,0 +1,415 @@
+<template>
+  <view class="container">
+    <tui-form ref="form" :show-message="false" :model="formData">
+      <tui-form-item asterisk label="名称" prop="treetype">
+        <tui-input padding="0" :borderBottom="false" placeholder="请输入名称" maxlength="30" :disabled="true"
+                   v-model="formData.treetype"></tui-input>
+      </tui-form-item>
+
+      <tui-row>
+        <tui-col :span="12">
+          <tui-form-item label="高度" asterisk prop="treeheight" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.treeheight"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa;font-size:14px;">米</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+        <tui-col :span="12">
+          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.dbh"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa;font-size:14px">厘米</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+      </tui-row>
+
+
+      <tui-form-item
+          asterisk
+          label="位置"
+          class="location-form-item"
+          prop="growlocation"
+      >
+        <tui-input padding="0" :borderBottom="false" placeholder="请选择" :disabled="true"
+                   v-model="formData.growlocation"></tui-input>
+        <template v-slot:right>
+          <tui-icon name="gps" :size="20"></tui-icon>
+        </template>
+      </tui-form-item>
+
+      <tui-col :span="12">
+        <tui-form-item
+
+            label="纬度"
+            class="location-form-item"
+
+            prop="latitude"
+        >
+          {{ formData.latitude }}
+        </tui-form-item>
+      </tui-col>
+      <tui-col :span="12">
+        <tui-form-item
+            label="经度"
+            class="location-form-item"
+            prop="latitude"
+        >
+          {{ formData.longitude }}
+        </tui-form-item>
+      </tui-col>
+
+
+      <tui-form-item asterisk label="管护单位" prop="managedutyunit">
+
+        <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
+                   v-model="formData.managedutyunit"></tui-input>
+
+        <!--        <tui-input padding="0" :borderBottom="false" placeholder="请选择" disabled-->
+        <!--                   backgroundColor="transparent" v-model="formData.managedutyunit"></tui-input>-->
+      </tui-form-item>
+      <tui-form-item asterisk label="权属分类" arrow highlight prop="oldtreeownershipText">
+        <tui-input padding="0" :borderBottom="false" placeholder="请选择" :disabled="true"
+                   backgroundColor="transparent" v-model="formData.oldtreeownershipText"></tui-input>
+      </tui-form-item>
+
+      <tui-form-item label="图片信息" asterisk prop="treeImgList">
+
+        <!--        <tui-image-group :imageList="formData.treeImgList" radius="0"></tui-image-group>-->
+
+        <!-- 图片组组件 -->
+        <tui-image-group
+            :imageList="formData.treeImgList"
+            radius="0"
+            @click="handleImageClick"
+        >
+        </tui-image-group>
+
+        <!-- 使用ThorUI的tui-upload组件 -->
+        <!--           @remove="handleRemove"   :multiple="true"    :value="formData.treeImgList"-->
+        <!--        <tui-upload  :disabled="true"-->
+        <!--            :height="140"-->
+        <!--            :width="140"-->
+        <!--            :value="formData.treeImgListFile"-->
+        <!--            :serverUrl="serverURL" :header="{'Authorization': userToken}"-->
+        <!--            @complete="handleComplete"-->
+        <!--            @remove="handleRemove"-->
+        <!--            :limit="3"-->
+        <!--            accept="image/*"-->
+        <!--        >-->
+        <!--          &lt;!&ndash; 自定义上传按钮 &ndash;&gt;-->
+        <!--          <view class="upload-btn">-->
+        <!--            <tui-icon name="plus" size="32" color="#999"></tui-icon>-->
+
+        <!--          </view>-->
+        <!--          &lt;!&ndash; 提示信息 &ndash;&gt;-->
+        <!--          &lt;!&ndash;        <view class="upload-tips">&ndash;&gt;-->
+        <!--          &lt;!&ndash;          最多上传3张图片，单张不超过5MB&ndash;&gt;-->
+        <!--          &lt;!&ndash;        </view>&ndash;&gt;-->
+
+
+        <!--        </tui-upload>-->
+        <!-- 提示信息 -->
+        <!--        <view class="upload-tips">-->
+        <!--          最多上传3张图片，单张不超过5MB-->
+        <!--        </view>-->
+      </tui-form-item>
+
+
+      <tui-row>
+        <tui-col :span="12">
+          <tui-form-item label="拉丁文" prop="latinname">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
+                       v-model="formData.latinname"></tui-input>
+          </tui-form-item>
+        </tui-col>
+        <tui-col :span="12">
+          <tui-form-item label="级别" arrow highlight prop="treeleveltext">
+            <tui-input padding="0" :borderBottom="false" placeholder="请选择" :disabled="true"
+                       backgroundColor="transparent" v-model="formData.treeleveltext"></tui-input>
+          </tui-form-item>
+        </tui-col>
+      </tui-row>
+
+      <tui-form-item label="生长环境" prop="growthenvironment">
+        <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="50" :disabled="true"
+                   v-model="formData.growthenvironment"></tui-input>
+      </tui-form-item>
+
+
+      <tui-row>
+        <tui-col :span="12">
+          <tui-form-item label="预估树龄" prop="estimationtreeage" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.estimationtreeage"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">年</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+        <tui-col :span="12">
+          <tui-form-item label="干周" prop="weekday" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.weekday"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">厘米</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+      </tui-row>
+
+
+      <tui-row>
+        <tui-col :span="12">
+          <tui-form-item label="东西冠幅" prop="canopyeastwest" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.canopyeastwest"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa">米</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+        <tui-col :span="12">
+          <tui-form-item label="南北冠幅" prop="canopysouthnorth" :position="3">
+            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+                       v-model="formData.canopysouthnorth"></tui-input>
+            <template v-slot:right>
+              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">米</text>
+            </template>
+          </tui-form-item>
+        </tui-col>
+      </tui-row>
+
+    </tui-form>
+    <tui-gallery :urls="urls" :show="show"  @hide="hide"></tui-gallery>
+  </view>
+</template>
+
+<script>
+import { uploadURL, OSSURL } from '@/config/app'
+import { treeOwnership, treeLevelReq } from "@/api/tree";
+const rules = [{
+  name: "treetype",
+  rule: ["required"],
+  msg: ["请输入名称"]
+}, {
+  name: "treeheight",
+  rule: ["required", "maxLength:10", "isAmount"],
+  msg: ["请输入数高", "数高不能超过10个字符", "请输入正确"]
+}, {
+  name: "dbh",
+  rule: ["required", "maxLength:10", "isAmount"],
+  msg: ["请输入胸径", "胸径不能超过10个字符", "请输入正确"]
+}, {
+  name: "estimationtreeage",
+  rule: ["maxLength:10", "isAmount"],
+  msg: ["胸径不能超过10个字符", "请输入正确"]
+},
+  {
+    name: "weekday",
+    rule: ["maxLength:10", "isAmount"],
+    msg: ["胸径不能超过10个字符", "请输入正确"]
+  },
+  {
+    name: "canopyeastwest",
+    rule: ["maxLength:10", "isAmount"],
+    msg: ["胸径不能超过10个字符", "请输入正确"]
+  },
+  {
+    name: "canopysouthnorth",
+    rule: ["maxLength:10", "isAmount"],
+    msg: ["胸径不能超过10个字符", "请输入正确"]
+  }, {
+    name: "growlocation",
+    rule: ["required"],
+    msg: ["请地图选择位置"]
+  }, {
+    name: "managedutyunit",
+    rule: ["required"],
+    msg: ["请选择权属单位"]
+  }, {
+    name: "oldtreeownershipText",
+    rule: ["required"],
+    msg: ["请选择权属分类"]
+  }, {
+    name: "treeImgListFile",
+    rule: ["required", "custom"], // 增加required强制必选
+    msg: ["请上传图片", "请至少上传一张图片"], // 对应两个规则的提示
+    custom: function (value) {
+      // 即使required通过，再校验数组长度
+      return value.length > 0;
+    }
+  }];
+export default {
+  data() {
+    return {
+// 当前预览索引
+      currentIndex: 0,
+      // 是否显示预览弹窗
+      show: false,
+      urls: [],
+      treeOwnershipData: [],
+      treeLevelData: [], // 级别
+      //仅对部分数据进行收集演示
+      formData: {
+        //数名
+        treetype: '',
+        //树高
+        treeheight: '',
+        //胸径
+        dbh: '',
+        //级别
+        treelevel: '',
+        treeleveltext: '',
+        //权属单位
+        managedutyunit: '',
+        //权属分类
+        oldtreeownership: '',
+        oldtreeownershipText: '',
+        latinname: '', // 拉丁名
+        estimationtreeage: '', // 估测树龄
+        canopysouthnorth: '', // 冠幅南北
+        canopyeastwest: '', // 冠幅东西
+        weekday: '', // 干周
+        growlocation: '', // 位置
+        growthenvironment: '', // 生长环境
+        treeImgList: [], // 图片信息
+        treeImgListFile: [], // 图片信息
+        address: '',      // 位置名称
+        latitude: '',     // 纬度
+        longitude: '',     // 经度
+        road: ''
+      },
+    }
+  },
+  onReady() {
+    //开启即时校验，开启后输入即校验【参数必传】，第一参数：是否开启；第二参数：校验规则
+    // 开启即时校验，参数：是否开启、校验规则
+    this.$refs.form && this.$refs.form.immediateValidate(true, rules);
+  },
+  onLoad(options) {
+    // 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
+    // })
+    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"
+    }
+    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.urls = this.formData.treeImgList.map((item, index) => {
+      return {
+        src: item
+      }
+    });
+    this.formData.treeImgList = this.formData.treeImgList.map((item, index) => {
+      return {
+        id: index,
+        src: item
+      }
+    });
+  },
+  methods: {
+// 图片点击事件
+    handleImageClick(e) {
+      console.log(e.id)
+      // 如果组件自带预览功能，可能不需要手动控制显示
+      // 否则手动显示预览弹窗
+      this.show = true;
+    },
+    hide(){
+      this.show = false
+    }
+  }
+}
+</script>
+
+<style>
+.tui-title {
+  width: 100%;
+  font-size: 28rpx;
+  color: #888;
+  padding: 30rpx;
+  box-sizing: border-box;
+}
+
+.tui-btn__box {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+
+.location-content {
+  font-size: 14px;
+}
+
+/* 动画区域样式 */
+.animated-area {
+  height: 200rpx;
+  transition: all 0.3s ease-out; /* 动画过渡效果 */
+}
+</style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeLog.vue b/subPackages/treePage/treeLog.vue
index 78da34c..4595bd7 100644
--- a/subPackages/treePage/treeLog.vue
+++ b/subPackages/treePage/treeLog.vue
@@ -1,6 +1,38 @@
-<script>
+<template>
+  <view class="container">
 
+    <!--    <tui-no-data imgUrl="/static/images/nodata.png" v-if="rows.length==0">暂无数据</tui-no-data>-->
+    <view class="record-wrap">
+      <view class="record-list-wrap cad-box-shadow fs-bg__white" v-for="i in rows" @click="todetailPage(i)">
+        <view style="display: flex">
+          <view class="record-list-left" :style="`background-image: url(${i.treephotoone});`"></view>
+          <view class="record-list-right">
+            <view class="record-list-right-title">
+              <view class="fs-ellipsis">{{ i.treetype }}</view>
+              <view style="min-width: 100px">{{ i.updatetime.substring(0, 10) }}</view>
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../static/images/tree/tree-high.png" style="width: 16px;height: 16px;margin-right: 6px;"
+                   alt=""> 高度：{{ i.treeheight }} 米
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../static/images/tree/treearound.png" style="width: 16px;height: 16px;margin-right: 6px;"
+                   alt="">胸径：{{ i.dbh }} 厘米
+            </view>
+          </view>
+        </view>
+        <view class="fs-mt8 fs-ellipsis treenumber-no">
+          树木编号：{{ i.treenumber }}
+        </view>
+      </view>
+    </view>
 
+  </view>
+
+</template>
+
+<script>
+import { treeLogReq } from "@/api/tree";
 export default {
   name: "treeLog",
   props: {
@@ -10,30 +42,83 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      rows: [],
+      roadId: ''
+    }
   },
   watch: {
     logId: {
       immediate: true,
       handler(newVal, oldVal) {
         if (newVal !== oldVal) {
-          this.initLog()
+          this.initLogQuery(newVal)
         }
       }
     }
   },
   methods: {
-    async initLog() {
+    initLogQuery(val) {
+      let obj = {
+        treeid: val,
+        pageNum: 1,
+        pageSize: 10000
+      }
+      treeLogReq({data: {...obj}}).then(res => {
+        console.log(res)
+        this.rows = res.rows
+      })
+    },
+    todetailPage(i) {
+      let dataString = JSON.stringify(i)
+      // uni.navigateTo({
+      //   url: 'subPackages/treePage/treeDetail?data=' + encodeURIComponent(dataString)
+      // })
+
+
+      // uni.$tui.href(`/subPackages/treePage/treeInfo?data=${dataString}`)
+
+      uni.navigateTo({
+        url: `/subPackages/treePage/treeInfo`,
+        success: function(res) {
+          res.eventChannel.emit('pageDataTreeInfo',i)
+        }
+      })
     }
   }
 }
 </script>
 
-<template>
-  <view>log</view>
-
-</template>
 
 <style scoped>
+.record-list-wrap {
+  margin: 20rpx 20rpx 0 20rpx;
+  padding: 20rpx;
+  border-radius: 10rpx;
+}
+
+.record-list-left {
+  height: 70px;
+  width: 70px;
+  background-size: 100% 100%;
+}
+
+.record-list-right {
+  margin-left: 20px;
+  flex: 1;
+  overflow: hidden;
+
+}
+
+.record-list-right-title {
+  display: flex;
+  justify-content: space-between;
+}
+
+.treenumber-no {
+  padding: 3px 10px;
+  background: #bdefd0;
+  font-size: 12px;
+}
 
 </style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeRecord.vue b/subPackages/treePage/treeRecord.vue
index 9a7883f..8dbeea3 100644
--- a/subPackages/treePage/treeRecord.vue
+++ b/subPackages/treePage/treeRecord.vue
@@ -3,23 +3,25 @@
 
     <tui-no-data imgUrl="/static/images/nodata.png" v-if="rows.length==0">暂无数据</tui-no-data>
     <view class="record-wrap" v-else>
-      <view class="record-list-wrap" v-for="i in rows" @click="toEditPage(i.id)">
-        <view class="record-list-left" :style="`background-image: url(${i.treephoto});`"></view>
-        <view class="record-list-right">
-          <view class="record-list-right-title">
-            <view>{{i.treetype}}</view>
-            <view>{{i.updatetime.substring(0,10)}}</view>
-          </view>
-          <view class="fs-mt8">
-            高度：{{i.treeheight}}
-          </view>
-          <view class="fs-mt8">
-            胸径：{{i.dbh}}
-          </view>
-          <view class="fs-mt8">
-            树木编号：{{i.treenumber}}
+      <view class="record-list-wrap cad-box-shadow fs-bg__white" v-for="i in rows" @click="toEditPage(i.id)">
+        <view style="display: flex">
+          <view class="record-list-left" :style="`background-image: url(${i.treephoto});`"></view>
+          <view class="record-list-right">
+            <view class="record-list-right-title">
+              <view class="fs-ellipsis">{{ i.treetype }}</view>
+              <view style="min-width: 100px">{{ i.updatetime.substring(0, 10) }}</view>
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../static/images/tree/tree-high.png" style="width: 16px;height: 16px;margin-right: 6px;" alt=""> 高度：{{ i.treeheight }} 米
+            </view>
+            <view class="fs-mt8 fs-align__center">
+              <img src="../../static/images/tree/treearound.png" style="width: 16px;height: 16px;margin-right: 6px;" alt="">胸径：{{ i.dbh }} 厘米
+            </view>
           </view>
         </view>
+        <view class="fs-mt8 fs-ellipsis treenumber-no">
+          树木编号：{{ i.treenumber }}
+        </view>
       </view>
     </view>
 
@@ -33,26 +35,26 @@
 import { treeRoadReq } from "@/api/tree";
 export default {
   name: "treeRecord",
-  data(){
-    return{
-      rows:[],
-      roadId:''
+  data() {
+    return {
+      rows: [],
+      roadId: ''
     }
   },
-  onLoad(options){
+  onLoad(options) {
     this.roadId = options.roadId
     this.treeRoadQuery()
   },
-  methods:{
-    toEditPage(id){  // 前往修改页面
+  methods: {
+    toEditPage(id) {  // 前往修改页面
       uni.$tui.href(`/subPackages/treePage/editTree?id=${id}`)
     },
-    toAddTreePage(){
+    toAddTreePage() {
       uni.$tui.href(`/subPackages/treePage/addTree?roadId=${this.roadId}`)
     },
     // 记录列表
-    treeRoadQuery(){
-      treeRoadReq({data:{road: this.roadId}}).then(res=>{
+    treeRoadQuery() {
+      treeRoadReq({data: {road: this.roadId}}).then(res => {
         console.log(res)
         this.rows = res.rows
       })
@@ -62,32 +64,37 @@ export default {
 </script>
 
 <style scoped>
-.record-wrap{
-  padding-bottom: 120rpx;
-}
-.record-list-wrap{
-  height: 130px;
+.record-list-wrap {
   margin: 20rpx 20rpx 0 20rpx;
   padding: 20rpx;
-  box-shadow: 0 1rpx 2rpx 5rpx rgb(0, 0, 0, .3);
   border-radius: 10rpx;
-  display: flex;
 }
-.record-list-left{
-  height: 100px;
-  width: 100px;
+
+.record-list-left {
+  height: 70px;
+  width: 70px;
   background-size: 100% 100%;
 }
-.record-list-right{
-  height: 140px;
+
+.record-list-right {
   margin-left: 20px;
-  flex:1
+  flex: 1;
+  overflow: hidden;
+
 }
-.record-list-right-title{
+
+.record-list-right-title {
   display: flex;
   justify-content: space-between;
 }
-.addTree{
+
+.treenumber-no{
+  padding: 3px 10px;
+  background: #bdefd0;
+  font-size: 12px;
+}
+
+.addTree {
   width: 100%;
   position: fixed;
   bottom: 0;
--
libgit2 0.21.4