树木历史

刘淇
1 parent b951d827
Showing 6 changed files with 40 additions and 90 deletions
pages/work/index.vue
static/images/work/itmeHometree.png
subPackages/treePage/editTreeIfo.vue
subPackages/treePage/treeFiles.vue
subPackages/treePage/treeInfo.vue
subPackages/treePage/treeLog.vue
@@ -58,7 +58,7 @@
 						<text>人员管理</text>
 					</view>
           <view class="fs-flex__column fs-items__center item" @click="href('/subPackages/treePage/treeFiles')">
-            <image class="fs-mb10 icon" src="/static/images/work/itmeHome9.png"></image>
+            <image class="fs-mb10 icon" src="/static/images/work/itmeHometree.png"></image>
             <text>一树一档案</text>
           </view>
 				</view>
@@ -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)
 <template>
   <view class="container">
     <tui-form ref="form" :show-message="false" :model="formData" style="border-bottom: 1px solid #f5f4f4">
-      <tui-form-item arrow highlight prop="area" @click="pickerShow">
+      <tui-form-item arrow highlight prop="area" @click="pickerShow" label="归属单位">
         <tui-input padding="0" :borderBottom="false" placeholder="请选择归属单位" disabled
                    backgroundColor="transparent" v-model="formData.area"></tui-input>
       </tui-form-item>
@@ -43,26 +43,28 @@
       <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>
+
       <tui-form-item asterisk label="管护单位" prop="managedutyunit">
         <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
@@ -291,60 +293,14 @@ export default {
     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"
-    }
+    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);
@@ -12,11 +12,11 @@
               <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;"
+              <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;"
+              <img src="/static/images/tree/treearound.png" style="width: 16px;height: 16px;margin-right: 6px;"
                    alt="">胸径：{{ i.dbh }} 厘米
             </view>
           </view>
@@ -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) {