树详情

刘淇
1 parent 12e66ec8
Showing 8 changed files with 305 additions and 25 deletions
api/tree-archive/tree-archive.js
pages-sub/data/tree-archive/addTree.vue
pages-sub/data/tree-archive/editTree.vue
pages-sub/data/tree-archive/logDetail.vue
pages-sub/data/tree-archive/treeRecord.vue
pages-sub/problem/ai-manage/index.vue
pages-sub/problem/regional-order-manage/order-detail.vue
pages/mine/index.vue
@@ -47,14 +47,20 @@ export const treeLogReq = (params) =&gt; {
  * @returns {Promise}
  */
 export const updateTree = (data) => {
-  return put(' /app-api/garden/tree/update', data);
+  return put('/app-api/garden/tree/update', data);
 };
  
  
-// // 树基本详情
-// export const treeDetailReq = (params) => request.get('/business/tree/'+params )
-//   ==>
-//   /app-api/garden/tree/get
-//
+/**
+ * 树基本详情
+ * @param {Object} params
+ * @returns {Promise}
+ */
+export const treeDetailReq = (data) => {
+  return get('/app-api/garden/tree/get', data);
+};
+
+
+
  
  
@@ -173,7 +173,13 @@
  
 <script setup>
 import { ref, reactive, nextTick } from 'vue'
-import { onReady, onLoad, onShow } from '@dcloudio/uni-app';
+import { onReady, onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+onUnload(() => {
+  // 关闭所有页面，直接打开【行道树档案】主页面 【微信小程序完美兼容，无任何报错】
+  uni.reLaunch({
+    url: '/pages-sub/data/tree-archive/index'
+  })
+})
 import { addTree } from "@/api/tree-archive/tree-archive.js";
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { useUserStore } from '@/pinia/user';
@@ -360,6 +366,8 @@ onReady(() =&gt; {
   });
 });
  
+
+
 const toggleArea = () => {
   isShow.value = !isShow.value
 }
@@ -50,7 +50,7 @@
             :show-head="false"
             class="tree-card"
             :foot-border-top="false"
-            @click="toLogDetailPage(item.id)"
+            @click="toLogDetailPage(item)"
         >
           <template #body>
             <view class="card-body-inner">
@@ -93,7 +93,13 @@
  
 <script setup>
 import { ref, reactive } from 'vue'
-import { onLoad, onShow } from '@dcloudio/uni-app';
+import { onReady, onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+onUnload(() => {
+  // 关闭所有页面，直接打开【行道树档案】主页面 【微信小程序完美兼容，无任何报错】
+  uni.reLaunch({
+    url: '/pages-sub/data/tree-archive/index'
+  })
+})
 import { treeRoadReq,treeLogReq } from "@/api/tree-archive/tree-archive.js";
 import { timeFormat } from '@/uni_modules/uview-plus';
  
@@ -136,6 +142,7 @@ onShow(() =&gt; {
   }
 })
  
+
 // ========== Tab切换事件 ==========
 const handleTabChange = (item) => {
   activeTab.value = item.index
@@ -182,9 +189,20 @@ const toAddTreePage = () =&gt; {
 }
  
 // ✅ 新增：点击变更日志卡片 前往日志详情页面
-const toLogDetailPage = (logId) => {
+const toLogDetailPage = (i) => {
   uni.navigateTo({
-    url: `/pages-sub/data/tree-archive/logDetail?id=${logId}&treeId=${treeId.value}`
+    // url: `/pages-sub/data/tree-archive/logDetail?id=${logId}&treeId=${treeId.value}`
+    url: `/pages-sub/data/tree-archive/logDetail`,
+    events: {
+      sendBackData: (data) => {
+        console.log('B页面回传的数据：', data);
+      }
+    },
+    // 2. 向B页面传递数据
+    success: (res) => {
+      // 通过 eventChannel 发送数据，key
+      res.eventChannel.emit('logData', i);
+    }
   })
 }
 </script>
-<script lang="ts">
-import {defineComponent} from 'vue'
+<template>
+  <view class="container">
+    <up-form :model="formData" ref="formRef" label-width="140rpx" border-bottom>
+      <up-form-item label="名称" prop="treetype" required>
+        <up-input v-model="formData.treetype" placeholder="请输入名称" maxlength="30" border="none" readonly/>
+      </up-form-item>
  
-export default defineComponent({
-  name: "logDetail"
-})
-</script>
+      <view class="form-row-wrap">
+        <up-row gutter="10">
+          <up-col span="6">
+            <up-form-item label="胸径" prop="dbh" required>
+              <up-input v-model="formData.dbh" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+              <template #right>
+                <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
+              </template>
+            </up-form-item>
+          </up-col>
+          <up-col span="6">
+            <up-form-item label="高度" prop="treeheight">
+              <up-input v-model="formData.treeheight" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+              <template #right>
+                <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
+              </template>
+            </up-form-item>
+          </up-col>
+        </up-row>
+      </view>
  
-<template>
+      <up-form-item label="位置" prop="growlocation" required class="location-form-item">
+        <up-input v-model="formData.growlocation" placeholder="请选择" readonly border="none"/>
+      </up-form-item>
+
+      <up-row gutter="10">
+        <up-col span="6">
+          <up-form-item label="经度" :borderBottom="false">
+            <up-input v-model="formData.longitude" placeholder="" readonly border="none"/>
+          </up-form-item>
+        </up-col>
+        <up-col span="6">
+          <up-form-item label="纬度" :borderBottom="false">
+            <up-input v-model="formData.latitude" placeholder="" readonly border="none"/>
+          </up-form-item>
+        </up-col>
+      </up-row>
+
+      <up-form-item label="管护单位" prop="managedutyunit" required>
+        <up-input v-model="formData.managedutyunit" placeholder="请输入" maxlength="30" border="none" readonly/>
+      </up-form-item>
+
+      <up-form-item label="权属分类" prop="oldtreeownershipText" required>
+        <text class="show-text">{{ uni.$dict.getDictLabel('tree_ownership',formData.oldtreeownership) || '' }}</text>
+      </up-form-item>
  
+      <!-- ✅ 核心修复：图片上传组件 格式兼容+正确赋值 -->
+      <up-form-item label="图片信息" prop="treeImgList" required>
+        <up-upload
+            :file-list="formatImgList(formData.treeImgList)"
+            multiple
+            :width="70"
+            :height="70"
+            :maxCount="formatImgList(formData.treeImgList).length"
+            disabled
+            :preview-full-image="true"
+        ></up-upload>
+      </up-form-item>
+
+      <view class="animated-area">
+        <up-row gutter="10">
+          <up-col span="6">
+            <up-form-item label="拉丁文" prop="latinname">
+              <up-input v-model="formData.latinname" placeholder="请输入" maxlength="30" border="none" readonly/>
+            </up-form-item>
+          </up-col>
+          <up-col span="6">
+            <up-form-item label="级别">
+              <text class="show-text">{{ uni.$dict.getDictLabel('tree_level',formData.treelevel) || '' }}</text>
+            </up-form-item>
+          </up-col>
+        </up-row>
+
+        <up-form-item label="生长环境" prop="growthenvironment">
+          <up-input v-model="formData.growthenvironment" placeholder="请输入" maxlength="50" border="none" readonly/>
+        </up-form-item>
+
+        <view class="form-row-wrap">
+          <up-row gutter="10">
+            <up-col span="6">
+              <up-form-item label="预估树龄" prop="estimationtreeage">
+                <up-input v-model="formData.estimationtreeage" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+                <template #right>
+                  <text style="padding-left:12rpx;color:#ccc;font-size:14px">年</text>
+                </template>
+              </up-form-item>
+            </up-col>
+            <up-col span="6">
+              <up-form-item label="干周" prop="weekday">
+                <up-input v-model="formData.weekday" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+                <template #right>
+                  <text style="padding-left:12rpx;color:#ccc;font-size:14px">厘米</text>
+                </template>
+              </up-form-item>
+            </up-col>
+          </up-row>
+        </view>
+
+        <view class="form-row-wrap">
+          <up-row gutter="10">
+            <up-col span="6">
+              <up-form-item label="东西冠幅" prop="canopyeastwest">
+                <up-input v-model="formData.canopyeastwest" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+                <template #right>
+                  <text style="padding-left:12rpx;color:#ccc;font-size:14px">米</text>
+                </template>
+              </up-form-item>
+            </up-col>
+            <up-col span="6">
+              <up-form-item label="南北冠幅" prop="canopysouthnorth">
+                <up-input v-model="formData.canopysouthnorth" placeholder="请输入" maxlength="10" border="none" input-align="left" readonly/>
+                <template #right>
+                  <text style="padding-left:12rpx;color:#ccc;font-size:14px">米</text>
+                </template>
+              </up-form-item>
+            </up-col>
+          </up-row>
+        </view>
+      </view>
+
+    </up-form>
+  </view>
 </template>
  
+<script setup>
+import { ref, reactive } from 'vue'
+import { onReady, onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+import { treeDetailReq } from "@/api/tree-archive/tree-archive.js";
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const formRef = ref(null)
+const userStore = useUserStore();
+
+// 表单数据
+const formData = reactive({
+  treetype: '',
+  treeheight: '',
+  dbh: '',
+  treelevel: '',
+  treeleveltext: '',
+  managedutyunit: '',
+  oldtreeownership: '',
+  oldtreeownershipText: '',
+  latinname: '',
+  estimationtreeage: '',
+  canopysouthnorth: '',
+  canopyeastwest: '',
+  weekday: '',
+  growlocation: '',
+  growthenvironment: '',
+  treeImgList: [],
+  address: '',
+  latitude: '',
+  longitude: '',
+  road: '',
+  maintainunit: ''
+})
+
+// ✅ ✅ ✅ 核心新增：图片格式转换函数 【解决图片不显示的关键】
+// 兼容两种格式：1.纯字符串数组 2.对象数组 都能正常渲染
+const formatImgList = (imgList) => {
+  if (!imgList || imgList.length === 0) return [];
+  // 判断是否是纯字符串数组，转成uview需要的 {url:xxx} 格式
+  return imgList.map(item => {
+    if (typeof item === 'string') {
+      return { url: item };
+    } else {
+      return item;
+    }
+  });
+}
+
+// ========== 生命周期 ==========
+onUnload(() => {
+  uni.reLaunch({
+    url: '/pages-sub/data/tree-archive/index'
+  })
+})
+
+onLoad((options) => {
+  // 获取事件通道接收上一页数据，仅做渲染赋值
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  if (currentPage.getOpenerEventChannel) {
+    const eventChannel = currentPage.getOpenerEventChannel();
+    eventChannel.on('logData', (data) => {
+      console.log('接收上一页完整数据：', data);
+      Object.assign(formData, data);
+      // 这里不需要额外赋值图片，formData赋值后会自动同步，formatImgList会做格式转换
+    });
+  }
+})
+
+onShow(async () => {})
+onReady(() => {});
+</script>
+
 <style scoped lang="scss">
+.container {
+  padding: 25rpx;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.location-form-item {
+  padding-right: 10rpx;
+}
+
+// 只读输入框文字颜色优化
+:deep(.u-input__inner) {
+  color: #333;
+  background-color: transparent !important;
+}
+
+// 纯文本展示的样式，和原输入框完全一致，无缝衔接
+.show-text {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 80rpx;
+  width: 100%;
+  display: block;
+  text-align: left;
+}
  
+// 补充：适配表单行间距，和之前一致
+.form-row-wrap {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  :deep(.u-form-item) {
+    position: relative;
+    margin-bottom: 0 !important;
+  }
+}
+.form-row-wrap + .u-form-item {
+  margin-top: 25rpx !important;
+}
+.animated-area {
+  margin-top: 10rpx;
+}
 </style>
 \ No newline at end of file
 <template>
   <view class="container">
     <!-- 空数据组件 -->
-    <up-empty v-if="rows.length === 0" text="暂无数据"></up-empty>
+    <up-empty v-if="rows.length === 0" text="暂无数据" marginTop="100"></up-empty>
  
     <!-- 树木列表：up-card重构 + 保留原始背景图写法 核心满足你的要求 -->
     <view class="record-wrap" v-else>
@@ -61,7 +61,13 @@
  
 <script setup>
 import { ref} from 'vue'
-import {  onLoad, onShow } from '@dcloudio/uni-app';
+import {  onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+onUnload(() => {
+  // 关闭所有页面，直接打开【行道树档案】主页面 【微信小程序完美兼容，无任何报错】
+  uni.reLaunch({
+    url: '/pages-sub/data/tree-archive/index'
+  })
+})
 import { treeRoadReq } from "@/api/tree-archive/tree-archive.js";
 import { timeFormat } from '@/uni_modules/uview-plus';
  
@@ -79,6 +85,8 @@ onShow(() =&gt; {
   treeRoadQuery()
 })
  
+
+
 const toEditPage = (id) => {
   uni.navigateTo({
     url: `/pages-sub/data/tree-archive/editTree?id=${id}`
@@ -252,7 +252,8 @@ import {
   doneBuzSimplePage,
   qyUniversalApproval,
   daquUniversalApproval,
-  dcyUniversalApproval
+  dcyUniversalApproval,
+  aiUniversalApproval
 } from '@/api/regional-order-manage/regional-order-manage'
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap, buzStatusMap } from '@/common/utils/common'
@@ -356,6 +357,7 @@ const callApprovalApi = async (params, taskKey) =&gt; {
   if (USER_ROLES.includes('regional_manager')) return await daquUniversalApproval(params);
   if (USER_ROLES.includes('Inspector_global')) return await dcyUniversalApproval(params);
   if (USER_ROLES.includes('patrol_global')) return await qyUniversalApproval(params);
+  if (USER_ROLES.includes('AI_dispatcher')) return await  aiUniversalApproval(params);
 };
  
 /**
@@ -371,7 +371,8 @@ import {
   getApprovalDetail,
   daquUniversalApproval,
   qyUniversalApproval,
-  dcyUniversalApproval
+  dcyUniversalApproval,
+  aiUniversalApproval
 } from '@/api/regional-order-manage/regional-order-manage';
 import {nextStepMap, buzStatusMap, calculateFormatTimeDiff} from '@/common/utils/common'
 import {useUploadImgs} from '@/common/utils/useUploadImgs'
@@ -424,6 +425,7 @@ const callApprovalApi = async (params: any, taskKey: string) =&gt; {
   if (USER_ROLES.includes('regional_manager')) return await daquUniversalApproval(params);
   if (USER_ROLES.includes('Inspector_global')) return await dcyUniversalApproval(params);
   if (USER_ROLES.includes('patrol_global')) return await qyUniversalApproval(params);
+  if (USER_ROLES.includes('AI_dispatcher')) return await  aiUniversalApproval(params);
   throw new Error('未匹配到对应的审批接口，请检查角色或工单taskKey');
 };
  
@@ -12,7 +12,9 @@
       <!-- 用户名+手机号 -->
       <view class="user-info-content">
         <view class="user-name">{{ userStore.isLogin ? userInfo.username : '未登录' }}</view>
-        <view class="user-phone">{{ userStore.isLogin ? userInfo.nickname : '--------' }}</view>
+<!--        <view class="user-phone">{{ userStore.isLogin ? userInfo.nickname : '&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;' }}</view>-->
+        <view class="user-phone">上次登录时间{{ timeFormat(userInfo.loginDate)}}</view>
+
       </view>
  
     </view>
@@ -22,7 +24,7 @@
       <up-cell-group title="个人信息">
         <up-cell  title="姓名"  :value="userInfo.nickname"></up-cell>
         <up-cell  title="账号" :value="userInfo.username"></up-cell>
-        <up-cell  title="电话" :value="userInfo.username"></up-cell>
+        <up-cell  title="电话" :value="userInfo.mobile"></up-cell>
         <up-cell  title="角色" :value="translateRoles(userStore.userInfo.roles)"></up-cell>
       </up-cell-group>
     </view>
@@ -61,7 +63,7 @@ import {  showModal, onShow } from &#39;@dcloudio/uni-app&#39;
 import {translateRoles} from '@/common/utils/common'
 // 初始化Pinia仓库
 const userStore = useUserStore()
-
+import { timeFormat } from '@/uni_modules/uview-plus';
 // 计算属性获取用户信息（响应式）
 const userInfo = computed(() => userStore.userInfo.user || {})