From d7461853cf5cf361a0c2fe6e0392aef75f17c861 Mon Sep 17 00:00:00 2001 From: Zones <765289303@qq.com> Date: Tue, 16 Jun 2026 19:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/base.js | 7 +- api/hj.js | 13 + assets/css/page.scss | 40 +- manifest.json | 2 +- pages.json | 18 + pages/index/index.vue | 27 +- pages/mine/index.vue | 8 +- pages/todo/list.vue | 598 +++++++++++++++++++++++ piipe/deliver/detail.vue | 140 ------ pipe/deliver/detail.vue | 35 +- pipe/diankou/list.vue | 7 + pipe/diankou/port_list.vue | 254 +++++++++- pipe/packaging/add.vue | 12 +- pipe/packaging/list.vue | 4 +- pipe/pressure/check_remove/list.vue | 3 + pipe/pressure/index.vue | 2 +- pipe/pressure/pressure_before/detail.vue | 242 +++++++++ pipe/pressure/pressure_before/list.vue | 10 +- store/modules/user.js | 27 +- utils/request.js | 3 +- 20 files changed, 1229 insertions(+), 223 deletions(-) create mode 100644 pages/todo/list.vue delete mode 100644 piipe/deliver/detail.vue create mode 100644 pipe/pressure/check_remove/list.vue create mode 100644 pipe/pressure/pressure_before/detail.vue diff --git a/api/base.js b/api/base.js index dc880a4..bd3ecd8 100644 --- a/api/base.js +++ b/api/base.js @@ -16,4 +16,9 @@ export const reqWeldingLocation = ()=>get(`BaseInfo/getWeldingLocation`) /** * 根据项目ID单位类型请求单位 */ -export const reqUnitByProjectIdUnitType = (projectId, unitType="")=>get(`Unit/getUnitByProjectIdUnitType?projectId=${projectId}&unitType=${unitType}`) \ No newline at end of file +export const reqUnitByProjectIdUnitType = (projectId, unitType="")=>get(`Unit/getUnitByProjectIdUnitType?projectId=${projectId}&unitType=${unitType}`) + +/** + * 获取待办 + */ +export const reqToDoItemByProjectIdUserId = (projectId, personId)=>get(`ToDoItem/getToDoItemByProjectIdUserId?projectId=${projectId}&personId=${personId}`) \ No newline at end of file diff --git a/api/hj.js b/api/hj.js index f5d11e2..cea2b6e 100644 --- a/api/hj.js +++ b/api/hj.js @@ -124,3 +124,16 @@ export const reqPipelineComponentList = (params={})=>get(`/PipelineComponent/Get * @param {Object} params - { PipelineComponentId, PersonId, Message } */ export const reqPipelineComponentAccept = (params={})=>get(`/PipelineComponent/GetComponentConfirmArrival?PipelineComponentId=${params.PipelineComponentId}&PersonId=${params.PersonId}&Message=${params.Message}`) +// =========================== 试压前条件确认 ======================================== +/** + * 获取试压前条件确认列表 + * @param {String} unitWorkId + * @param {String} isFinish + * @param {String} testPackageNo + */ +export const reqTestPackageNoList = (unitWorkId, isFinish, testPackageNo)=>get(`TestPackage/getTestPackageNo?unitWorkId=${unitWorkId}&isFinish=${isFinish}&testPackageNo=${testPackageNo}`) +/** + * 获取试压前条件确认详情 + * @param {String} ptp_Id + */ +export const reqTestPackageDetail = (ptp_Id)=>get(`TestPackage/GetTestPackageDetail?ptp_Id=${ptp_Id}`) diff --git a/assets/css/page.scss b/assets/css/page.scss index 18a85fc..574717b 100644 --- a/assets/css/page.scss +++ b/assets/css/page.scss @@ -26,8 +26,21 @@ // 首页 .home { - padding-top: 80px; + &-navbar{ + padding-top: 40px; + height: 85px; + background-color: var(--u-type-primary); + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + &-title { + font-size: 32rpx; + color: #ffffff; + position: relative; + } + } .u-border-bottom:after { border: none; } @@ -41,9 +54,28 @@ } } + &-navbar { + display: flex; + align-items: center; + justify-content: space-between; + height: 85px; + background-color: $u-type-primary; + padding: 40px 20rpx 0; + + &-title { + flex: 1; + text-align: center; + font-size: 28rpx; + color: #ffffff; + } + + &-placeholder { + width: 220rpx; + flex-shrink: 0; + } + } + &-icons { - position: fixed; - top: 95px; height: 80px; width: 100%; background-color: $u-type-primary; @@ -672,7 +704,7 @@ } .batch-label { - width: 160rpx; + width: 80rpx; font-size: 28rpx; color: #333; } diff --git a/manifest.json b/manifest.json index ac8ee13..a811bc8 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wx35c91aed9edf6e54", "setting" : { "urlCheck" : false }, diff --git a/pages.json b/pages.json index f14306a..77b9b5e 100644 --- a/pages.json +++ b/pages.json @@ -26,6 +26,12 @@ "style": { "navigationBarTitleText": "我的" } + }, + { + "path": "pages/todo/list", + "style": { + "navigationBarTitleText": "待办" + } } ], "subPackages": [ @@ -62,6 +68,18 @@ "navigationBarTitleText": "试压前条件确认" } }, + { + "path": "pressure/pressure_before/detail", + "style": { + "navigationBarTitleText": "试压前条件确认" + } + }, + { + "path": "pressure/check_remove/list", + "style": { + "navigationBarTitleText": "尾项检查及消项" + } + }, { "path": "packaging/list", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 596a59f..a2ba51a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,18 +1,20 @@