diff --git a/App.vue b/App.vue index 201bb66..cf53a6a 100644 --- a/App.vue +++ b/App.vue @@ -50,6 +50,35 @@ page { // 卡片列表样式 .common-card-list { + .card-header{ + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + .common-name{ + flex: 1; // 占满剩余空间,挤压标签到右侧 + font-size: 28rpx; + font-weight: 500; + color: #333; + // 关键:单行文本溢出省略 + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + // 与标签保持间距 + margin-right: 16rpx; + } + // 已失效标签样式 + .common-invalid-tag { + color: #f56c6c; + font-size: 24rpx; + flex-shrink: 0; // 禁止标签被压缩 + } + .common-finish-tag{ + color: #5ac725; + font-size: 24rpx; + flex-shrink: 0; // 禁止标签被压缩 + } + } .common-card-title { } diff --git a/api/patrol-manage/patrol-plan.js b/api/patrol-manage/patrol-plan.js index 38b15f7..931d66b 100644 --- a/api/patrol-manage/patrol-plan.js +++ b/api/patrol-manage/patrol-plan.js @@ -26,7 +26,7 @@ export const inspectioDetailByPlanno = (params) => { }; /** - * 巡查计划完成详情 + * 巡查计划创建 * @returns {Promise} */ export const inspectionCreate = (data) => { diff --git a/pages-sub/daily/maintain-manage/finish-plan-detail.vue b/pages-sub/daily/maintain-manage/finish-plan-detail.vue index 7dfccd0..ab86727 100644 --- a/pages-sub/daily/maintain-manage/finish-plan-detail.vue +++ b/pages-sub/daily/maintain-manage/finish-plan-detail.vue @@ -71,7 +71,7 @@ 巡查描述 diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue index 80f6024..787eac0 100644 --- a/pages-sub/daily/maintain-manage/index.vue +++ b/pages-sub/daily/maintain-manage/index.vue @@ -138,7 +138,7 @@ 计划完成次数: {{ item.planNum || 0 }} - + { \ No newline at end of file diff --git a/pages-sub/daily/patrol-manage/add-patrol-record.vue b/pages-sub/daily/patrol-manage/add-patrol-record.vue index 0e7a68e..5789ab5 100644 --- a/pages-sub/daily/patrol-manage/add-patrol-record.vue +++ b/pages-sub/daily/patrol-manage/add-patrol-record.vue @@ -268,7 +268,7 @@ export default { "inspectionState": this.inspectForm.isWorkOrder, "transState": this.inspectForm.isWorkOrder==1?'1':'2', "transWorkNo": "default'", - "remark": this.inspectForm.isWorkOrder + "remark": this.inspectForm.content } // 显示加载中 diff --git a/pages-sub/daily/patrol-manage/finish-plan-detail.vue b/pages-sub/daily/patrol-manage/finish-plan-detail.vue index a60e4e7..972ca3e 100644 --- a/pages-sub/daily/patrol-manage/finish-plan-detail.vue +++ b/pages-sub/daily/patrol-manage/finish-plan-detail.vue @@ -72,7 +72,7 @@ 巡查描述 diff --git a/pages-sub/daily/patrol-manage/pending-plan-detail.vue b/pages-sub/daily/patrol-manage/pending-plan-detail.vue index 7e80165..0d0da05 100644 --- a/pages-sub/daily/patrol-manage/pending-plan-detail.vue +++ b/pages-sub/daily/patrol-manage/pending-plan-detail.vue @@ -11,10 +11,13 @@ @@ -35,10 +38,10 @@ 计划完成次数: {{ item.planNum || 0 }} @@ -46,7 +49,7 @@ { const gotoFinishPlanDetail = (i) => { uni.navigateTo({ url: `/pages-sub/daily/patrol-manage/finish-plan-detail?planNo=${i.planNo}` - - }); }; // 新增记录 @@ -144,4 +145,5 @@ const addNewRecord = () => { \ No newline at end of file diff --git a/pages.json b/pages.json index 2f92839..d92a32c 100644 --- a/pages.json +++ b/pages.json @@ -47,7 +47,7 @@ { "path": "patrol-manage/finish-plan-detail", "style": { - "navigationBarTitleText": "已完成计划明细", + "navigationBarTitleText": "已完成详情", "enablePullDownRefresh": false } }, diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 0136bcf..0d9b5d6 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -80,7 +80,7 @@ const confirmLogout = async () => { if (res.confirm) { await userStore.logout() - uni.showToast({ title: '退出登录成功', type: 'success' }) + // uni.showToast({ title: '退出登录成功', type: 'success' }) } } catch (error) { console.error('退出登录失败:', error)