diff --git a/wuye-manager-uniapp/api/insepction.js b/wuye-manager-uniapp/api/insepction.js index a24b52b..ba07c75 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-19 16:25:14 + * @LastEditTime: 2026-06-03 18:19:51 */ import request, { @@ -41,7 +41,7 @@ import request, { * */ /** * @description: 获取巡检任务列表 - * @param { RequestParams<{ date?:string }> } data + * @param { RequestParams<{ date:string, status:number }> } data * @return { Promise> } */ export const getInspectionList = (data) => { diff --git a/wuye-manager-uniapp/jsdoc.types.js b/wuye-manager-uniapp/jsdoc.types.js index b2d681d..29591a9 100644 --- a/wuye-manager-uniapp/jsdoc.types.js +++ b/wuye-manager-uniapp/jsdoc.types.js @@ -9,6 +9,7 @@ * @property {number} total 总条数 * @property {T[]} rows 数据列表 */ + /** * 返回结果 * @template T diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue index aa3c2fc..38a203c 100644 --- a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue +++ b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue @@ -13,6 +13,7 @@ style="height: 100%; flex: 1" scroll-y="true" lower-threshold="160" + v-if="list.length > 0" @scrolltolower="scrolltolower" > + + 暂无数据 + @@ -229,6 +233,12 @@ function scrolltolower() { } } } + + .nodata { + text-align: center; + width: 100%; + flex: 1; + } } } diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue index 8567b7a..37512bb 100644 --- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue +++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_main.vue @@ -175,21 +175,22 @@ onLoad(options => { border-radius: 16rpx; background-color: #fff; .title_box { - height: 40rpx; - line-height: 40rpx; .title { font-weight: 550; font-size: 32rpx; color: #333333; + min-height: 40rpx; + text-wrap: wrap; line-height: 40rpx; .line { + display: block; width: 6rpx; - height: 28rpx; background: #4d5dfa; margin-right: 10rpx; } } .inspection_status { + width: 100rpx; font-weight: 400; font-size: 28rpx; color: #666666; diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue index 39555da..a93133d 100644 --- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue +++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_upload.vue @@ -68,14 +68,14 @@ - * + * 巡检照片 @@ -106,9 +106,8 @@ diff --git a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue index fc93989..6cf0901 100644 --- a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue +++ b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue @@ -158,10 +158,17 @@ function getlist() { hasMore.value = reportRecords.value.length < total.value }) .catch(err => { - uni.showToast({ - icon: 'error', - title: '网络错误' - }) + if (err.code === 500 && err.msg === '您没有权限访问') { + uni.showToast({ + icon: 'error', + title: '没有权限' + }) + } else { + uni.showToast({ + icon: 'error', + title: '网络异常' + }) + } }) .finally(() => { isLoading.value = false @@ -396,8 +403,8 @@ function handlePrivew(imgs) { } .tag-item { - width: 112rpx; height: 42rpx; + padding: 0 10rpx; border-radius: 8rpx 8rpx 8rpx 8rpx; border: 1rpx solid #999999; diff --git a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue index 17e5df4..cef41f5 100644 --- a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue +++ b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue @@ -147,7 +147,7 @@ function getlist() { hasMore.value = reportRecords.value.length < total.value total.value = res.total }) - .catch(() => { + .catch(err => { uni.showToast({ icon: 'error', title: '网络异常' @@ -392,7 +392,7 @@ function handlePrivew(imgs) { margin-right: 20rpx; } .tag-item { - width: 112rpx; + padding: 0 10rpx; height: 42rpx; border-radius: 8rpx 8rpx 8rpx 8rpx; border: 1rpx solid #999999; diff --git a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue index 16fa059..37defcb 100644 --- a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue +++ b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue @@ -241,7 +241,6 @@ function handleStop(row) { stepList.value[2].desc = `维修人员(${row.repairName})维修中` return } - console.log(status) if (status === '2') { currentStep.value = 4 stepList.value[0].desc = '提交报修成功' diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue index e8edf48..8804788 100644 --- a/wuye-manager-uniapp/pages/index/index.vue +++ b/wuye-manager-uniapp/pages/index/index.vue @@ -156,7 +156,7 @@