From 7fc91f7a0da496dc35257a3f466888c1cbbb80e2 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 3 Sep 2025 13:06:12 +0800
Subject: [PATCH] 上传体验版优化

---
 api/tree.js                          | 36 ------------------------------------
 pages.json                           | 11 +++++++----
 subPackages/common/api/tree.js       | 36 ++++++++++++++++++++++++++++++++++++
 subPackages/treePage/addTree.vue     | 11 ++++++++---
 subPackages/treePage/editTree.vue    |  1 -
 subPackages/treePage/editTreeIfo.vue |  3 +--
 subPackages/treePage/treeDetail.vue  | 35 -----------------------------------
 subPackages/treePage/treeFiles.vue   | 55 +++++++++++++++++++++++++++++++++++--------------------
 subPackages/treePage/treeInfo.vue    | 35 +++++++++++++++++------------------
 subPackages/treePage/treeLog.vue     |  4 ++--
 subPackages/treePage/treeRecord.vue  | 10 +++++++---
 11 files changed, 113 insertions(+), 124 deletions(-)
 delete mode 100644 api/tree.js
 create mode 100644 subPackages/common/api/tree.js
 delete mode 100644 subPackages/treePage/treeDetail.vue

diff --git a/api/tree.js b/api/tree.js
deleted file mode 100644
index b0ff0c9..0000000
--- a/api/tree.js
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-import request from '@/utils/request'
-
-// 权属分类
-export const treeOwnership = (params) => request.get('/system/dict/data/type/tree_ownership', params)
-
-// 新增树
-export const addTree = (params) => request.post('/business/tree', params)
-
-// 树基本详情
-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)
-
-
-// 班组集合
-export const deptListReq = (params) => request.get('/business/tree/dept/list', params)
-
-// 道路树木列表
-export const treeRoadReq = (params) => request.get('/business/tree/road/list', params)
-
-// 分类
-export const treeLevelReq = (params) => request.get('/system/dict/data/type/tree_level', params)
-
-
-
-// 获取道路数据列表（根据街道id）
-export const apiRoadListByStreetId = (params) => request.get('/road/manager/queryRoadListByStreetId', params)
diff --git a/pages.json b/pages.json
index 54d9c0e..0461fc6 100644
--- a/pages.json
+++ b/pages.json
@@ -1,19 +1,20 @@
 {
 	"pages": [
 		{
-			"path": "pages/index",
+			"path": "pages/work/index",
 			"style": {
-				"navigationBarTitleText": "首页",
+				"navigationBarTitleText": "工作台",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/work/index",
+			"path": "pages/index",
 			"style": {
-				"navigationBarTitleText": "工作台",
+				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom"
 			}
 		},
+
 		{
 			"path": "pages/mine/index",
 			"style": {
@@ -350,7 +351,9 @@
 		"navigationBarTitleText": "园林养护",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
+
 	},
+
 	"easycom": {
 		"autoscan": true,
 		"custom": {
diff --git a/subPackages/common/api/tree.js b/subPackages/common/api/tree.js
new file mode 100644
index 0000000..b0ff0c9
--- /dev/null
+++ b/subPackages/common/api/tree.js
@@ -0,0 +1,36 @@
+
+
+import request from '@/utils/request'
+
+// 权属分类
+export const treeOwnership = (params) => request.get('/system/dict/data/type/tree_ownership', params)
+
+// 新增树
+export const addTree = (params) => request.post('/business/tree', params)
+
+// 树基本详情
+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)
+
+
+// 班组集合
+export const deptListReq = (params) => request.get('/business/tree/dept/list', params)
+
+// 道路树木列表
+export const treeRoadReq = (params) => request.get('/business/tree/road/list', params)
+
+// 分类
+export const treeLevelReq = (params) => request.get('/system/dict/data/type/tree_level', params)
+
+
+
+// 获取道路数据列表（根据街道id）
+export const apiRoadListByStreetId = (params) => request.get('/road/manager/queryRoadListByStreetId', params)
diff --git a/subPackages/treePage/addTree.vue b/subPackages/treePage/addTree.vue
index 0552079..c61f81c 100644
--- a/subPackages/treePage/addTree.vue
+++ b/subPackages/treePage/addTree.vue
@@ -206,7 +206,7 @@
 
 <script>
 import { uploadURL, OSSURL } from '@/config/app'
-import { treeOwnership, addTree, treeLevelReq } from "@/api/tree";
+import { treeOwnership, addTree, treeLevelReq } from "@/subPackages/common/api/tree.js";
 const rules = [{
   name: "treetype",
   rule: ["required"],
@@ -316,10 +316,14 @@ export default {
     // this.$refs.form && this.$refs.form.immediateValidate(true, rules)
   },
   onLoad(options) {
+
+    this.formData.road = options.roadId
+
+  },
+  onShow(){
     treeLevelReq().then(res => {
       this.treeLevelData = res.data
     })
-    this.formData.road = options.roadId
     this.treeOwnership()
   },
   methods: {
@@ -398,7 +402,8 @@ export default {
             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}`)
+              uni.$tui.href(`/subPackages/treePage/treeFiles`)
             }
           })
         } else {
diff --git a/subPackages/treePage/editTree.vue b/subPackages/treePage/editTree.vue
index db86ac0..052fc06 100644
--- a/subPackages/treePage/editTree.vue
+++ b/subPackages/treePage/editTree.vue
@@ -14,7 +14,6 @@
 
 </template>
 <script >
-// import { treeDetailReq } from "@/api/tree";
 
 import treeLog from "./treeLog.vue";
 import editTreeIfo from "./editTreeIfo.vue";
diff --git a/subPackages/treePage/editTreeIfo.vue b/subPackages/treePage/editTreeIfo.vue
index d75c9f5..8efff6b 100644
--- a/subPackages/treePage/editTreeIfo.vue
+++ b/subPackages/treePage/editTreeIfo.vue
@@ -212,7 +212,7 @@
 
 <script>
 import { uploadURL, OSSURL } from '@/config/app'
-import { treeOwnership, addTree, treeLevelReq, treeDetailReq, updateTree } from "@/api/tree";
+import { treeOwnership, addTree, treeLevelReq, treeDetailReq, updateTree } from "@/subPackages/common/api/tree.js";
 const rules = [{
   name: "treetype",
   rule: ["required"],
@@ -318,7 +318,6 @@ export default {
       immediate: true,
       handler(newVal, oldVal) {
         if (newVal && newVal !== oldVal) {
-
           this.treeDetailQuery(newVal)
         }
       }
diff --git a/subPackages/treePage/treeDetail.vue b/subPackages/treePage/treeDetail.vue
deleted file mode 100644
index ae80582..0000000
--- a/subPackages/treePage/treeDetail.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <view class="container">
-
-    <!--    <tui-no-data imgUrl="/static/images/nodata.png" v-if="rows.length==0">暂无数据</tui-no-data>-->
-    <view>123</view>
-
-  </view>
-
-</template>
-
-<script>
-export default {
-
-  data() {
-    return {
-      rows: [],
-      roadId: ''
-    }
-  },
-  onLoad(options) {
-    let dataString = decodeURIComponent(options.data);
-    let data = JSON.parse(dataString);
-    console.log(data); // { key: 'value', otherKey: 123 }
-  },
-  methods: {
-
-  }
-}
-</script>
-
-
-<style scoped>
-
-
-</style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeFiles.vue b/subPackages/treePage/treeFiles.vue
index 112acd7..a73ec8f 100644
--- a/subPackages/treePage/treeFiles.vue
+++ b/subPackages/treePage/treeFiles.vue
@@ -1,33 +1,35 @@
 <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="companyId" @click="pickerShow" label="归属单位" >
+      <tui-form-item arrow highlight prop="companyId" :bottom-border="false" @click="pickerShow" label="归属单位" >
         <tui-input padding="0" :borderBottom="false" placeholder="请选择归属单位" disabled
                    backgroundColor="transparent" v-model="formData.companyId"></tui-input>
       </tui-form-item>
-      <tui-form-item prop="roadName" :bottom-border="false" label="道路名称">
-<!--        <tui-input padding="0" :borderBottom="false" placeholder="请输入道路" maxlength="20"  :clearable="true"  :backgroundColor="#f5f5f5" :inputBorder="true" :radius="30"-->
-<!--                   v-model="formData.roadName" @confirm="searchChange"   :left-icon="Search" >-->
-<!--          <slot :name="left">123</slot>-->
+<!--      <tui-form-item prop="roadName" :bottom-border="false" label="道路名称">-->
+<!--&lt;!&ndash;        <tui-input padding="0" :borderBottom="false" placeholder="请输入道路" maxlength="20"  :clearable="true"  :backgroundColor="#f5f5f5" :inputBorder="true" :radius="30"&ndash;&gt;-->
+<!--&lt;!&ndash;                   v-model="formData.roadName" @confirm="searchChange"   :left-icon="Search" >&ndash;&gt;-->
+<!--&lt;!&ndash;          <slot :name="left">123</slot>&ndash;&gt;-->
+<!--&lt;!&ndash;        </tui-input>&ndash;&gt;-->
+
+<!--        <tui-input padding="0" :borderBottom="false" placeholder="请输入道路" maxlength="20"   @confirm="searchChange"-->
+<!--                   v-model="formData.roadName">-->
+<!--&lt;!&ndash;          <template v-slot:left>&ndash;&gt;-->
+<!--&lt;!&ndash;            <tui-icon name="search" :size="15" ></tui-icon>&ndash;&gt;-->
+<!--&lt;!&ndash;          </template>&ndash;&gt;-->
 <!--        </tui-input>-->
+<!--        <template v-slot:right>-->
+<!--          <tui-icon name="search" :size="20" @click="searchChange"></tui-icon>-->
+<!--&lt;!&ndash;          <tui-form-button width="188rpx" height="64rpx" background="#f2f2f2" color="#5677fc" size="24"&ndash;&gt;-->
+<!--&lt;!&ndash;                           bold radius="12rpx">获取验证码</tui-form-button>&ndash;&gt;-->
+<!--        </template>-->
 
-        <tui-input padding="0" :borderBottom="false" placeholder="请输入道路" maxlength="20"   @confirm="searchChange"
-                   v-model="formData.roadName">
-<!--          <template v-slot:left>-->
-<!--            <tui-icon name="search" :size="15" ></tui-icon>-->
-<!--          </template>-->
-        </tui-input>
-        <template v-slot:right>
-          <tui-icon name="search" :size="20" @click="searchChange"></tui-icon>
-<!--          <tui-form-button width="188rpx" height="64rpx" background="#f2f2f2" color="#5677fc" size="24"-->
-<!--                           bold radius="12rpx">获取验证码</tui-form-button>-->
-        </template>
-
-      </tui-form-item>
+<!--      </tui-form-item>-->
 
 
     </tui-form>
 
+    <tui-searchbar radius="40rpx" height="64rpx" placeholder="请输入道路名称" @search="getSeach" @clear="setSeach"></tui-searchbar>
+
     <!--    <tui-row marginTop="10px" :gutter="5" class="full-height-row">-->
     <!--      <tui-col :span="8" class="left-con full-height-col" >-->
     <!--        <view class="full-height-col left-con">1</view>-->
@@ -81,7 +83,7 @@
 
 
 <script>
-import { belongCompanyreq, deptListReq, treeRoadReq } from "@/api/tree";
+import { belongCompanyreq, deptListReq, treeRoadReq } from "@/subPackages/common/api/tree.js";
 export default {
   name: "treeFiles",
   data() {
@@ -102,6 +104,9 @@ export default {
     }
   },
   onLoad() {
+
+  },
+  onShow(){
     // 归属公司
     belongCompanyreq().then(res => {
       this.belongCompanyData = res.data
@@ -113,6 +118,16 @@ export default {
     })
   },
   methods: {
+    // 获取搜索结果
+    getSeach(e) {
+      this.formData.roadName = e.value
+      this.deptListQuery()
+    },
+    // 清空搜索数据
+    setSeach() {
+      this.formData.roadName = ''
+      this.deptListQuery()
+    },
     // 前往历史页面
     toNewPage(params) {
       uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${params}`)
@@ -205,7 +220,7 @@ export default {
 }
 
 .card-wrap {
-  margin: 20px 10px 0;
+  margin: 15px 10px 0;
   padding: 20rpx;
   border-radius: 14rpx;
 }
diff --git a/subPackages/treePage/treeInfo.vue b/subPackages/treePage/treeInfo.vue
index d18162b..b68c1a3 100644
--- a/subPackages/treePage/treeInfo.vue
+++ b/subPackages/treePage/treeInfo.vue
@@ -2,7 +2,7 @@
   <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"
+        <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="30" :disabled="true"
                    v-model="formData.treetype"></tui-input>
       </tui-form-item>
 
@@ -10,7 +10,7 @@
 
         <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"
+            <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:#ccc;font-size:14px">厘米</text>
@@ -20,7 +20,7 @@
 
         <tui-col :span="12">
           <tui-form-item label="高度"  prop="treeheight" :position="3">
-            <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
+            <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:#ccc;font-size:14px;">米</text>
@@ -36,7 +36,7 @@
           class="location-form-item"
           prop="growlocation"
       >
-        <tui-input padding="0" :borderBottom="false" placeholder="请选择" :disabled="true"
+        <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>
@@ -68,14 +68,14 @@
 
       <tui-form-item asterisk label="管护单位" prop="managedutyunit">
 
-        <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
+        <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"
+        <tui-input padding="0" :borderBottom="false" placeholder="" :disabled="true"
                    backgroundColor="transparent" v-model="formData.oldtreeownershipText"></tui-input>
       </tui-form-item>
 
@@ -125,20 +125,20 @@
       <tui-row>
         <tui-col :span="12">
           <tui-form-item label="拉丁文" prop="latinname">
-            <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
+            <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"
+            <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"
+        <tui-input padding="0" :borderBottom="false" placeholder="" maxlength="50" :disabled="true"
                    v-model="formData.growthenvironment"></tui-input>
       </tui-form-item>
 
@@ -146,7 +146,7 @@
       <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"
+            <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:#ccc;font-size: 14px">年</text>
@@ -155,7 +155,7 @@
         </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"
+            <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:#ccc;font-size: 14px">厘米</text>
@@ -168,7 +168,7 @@
       <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"
+            <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:#ccc">米</text>
@@ -177,7 +177,7 @@
         </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"
+            <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:#ccc;font-size: 14px">米</text>
@@ -192,7 +192,7 @@
 
 <script>
 import { uploadURL, OSSURL } from '@/config/app'
-import { treeOwnership, treeLevelReq } from "@/api/tree";
+import { treeOwnership, treeLevelReq } from "@/subPackages/common/api/tree.js";
 import { useCounterStore } from '@/stores/counter'
 const rules = [{
   name: "treetype",
@@ -302,10 +302,10 @@ export default {
   onUnload() {
 
   },
-  onLoad(options) {
-    // this.formData = this.useCounterStore.treeData
+  onLoad() {
+  },
+  onShow(){
     const treeData = this.useCounterStore.treeData;
-
     this.formData = {
       ...treeData,
       // 仅在当前组件中临时转换为对象数组，不修改Pinia源数据
@@ -321,7 +321,6 @@ export default {
     //     src: item
     //   }
     // });
-
     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 6dd83db..dfda90f 100644
--- a/subPackages/treePage/treeLog.vue
+++ b/subPackages/treePage/treeLog.vue
@@ -33,7 +33,7 @@
 
 <script>
 import { useCounterStore } from '@/stores/counter'
-import { treeLogReq } from "@/api/tree";
+import { treeLogReq } from "@/subPackages/common/api/tree.js";
 export default {
   name: "treeLog",
   props: {
@@ -84,7 +84,7 @@ export default {
 
 <style scoped>
 .record-list-wrap {
-  margin: 20px 10px 0 ;
+  margin: 15px 10px 0 ;
   padding:10px;
   border-radius: 6px;
   font-size: 14px;
diff --git a/subPackages/treePage/treeRecord.vue b/subPackages/treePage/treeRecord.vue
index a1dc28d..1b90e76 100644
--- a/subPackages/treePage/treeRecord.vue
+++ b/subPackages/treePage/treeRecord.vue
@@ -1,6 +1,5 @@
 <template>
   <view class="container">
-
     <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 cad-box-shadow fs-bg__white" v-for="i in rows" @click="toEditPage(i.id)">
@@ -32,7 +31,7 @@
 </template>
 
 <script>
-import { treeRoadReq } from "@/api/tree";
+import { treeRoadReq } from "@/subPackages/common/api/tree.js";
 export default {
   name: "treeRecord",
   data() {
@@ -43,6 +42,8 @@ export default {
   },
   onLoad(options) {
     this.roadId = options.roadId
+  },
+  onShow(){
     this.treeRoadQuery()
   },
   methods: {
@@ -64,8 +65,11 @@ export default {
 </script>
 
 <style scoped>
+.record-wrap{
+  padding-bottom: 60px;
+}
 .record-list-wrap {
-  margin: 20px 10px 0 ;
+  margin: 15px 10px 0 ;
   padding:10px;
   border-radius: 6px;
   font-size: 14px;
--
libgit2 0.21.4