From abc8086ad0312619a964ed4df4deb939663cdcea Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Tue, 19 May 2026 17:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/App.vue                   |   6 +
 wuye-manager-uniapp/api/common.js             |   2 +-
 wuye-manager-uniapp/api/complain.js           |   2 +-
 wuye-manager-uniapp/api/insepction.js         |  44 ++++-
 wuye-manager-uniapp/api/ticket.js             |  64 +++++++
 .../pageSubPack/complaint/handleUser.vue      |   1 -
 .../inspection/inspection_main.vue            |  35 +++-
 .../inspection/inspection_record.vue          |  12 +-
 .../inspection/inspection_upload.vue          |  38 ++++-
 .../inspection/toDays_inscpection.vue         | 161 ++++++++++--------
 .../pageSubPack/instrument/addreplacement.vue |   1 -
 .../pageSubPack/ticket/myticket.vue           | 153 +++++++----------
 .../pageSubPack/ticket/repairCompleted.vue    |   1 -
 .../pageSubPack/ticket/repairMain.vue         |  17 +-
 wuye-manager-uniapp/pages/index/index.vue     | 149 +++++++++-------
 15 files changed, 433 insertions(+), 253 deletions(-)
 create mode 100644 wuye-manager-uniapp/api/ticket.js

diff --git a/wuye-manager-uniapp/App.vue b/wuye-manager-uniapp/App.vue
index 7dc69c1..b8969b1 100644
--- a/wuye-manager-uniapp/App.vue
+++ b/wuye-manager-uniapp/App.vue
@@ -74,6 +74,12 @@ export default {
 .overflow-auto {
   overflow: auto;
 }
+.nodata {
+  color: #ccc;
+  text-align: center;
+  margin-top: 200rpx;
+  letter-spacing: 1rpx;
+}
 /* 自定义导航栏专用 */
 .custom-header {
   height: calc(var(--status-bar-height) + 88rpx);
diff --git a/wuye-manager-uniapp/api/common.js b/wuye-manager-uniapp/api/common.js
index d7e6449..64261bb 100644
--- a/wuye-manager-uniapp/api/common.js
+++ b/wuye-manager-uniapp/api/common.js
@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-15 11:37:01
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-18 15:34:07
+ * @LastEditTime: 2026-05-19 16:32:46
  */
 import request, {
   get,
diff --git a/wuye-manager-uniapp/api/complain.js b/wuye-manager-uniapp/api/complain.js
index f0c6ffb..5b6690a 100644
--- a/wuye-manager-uniapp/api/complain.js
+++ b/wuye-manager-uniapp/api/complain.js
@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-15 08:50:47
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-16 15:42:36
+ * @LastEditTime: 2026-05-19 16:34:23
  */
 import request, {
   filterParams,
diff --git a/wuye-manager-uniapp/api/insepction.js b/wuye-manager-uniapp/api/insepction.js
index 1bce4af..a24b52b 100644
--- a/wuye-manager-uniapp/api/insepction.js
+++ b/wuye-manager-uniapp/api/insepction.js
@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-16 15:43:07
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-18 16:35:05
+ * @LastEditTime: 2026-05-19 16:25:14
  */
 
 import request, {
@@ -25,11 +25,16 @@ import request, {
 /**
  * @typedef InspectionListType 巡检任务表
  * @property {string} id = [巡检任务ID]
+ *
+ * @property {0|1} inspectSetting = [0必须拍照， 1允许跳检]
+ * @property {string} inspectorName = [巡检人员]
+ * @property {string} phoneNumber = [巡检人员 联系方式]
+ * @property {string} inspectTime = [巡检时间]
+ *
  * @property {string} taskName = [巡检任务名称]
  * @property {string} taskTime = [巡检任务执行时间]
  * @property {string} taskStatus = [巡检状态]
  * @property {string} planName = [巡检计划]
- * @property {string} inspectorName = [巡检人员]
  * @property {string} executeDate = [巡检日期]
  * @property {PointsType[]} points = [巡检点]
  * @property {string[]} [itemslist] = [巡检项目]
@@ -44,11 +49,42 @@ export const getInspectionList = (data) => {
 }
 
 
-
+/**
+ * @typedef PointType 巡检点 信息
+ * @property {string} imgUrl = [0必须拍照， 1允许跳检]
+ * @property {string} itemNames = [巡检人员]
+ * @property {string} itemStandards = [巡检人员 联系方式]
+ * @property {string} pointId = [巡检时间]
+ * @property {string} pointName = [巡检点名称]
+ * @property {string} remark = [巡检描述]
+ * @property { 0 | 1 } status = [巡检点状态 ]
+ * */
+/**
+ * @typedef RoutesType 巡检路线 信息
+ * @property {string} inspectSetting = [0必须拍照， 1允许跳检]
+ * @property {string} description = [巡检人员]
+ * @property {string} routeId = [巡检人员 联系方式]
+ * @property {string} routeName = [巡检时间]
+ * @property {PointType[]} points = [巡检计划]
+ * */
+/**
+ * @typedef InspectionMainType 巡检任务详情
+ * @property {0|1} inspectSetting = [0必须拍照， 1允许跳检]
+ * @property {string} inspectorName = [巡检人员]
+ * @property {string} villageName = [巡检小区]
+ * @property {string} phoneNumber = [巡检人员 联系方式]
+ * @property {string} inspectTime = [巡检时间]
+ * @property {string} planName = [巡检计划]
+ * @property {string} remindTime = [提醒时间]
+ * @property {string} taskId = [巡检任务ID]
+ * @property {string} taskName = [巡检任务名称]
+ * @property {string} taskTime = [巡检任务执行时间]
+ * @property {RoutesType[]} routes = [巡检路线信息]
+ * */
 /**
  * @description: 获取 巡检任务详情
  * @param {string} id
- * @return
+ * @return {Promise<DataResult<InspectionMainType>>}
  */
 export const getInspectionMain = (id) => {
   return get('/api/inspection/today/detail', {
diff --git a/wuye-manager-uniapp/api/ticket.js b/wuye-manager-uniapp/api/ticket.js
new file mode 100644
index 0000000..98173f2
--- /dev/null
+++ b/wuye-manager-uniapp/api/ticket.js
@@ -0,0 +1,64 @@
+/**
+ * @Description: 工单API
+ * @Author: Zy
+ * @Date: 2026-05-19 16:29:20
+ * @LastEditor: Zy
+ * @LastEditTime: 2026-05-19 17:15:09
+ */
+import request, {
+  get,
+  filterParams,
+  post
+} from './request.js'
+
+
+
+/**
+ * @typedef myOrderListType  个人维修工单列表
+ * @property {String} id = [工单ID]
+ * @property {String} houseId = [维修房屋ID]
+ * @property {String} maintenanceItemId = [维修项目ID]
+ * @property {String} maintenanceItemName = [维修项目名称]
+ * @property {String} problem = [报修描述]
+ * @property {String} residentId = [报修用户ID]
+ * @property {String} residentName = [报修用户名称]
+ * @property {String} phone = [报修用户 联系方式]
+ * @property {String} orderDate = [工单日期]
+ * @property {String} problemImageUrl = [报修图片]
+ * @property {String} problemStatus = [报修状态]
+ * @property {String} repairDes = [维修描述]
+ * @property {String} repairImageUrl = [维修描述]
+ * @property {String} repairId = [维修ID]
+ * @property {String} repairName = [维修人员名称]
+ * @property {String} houseName = [维修房屋地址]
+ * @property {String} item = []
+ * @property {String} projectType = [报修项目类型]
+ * @property {String} projectTypeStr = [报修 项目 名称]
+ * @property {String} repairIsCheck = [维修人员 已读]
+ * @property {String} manageIsCheck = [管理人员 已读]
+ * @property {String} isCheckStr = [状态已读]
+ */
+/**
+ * @description: 获取我的维修工单
+ * @param {RequestParams<{
+   itemType?: 0 | 1
+   problemStatus:1|2
+ }>} data
+ * @return { Promise<RowsResult<myOrderListType>>}
+ */
+export function getUserTicketlist(data) {
+  return get(`/manage/repair/order/myorderlist`, filterParams(data))
+}
+
+
+
+
+
+/**
+ * @description: 获取工单详细信息 by id
+ * @param {string} id
+ * @return
+ */
+export function getTicketMainById(id) {
+  return get('/manage/repair/order/orderdetail', data)
+}
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
index 161ebfb..8f91799 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
@@ -118,7 +118,6 @@ function getlist() {
   })
   getSystemUsers_employee('complainUser', queryParmas.value.value)
     .then(res => {
-      console.log(res)
       searchlist.value = res.data
     })
     .finally(() => {
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
index 1d0a62d..6699d0a 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue
@@ -16,7 +16,7 @@
           </view>
           <view class="item">
             <text>巡检时间：</text>
-            <text>07:00:00 - 09:00:00</text>
+            <text>{{ info.taskTime }}</text>
           </view>
           <view class="item">
             <text>巡检小区：</text>
@@ -34,7 +34,7 @@
           </view>
         </view>
       </view>
-      <view class="result_box">
+      <view class="result_box" v-if="baseFormData.length > 0">
         <view class="inspecton_result_title">
           <text>巡检结果</text>
         </view>
@@ -50,15 +50,15 @@
             </view>
             <view class="inspection_items">
               <text class="label">巡检人：</text>
-              <text>{{ ite.resientName }}</text>
+              <text>{{ info.inspectorName }}</text>
             </view>
             <view class="inspection_items">
               <text class="label">手机号码：</text>
-              <text>{{ ite.phone }}</text>
+              <text>{{ info.phoneNumber }}</text>
             </view>
             <view class="inspection_items">
               <text class="label">巡检时间：</text>
-              <text>{{ ite.time }}</text>
+              <text>{{ ite.createTime }}</text>
             </view>
             <view class="inspection_items">
               <text class="label">巡检状态：</text>
@@ -66,7 +66,11 @@
             </view>
             <view class="inspection_items">
               <view class="label">巡检结果：</view>
-              <view class="desction_value">{{ ite.descrtion }}</view>
+              <!-- <view class="desction_value"> {{ ite.desition }}</view> -->
+              <view class="desction_value">
+                <!-- <rich-text :nodes="ite.desition"></rich-text> -->
+                <textarea class="my_textarea" disabled auto-height :value="ite.desition" />
+              </view>
             </view>
             <view class="inspection_items">
               <view class="label">巡检照片：</view>
@@ -83,6 +87,9 @@
           </view>
         </view>
       </view>
+      <view class="nodata" v-else>
+        <text>暂无数据</text>
+      </view>
     </view>
   </view>
 </template>
@@ -100,6 +107,8 @@ const info = ref({
   taskId: '',
   taskName: '',
   taskTime: '',
+  inspectorName: '',
+  phoneNumber: '',
   villageName: ''
 })
 const baseFormData = ref([])
@@ -118,6 +127,7 @@ function init() {
               pointId: ite.pointId,
               pointName: ite.pointName,
               status: ite.status ?? 0,
+              createTime: ite.createTime,
               desition: ite.remark,
               files: ite.imgUrl ? ite.imgUrl.split(',') : [],
               phone: '',
@@ -134,7 +144,6 @@ function init() {
         })
         .filter(item => item !== false)
       baseFormData.value = result
-      console.log(result)
     })
     .catch(err => {
       uni.showToast({
@@ -233,7 +242,6 @@ onLoad(options => {
           width: 160rpx;
           height: 160rpx;
           margin-right: 20rpx;
-          margin-bottom: 20rpx;
           margin-top: 20rpx;
         }
 
@@ -241,7 +249,6 @@ onLoad(options => {
           font-weight: 450;
           font-size: 28rpx;
           color: #333333;
-          margin-bottom: 20rpx;
         }
 
         .desction_value {
@@ -250,6 +257,16 @@ onLoad(options => {
           font-size: 28rpx;
           color: #666666;
           line-height: 36rpx;
+          max-height: 250rpx; /* 最大高度，超出滚动 */
+          overflow-y: auto; /* 超出滚动 */
+
+          .my_textarea {
+            min-height: 80rpx;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #666666;
+            line-height: 36rpx;
+          }
         }
       }
       .linedash {
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
index 1308698..5907cbf 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
@@ -25,6 +25,7 @@
         scroll-y
         lower-threshold="160"
         @scrolltolower="scrolltolower"
+        v-if="list.length > 0"
       >
         <view
           class="record_list_item"
@@ -52,6 +53,9 @@
           </view>
         </view>
       </scroll-view>
+      <view class="nodata" v-else>
+        <text>暂无数据</text>
+      </view>
     </view>
   </view>
 </template>
@@ -110,11 +114,12 @@ function getlist() {
     title: '加载中',
     mask: true
   })
-  const { pageNum, pageSize, date } = queryParmas.value
+  const { pageNum, pageSize, date, status } = queryParmas.value
   getInspectionList({
     pageSize,
     pageNum,
-    date
+    date,
+    status
   })
     .then(res => {
       list.value = res.rows
@@ -125,7 +130,6 @@ function getlist() {
           ite.itemNames.forEach(it => items.add(it))
         })
         item.itemslist = Array.from(items)
-        console.log(item.itemslist)
       })
       hasMore.value = list.value.length < res.total
       total.value = res.total
@@ -163,6 +167,7 @@ function scrolltolower() {
 }
 
 function handleChangeTabs(val: number) {
+  hasMore.value = true
   queryParmas.value.status = val
   queryParmas.value.pageNum = 1
   queryParmas.value.pageSize = 10
@@ -177,7 +182,6 @@ function init() {
 
 onShow(() => {
   hasMore.value = true
-  console.log('show')
   init()
 })
 // 返回上一页
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue
index b2625f3..d8a4bce 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue
@@ -67,7 +67,10 @@
                 </view>
               </view>
               <view class="items_picker_box">
-                <view class="label"> 巡检照片 </view>
+                <view class="label">
+                  <text v-if="info.inspectSetting === 1" class="is-required">*</text>
+                  <text>巡检照片</text>
+                </view>
                 <view class="filePickerbox" v-if="!ite.complated">
                   <filePicker
                     v-model="ite.files"
@@ -138,6 +141,14 @@ const rules = {
         errorMessage: '巡检状态不能为空'
       }
     ]
+  },
+  files: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '巡检照片不能为空'
+      }
+    ]
   }
 }
 
@@ -169,8 +180,6 @@ function init() {
         })
         .filter(item => item !== false)
       baseFormData.value = result
-      console.log(result)
-      console.log(isComputed.value)
     })
     .catch(err => {
       uni.showToast({
@@ -194,7 +203,16 @@ function onUploadFail(e) {
 
 /** 提交巡检点 检查情况 */
 function handleSubmit(item) {
-  console.log(item, baseFormData.value)
+  if (info.value.inspectSetting === 1) {
+    if (item.files.length <= 0) {
+      uni.showToast({
+        icon: 'error',
+        mask: true,
+        title: '必须拍照'
+      })
+      return
+    }
+  }
   let obj = {
     pointId: item.pointId,
     imgUrl: item.files.length > 0 ? item.files.join(',') : '',
@@ -202,15 +220,15 @@ function handleSubmit(item) {
     status: item.status,
     taskId: taskid.value
   }
-  console.log(obj)
   putInsepctionPoint(obj)
     .then(res => {
       item.complated = true
-      console.log(isComputed.value)
-      console.log(res)
     })
     .catch(err => {
-      console.log(err)
+      uni.showToast({
+        icon: 'error',
+        title: '网络错误'
+      })
     })
 }
 
@@ -240,6 +258,10 @@ function previewImages(images, currentIndex) {
 </script>
 
 <style scoped lang="scss">
+.is-required {
+  color: #dd524d;
+  font-weight: bold;
+}
 .inspection_upload_box {
   background: #f9f9f9;
   padding: 20rpx 40rpx;
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
index 1b4cef9..f7fa00c 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
@@ -3,41 +3,45 @@
     <view class="today_inspection_page flex flex-col">
       <!-- 状态筛选标签 -->
       <TabsComponents :tabslist="tabslist" @update="handleTabs"></TabsComponents>
-
       <!-- body -->
-      <view class="inspection_body flex-1">
+      <view class="inspection_body flex-1" v-if="list.length > 0">
         <view
           class="inspection_items"
           v-for="(item, index) in list"
           :key="index"
-          @tap="gotoInspection(item)"
+          @tap="handleTap(item)"
         >
           <view class="title">
             <text class="subtitle">
               <i></i>
-              {{ item.address }}
+              {{ item.taskName }}
             </text>
-            <text class="noactions" v-if="item.status === 0">未巡检</text>
+            <text class="noactions" v-if="!isComputed(item.taskStatus)">未巡检</text>
             <text class="noactions alaway_actions" v-else>已巡检</text>
           </view>
           <view class="inspection_item_box flex">
-            <text class="inspection_item" v-for="(ite, index) in item.item" :key="index">
+            <text class="inspection_item" v-for="(ite, index) in item.itemslist" :key="index">
               {{ ite }}
             </text>
           </view>
           <view class="inspection_time">
             <text>巡检时间：</text>
-            <text>{{ item.time }}</text>
+            <text>{{ item.taskTime }}</text>
           </view>
-          <view class="inspection_time">
-            <text>巡检人：</text>
-            <text>{{ item.user }}</text>
-            <view class="actions" v-if="item.status === 0">
+          <view class="inspection_time flex items-center justify-between">
+            <view class="">
+              <text>巡检人：</text>
+              <text>{{ item.inspectorName }}</text>
+            </view>
+            <view class="actions" v-if="!isComputed(item.taskStatus)">
               <text>去巡检</text>
             </view>
           </view>
         </view>
       </view>
+      <view class="nodata" v-else>
+        <text>暂无数据</text>
+      </view>
     </view>
     <!-- body -->
   </view>
@@ -47,91 +51,103 @@
 import { ref, computed } from 'vue'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import { onShow } from '@dcloudio/uni-app'
+import { getInspectionList } from '@/api/insepction.js'
+import { parseTime } from '@/utils/time.js'
+
 // tabs =========================================================
 const activeValue = ref(0)
 const tabslist = ref([
   {
     name: '全部',
-    value: 0
+    value: 2
   },
   {
     name: '未巡检',
-    value: 1
+    value: 0
   },
   {
     name: '已巡检',
-    value: 2
+    value: 1
   }
 ])
 // 点击事件
 const handleTabs = (val: number) => {
   activeValue.value = val
+  queryParmas.value.status = val
+  init()
 }
 // tabs =========================================================
 // body =========================================================
+const isComputed = (status: string) => {
+  const awaitlist = ['未完成', '待执行', '执行中']
+  return !awaitlist.includes(status)
+}
+const list = ref([])
+const queryParmas = ref({
+  date: '',
+  status: 2,
+  pageNum: 1,
+  pageSize: 10
+})
+
+const isLoading = ref(false) // 加载锁
+const hasMore = ref(true) // 是否还有更多数据
+const total = ref(0)
+
+function getlist() {
+  if (isLoading.value || !hasMore.value) return
+  isLoading.value = true
+  uni.showLoading({
+    title: '加载中',
+    mask: true
+  })
+  const { pageNum, pageSize, date, status } = queryParmas.value
+  getInspectionList({
+    pageSize,
+    pageNum,
+    status,
+    date
+  })
+    .then(res => {
+      let items: Set<string> = new Set()
+      res.rows.forEach(item => {
+        if (!item.points || item.points.length <= 0) return
+        item.points.forEach(ite => {
+          ite.itemNames.forEach(it => items.add(it))
+        })
+        item.itemslist = Array.from(items)
+      })
+      list.value = res.rows
+      hasMore.value = list.value.length < res.total
+      total.value = res.total
+    })
+    .finally(() => {
+      isLoading.value = false
+      uni.hideLoading()
+    })
+}
 /** 跳转到巡检上传页面 */
-// 0未巡检 1已巡检
-const gotoInspection = row => {
-  if (row.status === 0) {
+function handleTap(ite) {
+  if (isComputed(ite.taskStatus)) {
     uni.navigateTo({
-      url: '/pageSubPack/inspection/inspection_upload'
+      url: '/pageSubPack/inspection/inspection_main?id=' + ite.id
     })
   } else {
     uni.navigateTo({
-      url: '/pageSubPack/inspection/inspection_main'
+      url: '/pageSubPack/inspection/inspection_upload?id=' + ite.id
     })
   }
 }
-// body =========================================================
-const list = ref([
-  {
-    address: '幸福苑小区- B1层地下车库',
-    time: '07:00:00 -09:00:00',
-    item: [
-      '防火设施安全巡检',
-      '防火设施安全巡检',
-      '防火设施安全巡检',
-      '防火设施安全巡检',
-      '防火设施安全巡检'
-    ],
-    user: '李相龙',
-    status: 0 // 0未巡检 1已巡检
-  },
-  {
-    address: '幸福苑小区- B2层地下车库',
-    time: '13:00:00 -15:00:00',
-    item: ['设备巡检'],
-    user: '李相龙',
-    status: 1 // 0未巡检 1已巡检
-  },
-  {
-    address: '幸福苑小区- B2层地下车库',
-    time: '13:00:00 -15:00:00',
-    item: ['设备巡检'],
-    user: '李相龙',
-    status: 1 // 0未巡检 1已巡检
-  },
-  {
-    address: '幸福苑小区- B2层地下车库',
-    time: '13:00:00 -15:00:00',
-    item: ['设备巡检'],
-    user: '李相龙',
-    status: 1 // 0未巡检 1已巡检
-  },
-  {
-    address: '幸福苑小区- B2层地下车库',
-    time: '13:00:00 -15:00:00',
-    item: ['设备巡检'],
-    user: '李相龙',
-    status: 1 // 0未巡检 1已巡检
-  }
-])
 
-function getInspectionList() {
-  getInspectionList()
+function init() {
+  hasMore.value = true
+  queryParmas.value.date = parseTime(new Date(), '{y}-{m}-{d}')
+  getlist()
 }
 
-onShow(() => getInspectionList())
+onShow(() => {
+  init()
+})
 </script>
 
 <style scoped lang="scss">
@@ -259,13 +275,11 @@ onShow(() => getInspectionList())
         color: #333333;
         line-height: 36rpx;
         position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .actions {
-        position: absolute;
-        right: 0;
-        bottom: 0;
-
         width: 140rpx;
         height: 50rpx;
         background: #4d5dfa;
@@ -279,5 +293,12 @@ onShow(() => getInspectionList())
       }
     }
   }
+
+  .nodata {
+    color: #ccc;
+    text-align: center;
+    margin-top: 200rpx;
+    letter-spacing: 1rpx;
+  }
 }
 </style>
diff --git a/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue b/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
index c65193f..8c6a119 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/addreplacement.vue
@@ -76,7 +76,6 @@ function handleClick() {
       backData: data => {
         houseName.value = data.HouseName
         formData.value.houseId = data.Houseid
-        console.log(data)
       }
     }
   })
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
index 3861b98..405a4a0 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
@@ -38,27 +38,29 @@
         <!-- 记录卡片 -->
         <view
           v-for="(record, index) in reportRecords"
-          @tap="handleComplted(record.id)"
+          @tap="handleComplted(record)"
           :key="index"
           class="record-card"
         >
           <!-- 标题 + 状态标签 -->
           <view class="card-header">
-            <text class="card-title">{{ record.title }}</text>
-            <view class="status-tag" :class="record.status">
-              {{ getStatusText(record.status) }}
-            </view>
+            <text class="card-title">{{ record.item }}</text>
+            <view class="status-tag pending" v-if="record.problemStatus === '0'"> 待分配 </view>
+            <view class="status-tag processing" v-if="record.problemStatus === '1'"> 待解决 </view>
+            <view class="status-tag completed" v-if="record.problemStatus === '2'"> 已完成 </view>
           </view>
 
           <!-- 类型标签 -->
-          <view class="tag-group">
-            <view class="tag-item">{{ record.reportType }}</view>
-            <view class="tag-item">{{ record.category }}</view>
+          <view class="tag-group" v-if="record.projectTypeStr || record.maintenanceItemName">
+            <view class="tag-item" v-if="record.projectTypeStr">{{ record.projectTypeStr }}</view>
+            <view class="tag-item" v-if="record.maintenanceItemName">{{
+              record.maintenanceItemName
+            }}</view>
           </view>
 
           <!-- 内容 -->
           <view class="card-content">
-            {{ record.content }}
+            {{ record.problem }}
           </view>
           <!-- 工单图片 -->
           <!--          <view class="card-image">
@@ -75,10 +77,10 @@
           <!-- 底部信息 -->
           <view class="card-footer">
             <text class="create-time">{{ record.createTime }}</text>
-            <text v-if="record.repairStatus === 2" class="repairman"
-              >维修师傅：{{ record.repairman }}</text
+            <text v-if="record.problemStatus === '1'" class="repairman"
+              >维修师傅：{{ record.repairName }}</text
             >
-            <view class="share" v-if="record.repairStatus === 1">
+            <view class="share" v-if="record.problemStatus === '2'">
               <text>维修完成</text>
             </view>
           </view>
@@ -93,60 +95,38 @@ import { ref, computed } from 'vue'
 import { onReady } from '@dcloudio/uni-app'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import NavBar from '@/components/navbar/navbar.vue'
-
-// 导航栏/标签高度（适配不同设备）
-const navHeight = ref(44)
-const statusTabHeight = ref(88)
-const typeTabHeight = ref(88)
+import { getUserTicketlist } from '@/api/ticket.js'
 
 // 筛选状态
-const activeStatus = ref('all') // 全部/待分配/待解决/已完成
-const activeType = ref('all') // 全部/公共报修/个人报修
+const activeStatus = ref(0) // 全部/待分配/待解决/已完成
+const activeType = ref(-1) // 全部/公共报修/个人报修
 
 // 状态筛选选项
 const statusTabs = ref([
-  { label: '全部', value: 'all' },
-  { label: '待解决', value: 'processing' },
-  { label: '已完成', value: 'completed' }
+  { label: '全部', value: 0 },
+  { label: '待解决', value: 1 },
+  { label: '已完成', value: 2 }
 ])
 
 // 类型筛选选项
 const typeTabs = ref([
-  { label: '全部', value: 'all' },
-  { label: '公共报修', value: 'public' },
-  { label: '个人报修', value: 'private' }
+  { label: '全部', value: -1 },
+  { label: '公共报修', value: 0 },
+  { label: '个人报修', value: 1 }
 ])
 
 // 模拟上报记录数据（实际项目替换为接口请求）
-const reportRecords = ref([
-  {
-    id: 1,
-    title: '标题巴拉巴拉巴拉',
-    status: 'processing', // pending/processing/completed
-    reportType: '公共报修',
-    category: '路灯',
-    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-    createTime: '2026-08-01 10:05:46',
-    repairman: '张胜',
-    images: [
-      'https://picsum.photos/93',
-      'https://picsum.photos/93',
-      'https://picsum.photos/93',
-      'https://picsum.photos/93',
-      'https://picsum.photos/93'
-    ],
-    repairStatus: 1 // 1待解决 2已完成
-  }
-])
+const reportRecords = ref([])
 
 const queryParmas = ref({
   pageNum: 1,
   pageSize: 10,
-  value: ''
+  itemType: undefined,
+  problemStatus: undefined
 })
 const isLoading = ref(false) // 加载锁
 const hasMore = ref(true) // 是否还有更多数据
-const total = ref(21)
+const total = ref(0)
 function scrolltolower() {
   // 必须加这两个判断！
   if (isLoading.value || !hasMore.value) {
@@ -164,37 +144,16 @@ function getlist() {
     title: '加载中',
     mask: true
   })
-  const { pageNum, pageSize } = queryParmas.value
-
-  const startId = (pageNum - 1) * pageSize + 1
-  const arr = Array.from({ length: pageSize }).map((_, index) => {
-    const realId = startId + index
-    const randomStatus = Math.floor(Math.random() * 2)
-    return {
-      id: realId,
-      title: '标题巴拉巴拉巴拉',
-      status: 'processing', // pending/processing/completed
-      reportType: '公共报修',
-      category: '路灯',
-      content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-      createTime: '2026-08-01 10:05:46',
-      repairman: '',
-      images: [
-        'https://picsum.photos/93',
-        'https://picsum.photos/93',
-        'https://picsum.photos/93',
-        'https://picsum.photos/93',
-        'https://picsum.photos/93'
-      ],
-      repairStatus: randomStatus // 1待解决 2已完成
-    }
-  })
-  // 追加数据（正确方式）
-  reportRecords.value = [...reportRecords.value, ...arr]
-  // 判断是否还有更多
-  hasMore.value = reportRecords.value.length < total.value
-  isLoading.value = false
-  uni.hideLoading()
+  getUserTicketlist(queryParmas.value)
+    .then(res => {
+      reportRecords.value = [...reportRecords.value, ...res.rows]
+      hasMore.value = reportRecords.value.length < total.value
+      total.value = res.total
+    })
+    .finally(() => {
+      isLoading.value = false
+      uni.hideLoading()
+    })
 }
 getlist()
 function resetList() {
@@ -207,20 +166,29 @@ function resetList() {
 // 切换状态（全部/待分配/待解决/已完成）筛选
 const switchStatus = value => {
   activeStatus.value = value
+  if (value === 0) {
+    queryParmas.value.problemStatus = undefined
+  } else {
+    queryParmas.value.problemStatus = value
+  }
+  hasMore.value = true
+  reportRecords.value = []
+  queryParmas.value.pageNum = 1
+  getlist()
 }
 
 // 切换类型（公共/个人）筛选
 const switchType = value => {
   activeType.value = value
-}
-
-// 获取状态文本
-const statusMap = {
-  processing: '待解决',
-  completed: '已完成'
-}
-const getStatusText = status => {
-  return statusMap[status] || ''
+  if (value === -1) {
+    queryParmas.value.itemType = undefined
+  } else {
+    queryParmas.value.itemType = value
+  }
+  hasMore.value = true
+  reportRecords.value = []
+  queryParmas.value.pageNum = 1
+  getlist()
 }
 
 // 返回上一页
@@ -228,17 +196,16 @@ const navBack = () => {
   uni.navigateBack()
 }
 // 1待解决 2已完成
-function handleComplted(id) {
-  const find = reportRecords.value.find(item => item.id === id)
-  if (find) {
-    const status = find.repairStatus
+function handleComplted(row) {
+  if (row) {
+    const status = row.repairStatus
     if (status === 2) {
       uni.navigateTo({
-        url: `/pageSubPack/ticket/repairMain?id=${id}&showbtn=${false}&path=myticket`
+        url: `/pageSubPack/ticket/repairMain?id=${row.id}&showbtn=${false}&path=myticket`
       })
     } else {
       uni.navigateTo({
-        url: `/pageSubPack/ticket/repairMain?id=${id}&showbtn=${true}&path=myticket`
+        url: `/pageSubPack/ticket/repairMain?id=${row.id}&showbtn=${true}&path=myticket`
       })
     }
   }
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/repairCompleted.vue b/wuye-manager-uniapp/pageSubPack/ticket/repairCompleted.vue
index 5768fd3..6819f9c 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/repairCompleted.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/repairCompleted.vue
@@ -57,7 +57,6 @@ const form = ref({
 })
 /** 返回上一页  */
 function handleSelecthouse() {
-  console.log('compltee')
   uni.navigateBack()
 }
 </script>
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
index 7cbf2d5..f8b822d 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
@@ -131,8 +131,9 @@
 
 <script setup>
 import { ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import Stops from '@/components/stops/stops.vue'
+import { getTicketMainById } from '@/api/ticket.js'
 // --------------------------------------
 /** 维修步骤：0提交 1分配 2维修完成 / 待解决 3记录完成 完成*/
 const currentStep = ref(2)
@@ -163,7 +164,6 @@ const repairInfo = ref({
     'https://picsum.photos/80',
     'https://picsum.photos/80'
   ],
-
   repairUser: {
     name: '盘下但',
     status: '正常',
@@ -184,6 +184,19 @@ onLoad(options => {
   Showbtn.value = JSON.parse(options.showbtn)
   prevPath.value = options.path
 })
+onShow(() => {
+  getTicketById()
+})
+
+function getTicketById() {
+  getTicketMainById(queryParams.value.id)
+    .then(res => {
+      console.log(res)
+    })
+    .catch(err => {
+      console.log(err)
+    })
+}
 
 // --------------------------------------
 /** 选择维修人员 */
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 9b51a17..b3c447b 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -13,13 +13,19 @@
           <view class="location-area">
             <!-- 定位图标 -->
             <view class="location-icon">
-              <image src="https://wuyeadmin.bugtc.com/images/imgs/adress.png" style="height: 100%; width: 100%"></image>
+              <image
+                src="https://wuyeadmin.bugtc.com/images/imgs/adress.png"
+                style="height: 100%; width: 100%"
+              ></image>
             </view>
             <!-- 小区名称和下拉箭头 -->
             <view class="community-selector">
               <text class="community-name">{{ currentCommunity }}</text>
               <view class="community-icon">
-                <image src="https://wuyeadmin.bugtc.com/images/imgs/三角形.png" style="height: 100%; width: 100%"></image>
+                <image
+                  src="https://wuyeadmin.bugtc.com/images/imgs/三角形.png"
+                  style="height: 100%; width: 100%"
+                ></image>
               </view>
             </view>
           </view>
@@ -52,8 +58,11 @@
       <view class="noticeClass">
         <!-- 左侧消息通知文字 -->
         <view class="notice-left">
-           <image src="https://wuyeadmin.bugtc.com/images/imgs/notice.png" class="notice-icon"></image>
-            <view class="notice-line"></view>
+          <image
+            src="https://wuyeadmin.bugtc.com/images/imgs/notice.png"
+            class="notice-icon"
+          ></image>
+          <view class="notice-line"></view>
         </view>
         <!-- 右侧滚动公告 -->
         <view class="notice-right" @click="getNoticeMore">
@@ -75,15 +84,15 @@
       <!-- 巡检数据统计区 -->
       <view class="statistics-wrap">
         <view class="statistics-item" @click="goToInspectionRecord">
-          <text class="num">{{allCount}}</text>
+          <text class="num">{{ totalTasks }}</text>
           <text class="label">全部巡检</text>
         </view>
         <view class="statistics-item" @click="goToDaysInspection">
-          <text class="num">{{pendingCount}}</text>
+          <text class="num">{{ pendingCount }}</text>
           <text class="label">待巡检</text>
         </view>
         <view class="statistics-item">
-          <text class="num">{{InspectedCount}}</text>
+          <text class="num">{{ InspectedCount }}</text>
           <text class="label">已巡检</text>
         </view>
       </view>
@@ -94,26 +103,46 @@
       <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
       <view class="function-row">
         <view class="function-item" @click="goToReport">
-          <image class="item-icon" src="https://wuyeadmin.bugtc.com/images/imgs/fault-report.png" mode="aspectFit"></image>
+          <image
+            class="item-icon"
+            src="https://wuyeadmin.bugtc.com/images/imgs/fault-report.png"
+            mode="aspectFit"
+          ></image>
           <text class="item-text">故障上报</text>
         </view>
         <view class="function-item" @click="goToOneOpenDoor">
-          <image class="item-icon" src="https://wuyeadmin.bugtc.com/images/imgs/open.png" mode="aspectFit"></image>
+          <image
+            class="item-icon"
+            src="https://wuyeadmin.bugtc.com/images/imgs/open.png"
+            mode="aspectFit"
+          ></image>
           <text class="item-text">一键开门</text>
         </view>
         <view class="function-item" @tap="goToTicketHall">
-          <image class="item-icon" src="https://wuyeadmin.bugtc.com/images/imgs/work-order.png" mode="aspectFit"></image>
+          <image
+            class="item-icon"
+            src="https://wuyeadmin.bugtc.com/images/imgs/work-order.png"
+            mode="aspectFit"
+          ></image>
           <text class="item-text">工单大厅</text>
         </view>
         <view class="function-item" @tap="goToMyTicket">
-          <image class="item-icon" src="https://wuyeadmin.bugtc.com/images/imgs/my-work.png" mode="aspectFit"></image>
+          <image
+            class="item-icon"
+            src="https://wuyeadmin.bugtc.com/images/imgs/my-work.png"
+            mode="aspectFit"
+          ></image>
           <text class="item-text">我的工单</text>
         </view>
       </view>
       <!-- 第二行 -->
       <view class="function-row" style="margin-top: 2px">
         <view class="function-item" @tap="goToComplaint">
-          <image class="item-icon" src="https://wuyeadmin.bugtc.com/images/imgs/complaint.png" mode="aspectFit"></image>
+          <image
+            class="item-icon"
+            src="https://wuyeadmin.bugtc.com/images/imgs/complaint.png"
+            mode="aspectFit"
+          ></image>
           <text class="item-text">投诉处理</text>
         </view>
       </view>
@@ -124,28 +153,27 @@
 <script setup>
 import { ref } from 'vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
-import { getCurrentVillage,getTodayInspection,getNewNoticeData } from '../../api/api.js'
+import { getCurrentVillage, getTodayInspection, getNewNoticeData } from '../../api/api.js'
 
 // 列表数据状态
 const current = ref(0)
 const currentCommunity = ref('请选择小区')
 const bannerList = ref([{ img: 'https://wuyeadmin.bugtc.com/images/imgs/banner1.png' }])
 const noticeText = ref('暂无公告')
-const allCount = ref(0) // 全部巡检
+const totalTasks = ref(0) // 全部巡检
 const pendingCount = ref(0) //待巡检
 const InspectedCount = ref(0) //已巡检
 
-
 // =======方法=======
 // 跳转小区
 const navigateToPage = () => {
-   const curVillageId = uni.getStorageSync('currentVillage')
-   let villageId = ''
-   if(curVillageId){
-     try{
-       villageId = JSON.parse(curVillageId).villageId || JSON.parse(curVillageId).id || ''
-     }catch(e){}
-   }
+  const curVillageId = uni.getStorageSync('currentVillage')
+  let villageId = ''
+  if (curVillageId) {
+    try {
+      villageId = JSON.parse(curVillageId).villageId || JSON.parse(curVillageId).id || ''
+    } catch (e) {}
+  }
   uni.navigateTo({
     url: `/pageSubPack/notice-list/select-community?villageId=${villageId}`
   })
@@ -200,42 +228,48 @@ const goToReport = () => {
 }
 // 获取当前小区
 const currentVillageData = () => {
-  getCurrentVillage().then(res => {
-    const data = res.data
-    if (data) {
-      currentCommunity.value = data.villageName
-      uni.setStorageSync('currentVillage', JSON.stringify(data))
-      getNoticeData()
-    }
-  }).catch(() => {})
+  getCurrentVillage()
+    .then(res => {
+      const data = res.data
+      if (data) {
+        currentCommunity.value = data.villageName
+        uni.setStorageSync('currentVillage', JSON.stringify(data))
+        getNoticeData()
+      }
+    })
+    .catch(() => {})
 }
 // 获取今日巡检数据
-const getInspectionData = () =>{
-  getTodayInspection().then(res =>{
-    if(res.code === 200){
-      if(res.data){
-        allCount.value = res.data.unfinishedPoints
-        pendingCount.value = res.data.unfinishedTasks
-        InspectedCount.value = res.data.completedTasks
-      }else{
-        allCount.value = 0
-         pendingCount.value = 0
-         InspectedCount.value = 0
+const getInspectionData = () => {
+  getTodayInspection()
+    .then(res => {
+      if (res.code === 200) {
+        if (res.data) {
+          totalTasks.value = res.data.totalTasks
+          pendingCount.value = res.data.unfinishedTasks
+          InspectedCount.value = res.data.completedTasks
+        } else {
+          totalTasks.value = 0
+          pendingCount.value = 0
+          InspectedCount.value = 0
+        }
       }
-    }
-  }).catch(err =>{
-    uni.showToast({title:err.msg || '获取失败',icon:'none'})
-  })
+    })
+    .catch(err => {
+      uni.showToast({ title: err.msg || '获取失败', icon: 'none' })
+    })
 }
 // 获取消息通知
 const getNoticeData = () => {
-  getNewNoticeData().then(res => {
-    if (res.code === 200 && res.data) {
-      noticeText.value = res.data.notice || ''
-    }else{
-      noticeText.value = '暂无公告'
-    }
-  }).catch(() => {})
+  getNewNoticeData()
+    .then(res => {
+      if (res.code === 200 && res.data) {
+        noticeText.value = res.data.notice || ''
+      } else {
+        noticeText.value = '暂无公告'
+      }
+    })
+    .catch(() => {})
 }
 
 // 接收选择小区返回的参数
@@ -396,17 +430,16 @@ const clickItem = index => {
     align-items: center;
     margin-right: 16rpx;
 
-     .notice-icon {
-        width: 48rpx;
-        height: 48rpx;
-        margin-right: 15rpx;
-      }
+    .notice-icon {
+      width: 48rpx;
+      height: 48rpx;
+      margin-right: 15rpx;
+    }
 
     .notice-line {
       width: 1rpx;
       height: 40rpx;
       background-color: rgba(255, 255, 255, 0.4);
-
     }
   }