diff --git a/yanzhu-ui-app/miniprogram/app.wxss b/yanzhu-ui-app/miniprogram/app.wxss index ad8f1f40..1fd53880 100644 --- a/yanzhu-ui-app/miniprogram/app.wxss +++ b/yanzhu-ui-app/miniprogram/app.wxss @@ -2011,8 +2011,8 @@ swiper-item video { padding: 0 6px; text-align: center; white-space: nowrap; - margin-left: 110rpx; - margin-top: 16rpx; + right: 40rpx; + top: 40rpx; } .van-col--18 { diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml index 6a2b476e..7ffb91c9 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml @@ -31,10 +31,12 @@ - + + 编辑 - + + 审批 {{ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss index 656ae4d1..13a7ad57 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss @@ -1,7 +1,10 @@ .project_checked_list .inspect_for_bgd { position: relative; } + .project_checked_list .inspect_for_bgd .edit-icon { position: absolute; right: 40rpx; -} + top: 20rpx; + display: flex; +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxss index be16fedc..9552abf1 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxss +++ b/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxss @@ -1,23 +1,28 @@ -.more_max{ - padding:10rpx 30rpx 30rpx; - } - .more_manage{ - border-radius: 10rpx; - margin-top: 50rpx; - } - .gd_max{ - padding:10rpx 50rpx 0; - } - .gd_min{ - padding: 30rpx 0; - text-align: center; - } - .gd_min image{ - width: 150rpx; - height: 150rpx; - } - .gd_min view{ - padding: 10rpx; - color: #89a4eb; - } - \ No newline at end of file +.more_max { + padding: 10rpx 30rpx 30rpx; +} + +.more_manage { + border-radius: 10rpx; + margin-top: 50rpx; +} + +.gd_max { + padding: 10rpx 50rpx 0; +} + +.gd_min { + padding: 30rpx 0; + text-align: center; + position: relative; +} + +.gd_min image { + width: 150rpx; + height: 150rpx; +} + +.gd_min view { + padding: 10rpx; + color: #89a4eb; +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js index b9ee76c4..c34852e4 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js @@ -20,6 +20,7 @@ Page({ zlglDb: 0, todoDB: 0, checkDB: 0, //举牌验收数量 + menuKey: 0, checkList: [ { id: 1, @@ -207,6 +208,7 @@ Page({ proUserInfo.subDeptType == "1" ? res.data.dwsh + res.data.rysh : res.data.todo, + menuKey: res.data.menuKey + 1, }); } }); @@ -223,6 +225,7 @@ Page({ if (res.success) { this.setData({ checkDB: res.data.cnt || 0, + menuKey: res.data.menuKey + 1, }); } }); diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml index ad04b755..507e7870 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml @@ -21,7 +21,7 @@ - + {{zlyhDB}} diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxss index 46f6bbac..9552abf1 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxss +++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxss @@ -1,27 +1,28 @@ .more_max { - padding: 10rpx 30rpx 30rpx; + padding: 10rpx 30rpx 30rpx; } .more_manage { - border-radius: 10rpx; - margin-top: 50rpx; + border-radius: 10rpx; + margin-top: 50rpx; } .gd_max { - padding: 10rpx 50rpx 0; + padding: 10rpx 50rpx 0; } .gd_min { - padding: 30rpx 0; - text-align: center; + padding: 30rpx 0; + text-align: center; + position: relative; } .gd_min image { - width: 150rpx; - height: 150rpx; + width: 150rpx; + height: 150rpx; } .gd_min view { - padding: 10rpx; - color: #89a4eb; + padding: 10rpx; + color: #89a4eb; } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxss index 46f6bbac..9552abf1 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxss +++ b/yanzhu-ui-app/miniprogram/pageage/project_safety/index.wxss @@ -1,27 +1,28 @@ .more_max { - padding: 10rpx 30rpx 30rpx; + padding: 10rpx 30rpx 30rpx; } .more_manage { - border-radius: 10rpx; - margin-top: 50rpx; + border-radius: 10rpx; + margin-top: 50rpx; } .gd_max { - padding: 10rpx 50rpx 0; + padding: 10rpx 50rpx 0; } .gd_min { - padding: 30rpx 0; - text-align: center; + padding: 30rpx 0; + text-align: center; + position: relative; } .gd_min image { - width: 150rpx; - height: 150rpx; + width: 150rpx; + height: 150rpx; } .gd_min view { - padding: 10rpx; - color: #89a4eb; + padding: 10rpx; + color: #89a4eb; } \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue b/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue index 52d555c2..b4b8bcca 100644 --- a/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue @@ -125,7 +125,7 @@