From 55074ca41ba5b5e84002a3483bb5124786d8b5ce Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Fri, 22 Sep 2023 17:03:06 +0800 Subject: [PATCH] 2023-9-22 --- src/views/assets/house.vue | 32 ++++++++++++++++++---------- src/views/component/detail.vue | 38 ++++++++++++++++++++++++++-------- src/views/component/map.vue | 4 ++-- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/src/views/assets/house.vue b/src/views/assets/house.vue index fe84db0..913ea00 100644 --- a/src/views/assets/house.vue +++ b/src/views/assets/house.vue @@ -687,17 +687,27 @@ export default { align: "center", customFn: (row) => { return ( - { - this.$refs["addHistory"].setRow(row); - this.$refs["addHistory"].setType("show"); - this.$refs["addHistory"].show(); - }, - }} - > - 查看 - + + + + + + + + + 查看 + + // { + // this.$refs["addHistory"].setRow(row); + // this.$refs["addHistory"].setType("show"); + // this.$refs["addHistory"].show(); + // }, + // }} + // > + // 查看 + // ); }, }); diff --git a/src/views/component/detail.vue b/src/views/component/detail.vue index 038fa2d..42f5256 100644 --- a/src/views/component/detail.vue +++ b/src/views/component/detail.vue @@ -41,9 +41,13 @@ - + +
+ 基本信息 +
@@ -191,6 +195,11 @@ style="width: 100%; height: 300px" > + +
+ 资产安全 +
+ @@ -200,10 +209,12 @@ (detail.id_assets_atlas_files_land_id_relation && detail.id_assets_atlas_files_land_id_relation.length > 0) " /> + + @@ -417,11 +428,20 @@ export default { computed: { picList() { - return ( - this.detail?.id_assets_atlas_files_asset_id_relation?.map( - (i) => i.url - ) || [] - ); + if (/\/house/g.test(this.$route.path)) { + return ( + this.detail?.id_assets_atlas_files_house_id_relation?.map( + (i) => i.url + ) || [] + ); + } + if (/\/land/g.test(this.$route.path)) { + return ( + this.detail?.id_assets_atlas_files_land_id_relation?.map( + (i) => i.url + ) || [] + ); + } }, contentFormat() { return function (i) { @@ -465,7 +485,7 @@ export default {