From c8f6e5c757c72a72fb52ec8fc019174fcf96a8eb Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Wed, 13 Aug 2025 15:36:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BE=E7=89=8C=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pageage/project_checked/info/index.js | 8 +--- .../pageage/project_checked/info/index.wxml | 2 + .../pageage/project_checked/list/index.js | 2 +- .../miniprogram/pageage/project_more/index.js | 2 +- .../views/bim/bimSetting/PersonRoaming.vue | 38 ++++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js index d74368da..908e7025 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js @@ -115,20 +115,16 @@ Page({ }, async submitSave(e) { let approveStatus = e.target.dataset.set; - if (!this.data.checkResult) { - app.toast("请选择审批结果!"); - return false; - } if (this.data.imageInfoData.length == 0) { app.toast("请上传图片!"); return; } let fileUrls = await uploadFiles(this.data.imageInfoData); - debugger + let postData = { id: this.data.rowData.id, approveStatus: approveStatus, - checkResult: this.data.checkResult, + checkResult: approveStatus == 3 ? 2 : 1, checkingFiles: fileUrls.join(","), }; try { diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml index 53de754b..5cfd2714 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml @@ -87,6 +87,7 @@ + 三方验收照片 diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js index ba0a2d1f..34cc7b4c 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js @@ -125,7 +125,7 @@ Page({ it.workingPositionFull = task.full; it.taskId = task.id; it.canEdit = (it.approveStatus == 1 || it.approveStatus == 3) && it.groupDeptUser == this.data.projectUserInfo.userPhone; - it.canApprove = (it.approveStatus == 1 || it.approveStatus == 3) && it.technicianUser == this.data.projectUserInfo.userPhone; + it.canApprove = (it.approveStatus == 1) && it.technicianUser == this.data.projectUserInfo.userPhone; return it; }); this.setData({ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js index e220444e..2013b8a8 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js @@ -71,7 +71,7 @@ Page({ * @param {*} proId */ getUserMenuList: function (proId) { - findUserMenuList(proId, 'gdgn').then(res => { + findUserMenuList(proId, this.data.active == 1 ? "" : 'gdgn').then(res => { if (res.code == 200) { this.setData({ menuList: res.data diff --git a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue b/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue index af457112..52d555c2 100644 --- a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue @@ -14,10 +14,12 @@ - + - + 开始漫游 @@ -95,15 +97,9 @@
- +
@@ -239,14 +235,15 @@ export default { }, mounted() { window.xapp = this - api.Plugin.addMiniMap() - let options = { - Anchor: 3, - Offset: [70, -380], - Size: 300, + if (!this.me.bimCfg.clientApi) { + api.Plugin.addMiniMap() + let options = { + Anchor: 3, + Offset: [70, -380], + Size: 300, + } + api.Plugin.updateMiniMap(options) } - api.Plugin.updateMiniMap(options) - const userStore = useUserStore() this.currentPrjId = userStore.currentPrjId this.currentComId = userStore.currentComId @@ -487,22 +484,27 @@ export default { .roaming-settings { width: 340px; padding: 0px 10px 10px; + .op-table { .cell { font-size: 12px; } } + .his-tool { font-size: 12px; margin-bottom: 8px; } + .pagination-container { margin-top: 10px; height: 32px; display: flex; justify-content: flex-end; + .el-pagination { font-size: 12px; + .el-pagination__total, .el-pagination__sizes { margin-right: 16px;