From 812182fa37ccea360f3832be53edc58620aca186 Mon Sep 17 00:00:00 2001 From: jiayu Date: Wed, 24 Jul 2024 17:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A8=A1=E5=9D=97=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 7 + .../InspectionRoute/editInspectionPlan.vue | 7 + .../InspectionRoute/editInspectionPoint.vue | 7 + .../InspectionRoute/inspectionPlan.vue | 7 + .../InspectionRoute/inspectionPointDetail.vue | 7 + .../InspectionRoute/inspectionPointList.vue | 7 + .../mapLocatoin/mapLocatoin.vue | 7 + .../InspectionRoute/planTaskDetail.vue | 14 +- .../InspectionRoute/planTaskRecord.vue | 326 ++++++++++++++++++ 9 files changed, 382 insertions(+), 7 deletions(-) create mode 100644 pages/projectEnd/InspectionRoute/planTaskRecord.vue diff --git a/pages.json b/pages.json index 9c537392..778043d4 100644 --- a/pages.json +++ b/pages.json @@ -2750,6 +2750,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/projectEnd/InspectionRoute/planTaskRecord", + "style" : + { + "navigationBarTitleText" : "" + } } ], // "subPackages":[{ diff --git a/pages/projectEnd/InspectionRoute/editInspectionPlan.vue b/pages/projectEnd/InspectionRoute/editInspectionPlan.vue index eea35128..d76ddb7c 100644 --- a/pages/projectEnd/InspectionRoute/editInspectionPlan.vue +++ b/pages/projectEnd/InspectionRoute/editInspectionPlan.vue @@ -470,6 +470,13 @@ import deepClone from "../../../uview-ui/libs/function/deepClone"; .headerName{ z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .flex { display: flex; diff --git a/pages/projectEnd/InspectionRoute/editInspectionPoint.vue b/pages/projectEnd/InspectionRoute/editInspectionPoint.vue index d02e38fa..93addaa2 100644 --- a/pages/projectEnd/InspectionRoute/editInspectionPoint.vue +++ b/pages/projectEnd/InspectionRoute/editInspectionPoint.vue @@ -458,6 +458,13 @@ .headerName{ z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .flex { display: flex; diff --git a/pages/projectEnd/InspectionRoute/inspectionPlan.vue b/pages/projectEnd/InspectionRoute/inspectionPlan.vue index 1095f45a..ca30d966 100644 --- a/pages/projectEnd/InspectionRoute/inspectionPlan.vue +++ b/pages/projectEnd/InspectionRoute/inspectionPlan.vue @@ -1033,6 +1033,13 @@ .headerName { z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .line { diff --git a/pages/projectEnd/InspectionRoute/inspectionPointDetail.vue b/pages/projectEnd/InspectionRoute/inspectionPointDetail.vue index bb0603bc..10a50aa7 100644 --- a/pages/projectEnd/InspectionRoute/inspectionPointDetail.vue +++ b/pages/projectEnd/InspectionRoute/inspectionPointDetail.vue @@ -254,6 +254,13 @@ .headerName{ z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .flex { display: flex; diff --git a/pages/projectEnd/InspectionRoute/inspectionPointList.vue b/pages/projectEnd/InspectionRoute/inspectionPointList.vue index 542821f8..25b01c29 100644 --- a/pages/projectEnd/InspectionRoute/inspectionPointList.vue +++ b/pages/projectEnd/InspectionRoute/inspectionPointList.vue @@ -258,6 +258,13 @@ .headerName { z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .line { diff --git a/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue b/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue index 2d26e120..87e37732 100644 --- a/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue +++ b/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue @@ -220,6 +220,13 @@ .headerName{ z-index: 1; } + /deep/ .headerBox { + background-color: #5181F6; + color: white; + .uni-icons{ + color: white !important; + } + } } .content { width: 100%; diff --git a/pages/projectEnd/InspectionRoute/planTaskDetail.vue b/pages/projectEnd/InspectionRoute/planTaskDetail.vue index dd91bac0..9aa1bd6d 100644 --- a/pages/projectEnd/InspectionRoute/planTaskDetail.vue +++ b/pages/projectEnd/InspectionRoute/planTaskDetail.vue @@ -40,9 +40,7 @@ 任务已下发 - - - + @@ -89,6 +87,8 @@ import uPopup from '@/components/u-popup/u-popup.vue' }, teach: true, detailId: '', + statusStr: ['', '正常', '异常', '未巡检'], + statusStyle: ['', 'success', 'error', 'primary'] } }, onLoad(option) { @@ -154,7 +154,7 @@ import uPopup from '@/components/u-popup/u-popup.vue' xzCheckingRouteTaskId: this.curCRoute?.id }; this.sendRequest({ - url: 'xmgl/checkingPointInfo/selectPage', + url: 'xmgl/checkingPoint/getTaskDetailPage', method: 'post', data, success: res => { @@ -198,9 +198,9 @@ import uPopup from '@/components/u-popup/u-popup.vue' this.getListData(true); }, goDetails(data) { - // uni.navigateTo({ - // url: `/pages/projectEnd/InspectionRoute/inspectionPointDetail?id=${data.id}` - // }) + uni.navigateTo({ + url: `/pages/projectEnd/InspectionRoute/planTaskRecord?detail=${JSON.stringify(data)}` + }) }, } } diff --git a/pages/projectEnd/InspectionRoute/planTaskRecord.vue b/pages/projectEnd/InspectionRoute/planTaskRecord.vue new file mode 100644 index 00000000..0d4c9203 --- /dev/null +++ b/pages/projectEnd/InspectionRoute/planTaskRecord.vue @@ -0,0 +1,326 @@ + + + + + \ No newline at end of file