From 73dee4bdf7ed0386350a90d91a4127e1d92c2081 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Tue, 2 Sep 2025 15:31:00 +0800
Subject: [PATCH] 高度非必填

---
 subPackages/treePage/addTree.vue     | 31 ++++++++++++++++---------------
 subPackages/treePage/editTreeIfo.vue | 51 ++++++++++++++++++++++++++-------------------------
 subPackages/treePage/treeInfo.vue    | 22 ++++++++++++----------
 utils/request.js                     |  2 +-
 4 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/subPackages/treePage/addTree.vue b/subPackages/treePage/addTree.vue
index 8afb841..0552079 100644
--- a/subPackages/treePage/addTree.vue
+++ b/subPackages/treePage/addTree.vue
@@ -1,27 +1,28 @@
 <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>
       </tui-form-item>
 
       <tui-row>
+
         <tui-col :span="12">
-          <tui-form-item label="高度" asterisk prop="treeheight" :position="3">
+          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
-                       v-model="formData.treeheight"></tui-input>
+                       v-model="formData.dbh"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
         <tui-col :span="12">
-          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
+          <tui-form-item label="高度"  prop="treeheight" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
-                       v-model="formData.dbh"></tui-input>
+                       v-model="formData.treeheight"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -45,21 +46,23 @@
       <tui-col :span="12">
         <tui-form-item
             label="经度"
+            labelColor="#ccc"
             class="location-form-item"
             prop="latitude"
             :bottomBorder="false"
         >
-          {{ formData.longitude }}
+          <span style="color: #ccc"> {{ formData.longitude }}</span>
         </tui-form-item>
       </tui-col>
       <tui-col :span="12">
         <tui-form-item
             :bottomBorder="false"
             label="纬度"
+            labelColor="#ccc"
             class="location-form-item"
             prop="latitude"
         >
-          {{ formData.latitude }}
+          <span style="color: #ccc"> {{ formData.latitude }}</span>
         </tui-form-item>
       </tui-col>
 
@@ -210,8 +213,8 @@ const rules = [{
   msg: ["请输入名称"]
 }, {
   name: "treeheight",
-  rule: ["required", "maxLength:10", "isAmount"],
-  msg: ["请输入树高", "数高不能超过10个字符", "请输入正确"]
+  rule: ["maxLength:10", "isAmount"],
+  msg: ["树高不能超过10个字符", "请输入正确"]
 }, {
   name: "dbh",
   rule: ["required", "maxLength:10", "isAmount"],
@@ -283,12 +286,12 @@ export default {
         dbh: '',
         //级别
         treelevel: '',
-        treeleveltext:'',
+        treeleveltext: '',
         //权属单位
         managedutyunit: '',
         //权属分类
         oldtreeownership: '',
-        oldtreeownershipText:'',
+        oldtreeownershipText: '',
         latinname: '', // 拉丁名
         estimationtreeage: '', // 估测树龄
         canopysouthnorth: '', // 冠幅南北
@@ -376,7 +379,6 @@ export default {
       console.log(e)
       this.formData.treelevel = e.dictValue
       this.formData.treeleveltext = e.dictLabel
-
     },
     submit() {
       // 3. 打印提交时的数据
@@ -444,7 +446,6 @@ export default {
 <style>
 
 
-
 .tui-btn__box {
   width: 100%;
   position: fixed;
diff --git a/subPackages/treePage/editTreeIfo.vue b/subPackages/treePage/editTreeIfo.vue
index e7824d3..d75c9f5 100644
--- a/subPackages/treePage/editTreeIfo.vue
+++ b/subPackages/treePage/editTreeIfo.vue
@@ -7,27 +7,26 @@
       </tui-form-item>
 
       <tui-row>
+
         <tui-col :span="12">
-          <tui-form-item label="高度" asterisk prop="treeheight" :position="3">
+          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
-                       v-model="formData.treeheight"></tui-input>
+                       v-model="formData.dbh"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px;">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
         <tui-col :span="12">
-          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
+          <tui-form-item label="高度"  prop="treeheight" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
-                       v-model="formData.dbh"></tui-input>
+                       v-model="formData.treeheight"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
             </template>
           </tui-form-item>
         </tui-col>
       </tui-row>
-
-
       <tui-form-item
           asterisk
           label="位置"
@@ -41,29 +40,31 @@
           <tui-icon name="gps" :size="20"></tui-icon>
         </template>
       </tui-form-item>
-
       <tui-col :span="12">
         <tui-form-item
-
-            label="纬度"
+            label="经度"
+            labelColor="#ccc"
             class="location-form-item"
-
             prop="latitude"
         >
-          {{ formData.latitude }}
+          <span style="color: #ccc"> {{ formData.longitude }}</span>
         </tui-form-item>
       </tui-col>
+
       <tui-col :span="12">
         <tui-form-item
-            label="经度"
+            labelColor="#ccc"
+            label="纬度"
             class="location-form-item"
+
             prop="latitude"
         >
-          {{ formData.longitude }}
+          <span style="color: #ccc"> {{ formData.latitude }}</span>
         </tui-form-item>
       </tui-col>
 
 
+
       <tui-form-item asterisk label="管护单位" prop="managedutyunit">
 
         <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30"
@@ -145,7 +146,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.estimationtreeage"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">年</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -154,7 +155,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.weekday"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">厘米</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -167,7 +168,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.canopyeastwest"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa">米</text>
+                <text style="padding-left: 12rpx;color:#ccc">米</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -176,13 +177,12 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.canopysouthnorth"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">米</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
               </template>
             </tui-form-item>
           </tui-col>
         </tui-row>
 
-
       </view>
 
       <!-- 触发按钮 -->
@@ -198,7 +198,7 @@
     </tui-form>
     <view style="height: 60px;width: 100%"></view>
     <view class="tui-btn__box">
-      <tui-button bold @click="submit">提交</tui-button>
+      <tui-button bold @click="submit">修改树木信息</tui-button>
     </view>
     <tui-picker :show="show" :pickerData="treeOwnershipData" textField="dictLabel" valueField="dictValue"
                 @hide="pickerHide" @change="pickerChange">
@@ -219,8 +219,8 @@ const rules = [{
   msg: ["请输入名称"]
 }, {
   name: "treeheight",
-  rule: ["required", "maxLength:10", "isAmount"],
-  msg: ["请输入数高", "数高不能超过10个字符", "请输入正确"]
+  rule: ["maxLength:10", "isAmount"],
+  msg: ["数高不能超过10个字符", "请输入正确"]
 }, {
   name: "dbh",
   rule: ["required", "maxLength:10", "isAmount"],
@@ -414,6 +414,7 @@ export default {
       // 3. 打印提交时的数据
       console.log("提交时treeImgList：", this.formData.treeImgList);
       // 手动校验图片
+      console.log( this.formData);
       if (!this.formData.treeImgList || this.formData.treeImgList.length === 0) {
         uni.showToast({title: "请上传图片", icon: "none"});
         return; // 阻止提交
@@ -423,11 +424,11 @@ export default {
         if (res.isPass) {
           console.log(this.formData)
           console.log('校验通过！')
-          updateTree({data: {...this.formData}}).then(res => {
+          updateTree({data:this.formData}).then(res => {
             console.log(res)
             if (res.code == '200') {
               uni.showToast({title: "修改成功", icon: "none"});
-              // uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${this.formData.road}`)
+              uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${this.formData.road}`)
             }
           })
         } else {
diff --git a/subPackages/treePage/treeInfo.vue b/subPackages/treePage/treeInfo.vue
index ec44aab..d18162b 100644
--- a/subPackages/treePage/treeInfo.vue
+++ b/subPackages/treePage/treeInfo.vue
@@ -7,21 +7,23 @@
       </tui-form-item>
 
       <tui-row>
+
         <tui-col :span="12">
-          <tui-form-item label="高度" asterisk prop="treeheight" :position="3">
+          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
-                       v-model="formData.treeheight"></tui-input>
+                       v-model="formData.dbh"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
+
         <tui-col :span="12">
-          <tui-form-item label="胸径" asterisk prop="dbh" :position="3">
+          <tui-form-item label="高度"  prop="treeheight" :position="3">
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
-                       v-model="formData.dbh"></tui-input>
+                       v-model="formData.treeheight"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -46,20 +48,20 @@
             label="经度"
             class="location-form-item"
             prop="latitude"
+            labelColor="#ccc"
         >
-          {{ formData.longitude }}
+          <span style="color: #ccc"> {{ formData.longitude }}</span>
         </tui-form-item>
       </tui-col>
 
       <tui-col :span="12">
         <tui-form-item
-
             label="纬度"
             class="location-form-item"
-
+            labelColor="#ccc"
             prop="latitude"
         >
-          {{ formData.latitude }}
+          <span style="color: #ccc"> {{ formData.latitude }}</span>
         </tui-form-item>
       </tui-col>
 
diff --git a/utils/request.js b/utils/request.js
index f6c9ac8..5cb3a0f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -7,7 +7,7 @@ function checkParams(params) {
 	if (typeof params != 'object') return params;
 	for (let key in params) {
 		const value = params[key]
-		if (value === null || value === undefined || value === "") {
+		if (value === null || value === undefined ) {
 			delete params[key]
 		}
 	}
--
libgit2 0.21.4